Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
43 changes: 0 additions & 43 deletions .github/workflows/strr-ui-cd.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/strr-ui-ci.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .sonarcloud.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ sonar.projectName=strr
sonar.projectVersion=Autoscan

# Path to sources
#sonar.sources=strr-api/src/**/*,strr-web/**/*
sonar.exclusions=strr-api/migrations/**/*,strr-api/devops/**/*,strr-api/tests/**/*,testing/**/*,strr-web/tests/**/*
#sonar.sources=strr-api/src/**/*
sonar.exclusions=strr-api/migrations/**/*,strr-api/devops/**/*,strr-api/tests/**/*,testing/**/*
#sonar.inclusions=

# Path to tests
Expand Down
8 changes: 0 additions & 8 deletions codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ coverage:
target: 80%
flags:
- strrapi
ui:
target: 80%
flags:
- strrui
ignore:
- "^/tests/**/*" # ignore test harness code

Expand All @@ -39,8 +35,4 @@ flags:
strrapi:
paths:
- strr-api
carryforward: true
strrui:
paths:
- strr-web
carryforward: true
3,595 changes: 1,869 additions & 1,726 deletions jobs/noc_expiry/poetry.lock

Large diffs are not rendered by default.

3,595 changes: 1,869 additions & 1,726 deletions jobs/registration_expiry/poetry.lock

Large diffs are not rendered by default.

3,739 changes: 1,941 additions & 1,798 deletions jobs/strr-backfiller/poetry.lock

Large diffs are not rendered by default.

402 changes: 330 additions & 72 deletions queue_services/strr-pay/poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion queue_services/strr-pay/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ python-dotenv = "^1.0.1"
sentry-sdk = "^1.44.1"
flask-babel = "^4.0.0"
psycopg2 = "^2.9.9"
flask-jwt-oidc = "^0.7.0"
flask-jwt-oidc = "^0.8.0"
gunicorn = "^21.2.0"
flask-cors = "^4.0.0"
pg8000 = "^1.31.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { v4 as uuidv4 } from 'uuid'
import type { DefineComponent } from 'vue'
import type { Form } from '#ui/types'
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const strrModal = useStrrModals()
const docUploadHelpId = useId() // id for aria-describedby on doc select
const docFormRef = ref<Form<any>>()
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/components/connect/Stepper.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
defineProps<{ stepperLabel: string }>()
const emit = defineEmits<{ newStep: [stepIndex: number] }>()

Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/components/connect/fee/Widget.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const fwConfig = useAppConfig().strrBaseLayer.feeWidget
const rtc = useRuntimeConfig().public
const {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const props = defineProps<{
address: Partial<ConnectAddress>,
useLocationDescLabel?: boolean
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/components/form/ContactInfo.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { z } from 'zod'
import type { Form } from '#ui/types'
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const { kcUser } = useKeycloak()

const props = defineProps<{ isComplete: boolean }>()
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/components/form/common/Contact.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const tPlat = (path: string) => t(`strr.${path}`)

const fullName = defineModel<string>('fullName', { required: false })
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/composables/useStrrBaseBrand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { z } from 'zod'
import { getRequiredNonEmptyString, getRequiredUrl } from '~/utils/connect-validation'

export const useStrrBaseBrand = () => {
const { t } = useI18n()
const { t } = useNuxtApp().$i18n

const getBrandSchema = () => z.object({
name: getRequiredNonEmptyString(t('validation.brand.name')),
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/composables/useStrrBaseBusiness.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { z } from 'zod'

export const useStrrBaseBusiness = <T extends StrrBusiness>() => {
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const getBaseBusinessSchema = () => {
return z.object({
legalName: getRequiredNonEmptyString(t('validation.business.legalName')),
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/pages/auth/login.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t, locale } = useI18n()
const { t, locale } = useNuxtApp().$i18n
const keycloak = useKeycloak()
const { createAccountUrl } = useConnectNav()
const runtimeConfig = useRuntimeConfig()
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/pages/auth/tos.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { FormError } from '#ui/types'
const { $sanitize } = useNuxtApp()
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const localePath = useLocalePath()
const tosStore = useTosStore()
const strrModal = useStrrModals()
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/pages/comingSoon.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t } = useI18n()
const { t } = useNuxtApp().$i18n

// page stuff
useHead({
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/pages/default.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
const { t } = useI18n()
const { t } = useNuxtApp().$i18n

// page stuff
useHead({
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/stores/connectFee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ConnectPaymentMethod } from '~/enums/connect-payment-method'

export const useConnectFeeStore = defineStore('connect/fee', () => {
const { $payApi } = useNuxtApp()
const { t } = useI18n()
const { t } = useNuxtApp().$i18n

const feeOptions = ref({
showFutureEffectiveFees: false,
Expand Down
2 changes: 1 addition & 1 deletion strr-base-web/app/stores/strrContact.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { z } from 'zod'
import type { Contact, StrrContact } from '#imports'

export const useStrrContactStore = defineStore('strr/contact', () => {
const { t } = useI18n()
const { t } = useNuxtApp().$i18n
const { kcUser } = useKeycloak()
const getContactSchema = (completingParty = false) => {
return z.object({
Expand Down
5 changes: 4 additions & 1 deletion strr-base-web/app/utils/isoCountriesList.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { type SbcCountrySubdivision } from '~~/app/interfaces/sbc-address'
export interface SbcCountrySubdivision {
code: string
name: string
}

export interface Iso3166_1Country {
alpha_2: string
Expand Down
14 changes: 14 additions & 0 deletions strr-base-web/app/utils/todoItems.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,17 @@ export const getTodoRenewalInfo = (expiryDate: Date | string): {
countdownLabel
}
}

// Check if renewal period is closed (3 years past expiry date for expired registrations)
export function isRenewalPeriodClosed (registration: ApiRegistrationResp): boolean {
const { status, expiryDate } = registration

if (status !== RegistrationStatus.EXPIRED) {
return false
}

const isoDate = expiryDate instanceof Date ? expiryDate.toISOString() : expiryDate
const expDate = DateTime.fromISO(isoDate).setZone('America/Vancouver')
const today = DateTime.now().setZone('America/Vancouver')
return today.diff(expDate, 'years').years > 3 // 3 is number of years before registration period closes
}
4 changes: 0 additions & 4 deletions strr-base-web/i18n.config.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
24 changes: 3 additions & 21 deletions strr-base-web/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,21 @@ export default defineNuxtConfig({
{
name: 'English',
code: 'en-CA',
iso: 'en-CA',
language: 'en-CA',
dir: 'ltr',
file: 'en-CA.ts'
},
{
name: 'Français',
code: 'fr-CA',
iso: 'fr-CA',
language: 'fr-CA',
dir: 'ltr',
file: 'fr-CA.ts'
}
],
strategy: 'prefix',
lazy: true,
langDir: 'locales',
defaultLocale: 'en-CA',
detectBrowserLanguage: false,
vueI18n: './i18n.config.ts'
detectBrowserLanguage: false
},

colorMode: {
Expand Down Expand Up @@ -133,20 +130,5 @@ export default defineNuxtConfig({
optimizeDeps: { // optimize immediately instead of after visiting page, prevents page reload in dev when initially visiting a page with these deps
include: ['zod', 'uuid', 'vitest', 'luxon', 'country-codes-list']
}
},

piniaPluginPersistedstate: {
storage: 'sessionStorage'
},

content: {
locales: [
'en-CA',
'fr-CA'
],
contentHead: false,
markdown: {
anchorLinks: false
}
}
})
30 changes: 15 additions & 15 deletions strr-base-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "strr-base-web",
"private": true,
"type": "module",
"version": "0.0.40",
"version": "0.0.41",
"scripts": {
"build-check": "nuxt build",
"build": "nuxt generate",
Expand All @@ -20,40 +20,40 @@
},
"devDependencies": {
"@axe-core/playwright": "^4.9.1",
"@nuxt/devtools": "^1.3.9",
"@nuxt/image": "^1.7.0",
"@nuxt/test-utils": "3.15.4",
"@nuxt/devtools": "^3.1.1",
"@nuxt/image": "^2.0.0",
"@nuxt/test-utils": "^3.21.0",
"@nuxtjs/eslint-config-typescript": "^12.1.0",
"@nuxtjs/eslint-module": "^4.1.0",
"@pinia/testing": "^0.1.3",
"@pinia/testing": "^1.0.3",
"@playwright/test": "^1.49.1",
"@testing-library/vue": "^8.1.0",
"@types/luxon": "^3.4.2",
"@types/uuid": "^10.0.0",
"@typescript-eslint/parser": "^8.19.0",
"@vitest/coverage-v8": "1.6.0",
"@vitest/coverage-v8": "3.2.4",
"@vue/test-utils": "^2.4.6",
"eslint": "^8.56.0",
"eslint": "^8.57.1",
"eslint-plugin-tailwindcss": "^3.17.4",
"happy-dom": "^14.12.3",
"happy-dom": "^20.0.11",
"nuxt": "3.15.4",
"playwright-core": "^1.49.1",
"playwright-core": "^1.57.0",
"sass": "^1.77.6",
"typescript": "^5.5.3",
"vitest": "^1.6.0"
"typescript": "^5.9.3",
"vitest": "^3.2.4"
},
"dependencies": {
"@daxiom/nuxt-core-layer-test": "^0.0.24",
"@daxiom/nuxt-core-layer-test": "^0.0.29",
"@vuepic/vue-datepicker": "^10.0.0",
"@zadigetvoltaire/nuxt-gtm": "^0.0.13",
"country-codes-list": "^1.6.11",
"country-codes-list": "^2.0.0",
"luxon": "^3.5.0",
"nuxt-gtag": "^3.0.2",
"nuxt-gtag": "^3.0.3",
"vue-country-flag-next": "^2.3.2"
},
"pnpm": {
"overrides": {
"vite": "6.0.0"
"vite": "6.0.15"
}
}
}
Loading
Loading