Skip to content

Commit

Permalink
Merge branch 'DangleDangle:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Sangjun-man authored Sep 16, 2023
2 parents d8854c3 + 8110122 commit f6997d5
Show file tree
Hide file tree
Showing 1,081 changed files with 33,679 additions and 3,430 deletions.
50 changes: 50 additions & 0 deletions .cz-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
module.exports = {
types: [
{ value: 'โœจ feat', name: 'โœจ feat:\t์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€' },
{ value: '๐Ÿ”จ fix', name: '๐Ÿ”จ fix:\t๋ฒ„๊ทธ, ์˜ค๋ฅ˜ ์ˆ˜์ •' },
{
value: '๐Ÿš€ update',
name: '๐Ÿš€ update: \t๋กœ์ง ๋˜๋Š” api ์ˆ˜์ • (๊ธฐํš ๋ณ€๊ฒฝ์œผ๋กœ ์ธํ•œ feat ์ปค๋ฐ‹ ์ดํ›„ ์ˆ˜์ •๋˜๋Š” ๊ฒฝ์šฐ)'
},
{
value: '๐Ÿค– refactor',
name: '๐Ÿค– refactor:\t๋ฆฌํŒฉํ† ๋ง(์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ ์ถ”๊ฐ€๋˜์ง€ ์•Š์Œ)'
},
{ value: '๐Ÿ“œ docs', name: '๐Ÿ“œ docs:\t๋ฌธ์„œ ์ถ”๊ฐ€ ํ˜น์€ ์—…๋ฐ์ดํŠธ' },
{ value: '๐Ÿช„ create', name: '๐Ÿช„ create:\t์ƒˆ๋กœ์šด ํŒŒ์ผ ์ƒ์„ฑ' },
{ value: '๐Ÿ”ฅ remove', name: '๐Ÿ”ฅ remove:\tํŒŒ์ผ ์‚ญ์ œ ๋˜๋Š” ํŒŒ์ผ๋ช… ๋ณ€๊ฒฝ' },
{
value: '๐Ÿ’„ style',
name: '๐Ÿ’„ style:\t์ฝ”๋“œ ํฌ๋งทํŒ… (prettier ์ ์šฉ, ๊ณต๋ฐฑ ์ถ”๊ฐ€/์ œ๊ฑฐ, ๋ณ€์ˆ˜๋ช… ๋ณ€๊ฒฝ ๋“ฑ)'
},
{
value: 'โœ… test',
name: 'โœ… test:\tํ…Œ์ŠคํŠธ ์ผ€์ด์Šค ๊ด€๋ จ ์ฝ”๋“œ ๋ณ€๊ฒฝ'
},
{
value: '๐Ÿšš chore',
name: '๐Ÿšš chore:\t๊ธฐํƒ€ ๋ณ€๊ฒฝ ์‚ฌํ•ญ (๋ผ์ด๋ธŒ๋Ÿฌ๋ฆฌ ์—…๋ฐ์ดํŠธ, ์ฃผ์„ ์ถ”๊ฐ€/์ œ๊ฑฐ ๋“ฑ)'
},
{
value: '๐Ÿ“ฆ build',
name: '๐Ÿ“ฆ build:\t๋นŒ๋“œ ๊ด€๋ จ ํŒŒ์ผ ์ˆ˜์ • (CI/CD ์„ค์ • ๋“ฑ)'
}
],
scopes: [{ name: '*' }],
allowCustomScopes: true,
skipQuestions: ['scope', 'body', 'breaking', 'footer'],
allowBreakingChanges: ['feat', 'fix'],
usePreparedCommit: false,
subjectLimit: 100,
messages: {
type: '์ปค๋ฐ‹์˜ ์œ ํ˜•(ํƒœ๊ทธ)์„ ์„ ํƒํ•˜์„ธ์š”:',
scope: '\n์ด ๋ณ€๊ฒฝ์˜ ๋ฒ”์œ„(SCOPE)๋ฅผ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š” (์„ ํƒ์‚ฌํ•ญ):',
customScope: '์ด ๋ฒ”์œ„(SCOPE)๋ฅผ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š” :',
subject: '๋ณ€๊ฒฝ์— ๋Œ€ํ•œ ๊ฐ„๊ฒฐํ•˜๊ฒŒ, ๋ช…๋ นํ˜•์œผ๋กœ ์„ค๋ช…์„ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”:\n',
body: '๋ณ€๊ฒฝ์— ๋Œ€ํ•œ ์ž์„ธํ•œ ์„ค๋ช…์„ ์ž‘์„ฑํ•˜์„ธ์š” "|"๋ฅผ ์‚ฌ์šฉํ•˜์—ฌ ์ค„๋ฐ”๊ฟˆ ๊ฐ€๋Šฅํ•ฉ๋‹ˆ๋‹ค (์„ ํƒ์‚ฌํ•ญ):\n',
breaking: '๋ชจ๋“  BREAKING CHANGES๋ฅผ ๋‚˜์—ดํ•˜์„ธ์š” (์„ ํƒ์‚ฌํ•ญ):\n',
footer:
'์ด ๋ณ€๊ฒฝ์— ์˜ํ•ด ํ•ด๊ฒฐ๋œ ์ด์Šˆ๋ฅผ ๋‚˜์—ดํ•˜์„ธ์š” ex): #31, #34 (์„ ํƒ์‚ฌํ•ญ):\n',
confirmCommit: '์œ„์˜ ์ปค๋ฐ‹์„ ์ง„ํ–‰ํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?'
}
};
13 changes: 7 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"extends": "next/core-web-vitals",
"extends": ["next/core-web-vitals", "prettier"],
"plugins": ["prettier"],
"rules": {
"no-var": "error",
"no-multiple-empty-lines": "error",
"eqeqeq": "error",
"dot-notation": "error",
"no-unused-vars": "error"
"no-var": "warn",
"no-multiple-empty-lines": "warn",
"eqeqeq": "warn",
"dot-notation": "warn",
"no-unused-vars": "warn"
}
}
57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/rfc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
name: RFC
about: ๊ธฐ์ˆ  ์Šคํƒ ๋ณ€๊ฒฝ, ์•„ํ‚คํ…์ณ ๋ณ€๊ฒฝ, ์ปจ๋ฒค์…˜ ๋ณ€๊ฒฝ ๋“ฑ ํ”„๋กœ์ ํŠธ์—์„œ ๊ธฐ์ˆ ์ ์œผ๋กœ ๋…ผ์˜ํ•  ์‚ฌํ•ญ์ด ์žˆ์„๋•Œ RFC ๋ฌธ์„œ๋กœ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”
title: 'RFC: '
labels: ๋…ผ์˜์‚ฌํ•ญ๐Ÿ’ฌ
assignees: ""
---

