From a0d30093cac73269aef5f998cc02718b9dfba7c3 Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 13 Dec 2024 12:16:24 -0800
Subject: [PATCH 1/5] fix error modal

---
 .../app/components/modal/error/ApplicationSubmit.vue        | 2 +-
 strr-base-web/app/composables/useStrrModals.ts              | 6 ++++--
 strr-platform-web/nuxt.config.ts                            | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/strr-base-web/app/components/modal/error/ApplicationSubmit.vue b/strr-base-web/app/components/modal/error/ApplicationSubmit.vue
index 78a55d42..b2278c15 100644
--- a/strr-base-web/app/components/modal/error/ApplicationSubmit.vue
+++ b/strr-base-web/app/components/modal/error/ApplicationSubmit.vue
@@ -22,7 +22,7 @@ const getErrorKey = () => {
 const errorKey = getErrorKey()
 </script>
 <template>
-  <ModalBase :actions="[{ label: $t('btn.close'), handler: () => useStrrModals().close() }]">
+  <ModalBase>
     <div class="-mt-6 flex flex-col items-center gap-4 text-center">
       <UIcon
         name="i-mdi-alert-circle-outline"
diff --git a/strr-base-web/app/composables/useStrrModals.ts b/strr-base-web/app/composables/useStrrModals.ts
index c6070542..975c5f08 100644
--- a/strr-base-web/app/composables/useStrrModals.ts
+++ b/strr-base-web/app/composables/useStrrModals.ts
@@ -8,19 +8,21 @@ import {
 
 export const useStrrModals = () => {
   const modal = useModal()
-  const { t } = useI18n()
-  const connectNav = useConnectNav()
+  const t = useNuxtApp().$i18n.t
   const { redirect } = useNavigate()
   const accountStore = useConnectAccountStore()
   const config = useRuntimeConfig().public
 
   function openAppSubmitError (e: unknown) {
     modal.open(ModalErrorApplicationSubmit, {
+      // @ts-expect-error - actions prop is passed down from ModalInfoCollectionNotice -> ModalBase
+      actions: [{ label: t('btn.close'), handler: () => close() }],
       error: e
     })
   }
 
   function openCreateAccountModal () {
+    const connectNav = useConnectNav()
     modal.open(ModalBase, {
       title: t('label.createNewAccount'),
       content: t('strr.text.onlyPremiumAccountModalContent'),
diff --git a/strr-platform-web/nuxt.config.ts b/strr-platform-web/nuxt.config.ts
index ca249433..7753e4b7 100644
--- a/strr-platform-web/nuxt.config.ts
+++ b/strr-platform-web/nuxt.config.ts
@@ -20,8 +20,8 @@ export default defineNuxtConfig({
   ],
 
   extends: [
-    // ['../strr-base-web', { install: true }] // dev only
-    ['github:bcgov/STRR/strr-base-web', { install: true }]
+    ['../strr-base-web', { install: true }] // dev only
+    // ['github:bcgov/STRR/strr-base-web', { install: true }]
   ],
 
   imports: {

From 41e3d62b07b718b690970d4035a36804cf51f2ad Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 13 Dec 2024 13:47:44 -0800
Subject: [PATCH 2/5] remove hardcoded jobtitle property

---
 strr-platform-web/nuxt.config.ts                | 4 ++--
 strr-strata-web/app/stores/strataApplication.ts | 6 ------
 strr-strata-web/package.json                    | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/strr-platform-web/nuxt.config.ts b/strr-platform-web/nuxt.config.ts
index 7753e4b7..ca249433 100644
--- a/strr-platform-web/nuxt.config.ts
+++ b/strr-platform-web/nuxt.config.ts
@@ -20,8 +20,8 @@ export default defineNuxtConfig({
   ],
 
   extends: [
-    ['../strr-base-web', { install: true }] // dev only
-    // ['github:bcgov/STRR/strr-base-web', { install: true }]
+    // ['../strr-base-web', { install: true }] // dev only
+    ['github:bcgov/STRR/strr-base-web', { install: true }]
   ],
 
   imports: {
diff --git a/strr-strata-web/app/stores/strataApplication.ts b/strr-strata-web/app/stores/strataApplication.ts
index 698277eb..7d5f0922 100644
--- a/strr-strata-web/app/stores/strataApplication.ts
+++ b/strr-strata-web/app/stores/strataApplication.ts
@@ -60,12 +60,6 @@ export const useStrrStrataApplicationStore = defineStore('strr/strataApplication
   const submitStrataApplication = async () => {
     const body = createApplicationBody()
 
-    // TODO: confirm if jobTitle for completing party is required for strata application
-    // @ts-expect-error - temporary until we confirm requirements
-    body.registration.completingParty.jobTitle = 'Completing Party Job Title'
-
-    // console.info('submitting application: ', body)
-
     const res = await postApplication<StrataApplicationPayload, StrataApplicationResp>(body) as StrataApplicationResp
 
     const paymentToken = res.header.paymentToken
diff --git a/strr-strata-web/package.json b/strr-strata-web/package.json
index b11e75fd..8862a39e 100644
--- a/strr-strata-web/package.json
+++ b/strr-strata-web/package.json
@@ -2,7 +2,7 @@
   "name": "strr-strata-web",
   "private": true,
   "type": "module",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",

From 78bdfd263b1e326ecf6dce9d992e314c7892cba3 Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 13 Dec 2024 14:13:23 -0800
Subject: [PATCH 3/5] update decline tos redirect url

---
 strr-base-web/app/composables/useStrrModals.ts | 5 ++++-
 strr-base-web/nuxt.config.ts                   | 3 +--
 strr-host-pm-web/.env.example                  | 1 +
 strr-host-pm-web/devops/vaults.env             | 1 +
 strr-host-pm-web/package.json                  | 2 +-
 strr-platform-web/.env.example                 | 1 +
 strr-platform-web/devops/vaults.env            | 1 +
 strr-strata-web/.env.example                   | 1 +
 strr-strata-web/devops/vaults.env              | 1 +
 9 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/strr-base-web/app/composables/useStrrModals.ts b/strr-base-web/app/composables/useStrrModals.ts
index 975c5f08..bd9959ac 100644
--- a/strr-base-web/app/composables/useStrrModals.ts
+++ b/strr-base-web/app/composables/useStrrModals.ts
@@ -43,6 +43,7 @@ export const useStrrModals = () => {
   }
 
   function openConfirmDeclineTosModal () {
+    const keycloak = useKeycloak()
     modal.open(ModalBase, {
       title: t('modal.declineTos.title'),
       content: t('modal.declineTos.content'),
@@ -50,7 +51,9 @@ export const useStrrModals = () => {
         { label: t('btn.cancel'), variant: 'outline', handler: () => close() },
         {
           label: t('modal.declineTos.declineBtn'),
-          handler: () => navigateTo(config.declineTosRedirectUrl as string, { external: true })
+          handler: () => {
+            keycloak.logout(config.declineTosRedirectUrl as string)
+          }
         }
       ]
     })
diff --git a/strr-base-web/nuxt.config.ts b/strr-base-web/nuxt.config.ts
index 72caec10..12d8c718 100644
--- a/strr-base-web/nuxt.config.ts
+++ b/strr-base-web/nuxt.config.ts
@@ -91,8 +91,7 @@ export default defineNuxtConfig({
       environment: process.env.NUXT_ENVIRONMENT_HEADER || '',
       version: `STRR Base UI v${process.env.npm_package_version}`,
       housingStrrUrl: process.env.NUXT_REGISTRY_HOME_URL, // TODO: update to NUXT_HOUSING_STRR_URL once we get the housing strr url set
-      // TODO: move to app config for core layer ?
-      declineTosRedirectUrl: process.env.NUXT_REGISTRY_HOME_URL, // TODO: update to NUXT_HOUSING_STRR_URL once we get the housing strr url set,
+      declineTosRedirectUrl: process.env.NUXT_DECLINE_TOS_REDIRECT_URL,
       bcGovStrrUrl: process.env.NUXT_BCGOV_STRR_URL
       // set by layer - still required in .env
       // keycloakAuthUrl - NUXT_KEYCLOAK_AUTH_URL
diff --git a/strr-host-pm-web/.env.example b/strr-host-pm-web/.env.example
index 328b1954..ef880f60 100644
--- a/strr-host-pm-web/.env.example
+++ b/strr-host-pm-web/.env.example
@@ -26,6 +26,7 @@ NUXT_HOUSING_REQUIRED_DOCS_URL="https://www2.gov.bc.ca/gov/content/housing-tenan
 NUXT_HOUSING_PROOF_OF_PR_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/host-registration#documents"
 NUXT_HOST_TAC_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/registry-toc-hosts"
 NUXT_BCGOV_STRR_URL="https://www.gov.bc.ca/STRRegistry"
+NUXT_DECLINE_TOS_REDIRECT_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry"
 
 #vaults keycloak
 NUXT_KEYCLOAK_AUTH_URL="https://dev.loginproxy.gov.bc.ca/auth"
diff --git a/strr-host-pm-web/devops/vaults.env b/strr-host-pm-web/devops/vaults.env
index e9e9ac18..5d6bfd3f 100644
--- a/strr-host-pm-web/devops/vaults.env
+++ b/strr-host-pm-web/devops/vaults.env
@@ -14,6 +14,7 @@ NUXT_HOUSING_PROOF_OF_PR_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy
 NUXT_HOST_TAC_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/registry-toc-hosts"
 NUXT_BCGOV_STRR_URL="https://www.gov.bc.ca/STRRegistry"
 NUXT_HOST_ACC_ACT_SUMMARY="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/short-term-rental-legislation#act"
+NUXT_DECLINE_TOS_REDIRECT_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry"
 
 # vaults api
 NUXT_PAY_API_URL="op://API/$APP_ENV/pay-api/PAY_API_URL"
diff --git a/strr-host-pm-web/package.json b/strr-host-pm-web/package.json
index e64500c0..f377206c 100644
--- a/strr-host-pm-web/package.json
+++ b/strr-host-pm-web/package.json
@@ -2,7 +2,7 @@
   "name": "strr-host-pm-web",
   "private": true,
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",
diff --git a/strr-platform-web/.env.example b/strr-platform-web/.env.example
index a75c49f7..508350fe 100644
--- a/strr-platform-web/.env.example
+++ b/strr-platform-web/.env.example
@@ -22,6 +22,7 @@ NUXT_BASE_URL="http://localhost:3000/" # app base url
 NUXT_HOUSING_STRR_URL="" # TODO: add housing strr base url here for redirects
 NUXT_PLATFORMS_TAC_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/registry-toc-platforms"
 NUXT_BCGOV_STRR_URL="https://www.gov.bc.ca/STRRegistry"
+NUXT_DECLINE_TOS_REDIRECT_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry"
 
 #vaults keycloak
 NUXT_KEYCLOAK_AUTH_URL="https://dev.loginproxy.gov.bc.ca/auth"
diff --git a/strr-platform-web/devops/vaults.env b/strr-platform-web/devops/vaults.env
index 4a23d2b9..468cbc63 100644
--- a/strr-platform-web/devops/vaults.env
+++ b/strr-platform-web/devops/vaults.env
@@ -9,6 +9,7 @@ NUXT_BASE_URL="op://web-url/$APP_ENV/strr/STRR_PLATFORM_URL"
 NUXT_HOUSING_STRR_URL="" # TODO: add housing strr base url here for redirects
 NUXT_PLATFORMS_TAC_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/registry-toc-platforms"
 NUXT_BCGOV_STRR_URL="https://www.gov.bc.ca/STRRegistry"
+NUXT_DECLINE_TOS_REDIRECT_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry"
 
 # vaults api
 NUXT_PAY_API_URL="op://API/$APP_ENV/pay-api/PAY_API_URL"
diff --git a/strr-strata-web/.env.example b/strr-strata-web/.env.example
index 3d109de5..94e6e6a0 100644
--- a/strr-strata-web/.env.example
+++ b/strr-strata-web/.env.example
@@ -22,6 +22,7 @@ NUXT_BASE_URL="http://localhost:3000/" # app base url
 NUXT_HOUSING_STRR_URL="" # TODO: add housing strr base url here for redirects
 NUXT_STRATA_TAC_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/registry-toc-strataplatforms"
 NUXT_BCGOV_STRR_URL="https://www.gov.bc.ca/STRRegistry"
+NUXT_DECLINE_TOS_REDIRECT_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry"
 
 #vaults keycloak
 NUXT_KEYCLOAK_AUTH_URL="https://dev.loginproxy.gov.bc.ca/auth"
diff --git a/strr-strata-web/devops/vaults.env b/strr-strata-web/devops/vaults.env
index 80df1849..b2aa7522 100644
--- a/strr-strata-web/devops/vaults.env
+++ b/strr-strata-web/devops/vaults.env
@@ -9,6 +9,7 @@ NUXT_BASE_URL="op://web-url/$APP_ENV/strr/STRR_STRATA_HOTEL_URL"
 NUXT_HOUSING_STRR_URL="" # TODO: add housing strr base url here for redirects
 NUXT_STRATA_TAC_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry/registry-toc-strataplatforms"
 NUXT_BCGOV_STRR_URL="https://www.gov.bc.ca/STRRegistry"
+NUXT_DECLINE_TOS_REDIRECT_URL="https://www2.gov.bc.ca/gov/content/housing-tenancy/short-term-rentals/registry"
 
 # vaults api
 NUXT_PAY_API_URL="op://API/$APP_ENV/pay-api/PAY_API_URL"

From 8f2efe8124046f646eaf16f77cc3f798b6a5c484 Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 13 Dec 2024 14:17:24 -0800
Subject: [PATCH 4/5] bump platform version

---
 strr-platform-web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strr-platform-web/package.json b/strr-platform-web/package.json
index f837b63f..c97c88c0 100644
--- a/strr-platform-web/package.json
+++ b/strr-platform-web/package.json
@@ -2,7 +2,7 @@
   "name": "strr-platform-web",
   "private": true,
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",

From 05ab0243ecb928008a894d73b3b7db7018535829 Mon Sep 17 00:00:00 2001
From: deetz99 <dietrich@wolpert.ca>
Date: Fri, 13 Dec 2024 14:20:27 -0800
Subject: [PATCH 5/5] fix version compared to other pr

---
 strr-host-pm-web/package.json | 2 +-
 strr-strata-web/package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/strr-host-pm-web/package.json b/strr-host-pm-web/package.json
index f377206c..25f59f5d 100644
--- a/strr-host-pm-web/package.json
+++ b/strr-host-pm-web/package.json
@@ -2,7 +2,7 @@
   "name": "strr-host-pm-web",
   "private": true,
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",
diff --git a/strr-strata-web/package.json b/strr-strata-web/package.json
index 8862a39e..f64ebea7 100644
--- a/strr-strata-web/package.json
+++ b/strr-strata-web/package.json
@@ -2,7 +2,7 @@
   "name": "strr-strata-web",
   "private": true,
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "scripts": {
     "build-check": "nuxt build",
     "build": "nuxt generate",