Skip to content

Commit

Permalink
Merge branch 'main' into temporary-17869
Browse files Browse the repository at this point in the history
  • Loading branch information
AbrahamRostampoor authored Nov 2, 2023
2 parents 8d02bd1 + b93ab40 commit fe63aa0
Show file tree
Hide file tree
Showing 36 changed files with 797 additions and 747 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: BUSINESS FILINGS UI CD

on:
push:
branches:
- main
# push:
# branches:
# - main
workflow_dispatch:
inputs:
environment:
Expand Down
15 changes: 13 additions & 2 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-filings-ui",
"version": "6.9.3",
"version": "6.9.6",
"private": true,
"appName": "Filings UI",
"sbcName": "SBC Common Components",
Expand All @@ -19,6 +19,7 @@
"@bcrs-shared-components/confirm-dialog": "1.2.1",
"@bcrs-shared-components/corp-type-module": "1.0.11",
"@bcrs-shared-components/court-order-poa": "2.1.4",
"@bcrs-shared-components/date-picker": "1.2.34",
"@bcrs-shared-components/document-delivery": "1.2.1",
"@bcrs-shared-components/enums": "1.0.51",
"@bcrs-shared-components/expandable-help": "^1.0.0",
Expand Down
9 changes: 6 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
type="warning"
>
<div
class="mb-0 text-center colour-dk-text"
class="mb-0 text-center color-dk-text"
v-html="bannerText"
/>
</v-alert>
Expand Down Expand Up @@ -393,6 +393,7 @@ export default {
'setRecordsAddress',
'setRegisteredAddress',
'setTasks',
'setUserInfo',
'setUserKeycloakGuid'
]),
Expand Down Expand Up @@ -436,12 +437,14 @@ export default {
// fetch user info and update Launch Darkly
// and save user's Keycloak GUID
try {
const userInfo = await AuthServices.fetchUserInfo(this.getAuthApiUrl).then(response => response?.data)
const userInfo = await AuthServices.fetchUserInfo(this.getAuthApiUrl)
this.setUserInfo(userInfo)
await this.updateLaunchDarkly(userInfo)
this.setUserKeycloakGuid(userInfo.keycloakGuid)
} catch (error) {
// just log the error -- no need to halt app
console.log('Error updating Launch Darkly =', error) // eslint-disable-line no-console
// eslint-disable-next-line no-console
console.log('Error fetching user info or updating Launch Darkly =', error)
}
// is this a business entity?
Expand Down
6 changes: 5 additions & 1 deletion src/assets/styles/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ ul.list {
border-left: 1px solid $gray6;
}

.colour-dk-text {
.color-dk-text {
color: $gray9 !important;
}

.bg-color-blue {
background-color: $BCgovBlue5O !important;
}
77 changes: 77 additions & 0 deletions src/components/AgmExtension/AboutTheBusiness.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<template>
<VcardTemplate id="about-the-business">
<template #icon>
mdi-domain
</template>

<template #title>
About the Business
</template>

<template #content>
<v-row
no-gutters
class="px-6 py-7"
>
<v-col
cols="12"
sm="3"
>
<strong>Business in Good Standing</strong>
</v-col>
<v-col
cols="12"
sm="9"
>
{{ data.isGoodStanding ? 'Yes' : 'No' }}
</v-col>
</v-row>

<v-divider class="mx-4" />

<v-row
no-gutters
class="px-6 py-7"
>
<v-col
cols="12"
sm="3"
>
<strong>Date of Incorporation</strong>
</v-col>
<v-col
cols="12"
sm="9"
>
{{ DateUtilities.dateToPacificDate(data.incorporationDate, true) }}
</v-col>
</v-row>
</template>
</VcardTemplate>
</template>

<script lang="ts">
import { AgmExtEvalIF } from '@/interfaces'
import { Component, Prop, Vue } from 'vue-property-decorator'
import { DateUtilities } from '@/services'
import { VcardTemplate } from '@/components/common'
@Component({
components: {
VcardTemplate
}
})
export default class AboutTheBusiness extends Vue {
readonly DateUtilities = DateUtilities
@Prop({ required: true }) readonly data!: AgmExtEvalIF
}
</script>

<style lang="scss" scoped>
@import '@/assets/styles/theme.scss';
.col-12 {
font-size: $px-16;
}
</style>
82 changes: 82 additions & 0 deletions src/components/AgmExtension/AgmExtensionEvaluation.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<template>
<VcardTemplate id="agm-extension-evaluation">
<template #icon>
mdi-calendar-range
</template>

<template #title>
AGM Extension Evaluation
</template>

<template #content>
<v-row
no-gutters
class="px-6 pt-7"
>
<v-col
cols="12"
sm="3"
>
<strong>AGM Year</strong>
</v-col>
<v-col
cols="12"
sm="9"
>
{{ data.agmYear || 'Unknown' }}
</v-col>
</v-row>

<v-row
no-gutters
class="px-6 py-4"
>
<v-col
cols="12"
sm="3"
>
<strong>Duration of Extension</strong>
</v-col>
<v-col
cols="12"
sm="9"
>
{{ data.extensionDuration || 'Unknown' }}
</v-col>
</v-row>

<v-row
no-gutters
class="px-6 pb-7"
>
<v-col
cols="12"
sm="3"
>
<strong>Due date for this AGM</strong>
</v-col>
<v-col
cols="12"
sm="9"
>
{{ data.agmDueDate || 'Unknown' }}
</v-col>
</v-row>
</template>
</VcardTemplate>
</template>

<script lang="ts">
import { Component, Prop, Vue } from 'vue-property-decorator'
import { VcardTemplate } from '@/components/common'
import { AgmExtEvalIF } from '@/interfaces'
@Component({
components: {
VcardTemplate
}
})
export default class AgmExtensionEvaluation extends Vue {
@Prop({ required: true }) readonly data!: AgmExtEvalIF
}
</script>
31 changes: 31 additions & 0 deletions src/components/AgmExtension/AgmExtensionHelp.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<template>
<section class="agm-extension-help mt-0">
<h3 class="text-center">
AGM Extension Help
</h3>
<div class="mt-6">
<p class="ml-1">
A company must have an annual general meeting (AGM) every calendar year, not more than 15
months after the previous year's meeting. A company's first AGM must happen within 18 months
of recognition. The date of an AGM becomes the company's annual reference date.
</p>
<p class="ml-1">
Shareholders entitled to vote may decide by unanimous resolution to postpone the AGM to a
later date than the annual reference date. They can also decide by unanimous resolution to
waive the AGM for that year. A unanimous resolution to postpone or waive the AGM must pass on
or before the annual reference date. Shareholders must select a new annual reference date.
</p>
<p class="ml-1">
If a company does not pass a unanimous resolution before the required date, they must apply
for an AGM extension.
</p>
</div>
</section>
</template>

<script lang="ts">
import { Component, Vue } from 'vue-property-decorator'
@Component({})
export default class AgmExtensionHelp extends Vue {}
</script>
Loading

0 comments on commit fe63aa0

Please sign in to comment.