Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Week2/assign2] 배포를 위한 머지입니다 #4

Merged
merged 21 commits into from
Oct 26, 2023
Merged

[Week2/assign2] 배포를 위한 머지입니다 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
442b4b5
init : 폴더 생성
Yeonseo-Jo Oct 25, 2023
93668d4
init : js 파일 생성 및 연결
Yeonseo-Jo Oct 25, 2023
cb18ef1
feat : 상수 데이터 추가
Yeonseo-Jo Oct 25, 2023
3e37997
chore : 주석 제거
Yeonseo-Jo Oct 25, 2023
9661a0f
feat : 초기 데이터 (총 자산, 내역 리스트) 렌더링 구현
Yeonseo-Jo Oct 25, 2023
4534635
fix : 총 자산 앞에 가상 선택자로 달러 붙이기
Yeonseo-Jo Oct 25, 2023
283d162
feat : 총수입/총지출 초기 렌더링 구현
Yeonseo-Jo Oct 25, 2023
0ea7a50
chore : 주석 추가
Yeonseo-Jo Oct 25, 2023
f0b13b2
fix : 수입 지출 계산 로직 수정
Yeonseo-Jo Oct 25, 2023
8e8c58e
feat : 수입/지출 필터링 구현
Yeonseo-Jo Oct 25, 2023
81d0a24
fix : 수입 지출 총자산 계산 로직 변경
Yeonseo-Jo Oct 25, 2023
a4390a1
feat : 리스트 삭제 구현
Yeonseo-Jo Oct 25, 2023
39221b5
feat : 추가 모달 구현
Yeonseo-Jo Oct 25, 2023
21f8b1c
fix : 라디오 박스 수정
Yeonseo-Jo Oct 25, 2023
7fd6d03
feat : 리스트 추가 모달 구현
Yeonseo-Jo Oct 25, 2023
516adef
chore : 주석 추가
Yeonseo-Jo Oct 25, 2023
154dbcd
chore : 주석 추가
Yeonseo-Jo Oct 25, 2023
778633c
feat : 리스트 추가 입력하지 않은 항목 저장 방지 구현
Yeonseo-Jo Oct 26, 2023
e4fa747
feat : 리스트 추가 모달 fade in 애니메이션 적용
Yeonseo-Jo Oct 26, 2023
939378b
feat : 금액 유효성 검사 구현
Yeonseo-Jo Oct 26, 2023
2cdf9b3
feat : 화폐 단위 표시(localString)
Yeonseo-Jo Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions week2/assign2/data/HISTORY_LIST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
export const HISTORY_LIST_DATA = [
{
id: 1,
category: "식비",
contents: "맥도날드 안암점",
type: "expense",
amount: 10800,
},
{
id: 2,
category: "취미",
contents: "하루필름 강남2호점",
type: "expense",
amount: 5000,
},
{
id: 3,
category: "월급",
contents: "이번 달 알바비",
type: "income",
amount: 300000,
},
{
id: 4,
category: "쇼핑",
contents: "오렌즈 강남역 지하쇼핑역점",
type: "expense",
amount: 30000,
},
];
158 changes: 158 additions & 0 deletions week2/assign2/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="style.css" />
<title>연또의 가계부</title>
</head>
<body>
<header class="header">
<h1>💰 연또의 가계부 💰</h1>
</header>

<main>
<section class="asset">
<article class="asset__box">
<h2 class="asset__box__title">나의 자산</h2>
<p class="asset__box__total-amount"></p>
<div class="asset__box__detail-amount">
<p class="detail-amount__plus income">
<span class="amount-sign">+</span
><span class="detail-amount__num__plus"></span>
</p>
<p class="detail-amount__minus expense">
<span class="amount-sign">-</span
><span class="detail-amount__num__minus"></span>
</p>
</div>
</article>
</section>

<section class="history">
<article class="history__top">
<button type="button">&lt;</button>
<h2>10월 1일</h2>
<button type="button">&gt;</button>
</article>

<article class="history__detail">
<h3>내역 리스트</h3>
<div class="history__detail__checkbox">
<input type="checkbox" id="checkbox-income" checked />
<label for="checkbox-income">수입</label>
<input type="checkbox" id="checkbox-expense" checked />
<label for="checkbox-expense">지출</label>
</div>
</article>

<article class="history__list">
<ul class="history__list__container">
<!-- <li class="history__list__box">
<span class="history-category">식비</span>
<span class="history-contents">맥도날드 안암역점</span>
<span class="history-amount expense">10800</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">취미</span>
<span class="history-contents">하루필름 강남2호점</span>
<span class="history-amount expense">5000</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">월급</span>
<span class="history-contents">이번달 알바비</span>
<span class="history-amount income">300000</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">쇼핑</span>
<span class="history-contents">오렌즈 강남역 지하쇼핑역점</span>
<span class="history-amount expense">30000</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">식비</span>
<span class="history-contents">지에스25 안암역점</span>
<span class="history-amount expense">4500</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">식비</span>
<span class="history-contents">지에스25 안암역점</span>
<span class="history-amount expense">4500</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">식비</span>
<span class="history-contents">지에스25 안암역점</span>
<span class="history-amount expense">4500</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">식비</span>
<span class="history-contents">지에스25 안암역점</span>
<span class="history-amount expense">4500</span>
<button type="button" class="history-del-btn">X</button>
</li>
<li class="history__list__box">
<span class="history-category">식비</span>
<span class="history-contents">지에스25 안암역점</span>
<span class="history-amount expense">4500</span>
<button type="button" class="history-del-btn">X</button>
</li> -->
</ul>
</article>
</section>
</main>

<footer class="footer">
<button type="button" class="footer__add-btn">+</button>
</footer>

<div class="add-list-modal__background">
<section class="add-list-modal">
<header class="add-list-modal__header">
<h3>내역 추가</h3>
</header>
<div class="add-list-modal__radio-input">
<input
type="radio"
name="type"
value="income"
id="modal__radio__income"
checked
/>
<label for="modal__radio__income">수입</label>
<input
type="radio"
name="type"
value="expense"
id="modal__radio__expense"
/>
<label for="modal__radio__expense">지출</label>
</div>
<div class="add-list-modal__category">
<p class="add-category__title">종류</p>
<select class="add-category__select"></select>
</div>
<div class="add-list-modal__amounts">
<p class="add-amounts__title">금액</p>
<input class="add-amounts__input" placeholder="금액을 입력해주세요" />
</div>
<div class="add-list-modal__contents">
<p class="add-contents__title">내용</p>
<input
class="add-contents__input"
placeholder="내용을 입력해주세요"
/>
</div>
<button type="button" class="add-list-modal__save-btn">저장하기</button>
<button type="button" class="add-list-modal__close-btn">닫기</button>
</section>
</div>

<script type="module" src="./script.js"></script>
</body>
</html>
133 changes: 133 additions & 0 deletions week2/assign2/reset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/

* {
box-sizing: border-box;
}

html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
/* font: inherit; */
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}
body {
line-height: 1;
}
ol,
ul {
list-style: none;
}
blockquote,
q {
quotes: none;
}
blockquote:before,
blockquote:after,
q:before,
q:after {
content: "";
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
Loading