diff --git a/demo/vue/app/config/custom-environment-variables.json b/demo/vue/app/config/custom-environment-variables.json index 4156d238..007d92bb 100644 --- a/demo/vue/app/config/custom-environment-variables.json +++ b/demo/vue/app/config/custom-environment-variables.json @@ -23,18 +23,5 @@ "logFile": "SERVER_LOGFILE", "logLevel": "SERVER_LOGLEVEL", "port": "SERVER_PORT" - }, - "serviceClient": { - "commonServices": { - "ches": { - "endpoint": "SC_CS_CHES_ENDPOINT" - }, - "cdogs": { - "endpoint": "SC_CS_CDOGS_ENDPOINT" - }, - "tokenEndpoint": "SC_CS_TOKEN_ENDPOINT", - "username": "SC_CS_USERNAME", - "password": "SC_CS_PASSWORD" - } } -} +} \ No newline at end of file diff --git a/demo/vue/app/config/default.json b/demo/vue/app/config/default.json index b49aa8fe..0e33a3b7 100644 --- a/demo/vue/app/config/default.json +++ b/demo/vue/app/config/default.json @@ -1,30 +1,19 @@ { "frontend": { "apiPath": "api/v1", - "basePath" : "/app", + "basePath": "/app", "keycloak": { - "serverUrl": "https://dev.oidc.gov.bc.ca/auth" + "serverUrl": "" } }, "server": { "apiPath": "/api/v1", - "basePath" : "/app", + "basePath": "/app", "bodyLimit": "30mb", "keycloak": { - "serverUrl": "https://dev.oidc.gov.bc.ca/auth" + "serverUrl": "" }, "logLevel": "http", "port": "8080" - }, - "serviceClient": { - "commonServices": { - "ches": { - "endpoint": "https://ches-dev.pathfinder.gov.bc.ca/api" - }, - "cdogs": { - "endpoint": "https://cdogs-dev.pathfinder.gov.bc.ca/api" - }, - "tokenEndpoint": "https://dev.oidc.gov.bc.ca/auth/realms/jbd6rnxw/protocol/openid-connect/token" - } } -} +} \ No newline at end of file diff --git a/demo/vue/app/config/test.json b/demo/vue/app/config/test.json index 0b5497c5..c1a26a59 100644 --- a/demo/vue/app/config/test.json +++ b/demo/vue/app/config/test.json @@ -14,9 +14,9 @@ "logLevel": "silent" }, "serviceClient": { - "commonServices": { + "customService": { "username": "username", "password": "password" } } -} +} \ No newline at end of file diff --git a/demo/vue/app/frontend/package-lock.json b/demo/vue/app/frontend/package-lock.json index 823b7347..53c4b7f5 100644 --- a/demo/vue/app/frontend/package-lock.json +++ b/demo/vue/app/frontend/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/eslint-parser": "^7.25.9", - "@bcgov/bc-sans": "^2.1.0", "@vue/eslint-config-prettier": "^10.1.0", "axios": "^1.7.7", "core-js": "^3.39.0", @@ -1837,11 +1836,6 @@ "node": ">=6.9.0" } }, - "node_modules/@bcgov/bc-sans": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-2.1.0.tgz", - "integrity": "sha512-1MesF4NAVpM5dywoJ68wNcBylHbPqg1dDV/FNuQm0BbspETGlPmfX8LG8rtrCjCAPhWuL2qRT/lBYDUMvFTUnw==" - }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", @@ -6352,9 +6346,10 @@ } }, "node_modules/cross-spawn": { - "version": "6.0.5", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, - "license": "MIT", "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -6721,9 +6716,9 @@ } }, "node_modules/default-gateway/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -7777,9 +7772,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/eslint/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -9577,9 +9572,9 @@ } }, "node_modules/jest-changed-files/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", @@ -10879,9 +10874,9 @@ "dev": true }, "node_modules/jest-runtime/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "dependencies": { "path-key": "^3.1.0", diff --git a/demo/vue/app/frontend/package.json b/demo/vue/app/frontend/package.json index 6fec82c2..e9e95971 100644 --- a/demo/vue/app/frontend/package.json +++ b/demo/vue/app/frontend/package.json @@ -18,7 +18,6 @@ }, "dependencies": { "@babel/eslint-parser": "^7.25.9", - "@bcgov/bc-sans": "^2.1.0", "@vue/eslint-config-prettier": "^10.1.0", "axios": "^1.7.7", "core-js": "^3.39.0", @@ -52,4 +51,4 @@ "optionalDependencies": { "fsevents": "^2.3.2" } -} +} \ No newline at end of file diff --git a/demo/vue/app/frontend/public/favicon.ico b/demo/vue/app/frontend/public/favicon.ico index 1841396d..956780a1 100644 Binary files a/demo/vue/app/frontend/public/favicon.ico and b/demo/vue/app/frontend/public/favicon.ico differ diff --git a/demo/vue/app/frontend/src/assets/images/OpenWallet_Foundation_Logo_Color.svg b/demo/vue/app/frontend/src/assets/images/OpenWallet_Foundation_Logo_Color.svg new file mode 100644 index 00000000..0721e457 --- /dev/null +++ b/demo/vue/app/frontend/src/assets/images/OpenWallet_Foundation_Logo_Color.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demo/vue/app/frontend/src/assets/images/bc_logo.svg b/demo/vue/app/frontend/src/assets/images/bc_logo.svg deleted file mode 100644 index 5ba3bb5d..00000000 --- a/demo/vue/app/frontend/src/assets/images/bc_logo.svg +++ /dev/null @@ -1 +0,0 @@ -bc_logo diff --git a/demo/vue/app/frontend/src/assets/images/bc_logo_print.svg b/demo/vue/app/frontend/src/assets/images/bc_logo_print.svg deleted file mode 100644 index aae06ff7..00000000 --- a/demo/vue/app/frontend/src/assets/images/bc_logo_print.svg +++ /dev/null @@ -1 +0,0 @@ -bc_logo_print diff --git a/demo/vue/app/frontend/src/assets/images/bc_logo_square.svg b/demo/vue/app/frontend/src/assets/images/bc_logo_square.svg deleted file mode 100644 index 8d228dc8..00000000 --- a/demo/vue/app/frontend/src/assets/images/bc_logo_square.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/demo/vue/app/frontend/src/assets/scss/style.scss b/demo/vue/app/frontend/src/assets/scss/style.scss index 24dbee63..d7f049ea 100644 --- a/demo/vue/app/frontend/src/assets/scss/style.scss +++ b/demo/vue/app/frontend/src/assets/scss/style.scss @@ -4,11 +4,11 @@ @import '~vuetify/src/styles/styles.sass'; // Variables -$bcgov-blue: #003366; -$bcgov-blue-secondary: #38598a; -$bcgov-orange: #fcba19; -$bcgov-grey: #efefef; -$bcgov-font: #494949; +$custom-blue: #4066B2; +$custom-blue-secondary: #003399; +$custom-lightblue: #BFCBE5; +$custom-grey: #efefef; +$custom-font: #252525; // Sticky Footer body { @@ -32,12 +32,12 @@ h3 { font-size: 1.3em; } h4 { font-size: 1.05em; } h1, h2, h3, h4, h5 { - color: $bcgov-font; + color: $custom-font; line-height: 1.2; } p { - color: $bcgov-font; + color: $custom-font; line-height: 1.4; } @@ -46,7 +46,7 @@ hr { border-top: 1px solid lightgrey; margin-bottom: 1em; .orange { - border-top: 2px solid $bcgov-orange; + border-top: 2px solid $custom-lightblue; } } @@ -94,19 +94,19 @@ a, .v-tab { // Stepper .silv-stepper { .header-row { - background-color: $bcgov-grey !important; + background-color: $custom-grey !important; } &.v-stepper--alt-labels { .v-stepper__step { padding-left: 0; padding-right: 0; .v-stepper__label { - color: $bcgov-font; + color: $custom-font; font-size: .75em; } &.v-stepper__step--active { .v-stepper__label{ - color: $bcgov-font; + color: $custom-font; font-weight: bold; } } diff --git a/demo/vue/app/frontend/src/components/owf/OWFFooter.vue b/demo/vue/app/frontend/src/components/owf/OWFFooter.vue index d0c3b19d..332ba19f 100644 --- a/demo/vue/app/frontend/src/components/owf/OWFFooter.vue +++ b/demo/vue/app/frontend/src/components/owf/OWFFooter.vue @@ -1,25 +1,16 @@ @@ -31,7 +22,7 @@ export default {