Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vue3 #1004

Merged
merged 94 commits into from
Nov 15, 2023
Merged

Vue3 #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
a5e71ae
updating packages
jasonchung1871 Apr 28, 2023
437fd05
fixed linting and some packages
jasonchung1871 May 2, 2023
cc16ad6
Vue3 runs with vite
jasonchung1871 May 2, 2023
ca51b3e
many packages upgraded
itsjasonc May 11, 2023
06369a7
merge from master
itsjasonc May 11, 2023
f7b5f93
Merge master
jasonchung1871 May 17, 2023
1855217
Minor fixes
jasonchung1871 May 17, 2023
8b28551
vite
jasonchung1871 May 25, 2023
47e88c6
Added components and views
jasonchung1871 May 31, 2023
69b8d8a
added some components
jasonchung1871 May 31, 2023
b01c37a
added vue components
jasonchung1871 Jun 5, 2023
2297a7d
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Jun 5, 2023
f6efafb
added internationalization
jasonchung1871 Jun 7, 2023
0256bc3
Added components
jasonchung1871 Jun 7, 2023
1f74bd5
added status panel
jasonchung1871 Jun 7, 2023
8987044
added export
jasonchung1871 Jun 8, 2023
f4bac37
fixed bugs added draft upload
jasonchung1871 Jun 12, 2023
4576a98
Added download view
jasonchung1871 Jun 12, 2023
ccc4d09
Added admin view
jasonchung1871 Jun 13, 2023
7baca04
Merge remote-tracking branch 'origin/master' into vue3
jasonchung1871 Jun 14, 2023
955ed18
update from master
jasonchung1871 Jun 14, 2023
d379c26
Merge branch 'bcgov:vue3' into vue3
jasonchung1871 Jun 14, 2023
ab68b5c
added frontend tests
jasonchung1871 Jun 19, 2023
97d2040
Added tests
jasonchung1871 Jun 19, 2023
b401890
Added tests
jasonchung1871 Jun 22, 2023
f9f0427
Options API and some tests
jasonchung1871 Jun 29, 2023
2d447dd
tests completed
jasonchung1871 Jul 4, 2023
7bcd0f0
Merge remote-tracking branch 'origin/master' into vue3
jasonchung1871 Jul 5, 2023
c52ce20
vue2 to vue 3
jasonchung1871 Jul 5, 2023
c0b70f5
fixed backend tests
jasonchung1871 Jul 5, 2023
435244f
fixed icons added tests
jasonchung1871 Jul 6, 2023
d34daf8
removed composition, tests
jasonchung1871 Jul 6, 2023
441bfe6
more coverage and fixed bugs
jasonchung1871 Jul 18, 2023
766a294
fixed test and FormDesigner
jasonchung1871 Jul 18, 2023
3ebd487
a few changes
jasonchung1871 Jul 19, 2023
a1d78d7
Merge remote-tracking branch 'origin/master' into vue3
jasonchung1871 Jul 20, 2023
8cb3c56
Update FormViewerMultiUpload.vue
jasonchung1871 Jul 20, 2023
fc8800a
fixed filter bugs
jasonchung1871 Jul 26, 2023
2af3fac
Update FormViewer.vue
jasonchung1871 Jul 26, 2023
66b59a3
fix alignment and positioning issues with rtl multilang support
timisenco2015 Aug 2, 2023
dcdb83e
fix test failed issue in Root.spec.js
timisenco2015 Aug 2, 2023
826b232
undo changes in BaseCopyToClipboard.vue
timisenco2015 Aug 7, 2023
98b5fd1
some things
jasonchung1871 Aug 11, 2023
6ce3cb9
some fixes
jasonchung1871 Aug 15, 2023
67c5aa4
fixed view all submissions
jasonchung1871 Aug 16, 2023
1ef4ebe
Update ManageVersions.vue
jasonchung1871 Aug 21, 2023
b396861
Update BaseNotificationBar.vue
jasonchung1871 Aug 22, 2023
86137c0
icon sizes and stepper
jasonchung1871 Aug 23, 2023
c268aaa
Merge remote-tracking branch 'origin/master' into vue3
jasonchung1871 Aug 31, 2023
249a865
some minor fixes
jasonchung1871 Aug 31, 2023
4e8358f
fixed some things
jasonchung1871 Sep 13, 2023
242b9d1
Fixed tests
jasonchung1871 Sep 13, 2023
497717e
Merge pull request #799 from jasonchung1871/vue3
bcgov-citz-ccft Sep 13, 2023
15d36ad
Merge branch 'master' into vue3
jasonchung1871 Sep 13, 2023
5177106
Update FormViewerMultiUpload.vue
jasonchung1871 Sep 13, 2023
28bf299
Update FormViewerMultiUpload.vue
jasonchung1871 Sep 13, 2023
d887df0
Fixed router navigation translation
jasonchung1871 Sep 19, 2023
95a8312
Fixed some tests
jasonchung1871 Sep 19, 2023
9dfaa20
Vue3 (#1027)
jasonchung1871 Sep 20, 2023
a409e19
Merge branch 'master' into vue3
jasonchung1871 Sep 20, 2023
a2313c5
Vue3 (#1041)
jasonchung1871 Sep 25, 2023
641a479
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Sep 25, 2023
3dc8b12
Merge branch 'master' into vue3
jasonchung1871 Sep 25, 2023
45617a6
Vue3 (#1044)
jasonchung1871 Sep 26, 2023
f4696ea
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Sep 28, 2023
5b29841
some fixes
jasonchung1871 Sep 28, 2023
463d698
Vue3 (#1057)
jasonchung1871 Oct 3, 2023
d93bc7c
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Oct 3, 2023
0c53195
Added form store functions for email templating
jasonchung1871 Oct 3, 2023
c4af6d6
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Oct 3, 2023
d318900
Vue3 (#1060)
jasonchung1871 Oct 3, 2023
8d2d4ad
fix: set default object field used for select (#1061)
WalterMoar Oct 5, 2023
b97a1a8
fix: show/hide api key when not using english (#1062)
WalterMoar Oct 6, 2023
5090134
fix: team management table not displaying data (#1063)
WalterMoar Oct 6, 2023
159d70a
Fix/data table no search results (#1064)
WalterMoar Oct 10, 2023
ba404d7
Submission search fix - Vue3 (#1070)
Sai-CITZ Oct 10, 2023
a50d1c1
fix: vue3 event subscription problems (#1074)
WalterMoar Oct 11, 2023
c6a7dfa
Fixed submission table sort (#1077)
Sai-CITZ Oct 11, 2023
6f55272
fix: filter draft submissions from the submission list during the sub…
timisenco2015 Oct 11, 2023
fd95bd2
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Oct 11, 2023
c1cf8c3
fix: various vue3 css fixes (#1079)
WalterMoar Oct 11, 2023
f6b5e8e
fix: API repeated call when searching in MySubmission page (#1076)
timisenco2015 Oct 12, 2023
16551cf
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Oct 12, 2023
a73b607
Fix: Visual changes - Vue3 (#1086)
Sai-CITZ Oct 19, 2023
1ae2331
Fixed bug in CSV field selection (#1089)
Sai-CITZ Oct 19, 2023
c9a67cb
Override default smooth-scroll value to false (#1100)
Sai-CITZ Oct 23, 2023
f87152c
fix: repeated put requests for update submission (#1099)
Sai-CITZ Oct 23, 2023
9210add
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Oct 25, 2023
948cccf
some styling changes (#1114)
jasonchung1871 Oct 25, 2023
de6a9dd
Fix transparent button for v-card-actions (#1116)
Sai-CITZ Oct 26, 2023
519e972
Fix: v-data-table background/hover & other visual changes - Vue3 (#1…
Sai-CITZ Oct 26, 2023
2f56496
Some fixes (#1124)
jasonchung1871 Nov 1, 2023
c278b31
Merge remote-tracking branch 'origin' into vue3
jasonchung1871 Nov 9, 2023
0b77824
some updates (#1147)
jasonchung1871 Nov 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
[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
Loading