# Title of RFC

| ์ƒํƒœ | (Proposed / Accepted / Implemented / Obsolete) |
:----------- |:---------------------------------------------------- |
| **RFC #** | [NNN](https://github.com/YAPP-Github/22nd-Web-Team-2-Web/pull/NNN) (update when you have community PR #)|
| **์ €์ž** | @Github Id |
| **์—…๋ฐ์ดํŠธ** | YYYY-MM-DD |

## ๋ชฉ์ 

๋ฌด์—‡์„ ํ•˜๊ณ  ์žˆ๊ณ  ์™œ ํ•ฉ๋‹ˆ๊นŒ?
์ด๊ฒƒ์ด ์–ด๋–ค ๋ฌธ์ œ๋ฅผ ํ•ด๊ฒฐํ•  ์ˆ˜ ์žˆ์„๊นŒ์š”?
๋ชฉํ‘œ์™€ ๋น„๋ชฉํ‘œ๋Š” ๋ฌด์—‡์ž…๋‹ˆ๊นŒ? ๊ฐ„๋žตํ•˜๊ฒŒ ์ž‘์„ฑํ•˜๊ณ  ์•„๋ž˜์— ์ž์„ธํžˆ ์„ค๋ช…ํ•ด ์ฃผ์‹ญ์‹œ์˜ค.

## ๋™๊ธฐ

