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.

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

[FE][Feat] #131 : 페이지 router 설정 #141

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
});
return JSON.stringify(pr);
core.setOutput('prResult', JSON.stringify(pr));

- name: 'Check Approvals and Labels'
id: check
uses: actions/github-script@v6
with:
script: |
const pr = JSON.parse(steps.pr.outputs.result);
const pr = JSON.parse(process.env.PR_RESULT);
const reviews = await github.rest.pulls.listReviews({
owner: context.repo.owner,
repo: context.repo.repo,
Expand All @@ -37,7 +37,9 @@ jobs:

// 메인 브랜치로 향하는 PR인 경우 리뷰어 3명, 다른 브랜치인 경우 2명 필요
const requiredApprovals = pr.base.ref === 'main' ? 3 : 2;
return approvals.length >= requiredApprovals && hasLabel;

// Check 조건 결과를 출력에 설정
core.setOutput('result', approvals.length >= requiredApprovals && hasLabel);

- name: 'Change Label to 작업 완료'
if: steps.check.outputs.result == 'true'
Expand All @@ -62,6 +64,6 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
merge_method: 'merge', # 'squash' 또는 'rebase'로도 설정 가능
merge_method: 'merge', // 'squash' 또는 'rebase'로도 설정 가능
commit_title: `자동 머지: PR #${context.payload.pull_request.number}`
});
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<p>
<a href="https://www.notion.so/127b1b2b649180e88f70d6a4648924a0?pvs=4">팀 노션</a> |
<a href="https://github.com/boostcampwm-2024/web28-DDara/wiki">팀 위키</a> |
<a href="https://ddara-docs.vercel.app/">팀 위키</a> |
<a href="https://www.figma.com/design/r9nl4Jcz9VXIMbrpf50wY6/PickMeUp?node-id=90-1897">기획서</a> |
<a href="https://www.figma.com/design/r9nl4Jcz9VXIMbrpf50wY6/PickMeUp?node-id=87-929">디자인</a>
<!-- <br />
Expand Down
2 changes: 1 addition & 1 deletion docs/docusaurus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<p>
<a href="https://www.notion.so/127b1b2b649180e88f70d6a4648924a0?pvs=4">팀 노션</a> |
<a href="https://github.com/boostcampwm-2024/web28-DDara/wiki">팀 위키</a> |
<a href="https://ddara-docs.vercel.app/">팀 위키</a> |
<a href="https://www.figma.com/design/r9nl4Jcz9VXIMbrpf50wY6/PickMeUp?node-id=90-1897">기획서</a> |
<a href="https://www.figma.com/design/r9nl4Jcz9VXIMbrpf50wY6/PickMeUp?node-id=87-929">디자인</a>
<!-- <br />
Expand Down
3 changes: 2 additions & 1 deletion docs/docusaurus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react-dom": "^18.0.0",
"react-player": "^2.16.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.6.1",
Expand Down
8 changes: 7 additions & 1 deletion docs/docusaurus/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
// This file is not used in compilation. It is here just for a nice editor experience.
"extends": "@docusaurus/tsconfig",
"compilerOptions": {
"baseUrl": "."
"baseUrl": ".",
"paths": {
"@site/*": ["src/*"],
"@theme/*": ["src/theme/*"],
"@component/*": ["src/components/*"],
"@markdown/*": ["src/components/markdown/*"],
}
}
}
16 changes: 6 additions & 10 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,7 @@ export default [
'prettier/prettier': 'error',
'no-underscore-dangle': 'warn',
'no-undef': 'off',
'import/extensions': [
'error',
'ignorePackages',
{
js: 'never',
jsx: 'never',
ts: 'never',
tsx: 'never',
},
],
'import/extensions': 'off',
},
settings: {
'import/resolver': {
Expand Down Expand Up @@ -111,6 +102,10 @@ export default [
'import/prefer-default-export': 'off',
'import/no-unresolved': 'warn',
'no-console': 'off',
'import/extensions': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/consistent-type-definitions': 'off',
'@typescript-eslint/naming-convention': 'off',
},
},

Expand Down Expand Up @@ -185,6 +180,7 @@ export default [
'prettier/prettier': 'error',
'no-underscore-dangle': 'warn',
'no-undef': 'off',
'arrow-body-style': 'off',
},
},

Expand Down
4 changes: 3 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"dependencies": {
"@fontsource/pretendard": "^5.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react-dom": "^18.3.1",
"react-router-dom": "^6.28.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^3.2.2",
Expand All @@ -36,6 +37,7 @@
"@types/navermaps": "^3.7.8",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react-swc": "^3.5.0",
"autoprefixer": "^10.4.20",
"classnames": "^2.5.1",
Expand Down
64 changes: 64 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading