Skip to content

Commit

Permalink
All - UI: New core layer update (#401)
Browse files Browse the repository at this point in the history
* update core layer version and base layer stuff

* update host with changes from core layer

* updates

* updates

* fix error.vue i18n stuff
  • Loading branch information
deetz99 authored Dec 17, 2024
1 parent d0cdfb8 commit 996bc6b
Show file tree
Hide file tree
Showing 40 changed files with 1,903 additions and 2,050 deletions.
11 changes: 0 additions & 11 deletions strr-base-web/app/assets/css/layout.css

This file was deleted.

46 changes: 0 additions & 46 deletions strr-base-web/app/components/connect/SystemBanner.vue

This file was deleted.

4 changes: 2 additions & 2 deletions strr-base-web/app/components/connect/form/certify/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ defineProps<{
class="py-5 first:pt-0 last:pb-8"
>
<slot :name="item.slot || 'listLabel'">
<ConnectI18nBold
<ConnectI18nHelper
v-if="item.i18nKey"
:translation-path="item.i18nKey"
v-bind="item.i18nProps"
Expand All @@ -53,7 +53,7 @@ defineProps<{
>
<template #label>
<slot name="checkboxLabel">
<ConnectI18nBold
<ConnectI18nHelper
v-if="typeof checkboxLabel === 'object'"
:translation-path="checkboxLabel.key"
v-bind="checkboxLabel.props"
Expand Down
8 changes: 0 additions & 8 deletions strr-base-web/app/components/connect/typography/H1.vue

This file was deleted.

8 changes: 0 additions & 8 deletions strr-base-web/app/components/connect/typography/H2.vue

This file was deleted.

28 changes: 0 additions & 28 deletions strr-base-web/app/composables/useNavigate.ts

This file was deleted.

4 changes: 2 additions & 2 deletions strr-base-web/app/composables/useStrrModals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
export const useStrrModals = () => {
const modal = useModal()
const t = useNuxtApp().$i18n.t
const { redirect } = useNavigate()
const { handleExternalRedirect } = useConnectNav()
const accountStore = useConnectAccountStore()
const config = useRuntimeConfig().public

Expand Down Expand Up @@ -84,7 +84,7 @@ export const useStrrModals = () => {
actions: [
{
label: t('modal.changeAccountConfirm.leaveBtn'),
handler: () => redirect(config.registryHomeURL + 'dashboard')
handler: () => handleExternalRedirect(config.registryHomeURL + 'dashboard')
},
{
label: t('btn.cancel'),
Expand Down
38 changes: 0 additions & 38 deletions strr-base-web/app/error.vue

This file was deleted.

11 changes: 0 additions & 11 deletions strr-base-web/app/layouts/default.vue

This file was deleted.

26 changes: 14 additions & 12 deletions strr-base-web/app/locales/en-CA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -342,18 +342,6 @@ export default {
certificate: 'certificate'
},
page: {
error: {
404: {
title: 'Page Not Found - Short-Term Rental Registry',
h1: '404 Page Not Found',
content: 'This page could not be found or does not exist.'
},
unknown: {
title: 'Unknown Error - Short-Term Rental Registry',
h1: 'Unknown Error',
content: 'An unknown error occured, please refresh the page or try again later.'
}
},
notFound: {
h1: 'Page Not Found'
},
Expand Down Expand Up @@ -519,5 +507,19 @@ export default {
delistAndCancelBookings: 'I confirm agreement to delist and cancel existing bookings for unregistered listings as required under s. 17 (2) (a) and [relevant section of the forthcoming regulation].'
}
}
},
ConnectPage: {
error: {
404: {
title: 'Page Not Found - Short-Term Rental Registry',
h1: '404 Page Not Found',
content: 'This page could not be found or does not exist.'
},
unknown: {
title: 'Unknown Error - Short-Term Rental Registry',
h1: 'Unknown Error',
content: 'An unknown error occured, please refresh the page or try again later.'
}
}
}
}
6 changes: 3 additions & 3 deletions strr-base-web/app/pages/comingSoon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ useHead({
title: t('strr.title.comingSoon')
})
definePageMeta({
path: '/comingSoon'
})
// definePageMeta({
// path: '/comingSoon'
// })
setBreadcrumbs([
{
Expand Down
6 changes: 3 additions & 3 deletions strr-base-web/app/pages/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ useHead({
title: t('strr.title')
})
definePageMeta({
path: '/'
})
// definePageMeta({
// path: '/'
// })
setBreadcrumbs([
{ label: t('strr.title') }
Expand Down
30 changes: 0 additions & 30 deletions strr-base-web/app/plugins/pay-api.ts

This file was deleted.

41 changes: 0 additions & 41 deletions strr-base-web/app/spa-loading-template.html

This file was deleted.

2 changes: 1 addition & 1 deletion strr-base-web/app/utils/todoItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const getTodoApplication = (
}
})
} else if (applicationInfo?.hostActions.includes(HostActions.SUBMIT_PAYMENT)) { // TODO: handle other host actions
const { handlePaymentRedirect } = useNavigate()
const { handlePaymentRedirect } = useConnectNav()
todos.push({
title: t('label.completePayment'),
subtitle: undefined, // TODO: add subtitle ?
Expand Down
10 changes: 4 additions & 6 deletions strr-base-web/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// https://nuxt.com/docs/api/configuration/nuxt-config
import { fileURLToPath } from 'url'
import { dirname, join } from 'path'
// import { fileURLToPath } from 'url'
// import { dirname, join } from 'path'

const currentDir = dirname(fileURLToPath(import.meta.url))
// const currentDir = dirname(fileURLToPath(import.meta.url))

export default defineNuxtConfig({
devtools: { enabled: false },
Expand Down Expand Up @@ -34,9 +34,7 @@ export default defineNuxtConfig({
dirs: ['stores', 'composables', 'enums', 'interfaces', 'types', 'utils']
},

css: [
join(currentDir, './app/assets/css/layout.css')
],
css: [],

app: {
head: {
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"vitest": "^1.6.0"
},
"dependencies": {
"@daxiom/nuxt-core-layer-test": "^0.0.11",
"@daxiom/nuxt-core-layer-test": "^0.0.14",
"@vuepic/vue-datepicker": "^9.0.3",
"country-codes-list": "^1.6.11",
"luxon": "^3.5.0",
Expand Down
8 changes: 4 additions & 4 deletions strr-base-web/pnpm-lock.yaml

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

Loading

0 comments on commit 996bc6b

Please sign in to comment.