Skip to content

Commit 44dfce9

Browse files
authored
Merge pull request #128 from billilge/develop
[Merge] 0차 스프린트 develop -> main
2 parents 6e40cbb + 519ecdb commit 44dfce9

File tree

148 files changed

+15111
-944
lines changed

Some content is hidden

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

148 files changed

+15111
-944
lines changed

.eslintrc.json

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,54 @@
11
{
2-
"extends": ["next/core-web-vitals", "next/typescript"]
2+
"env": {
3+
"browser": true,
4+
"es2021": true,
5+
"node": true
6+
},
7+
"settings": {
8+
"import/resolver": {
9+
"node": {
10+
"extensions": [".js", ".jsx", ".ts", ".tsx"]
11+
},
12+
"typescript": {}
13+
}
14+
},
15+
"extends": [
16+
"next",
17+
"next/core-web-vitals",
18+
"prettier",
19+
"airbnb",
20+
"eslint:recommended",
21+
"plugin:react/recommended",
22+
"plugin:prettier/recommended",
23+
"plugin:@typescript-eslint/recommended",
24+
"airbnb-typescript"
25+
],
26+
"parser": "@typescript-eslint/parser",
27+
"parserOptions": {
28+
"ecmaVersion": "latest",
29+
"sourceType": "module",
30+
"project": "./tsconfig.json"
31+
},
32+
"plugins": ["@typescript-eslint", "react", "prettier"],
33+
"rules": {
34+
"react/jsx-props-no-spreading": "off",
35+
"prettier/prettier": ["error", { "endOfLine": "lf" }],
36+
"react/prop-types": "off",
37+
"jsx-a11y/no-static-element-interactions": "off",
38+
"import/prefer-default-export": "off",
39+
"@typescript-eslint/indent": "off",
40+
"prettier/prettier": "error",
41+
"react/react-in-jsx-scope": "off",
42+
"react/require-default-props": "off",
43+
"import/extensions": [
44+
"error",
45+
"ignorePackages",
46+
{
47+
"js": "never",
48+
"jsx": "never",
49+
"ts": "never",
50+
"tsx": "never"
51+
}
52+
]
53+
}
354
}

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: "버그 수정"
1+
name: '버그 수정'
22
description: 버그 수정 사항을 작성해주세요.
3-
title: "[ Bug ] "
3+
title: '[ Bug ] '
44
body:
55
- type: markdown
66
attributes:
@@ -11,7 +11,7 @@ body:
1111
attributes:
1212
label: 🐛 Issue
1313
description: 버그가 발생한 이슈 이름과 번호를 작성해주세요.
14-
placeholder: "[ Feat ] 로그인 기능 구현 <#1>"
14+
placeholder: '[ Feat ] 로그인 기능 구현 <#1>'
1515
validations:
1616
required: true
1717
- type: textarea
@@ -22,7 +22,7 @@ body:
2222
placeholder: |
2323
1. <버그 설명 1>
2424
2. <버그 설명 2>
25-
render: ""
25+
render: ''
2626
validations:
2727
required: true
2828
- type: textarea

.github/ISSUE_TEMPLATE/feature.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: "기능 추가"
1+
name: '기능 추가'
22
description: 기능 추가 작업 사항을 작성해주세요.
3-
title: "[ Feat ] "
3+
title: '[ Feat ] '
44
body:
55
- type: markdown
66
attributes:

.github/ISSUE_TEMPLATE/refactor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
name: "리팩토링"
1+
name: '리팩토링'
22
description: 리팩토링 작업 사항을 작성해주세요.
3-
title: "[ Refactor ] "
3+
title: '[ Refactor ] '
44
body:
55
- type: markdown
66
attributes:
@@ -19,7 +19,7 @@ body:
1919
attributes:
2020
label: 🔢 리팩토링하는 이슈를 기입해주세요.
2121
description: 리팩토링을 진행하는 이전 이슈를 작성해주세요.
22-
placeholder: "#이슈번호"
22+
placeholder: '#이슈번호'
2323
validations:
2424
required: true
2525
- type: textarea
@@ -30,7 +30,7 @@ body:
3030
placeholder: |
3131
1. 이유
3232
2. 이유
33-
render: ""
33+
render: ''
3434
validations:
3535
required: false
3636
- type: textarea

