Skip to content

Commit 106cc09

Browse files
authored
Merge pull request #150 from devping-kr/dev
Chore: Version v2.0.0 main 배포
2 parents 62b6bd8 + e023f6e commit 106cc09

File tree

218 files changed

+6652
-2686
lines changed

Some content is hidden

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

218 files changed

+6652
-2686
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
<!--
2-
제목은 `feat[#issue 번호]: 기능 구현 내용`으로 작성해 주세요
3-
예시) feat[#Issue number]: 기능 구현
2+
제목은 `Feat[#issue 번호]: 기능 구현 내용`으로 작성해 주세요
3+
예시) Feat[#THKV-108]: 버튼 컴포넌트 기능 구현
44
-->
55

6-
## 관련 문서
7-
8-
- issue: #
9-
- close #
10-
116
## 유형
127

138
- [ ] 기능 구현

.github/workflows/deploy.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@ name: git push into another repo to deploy to vercel
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
7+
- dev
68

79
jobs:
810
build:
911
runs-on: ubuntu-latest
1012
container: pandoc/latex
1113
steps:
1214
- uses: actions/checkout@v4
13-
- name: Install mustache (to update the date)
14-
run: apk add ruby && gem install mustache
15+
- name: Install mustache
16+
run: |
17+
apk add ruby && gem install mustache
1518
- name: creates output
1619
run: sh ./build.sh
1720
- name: Pushes to another repository
@@ -24,7 +27,7 @@ jobs:
2427
destination-github-username: plla2
2528
destination-repository-name: NNplanner-FE
2629
user-email: ${{ secrets.EMAIL }}
27-
commit-message: ${{ github.event.commits[0].message }}
28-
target-branch: main
30+
commit-message: ${{ github.event.head_commit.message }}
31+
target-branch: ${{ github.ref_name }}
2932
- name: Test get variable exported by push-to-another-repository
3033
run: echo $DESTINATION_CLONED_DIRECTORY

next.config.mjs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ const nextConfig = {
1919
},
2020
];
2121
},
22-
redirects() {
23-
return [
24-
{
25-
source: '/',
26-
destination: '/main',
27-
permanent: true,
28-
},
29-
];
30-
},
3122
};
3223

3324
export default nextConfig;

package-lock.json

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

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,26 @@
1717
]
1818
},
1919
"dependencies": {
20+
"@emailjs/browser": "^4.4.1",
2021
"@hookform/resolvers": "^3.9.0",
2122
"@tanstack/react-query": "^5.54.1",
2223
"@tanstack/react-query-devtools": "^5.54.1",
23-
"apexcharts": "^4.0.0",
24+
"apexcharts": "^4.5.0",
2425
"axios": "^1.7.7",
2526
"class-variance-authority": "^0.7.0",
2627
"clsx": "^2.1.1",
2728
"date-fns": "^4.1.0",
2829
"dayjs": "^1.11.13",
30+
"framer-motion": "^12.5.0",
2931
"next": "14.2.6",
3032
"nookies": "^2.5.2",
33+
"qrcode.react": "^4.2.0",
3134
"react": "^18",
32-
"react-apexcharts": "^1.5.0",
35+
"react-apexcharts": "^1.7.0",
3336
"react-datepicker": "^7.4.0",
3437
"react-dom": "^18",
3538
"react-hook-form": "^7.53.0",
39+
"react-scroll": "^1.9.3",
3640
"tailwind-merge": "^2.5.2",
3741
"xlsx": "^0.18.5",
3842
"zod": "^3.23.8",
@@ -43,6 +47,7 @@
4347
"@types/react": "^18",
4448
"@types/react-datepicker": "^7.0.0",
4549
"@types/react-dom": "^18",
50+
"@types/react-scroll": "^1.8.10",
4651
"@typescript-eslint/eslint-plugin": "^7.2.0",
4752
"@typescript-eslint/parser": "^7.2.0",
4853
"eslint": "^8",

public/imgs/auth.jpg

-1.77 MB
Binary file not shown.

public/imgs/auth.png

479 KB
Loading

public/imgs/beta-active.png

3.37 KB
Loading

public/imgs/beta-inactive.png

3.32 KB
Loading

public/imgs/header-logo.png

2.64 KB
Loading

0 commit comments

Comments
 (0)