์™œ ์ด๊ฒƒ์ด ํ•ด๊ฒฐํ•ด์•ผ ํ•  ๊ฐ€์น˜ ์žˆ๋Š” ๋ฌธ์ œ์ž…๋‹ˆ๊นŒ? ํ•„์š”ํ•œ ๋ฐฐ๊ฒฝ ์ •๋ณด, ์ด ๋””์ž์ธ์ด ์–ด๋–ป๊ฒŒ ๋ฌธ์ œ๋ฅผ ํ•ด๊ฒฐํ•˜๋Š”์ง€ ๋ณด์—ฌ์ค„ ์ˆ˜ ์žˆ์Šต๋‹ˆ๊นŒ?
์–ด๋–ค ํŒŒํŠธ์—์„œ ๋ฌธ์ œ์˜ ์˜ํ–ฅ์„ ๋ฐ›์Šต๋‹ˆ๊นŒ? ์™œ ๊ทธ๊ฒƒ์ด ๋ฌธ์ œ์ž…๋‹ˆ๊นŒ? ์–ด๋–ค ๊ด€๋ จ๋œ ์ผ์ด ์žˆ์Šต๋‹ˆ๊นŒ?

## ์ƒ์„ธ ๋‚ด์šฉ

RFC์˜ ๋Œ€๋ถ€๋ถ„์„ ์ฐจ์ง€ํ•˜๋Š” ํ•ญ๋ชฉ์ž…๋‹ˆ๋‹ค. ํ”„๋กœ์ ํŠธ์— ์ฐธ์—ฌํ•œ ์‚ฌ์šฉ์ž๊ฐ€ ์ดํ•ดํ•  ์ˆ˜ ์žˆ๋„๋ก ์„ค๊ณ„๋ฅผ ์ž์„ธํžˆ ์„ค๋ช…ํ•ฉ๋‹ˆ๋‹ค.


## ์‚ฌ์šฉ์‹œ ์ด์ 

์‚ฌ์šฉ์ž(๋˜๋Š” ๊ธฐํƒ€ ๊ธฐ์—ฌ์ž)๋Š” ์ด ์ž‘์—…์„ ํ†ตํ•ด ์–ด๋–ค ์ด์ ์„ ์–ป์„ ์ˆ˜ ์žˆ์Šต๋‹ˆ๊นŒ? ์–ด๋–ค ๊ฒƒ์ด ์žˆ์„๊นŒ์š”
๋ฐœํ‘œ ๋…ธํŠธ๋‚˜ ๋ธ”๋กœ๊ทธ ๊ฒŒ์‹œ๋ฌผ์— ํ—ค๋“œ๋ผ์ธ์ด ์žˆ์Šต๋‹ˆ๊นŒ?


## ๊ณ ๋ ค๋œ ๋Œ€์•ˆ๋“ค
์ œ์•ˆํ•œ ๋Œ€์•ˆ๊ณผ์˜ ์ƒ๋Œ€์ ์ธ ์žฅ์ ์„ ๋…ผ์˜ํ•ด์•ผ ํ•ฉ๋‹ˆ๋‹ค.


## ๋‹จ์ 

์™œ ์šฐ๋ฆฌ๋Š” ์ด๊ฒƒ์„ ํ•˜์ง€ ๋ง์•„์•ผ ํ•˜๋Š”์ง€?

- ์ฝ”๋“œ ํฌ๊ธฐ ๋ฐ ๋ณต์žก์„ฑ ์ธก๋ฉด์—์„œ ๊ตฌํ˜„ ๋น„์šฉ
- ๋Ÿฌ๋‹์ปค๋ธŒ๊ฐ€ ํฐ์ง€?
- ์ด ๊ธฐ๋Šฅ์„ ๋‹ค๋ฅธ ๊ธฐ์กด ๊ธฐ๋Šฅ๊ณผ ํ†ตํ•ฉ ํ•  ์ˆ˜ ์žˆ๋Š”์ง€?

ํ•ด๋‹น ๊ธฐ์ˆ ์„ ์„ ํƒํ•˜๋Š”๋ฐ์— ์–ด๋–ค ํŠธ๋ ˆ์ด๋“œ ์˜คํ”„๊ฐ€ ์žˆ์„์ง€ ์ƒ๊ฐํ•ด ๋ด…์‹œ๋‹ค.


## ํ•ด๊ฒฐ๋˜์ง€ ์•Š์€ ์งˆ๋ฌธ

์„ ํƒ์‚ฌํ•ญ์ด์ง€๋งŒ, ์ฒซ ๋ฒˆ์งธ ์ดˆ์•ˆ์— ์‚ฌ์šฉํ•  ๊ฒƒ์„ ๊ถŒ์žฅํ•ฉ๋‹ˆ๋‹ค. ๋””์ž์ธ์˜ ์–ด๋–ค ๋ถ€๋ถ„์ด ์—ฌ์ „ํžˆ ํ•ด๊ฒฐ๋˜์ง€ ์•Š๋‚˜์š”?

28 changes: 28 additions & 0 deletions .github/workflows/repostiory_dispatch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Dispatch to Forked Repository

on:
push:
branches-ignore:
- '.*\/ignore-action$'

jobs:
print:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Get the refs
run: echo "[log] ref is ${{github.ref}}"
- name: Get the branch name
run: echo "[log] Branch name is ${{github.ref_name}}"

dispatch:
runs-on: ubuntu-latest
steps:
- name: Repository Dispatch
run: |
curl -L \
-X POST https://api.github.com/repos/${{vars.DEPLOY_REPO_PATH}}/dispatches \
-H "Accept: application/vnd.github+json" \
-H "Authorization: Bearer ${{ secrets.DEPLOY_REPO_ACCESS_TOKEN}}" \
-d '{"event_type": "sync", "client_payload": {"target_branch": "${{github.ref_name}}"}}'
7 changes: 7 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
. "$(dirname "$0")/_/husky.sh"

# Add the following
yarn lint-staged

# If using npm, remove above and uncomment below
# npm run lint-staged
37 changes: 37 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/sh

FORBIDDEN_HTTPS_URL="https://github.com/YAPP-Github/22nd-Web-Team-2-Web" # insert your remote url (https)
FORBIDDEN_SSH_URL="[email protected]:YAPP-Github/22nd-Web-Team-2-Web" # insert your remote url (ssh)
FORBIDDEN_REF=("refs/heads/main" "refs/heads/develop" "refs/heads/feat/YW2-4") # ๋ฉ”์ธ, ๋””๋ฒจ๋กญ์— ํ‘ธ์‹œ ๊ธˆ์ง€




remote="$1" # origin
url="$2" # https://github.com/YAPP-Github/22nd-Web-Team-2-Web
if [ "$url" != "$FORBIDDEN_HTTPS_URL" -a "$url" != "$FORBIDDEN_SSH_URL" ]
then
exit 0 # Forked Project ์—์„œ๋Š” ์ œํ•œํ•˜์ง€ ์•Š์Œ
fi





while read local_ref local_sha remote_ref remote_sha
do
for forbidden_ref in "${FORBIDDEN_REF[@]}"

do
# echo "์–ด๋–ค๊ฐ’์„ ๊ฐ–๋Š๋ƒ, - local $local_ref, $remote_ref, $remote_sha"
# echo "๊ธˆ์ง€Ref : $forbidden_ref"
if [ "$remote_ref" = "$forbidden_ref" ]
then
echo "DO NOT PUSH to $remote_ref"
exit 1
fi
done
done

exit

20 changes: 20 additions & 0 deletions .husky/prepare-commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
COMMIT_MSG_FILE=$1
BEFORE_FIRST_LINE=$(head -n1 $COMMIT_MSG_FILE)

# echo "์ž‘์„ฑ์ „ ์ฒซ์งธ์ค„ ํ™•์ธ :: $BEFORE_FIRST_LINE"

exec < /dev/tty && yarn cz --hook || true


AFTER_FIRST_LINE=$(head -n1 $COMMIT_MSG_FILE)

# echo "์ž‘์„ฑํ›„ ์ฒซ์งธ์ค„ ํ™•์ธ :: $AFTER_FIRST_LINE"

if [ -z "$AFTER_FIRST_LINE" ]
then
echo "์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ์ž…๋ ฅํ•˜๋Š” ๋„์ค‘ ์—๋Ÿฌ๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค"
exit 1
else
echo "์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€ ์ž‘์„ฑ ์„ฑ๊ณต"
exit 0
fi
13 changes: 13 additions & 0 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
// Type check TypeScript files
'**/*.(ts|tsx)': () => 'yarn tsc --noEmit',

// Lint & Prettify TS and JS files
'**/*.(ts|tsx|js)': filenames => [
`yarn eslint ${filenames.join(' ')}`,
`yarn prettier --write ${filenames.join(' ')}`
],

// Prettify only Markdown and JSON files
'**/*.(md|json)': filenames => `yarn prettier --write ${filenames.join(' ')}`
};
Loading

0 comments on commit f6997d5

Please sign in to comment.