Skip to content

Commit

Permalink
Merge pull request #1004 from bcgov/vue3
Browse files Browse the repository at this point in the history
Vue3
  • Loading branch information
bcgov-citz-ccft authored Nov 15, 2023
2 parents 3e61ac6 + 0b77824 commit a18aa4a
Show file tree
Hide file tree
Showing 293 changed files with 37,271 additions and 57,504 deletions.
32 changes: 16 additions & 16 deletions .github/actions/build-push-container/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,26 @@ runs:

- name: Creates env variables
env:
VUE_APP_TITLE: ${{ inputs.app_title }}
VUE_APP_CONTACT: ${{ inputs.VUE_APP_CONTACT }}
VUE_APP_HOWTOURL: ${{ inputs.app_howtourl }}
VUE_APP_CHEFSTOURURL: ${{ inputs.app_chefstoururl }}
VUE_APP_FRONTEND_BASEPATH: ${{ inputs.route_path }}
VUE_APP_CHEFS_GEO_ADDRESS_APIURL: ${{ inputs.app_chefs_geo_address_apiurl }}
VUE_APP_CHEFS_ADVANCE_GEO_ADDRESS_APIURL: ${{ inputs.app_chefs_advance_geo_address_apiurl }}
VUE_APP_BC_GEO_ADDRESS_APIURL: ${{ inputs.app_bc_geo_address_apiurl }}
VITE_TITLE: ${{ inputs.app_title }}
VITE_CONTACT: ${{ inputs.VITE_CONTACT }}
VITE_HOWTOURL: ${{ inputs.app_howtourl }}
VITE_CHEFSTOURURL: ${{ inputs.app_chefstoururl }}
VITE_FRONTEND_BASEPATH: ${{ inputs.route_path }}
VITE_CHEFS_GEO_ADDRESS_APIURL: ${{ inputs.app_chefs_geo_address_apiurl }}
VITE_CHEFS_ADVANCE_GEO_ADDRESS_APIURL: ${{ inputs.app_chefs_advance_geo_address_apiurl }}
VITE_BC_GEO_ADDRESS_APIURL: ${{ inputs.app_bc_geo_address_apiurl }}
ENV_PATH: ./app/frontend/.env
shell: bash
run: |
touch $ENV_PATH
echo VUE_APP_TITLE=$VUE_APP_TITLE >> $ENV_PATH
echo VUE_APP_CONTACT=$VUE_APP_CONTACT >> $ENV_PATH
echo VUE_APP_HOWTOURL=$VUE_APP_HOWTOURL >> $ENV_PATH
echo VUE_APP_CHEFSTOURURL=$VUE_APP_CHEFSTOURURL >> $ENV_PATH
echo VUE_APP_CHEFS_GEO_ADDRESS_APIURL=$VUE_APP_CHEFS_GEO_ADDRESS_APIURL >> $ENV_PATH
echo VUE_APP_CHEFS_ADVANCE_GEO_ADDRESS_APIURL=$VUE_APP_CHEFS_ADVANCE_GEO_ADDRESS_APIURL >> $ENV_PATH
echo VUE_APP_BC_GEO_ADDRESS_APIURL=$VUE_APP_BC_GEO_ADDRESS_APIURL >> $ENV_PATH
echo VUE_APP_FRONTEND_BASEPATH=$VUE_APP_FRONTEND_BASEPATH >> $ENV_PATH
echo VITE_TITLE=$VITE_TITLE >> $ENV_PATH
echo VITE_CONTACT=$VITE_CONTACT >> $ENV_PATH
echo VITE_HOWTOURL=$VITE_HOWTOURL >> $ENV_PATH
echo VITE_CHEFSTOURURL=$VITE_CHEFSTOURURL >> $ENV_PATH
echo VITE_CHEFS_GEO_ADDRESS_APIURL=$VITE_CHEFS_GEO_ADDRESS_APIURL >> $ENV_PATH
echo VITE_CHEFS_ADVANCE_GEO_ADDRESS_APIURL=$VITE_CHEFS_ADVANCE_GEO_ADDRESS_APIURL >> $ENV_PATH
echo VITE_BC_GEO_ADDRESS_APIURL=$VITE_BC_GEO_ADDRESS_APIURL >> $ENV_PATH
echo VITE_FRONTEND_BASEPATH=$VITE_FRONTEND_BASEPATH >> $ENV_PATH
echo "cat $ENV_PATH"
cat $ENV_PATH
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_pr_opened.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
app_title: Common Hosted Forms - PR-${{ github.event.number }}
route_path: /pr-${{ github.event.number }}
app_contact: ${{ secrets.VUE_APP_CONTACT }}
app_contact: ${{ secrets.VITE_CONTACT }}