.github/labeler.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@ enable:
1313
# - 'include' patterns will associate a label if any of these patterns match
1414
# - 'exclude' patterns will ignore this label if any of these patterns match
1515
labels:
16-
":bug: BUG":
16+
':bug: BUG':
1717
include: ['\bBug\b', '\bbug\b', '\bFix\b', '\bfix\b']
18-
":sparkles: FEAT":
18+
':sparkles: FEAT':
1919
include: ['\bFeat\b', '\bfeat\b', '\bFeature\b', '\bfeature\b']
20-
":memo: DOCS":
20+
':memo: DOCS':
2121
include: ['\bDocs\b', '\bdocs\b', '\bREADME\b']
22-
":package: CHORE":
22+
':package: CHORE':
2323
include: ['\bChore\b', '\bchore\b']
24-
":lipstick: DESIGN":
24+
':lipstick: DESIGN':
2525
include: ['\bDesign\b', '\bdesign\b']
26-
":rocket: API":
26+
':rocket: API':
2727
include: ['\bAPI\b', '\bapi\b']
28-
":recycle: REFACTOR":
28+
':recycle: REFACTOR':
2929
include: ['\bRefactor\b', '\brefactor\b']
30-
":wrench: INIT":
30+
':wrench: INIT':
3131
include: ['\bINIT\b', '\bInit\b', '\binit\b']
32-
":twisted_rightwards_arrows: MERGE":
32+
':twisted_rightwards_arrows: MERGE':
3333
include: ['\bMERGE\b', '\bMerge\b', '\bmerge\b']
34-
":ambulance: !HOTFIX":
34+
':ambulance: !HOTFIX':
3535
include: ['\bHOTFIX\b', '\bhotfix\b']
36-
":bookmark: RELEASE":
36+
':bookmark: RELEASE':
3737
include: ['\bRelease\b', '\brelease\b']

.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
## ✅ Key Changes
2929

3030
> 이번 PR에서 작업한 내용을 간략히 설명해주세요
31+
3132
1. 작업 내용
3233

3334
## 📢 To Reviewers

.github/workflows/autoLabel.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Auto Labeler
2-
on:
2+
on:
33
issues:
44
types: [opened]
55
pull_request_target:
@@ -13,8 +13,8 @@ jobs:
1313
issues: write
1414
pull-requests: write
1515
steps:
16-
- name: Check Labels
17-
id: labeler
18-
uses: jimschubert/labeler-action@v2
19-
with:
20-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
16+
- name: Check Labels
17+
id: labeler
18+
uses: jimschubert/labeler-action@v2
19+
with:
20+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/autoSync.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Synchronize to forked repo
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
7+
jobs:
8+
sync:
9+
name: Sync forked repo
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout develop
14+
uses: actions/checkout@v4
15+
with:
16+
token: ${{ secrets.AUTO_SYNC_TOKEN }}
17+
fetch-depth: 0
18+
ref: develop
19+
20+
- name: Add remote-url
21+
run: |
22+
git remote add forked-repo https://tnals0924:${{ secrets.AUTO_SYNC_TOKEN }}@github.com/tnals0924/billilge-frontend
23+
git config user.name tnals0924
24+
git config user.email ${{ secrets.EMAIL }}
25+
26+
- name: Push changes to forked-repo
27+
run: |
28+
git push -f forked-repo develop
29+
30+
- name: Clean up
31+
run: |
32+
git remote remove forked-repo

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,12 @@ yarn-error.log*
3838
# typescript
3939
*.tsbuildinfo
4040
next-env.d.ts
41+
42+
*.idea
43+
44+
**/public/sw.js
45+
**/public/workbox-*.js
46+
**/public/worker-*.js
47+
**/public/sw.js.map
48+
**/public/workbox-*.js.map
49+
**/public/worker-*.js.map

.idea/.gitignore

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)