Skip to content

Commit 9086b97

Browse files
weskubo-cgiweskubo-cgivietle-cgi
authored
CCFRI-3810 - Landing page html (#551)
* Initial updates and console cleanup. * Further style fixes and remove some common console logs. * ccfri-3810 - adjust SmallCard layouts in LandingPage and ReportChanges and fix the button color in those pages --------- Co-authored-by: weskubo-cgi <Wesley.Kubo@gov.bc.ca> Co-authored-by: Le <vietdung.le@cgi.com>
1 parent d66ce7b commit 9086b97

File tree

8 files changed

+298
-332
lines changed

8 files changed

+298
-332
lines changed

‎frontend/src/components/LandingPage.vue

Lines changed: 215 additions & 237 deletions
Large diffs are not rendered by default.

‎frontend/src/components/guiComponents/LargeCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
export default {
3232
props: {
3333
title: { type: String, required: true },
34-
subtitle: { type: String, required: true },
34+
subtitle: { type: String, default: '' },
3535
pText: { type: String, required: true },
3636
},
3737
};

‎frontend/src/components/guiComponents/SmallCard.vue

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
<template>
2-
<v-col class="col-12 flex d-flex flex-column">
3-
<v-card
4-
class="pa-0 elevation-4 rounded-lg flex d-flex flex-column"
5-
:class="isDisabled"
6-
:disabled="disable"
7-
width="100%"
8-
>
9-
<v-card-text class="text--primary">
10-
<slot name="content" />
11-
</v-card-text>
12-
<v-card-actions class="mt-auto pb-4 pl-4">
13-
<slot name="button" />
14-
</v-card-actions>
15-
</v-card>
16-
</v-col>
2+
<v-card
3+
class="pa-0 elevation-4 rounded-lg d-flex flex-column"
4+
:class="isDisabled"
5+
:disabled="disable"
6+
width="100%"
7+
height="100%"
8+
>
9+
<v-card-text class="text--primary">
10+
<slot name="content" />
11+
</v-card-text>
12+
<v-card-actions class="mt-auto pb-4 pl-4">
13+
<slot name="button" />
14+
</v-card-actions>
15+
</v-card>
1716
</template>
1817
<script>
1918
export default {
2019
props: {
21-
title: { type: String, required: true },
22-
subtitle: { type: String, required: true },
2320
disable: {
2421
default: false,
2522
type: Boolean,

‎frontend/src/components/requestChanges/ReportChanges.vue

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -11,75 +11,78 @@
1111
<v-form ref="isValidForm" v-model="isValidForm" model-value="false">
1212
<v-container>
1313
<p class="text-h6 text-center">What changes do you want to make?</p>
14-
<v-row class="d-flex justify-start">
15-
<SmallCard v-if="organizationProviderType == 'GROUP'" class="col-lg-6" :disable="false">
16-
<template #content>
17-
<div class="px-10">
18-
<p class="text-h6 text-center">Add a New facility to an existing organization</p>
19-
<p class="px-2 text-center">
20-
This will lead you through the CCOF application process. Please have your facility, CCFRI and ECE-WE
21-
information ready.
22-
</p>
23-
<p class="px-2 text-center">
24-
You need to attach an <strong>updated</strong><i> Community Care And Assisted Living Act</i> licence.
25-
</p>
26-
</div>
27-
</template>
28-
<template #button>
29-
<v-row justify="space-around" class="ma-0 pa-0">
30-
<v-btn dark class="blueButton mb-10" :loading="processing" @click="routeToFacilityAdd()">
31-
Add new facility
32-
</v-btn>
33-
</v-row>
34-
</template>
35-
</SmallCard>
36-
37-
<SmallCard class="col-lg-6" :disable="false">
38-
<template #content>
39-
<div class="px-10">
40-
<p class="text-h6 text-center">Report changes to your Licence or service</p>
41-
<p class="px-2 text-center">
42-
Please have your <i>Community Care And Assisted Living Act</i> licence (if required) and other
43-
supporting documents ready.
44-
</p>
45-
</div>
46-
</template>
47-
<template #button>
48-
<div class="ma-0 pa-0">
14+
<v-row>
15+
<v-col cols="12" md="6" xl="4">
16+
<SmallCard v-if="organizationProviderType == 'GROUP'">
17+
<template #content>
18+
<div class="px-10">
19+
<p class="text-h6 text-center">Add a New facility to an existing organization</p>
20+
<p class="px-2 text-center">
21+
This will lead you through the CCOF application process. Please have your facility, CCFRI and ECE-WE
22+
information ready.
23+
</p>
24+
<p class="px-2 text-center">
25+
You need to attach an <strong>updated</strong
26+
><i> Community Care And Assisted Living Act</i> licence.
27+
</p>
28+
</div>
29+
</template>
30+
<template #button>
31+
<v-row no-gutters justify="space-around">
32+
<v-btn dark class="blueButton mb-10" :loading="processing" @click="routeToFacilityAdd()">
33+
Add new facility
34+
</v-btn>
35+
</v-row>
36+
</template>
37+
</SmallCard>
38+
</v-col>
39+
<v-col cols="12" md="6" xl="4">
40+
<SmallCard>
41+
<template #content>
42+
<div class="px-10">
43+
<p class="text-h6 text-center">Report changes to your Licence or service</p>
44+
<p class="px-2 text-center">
45+
Please have your <i>Community Care And Assisted Living Act</i> licence (if required) and other
46+
supporting documents ready.
47+
</p>
48+
</div>
49+
</template>
50+
<template #button>
4951
<v-row justify="space-around">
5052
<v-btn dark class="blueButton mb-10" :loading="processing" @click="goToChangeDialogue()">
5153
Upload a Change Notification Form
5254
</v-btn>
5355
</v-row>
54-
</div>
55-
</template>
56-
</SmallCard>
57-
58-
<SmallCard class="col-lg-6" :disable="!isMtfiEnabled()">
59-
<template #content>
60-
<div class="px-10">
61-
<p class="text-h6 text-center">Mid-Term Fee Increase</p>
62-
<p class="px-2 text-center">
63-
Request a parent fee increase for a facility after you have received approval for the CCFRI.
64-
</p>
65-
<p class="px-2 text-center">You may need to provide details about your expenses.</p>
66-
</div>
67-
</template>
68-
<template #button>
69-
<v-row justify="space-around" class="ma-0 pa-0">
70-
<v-btn
71-
dark
72-
class="mb-10"
73-
:color="buttonColor(!isMtfiEnabled())"
74-
:disable="!isMtfiEnabled()"
75-
:loading="processing"
76-
@click="goToMTFI()"
77-
>
78-
Update parent fees
79-
</v-btn>
80-
</v-row>
81-
</template>
82-
</SmallCard>
56+
</template>
57+
</SmallCard>
58+
</v-col>
59+
<v-col cols="12" md="6" xl="4">
60+
<SmallCard :disable="!isMtfiEnabled()">
61+
<template #content>
62+
<div class="px-10">
63+
<p class="text-h6 text-center">Mid-Term Fee Increase</p>
64+
<p class="px-2 text-center">
65+
Request a parent fee increase for a facility after you have received approval for the CCFRI.
66+
</p>
67+
<p class="px-2 text-center">You may need to provide details about your expenses.</p>
68+
</div>
69+
</template>
70+
<template #button>
71+
<v-row no-gutters justify="space-around">
72+
<v-btn
73+
dark
74+
class="mb-10"
75+
:class="buttonColor(!isMtfiEnabled())"
76+
:disable="!isMtfiEnabled()"
77+
:loading="processing"
78+
@click="goToMTFI()"
79+
>
80+
Update parent fees
81+
</v-btn>
82+
</v-row>
83+
</template>
84+
</SmallCard>
85+
</v-col>
8386
</v-row>
8487

8588
<v-row id="change-request-history" no-gutters>
@@ -712,7 +715,7 @@ export default {
712715
return !foundCRNotInEndStateStatus && foundFacilityWithApprovedCCFRI;
713716
},
714717
buttonColor(isDisabled) {
715-
return isDisabled ? '#909090' : '#003366';
718+
return isDisabled ? 'disabledButton' : 'blueButton';
716719
},
717720
},
718721
};

‎frontend/src/store/application.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,11 @@ export const useApplicationStore = defineStore('application', {
109109
}
110110
},
111111
async loadApplicationFromStore(programYearId) {
112-
console.log('loadApplicationFromStore called with programYearId: ', programYearId);
113112
const application = this.applicationMap.get(programYearId);
114113
const navBarStore = useNavBarStore();
115114
const applicationStore = useApplicationStore();
116115

117116
if (application) {
118-
console.log('loadApplicationFromStore found for guid : ', application);
119117
this.setApplicationId(application.applicationId);
120118
this.setApplicationStatus(application.applicationStatus);
121119
this.setApplicationType(application.applicationType);
@@ -138,7 +136,6 @@ export const useApplicationStore = defineStore('application', {
138136
},
139137
async deletePcfApplication({ state }) {
140138
//this should only be used on NEW PCF applications - usually in the case where the user incorrectly selects "GROUP or FAMILY"
141-
console.log(state?.applicationId);
142139
await ApiService.apiAxios.delete(ApiRoutes.APPLICATION + '/' + state?.applicationId);
143140
},
144141
},
@@ -159,7 +156,6 @@ export const useApplicationStore = defineStore('application', {
159156
},
160157
latestProgramYearId: (state) => {
161158
const appStore = useAppStore();
162-
console.log(appStore.programYearList.list);
163159
let currentGuid;
164160
let futureGuid;
165161
let lastGuid;

‎frontend/src/store/auth.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ export const useAuthStore = defineStore('auth', {
8787
userInfoRes = await ApiService.getUserImpersonateInfo(this.impersonateId);
8888
} else {
8989
userInfoRes = await ApiService.getUserInfo();
90-
console.log('dataaaaa');
91-
console.log(userInfoRes.data);
9290
}
9391
this.setUserInfo(userInfoRes.data);
9492

@@ -105,8 +103,6 @@ export const useAuthStore = defineStore('auth', {
105103
latestApplication?.ccofApplicationStatus,
106104
]);
107105
}
108-
console.log('getUserInfo --------------------------- ');
109-
console.log(userInfoRes.data);
110106
organizationStore.setOrganizationId(userInfoRes.data.organizationId);
111107
organizationStore.setOrganizationName(userInfoRes.data?.organizationName);
112108
organizationStore.setOrganizationAccountNumber(userInfoRes.data?.organizationAccountNumber);
@@ -130,7 +126,6 @@ export const useAuthStore = defineStore('auth', {
130126
},
131127
async getInitialToken() {
132128
const response = await AuthService.getAuthToken();
133-
console.log('TOKEN Received: ', response);
134129
if (response.jwtFrontend) {
135130
this.setJwtToken(response.jwtFrontend);
136131
ApiService.setAuthHeader(response.jwtFrontend);

‎frontend/src/store/message.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export const useMessageStore = defineStore('message', {
4242
}
4343
},
4444
async getAllMessages(organizationId) {
45-
console.log('WHEE messages');
4645
if (!localStorage.getItem('jwtToken')) {
4746
console.log('unable to get Messages data because you are not logged in');
4847
throw 'unable to get Messages data because you are not logged in';

‎frontend/src/store/navBar.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ export const useNavBarStore = defineStore('navBar', {
183183
this.navBarList = [];
184184
},
185185
forceNavBarRefresh() {
186-
console.log('nav refersh?');
187186
this.refreshNavBar = this.refreshNavBar + 1;
188187
},
189188
setUserProfileList(value) {
@@ -330,7 +329,6 @@ export const useNavBarStore = defineStore('navBar', {
330329
await this.loadChangeRequest(changeRequestId);
331330
},
332331
async setUrlDetails(to) {
333-
console.log('to url is: ', to);
334332
this.setCurrentUrl(to.fullPath);
335333
const applicationStore = useApplicationStore();
336334

0 commit comments

Comments
 (0)