deploy-pr-dev:
name: Deploy Pull Request to Dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
image_name: ${{ vars.APP_NAME }}
github_username: ${{ github.repository_owner }}
github_token: ${{ secrets.GITHUB_TOKEN }}
app_contact: ${{ secrets.VUE_APP_CONTACT }}
app_contact: ${{ secrets.VITE_CONTACT }}

deploy-dev:
name: Deploy to Dev
Expand Down
6 changes: 5 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
{
"cwd": "${workspaceFolder}/app/frontend",
"env": {
"VUE_APP_TITLE": "Common Hosted Forms - Local"
"VITE_TITLE": "Common Hosted Forms - Local",
"VITE_CONTACT": "[email protected]",
"VITE_FRONTEND_BASEPATH": "/app",
"VITE_CHEFSTOURURL": "https://www.youtube.com/embed/obOhyYusMjM",
"VITE_HOWTOURL": "https://www.youtube.com/playlist?list=PL9CV_8JBQHirsQAShw45PZeU1CkU88Q53"
},
"name": "CHEFS Frontend",
"outputCapture": "std",
Expand Down
4 changes: 2 additions & 2 deletions app/config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
}
},
"frontend": {
"adminDashboardUrl": "VUE_APP_ADMIN_DASHBOARD_URL",
"adminDashboardUrl": "VITE_ADMIN_DASHBOARD_URL",
"apiPath": "FRONTEND_APIPATH",
"basePath": "VUE_APP_FRONTEND_BASEPATH",
"basePath": "VITE_FRONTEND_BASEPATH",
"keycloak": {
"clientId": "FRONTEND_KC_CLIENTID",
"realm": "FRONTEND_KC_REALM",
Expand Down
1 change: 1 addition & 0 deletions app/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"fileCount": "1",
"fileKey": "files",
"fileMaxSize": "25MB",
"fileMaxSizeBytes": "25000000",
"fileMinSize": "0KB",
"path": "files"
},
Expand Down
5 changes: 5 additions & 0 deletions app/frontend/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
VITE_TITLE=Common Hosted Forms
VITE_CONTACT=[email protected]
VITE_FRONTEND_BASEPATH=/app
VITE_CHEFSTOURURL=https://www.youtube.com/embed/obOhyYusMjM
VITE_HOWTOURL=https://www.youtube.com/playlist?list=PL9CV_8JBQHirsQAShw45PZeU1CkU88Q53
1 change: 1 addition & 0 deletions app/frontend/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ dist
node_modules
public/js
src/formio
tests
13 changes: 9 additions & 4 deletions app/frontend/.eslintrc.js → app/frontend/.eslintrc.cjs
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ module.exports = {
node: true,
},
extends: [
'plugin:vue/essential',
'eslint:recommended',
'plugin:vue/vue3-recommended',
'eslint-config-prettier',
'plugin:prettier/recommended',
'plugin:vuetify/base',
],
plugins: ['vuetify', 'prettier'],
globals: {
Expand All @@ -20,8 +22,7 @@ module.exports = {
},
parserOptions: {
sourceType: 'module',
ecmaVersion: 2018,
parser: 'babel-eslint',
ecmaVersion: 2020,
},
rules: {
'prettier/prettier': 'error',
Expand Down Expand Up @@ -58,7 +59,11 @@ module.exports = {
'vue/no-spaces-around-equal-signs-in-attribute': ['error'],
'vuetify/no-deprecated-classes': 'error',
'vuetify/grid-unknown-attributes': 'error',
'vuetify/no-legacy-grid': 'error',
/* This needs to be removed during testing, we need it in production to ignore the v-data-table
but there may be more Vuetify components that are deprecated or in labs */
'vuetify/no-deprecated-components': 'off',
'vue/v-on-event-hyphenation': 'off',
'vue/no-v-html': 'off',
},
overrides: [
{
Expand Down
25 changes: 25 additions & 0 deletions app/frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,29 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

.env
.env.development
.env.production
.env*
.vscode
4 changes: 1 addition & 3 deletions app/frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
.eslintignore
.gitignore
src/formio/*
tests
201 changes: 0 additions & 201 deletions app/frontend/LICENSE

This file was deleted.

Loading

0 comments on commit a18aa4a

Please sign in to comment.