Skip to content

Commit ce71f19

Browse files
committed
newest version
1 parent 0348085 commit ce71f19

File tree

6 files changed

+360
-433
lines changed

6 files changed

+360
-433
lines changed

.github/workflows/deploy.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ on:
55
branches:
66
- master
77
- vite_ver
8+
- nodejs-backend-test
89
pull_request:
910
types: [closed]
1011
branches:
1112
- master
1213
- vite_ver
13-
14+
- nodejs-backend-test
1415
jobs:
1516
build:
1617
if: github.event.pull_request.merged == true || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/vite_ver'
@@ -28,18 +29,25 @@ jobs:
2829
- name: Install pnpm
2930
run: npm install -g pnpm
3031

31-
- name: Install dependencies
32-
run: pnpm install --no-frozen-lockfile
32+
- name: Install dependencies for frontend
33+
run: |
34+
cd frontend
35+
pnpm install --no-frozen-lockfile
3336
34-
- name: Build the project
35-
run: pnpm run build
37+
- name: Build frontend
38+
run: |
39+
cd frontend
40+
pnpm run build
3641
37-
- name: List build files (for debugging)
38-
run: ls -la ./dist
42+
- name: Install dependencies for backend
43+
run: |
44+
cd backend
45+
pnpm install --no-frozen-lockfile
3946
4047
- name: Deploy to Firebase Hosting
4148
env:
4249
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
4350
run: |
4451
npm install -g firebase-tools
45-
firebase deploy --only hosting
52+
cd backend
53+
firebase deploy --only hosting,functions

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ dist-ssr
5454
*.njsproj
5555
*.sln
5656
*.sw?
57+
.vercel

frontend/.gitignore

-1
This file was deleted.

frontend/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@
1414
"deploy": "gh-pages -d build"
1515
},
1616
"dependencies": {
17-
"@tanstack/react-router": "^1.36.2",
17+
"@tanstack/react-router": "^1.40.0",
1818
"aos": "^2.3.4",
1919
"axios": "^1.7.2",
2020
"dotenv": "^16.4.5",
2121
"emailjs-com": "^3.2.0",
2222
"firebase": "^10.12.2",
2323
"locomotive-aos": "^1.0.7",
2424
"locomotive-scroll": "^4.1.4",
25-
"pnpm": "^9.3.0",
25+
"pnpm": "^9.4.0",
2626
"react": "^18.3.1",
2727
"react-dom": "^18.3.1",
2828
"react-helmet-async": "^2.0.5",
2929
"sonner": "^1.5.0"
3030
},
3131
"devDependencies": {
32-
"@tanstack/router-vite-plugin": "^1.35.4",
33-
"@types/react": "^18.2.66",
34-
"@types/react-dom": "^18.2.22",
32+
"@tanstack/router-vite-plugin": "^1.40.3",
33+
"@types/react": "^18.3.3",
34+
"@types/react-dom": "^18.3.0",
3535
"@vitejs/plugin-react": "^4.3.1",
3636
"autoprefixer": "^10.4.19",
37-
"babel-plugin-react-compiler": "^0.0.0-experimental-938cd9a-20240601",
38-
"eslint": "^8.57.0",
39-
"eslint-plugin-react": "^7.34.1",
37+
"babel-plugin-react-compiler": "^0.0.0",
38+
"eslint": "^9.5.0",
39+
"eslint-plugin-react": "^7.34.3",
4040
"eslint-plugin-react-compiler": "0.0.0-experimental-51a85ea-20240601",
41-
"eslint-plugin-react-hooks": "^4.6.0",
42-
"eslint-plugin-react-refresh": "^0.4.6",
41+
"eslint-plugin-react-hooks": "^4.6.2",
42+
"eslint-plugin-react-refresh": "^0.4.7",
4343
"gh-pages": "^6.1.1",
4444
"postcss": "^8.4.38",
45-
"tailwindcss": "^3.4.3",
46-
"vite": "^5.2.0"
45+
"tailwindcss": "^3.4.4",
46+
"vite": "^5.3.2"
4747
},
4848
"browserslist": {
4949
"production": [

0 commit comments

Comments
 (0)