diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7ff7df0..b9e149c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,11 +4,9 @@ on: push: branches: - main - - develop pull_request: branches: - main - - develop jobs: build-backend: @@ -58,10 +56,9 @@ jobs: run: npm run build deploy-frontend: - name: Deploy Frontend to GitHub Pages runs-on: ubuntu-latest needs: build-frontend - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/develop' steps: - name: Checkout repository @@ -72,3 +69,4 @@ jobs: with: branch: develop folder: frontend/dist + clean: true diff --git a/.gitignore b/.gitignore index baabf62..bce866e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,7 @@ app/logs **/__pycache__/ /frontend/package-lock.json /backend/.env -/backend/logs/* \ No newline at end of file +/backend/logs/* +# Ignore build output directories +/dist +/frontend/dist \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index ba3b492..0214b24 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,8 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build" + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" }, "dependencies": { "axios": "^1.7.2", diff --git a/run/frontend.bat b/run/frontend.bat index 877c8c8..dae2bc3 100644 --- a/run/frontend.bat +++ b/run/frontend.bat @@ -11,6 +11,8 @@ cd /d "%diretorioVerificar%" cmd /c npm install +cmd /c npm run build + cmd /c npm run serve pause