Skip to content

Commit 7c4e7b0

Browse files
authored
Merge pull request #106 from boostcamp-2020/dev
[Merge] dev -> master
2 parents 35a709c + 6ecc5ad commit 7c4e7b0

File tree

167 files changed

+23291
-4055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+23291
-4055
lines changed

.github/CODEOWNERS

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* @gyim1345 @Yejikwon @jch422 @AccountBook_Mentor
2+

.github/ISSUE_TEMPLATE/bug_report.md

+31-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
1-
### 🤔 Current behaviour (bug)
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
27

3-
Write here
8+
---
49

5-
<br/>
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
612

7-
### 😮 Expected behaviour (correct)
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
819

9-
Write here
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
1022

11-
<br/>
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
1225

13-
### 😣 버그 재현방법
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
1430

15-
1. Write here
16-
2. Write here
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
110
## 🗣 설명
211

312
Github 이슈 설명

.github/PULL_REQUEST_TEMPLATE.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
## ✅ 작업 내용
2-
- [ ] 작업 내역 1
3-
- [ ] 작업 내역 2
4-
5-
## 🔨 변경 사항 (구현 사항)
6-
- [ ] 구현 사항 1
7-
- [ ] 구현 사항 2
2+
- [X] 작업 내역 1
3+
- [X] 작업 내역 2
84

95
## 📸 스크린샷 (Optional)
106

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ node_modules
33
dist
44

55
# file
6-
.env
6+
.env
7+
.env.development
8+
.env.production
9+
.env.test

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
웹 기반으로 동작하는 개인의 입출금 및 가계 재정을 시각화 및 분석할 수 있는 가계부 입니다.
77

8+
89
## 😊 팀원 소개
910

1011
| J018 권예지 | J169 임기봉 | J188 정지찬 |

client/.babelrc

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
{
2-
"presets": ["@babel/preset-env", "@babel/preset-react"],
3-
"plugins": ["react-refresh/babel"]
2+
"env": {
3+
"development": {
4+
"presets": ["@babel/preset-env", "@babel/preset-react"],
5+
"plugins": ["react-refresh/babel"]
6+
},
7+
"test": {
8+
"presets": ["@babel/preset-env", "@babel/preset-react"],
9+
"plugins": []
10+
}
11+
}
412
}

client/.eslintrc.js

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
module.exports = {
2-
"env": {
3-
"browser": true,
4-
"es2021": true,
5-
"node": true
2+
env: {
3+
browser: true,
4+
es2021: true,
5+
node: true,
6+
},
7+
extends: ['eslint:recommended', 'plugin:react/recommended'],
8+
parserOptions: {
9+
ecmaFeatures: {
10+
jsx: true,
611
},
7-
"extends": [
8-
"eslint:recommended",
9-
"plugin:react/recommended"
10-
],
11-
"parserOptions": {
12-
"ecmaFeatures": {
13-
"jsx": true
14-
},
15-
"ecmaVersion": 12,
16-
"sourceType": "module"
17-
},
18-
"plugins": [
19-
"react"
20-
],
21-
"rules": {
22-
}
12+
ecmaVersion: 12,
13+
sourceType: 'module',
14+
},
15+
plugins: ['react'],
16+
rules: {
17+
'react/react-in-jsx-scope': 'off',
18+
indent: ['error', 2],
19+
'react/prop-types': 0,
20+
},
2321
};

client/csvLoader.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module.exports = function (source) {
2+
const result = { header: undefined, rows: [] };
3+
const rows = source.split('\n');
4+
5+
rows.forEach((row) => {
6+
const columns = row.split(',');
7+
if (!result.header) {
8+
result.header = columns;
9+
return;
10+
}
11+
result.rows = [...result.rows, columns];
12+
});
13+
14+
return `export default ${JSON.stringify(result)}`;
15+
};

0 commit comments

Comments
 (0)