Skip to content

Commit 44d9967

Browse files
committed
Adjust breadcrumb instances and remove items
1 parent cea091b commit 44d9967

31 files changed

+134
-608
lines changed

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/AddProfessionalDevelopment.vue

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<template>
22
<v-container>
3-
<v-breadcrumbs class="pl-0" :items="items" color="primary">
4-
<template #divider>/</template>
5-
</v-breadcrumbs>
3+
<Breadcrumb />
64
<div class="d-flex flex-column ga-3">
75
<h1 class="mt-5">Professional development</h1>
86
<v-row>
@@ -270,7 +268,7 @@ import type { Components } from "@/types/openapi";
270268
import { formatDate } from "@/utils/format";
271269
import { isNumber } from "@/utils/formInput";
272270
import * as Rules from "@/utils/formRules";
273-
271+
import Breadcrumb from "@/components/Breadcrumb.vue";
274272
import type { FileItem } from "./UploadFileItem.vue";
275273
276274
interface ProfessionalDevelopmentData {
@@ -281,7 +279,7 @@ interface ProfessionalDevelopmentData {
281279
282280
export default defineComponent({
283281
name: "AddProfessionalDevelopment",
284-
components: { FileUploader, EceTextField, EceDateInput },
282+
components: { FileUploader, EceTextField, EceDateInput, Breadcrumb },
285283
props: {
286284
applicationId: {
287285
type: String,
@@ -309,36 +307,13 @@ export default defineComponent({
309307
};
310308
},
311309
data() {
312-
const items = [
313-
{
314-
title: "Home",
315-
disabled: false,
316-
href: "/",
317-
},
318-
{
319-
title: "Application",
320-
disabled: false,
321-
href: `/manage-application/${this.applicationId}`,
322-
},
323-
{
324-
title: "Professional development",
325-
disabled: false,
326-
href: `/manage-application/${this.applicationId}/professional-development`,
327-
},
328-
{
329-
title: "Add",
330-
disabled: true,
331-
href: `/manage-application/${this.applicationId}/professional-development/add`,
332-
},
333-
];
334-
335310
const professionalDevelopment: ProfessionalDevelopmentData & Components.Schemas.ProfessionalDevelopment = {
336311
selection: [],
337312
areAttachedFilesValid: true,
338313
isFileUploadInProgress: false,
339314
};
340315
341-
return { items, professionalDevelopment, Rules };
316+
return { professionalDevelopment, Rules };
342317
},
343318
computed: {
344319
applicationType() {

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ApplicationRequirements.vue

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<v-container>
3-
<Breadcrumb :items="items" />
3+
<Breadcrumb />
44

55
<!-- Renewal -->
66
<template v-if="applicationStore.isDraftApplicationRenewal">
@@ -107,53 +107,7 @@ export default defineComponent({
107107
return { applicationStore, certificationStore, userStore, router };
108108
},
109109
data() {
110-
const applicationStore = useApplicationStore();
111-
const userStore = useUserStore();
112-
113-
let items: { title: string; disabled: boolean; href: string }[] = [
114-
{
115-
title: "Home",
116-
disabled: false,
117-
href: "/",
118-
},
119-
];
120-
121-
if (applicationStore.isDraftApplicationLaborMobility) {
122-
items.push(
123-
{
124-
title: "Check your transfer eligibility",
125-
disabled: false,
126-
href: "/application/transfer",
127-
},
128-
{
129-
title: "Requirements",
130-
disabled: true,
131-
href: "/application/certification/requirements",
132-
},
133-
);
134-
} else if (applicationStore.isDraftApplicationRenewal || userStore.isRegistrant) {
135-
items.push({
136-
title: "Requirements",
137-
disabled: true,
138-
href: "/application/certification/requirements",
139-
});
140-
} else {
141-
items.push(
142-
{
143-
title: "Application types",
144-
disabled: false,
145-
href: "/application/certification",
146-
},
147-
{
148-
title: "Requirements",
149-
disabled: true,
150-
href: "/application/certification/requirements",
151-
},
152-
);
153-
}
154-
155110
return {
156-
items,
157111
specializationSelection: [] as Components.Schemas.CertificationType[],
158112
};
159113
},

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/ApplicationSummary.vue

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<template>
22
<v-container>
3-
<v-breadcrumbs class="pl-0" :items="items" color="primary">
4-
<template #divider>/</template>
5-
</v-breadcrumbs>
6-
3+
<Breadcrumb />
74
<ApplicationCertificationTypeHeader :certification-types="applicationStore.applications?.[0]?.certificationTypes || []" class="pb-5" />
85
<h2>Status</h2>
96
<p class="pb-3">It is a 3-step process to apply.</p>
@@ -88,7 +85,7 @@
8885
:go-to="
8986
() =>
9087
router.push({
91-
name: 'viewCharacterReference',
88+
name: 'view-character-reference',
9289
params: { applicationId: route.params.applicationId, referenceId: reference.id?.toString() },
9390
})
9491
"
@@ -220,7 +217,7 @@
220217
:go-to="
221218
() =>
222219
router.push({
223-
name: 'viewCharacterReference',
220+
name: 'view-character-reference',
224221
params: { applicationId: route.params.applicationId, referenceId: reference.id?.toString() },
225222
})
226223
"
@@ -261,6 +258,7 @@ import ApplicationSummaryCharacterReferenceListItem from "./ApplicationSummaryCh
261258
import ApplicationSummaryTranscriptListItem from "./ApplicationSummaryTranscriptListItem.vue";
262259
import ApplicationSummaryHeader from "./ApplicationSummaryHeader.vue";
263260
import { useConfigStore } from "@/store/config";
261+
import Breadcrumb from "@/components/Breadcrumb.vue";
264262
265263
export default defineComponent({
266264
name: "ApplicationSummary",
@@ -270,6 +268,7 @@ export default defineComponent({
270268
ApplicationSummaryCharacterReferenceListItem,
271269
ApplicationSummaryActionListItem,
272270
ApplicationSummaryHeader,
271+
Breadcrumb,
273272
},
274273
setup: async () => {
275274
const { smAndUp } = useDisplay();
@@ -297,22 +296,7 @@ export default defineComponent({
297296
route,
298297
};
299298
},
300-
data() {
301-
return {
302-
items: [
303-
{
304-
title: "Home",
305-
disabled: false,
306-
href: "/",
307-
},
308-
{
309-
title: "Application",
310-
disabled: true,
311-
href: "application",
312-
},
313-
],
314-
};
315-
},
299+
316300
computed: {
317301
currentStep() {
318302
switch (this.applicationStatus?.status) {

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/CertificationRequirements.vue

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<v-container>
3-
<Breadcrumb :items="items" />
3+
<Breadcrumb />
44
<div v-for="certificationType in certificationTypes" :key="certificationType">
55
<ECEAssistantRenewalRequirements v-if="certificationType === CertificationType.ECE_ASSISTANT" />
66
<ECEOneYearRenewalRequirements v-if="certificationType === CertificationType.ONE_YEAR" />
@@ -36,21 +36,5 @@ export default defineComponent({
3636
setup: () => {
3737
return { CertificationType };
3838
},
39-
data() {
40-
return {
41-
items: [
42-
{
43-
title: "Home",
44-
disabled: false,
45-
href: "/",
46-
},
47-
{
48-
title: "Renew",
49-
disabled: true,
50-
href: "/application/certification/requirements",
51-
},
52-
],
53-
};
54-
},
5539
});
5640
</script>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<template>
2+
<v-container>
3+
<Breadcrumb />
4+
<h1 class="mb-5">Parent or guardian consent will be required</h1>
5+
<div class="d-flex flex-column ga-3 my-6">
6+
<p>Applicants under 19 years old need consent from a parent or legal guardian to apply for certification.</p>
7+
<p>To provide consent, you will need to:</p>
8+
<ol class="ml-10">
9+
<li>Choose the type of certification you want to apply for</li>
10+
<li>Submit your application form</li>
11+
<li>Get a parent or guardian to sign the consent form we will send you in a message (it will include your application details)</li>
12+
<li>Send us a photo or scanned copy of the signed consent form</li>
13+
</ol>
14+
</div>
15+
<v-btn class="mt-6" rounded="lg" color="primary" @click="continueClick" id="btnContinue">Continue</v-btn>
16+
</v-container>
17+
</template>
18+
19+
<script lang="ts">
20+
import { defineComponent } from "vue";
21+
import Breadcrumb from "@/components/Breadcrumb.vue";
22+
23+
import { useRouter } from "vue-router";
24+
25+
export default defineComponent({
26+
name: "ConsentRequired",
27+
components: { Breadcrumb },
28+
async setup() {
29+
const router = useRouter();
30+
31+
return { router };
32+
},
33+
34+
methods: {
35+
async continueClick() {
36+
this.router.push({ name: "application-requirements" });
37+
},
38+
},
39+
});
40+
</script>

src/ECER.Clients.RegistryPortal/ecer.clients.registryportal.client/src/components/Declaration.vue

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<v-container>
3-
<Breadcrumb :items="items" />
3+
<Breadcrumb />
44
<h1 class="mb-5">Declaration and consent</h1>
55
<p>You must read and agree to the following to apply for certification.</p>
66
<br />
@@ -73,71 +73,7 @@ export default defineComponent({
7373
userStore.setUserProfile(userProfile);
7474
}
7575
76-
const items = applicationStore.isDraftApplicationLaborMobility
77-
? [
78-
{
79-
title: "Home",
80-
disabled: false,
81-
href: "/",
82-
},
83-
{
84-
title: "Check your transfer eligibility",
85-
disabled: false,
86-
href: "/application/transfer",
87-
},
88-
{
89-
title: "Requirements",
90-
disabled: false,
91-
href: "/application/certification/requirements",
92-
},
93-
{
94-
title: "Declaration",
95-
disabled: true,
96-
href: "/application/declaration",
97-
},
98-
]
99-
: applicationStore.isDraftApplicationRenewal || userStore.isRegistrant
100-
? [
101-
{
102-
title: "Home",
103-
disabled: false,
104-
href: "/",
105-
},
106-
{
107-
title: "Requirements",
108-
disabled: false,
109-
href: "/application/certification/requirements",
110-
},
111-
{
112-
title: "Declaration",
113-
disabled: true,
114-
href: "/application/declaration",
115-
},
116-
]
117-
: [
118-
{
119-
title: "Home",
120-
disabled: false,
121-
href: "/",
122-
},
123-
{
124-
title: "Application types",
125-
disabled: false,
126-
href: "/application/certification",
127-
},
128-
{
129-
title: "Requirements",
130-
disabled: false,
131-
href: "/application/certification/requirements",
132-
},
133-
{
134-
title: "Declaration",
135-
disabled: true,
136-
href: "/application/declaration",
137-
},
138-
];
139-
140-
return { items, Rules, userStore, applicationStore, alertStore, loadingStore, configStore, router };
76+
return { Rules, userStore, applicationStore, alertStore, loadingStore, configStore, router };
14177
},
14278
data() {
14379
return {

0 commit comments

Comments
 (0)