Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into menu
Browse files Browse the repository at this point in the history
  • Loading branch information
That-Thing committed Nov 4, 2024
2 parents d97218e + de4d4ca commit 1db987f
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
VITE_APP_API_URL="http://localhost:8080"

# Contact email
VITE_APP_CONTACT_EMAIL="[email protected]"
VITE_APP_CONTACT_EMAIL="[email protected]"

# Set base path (used for GitHub Pages)
VITE_APP_BASE_PATH="/"
42 changes: 42 additions & 0 deletions .github/workflows/pages_deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Vue.js CI/CD

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: 'npm'

- name: Install dependencies
run: npm ci

- name: Set .env params
run: |
echo "VITE_APP_API_URL=https://dishapi-cuczdxckhdh4caev.eastus-01.azurewebsites.net/" > .env
echo "VITE_APP_BASE_PATH=/" >> .env
- name: Build the Vue.js app
run: npm run build

- name: Deploy to d-i-s-h.github.io
uses: peaceiris/actions-gh-pages@v3
with:
personal_token: ${{ secrets.DEPLOY_TOKEN }}
publish_dir: ./dist
external_repository: d-i-s-h/d-i-s-h.github.io
publish_branch: main
13 changes: 13 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@popperjs/core": "^2.11.8",
"axios": "^1.7.7",
"bootstrap": "^5.3.3",
"dotenv": "^16.4.5",
"vue": "^3.4.29",
"vue-router": "^4.4.5",
"vue-toast-notification": "^3.1.3"
Expand Down
5 changes: 4 additions & 1 deletion vite.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { fileURLToPath, URL } from 'node:url'

import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import dotenv from 'dotenv'

dotenv.config()

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
vue(),
],
base: process.env.VITE_APP_BASE_PATH,
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
Expand Down

0 comments on commit 1db987f

Please sign in to comment.