Skip to content

Commit 6c67da8

Browse files
authored
Merge pull request #7 from my-python-projects/develop
- adjustment in frontend/dist
2 parents edbc68c + 2758066 commit 6c67da8

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ on:
44
push:
55
branches:
66
- main
7-
- develop
87
pull_request:
98
branches:
109
- main
11-
- develop
1210

1311
jobs:
1412
build-backend:
@@ -58,10 +56,9 @@ jobs:
5856
run: npm run build
5957

6058
deploy-frontend:
61-
name: Deploy Frontend to GitHub Pages
6259
runs-on: ubuntu-latest
6360
needs: build-frontend
64-
if: github.ref == 'refs/heads/main'
61+
if: github.ref == 'refs/heads/develop'
6562

6663
steps:
6764
- name: Checkout repository
@@ -72,3 +69,4 @@ jobs:
7269
with:
7370
branch: develop
7471
folder: frontend/dist
72+
clean: true

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ app/logs
66
**/__pycache__/
77
/frontend/package-lock.json
88
/backend/.env
9-
/backend/logs/*
9+
/backend/logs/*
10+
# Ignore build output directories
11+
/dist
12+
/frontend/dist

frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",
7-
"build": "vue-cli-service build"
7+
"build": "vue-cli-service build",
8+
"lint": "vue-cli-service lint"
89
},
910
"dependencies": {
1011
"axios": "^1.7.2",

run/frontend.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ cd /d "%diretorioVerificar%"
1111

1212
cmd /c npm install
1313

14+
cmd /c npm run build
15+
1416
cmd /c npm run serve
1517

1618
pause

0 commit comments

Comments
 (0)