Skip to content

Commit 4e06dff

Browse files
committed
WIP: Cosmetology multi-backend scaffolding
- Implement new public dashboard page - Remove cosmetology license types from registration & mfa recovery screens - Remove form subtext from state upload form (#1293)
1 parent bc42960 commit 4e06dff

14 files changed

Lines changed: 391 additions & 271 deletions

File tree

webroot/src/components/Icons/LicenseeUser/LicenseeUser.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<template>
99
<svg class="icon licensee-user-icon stroke-fill-type" viewBox="0 0 50 51">
10+
<rect x="1.5" y="2" width="47" height="47" rx="3" stroke-width="2.5" stroke-linejoin="round"/>
1011
<path class="custom-fill" d="M29.8659 13.0256C29.8659 12.2824 29.8659 11.9108 29.7212 11.6269C29.594 11.3772
1112
29.391 11.1742 29.1413 11.047C28.8574 10.9023 28.4858 10.9023 27.7426 10.9023H22.2574C21.5142 10.9023
1213
21.1426 10.9023 20.8587 11.047C20.609 11.1742 20.406 11.3772 20.2787 11.6269C20.1341 11.9108 20.1341
@@ -27,7 +28,6 @@
2728
20.4895C30.3407 20.3622 30.1377 20.1592 30.0105 19.9095C29.8659 19.6256 29.8659 19.254 29.8659
2829
18.5108V13.0256Z"
2930
stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
30-
<rect x="1.5" y="2" width="47" height="47" rx="3" stroke-width="2.5" stroke-linejoin="round"/>
3131
</svg>
3232

3333
</template>

webroot/src/components/Page/PageContainer/PageContainer.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class PageContainer extends Vue {
4949
get includePageHeader(): boolean {
5050
const nonHeaderRouteNames: Array<string> = [
5151
'Logout',
52+
'DashboardPublic',
5253
'LicenseeVerification',
5354
'MfaResetConfirmLicensee',
5455
];
@@ -69,6 +70,7 @@ class PageContainer extends Vue {
6970

7071
get includeMainNav(): boolean {
7172
const nonMainNavRouteNames: Array<string> = [
73+
'DashboardPublic', // This is a custom splash page with custom button navigation
7274
'LicenseeVerification', // This is a printer-friendly page
7375
'MfaResetConfirmLicensee', // This is a standalone automation page accessed from emailed link
7476
];

webroot/src/components/StateUpload/StateUpload.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<template>
99
<div class="state-upload-container">
1010
<h1>{{ $t('stateUpload.formTitle') }}</h1>
11-
<div class="sub-title">{{ $t('stateUpload.formSubtext') }}</div>
1211
<Card class="state-upload">
1312
<Transition name="fade" :mode="elementTransitionMode">
1413
<LoadingSpinner v-if="isInitializing" />

webroot/src/locales/en.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"common": {
3-
"appName": "Compact Connect",
3+
"appName": "CompactConnect",
44
"yes": "Yes",
55
"no": "No",
66
"back": "Back",
@@ -378,11 +378,16 @@
378378
"dashboard": "Dashboard",
379379
"goToDashboard": "Go to dashboard",
380380
"login": "Login",
381-
"loginAsStaff": "Login as Compact or State Staff",
382-
"loginAsProvider": "Login as Practitioner",
381+
"loginAsStaff": "Compact / State Staff Login",
382+
"loginAsStaffSubtext": "Select a compact",
383+
"loginAsProvider": "Practitioner login",
384+
"loginAsProviderSubtext": "Access your account and privileges",
383385
"register": "Register",
384-
"registerAsProvider": "Register as Practitioner",
386+
"registerAsProvider": "Create an account",
387+
"registerAsProviderSubtext": "Don't have an account?",
385388
"verifyPrivilege": "Verify a compact privilege",
389+
"verifyPrivilegeSubtext": "Look up practitioner credentials and status",
390+
"verifyPrivilegeSearch": "Go to search",
386391
"home": "Home",
387392
"upload": "Upload data",
388393
"licensing": "Search licensing data",
@@ -508,6 +513,7 @@
508513
}
509514
],
510515
"compact": {
516+
"welcomeTo": "Welcome to",
511517
"settingsTitle": "Settings",
512518
"configuration": "Configuration",
513519
"paymentProcessorCredentials": "Authorize.net credentials",
@@ -547,7 +553,6 @@
547553
},
548554
"stateUpload": {
549555
"formTitle": "Compact data upload",
550-
"formSubtext": "Current uploads are for test purposes and the data will not be saved permanently",
551556
"uploadHint": "Only 1 CSV",
552557
"successTitle": "Your document has been uploaded successfully",
553558
"successSubTitle": "If your document encounters any errors during processing you will be notified via email"

webroot/src/locales/es.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,11 +377,16 @@
377377
"dashboard": "Panel",
378378
"goToDashboard": "Ir al panel de control",
379379
"login": "Iniciar sesión",
380-
"loginAsStaff": "Iniciar sesión como personal compacto o estatal",
381-
"loginAsProvider": "Iniciar sesión como practicante",
380+
"loginAsStaff": "Inicio de sesión del personal del Pacto / Estado",
381+
"loginAsStaffSubtext": "Seleccione un compacto",
382+
"loginAsProvider": "Inicio de sesión de practicante",
383+
"loginAsProviderSubtext": "Accede a tu cuenta y privilegios",
382384
"register": "Registro",
383-
"registerAsProvider": "Registrarse como practicante",
384-
"verifyPrivilege": "Verificar un privilegio del compacto",
385+
"registerAsProvider": "Crear una cuenta",
386+
"registerAsProviderSubtext": "¿No tienes una cuenta?",
387+
"verifyPrivilege": "Verificar un privilegio compacto",
388+
"verifyPrivilegeSubtext": "Busque credenciales y estado del profesional",
389+
"verifyPrivilegeSearch": "Ir a la búsqueda",
385390
"home": "Hogar",
386391
"upload": "Subir",
387392
"licensing": "Licencia",
@@ -492,6 +497,7 @@
492497
}
493498
],
494499
"compact": {
500+
"welcome": "Bienvenido a CompactConnect",
495501
"settingsTitle": "Ajustes",
496502
"configuration": "Configuración",
497503
"paymentProcessorCredentials": "Authorize.net cartas credenciales",
@@ -531,7 +537,6 @@
531537
},
532538
"stateUpload": {
533539
"formTitle": "Carga de datos compacta",
534-
"formSubtext": "Las cargas actuales son para fines de prueba y los datos no se guardarán de forma permanente.",
535540
"uploadHint": "Sólo 1 archivo CSV",
536541
"successTitle": "Su documento ha sido subido exitosamente",
537542
"successSubTitle": "Si su documento encuentra algún error durante el procesamiento, se le notificará por correo electrónico."

webroot/src/pages/MfaResetStartLicensee/MfaResetStartLicensee.less

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,16 +206,6 @@
206206
cursor: pointer;
207207
}
208208

209-
.recaptcha-terms {
210-
margin: 2.4rem;
211-
font-size: @fontSizeSmall;
212-
text-align: center;
213-
214-
.recaptcha-link {
215-
text-decoration: underline;
216-
}
217-
}
218-
219209
.mock-nav {
220210
display: flex;
221211
flex-direction: column;

webroot/src/pages/MfaResetStartLicensee/MfaResetStartLicensee.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import InputSubmit from '@components/Forms/InputSubmit/InputSubmit.vue';
3535
import InputButton from '@components/Forms/InputButton/InputButton.vue';
3636
import CheckCircle from '@components/Icons/CheckCircle/CheckCircle.vue';
3737
import MockPopulate from '@components/Forms/MockPopulate/MockPopulate.vue';
38+
import { CompactType } from '@models/Compact/Compact.model';
3839
import { State } from '@models/State/State.model';
3940
import { FormInput } from '@models/FormInput/FormInput.model';
4041
import Joi from 'joi';
@@ -109,14 +110,21 @@ class MfaResetStartLicensee extends mixins(MixinForm) {
109110
get licenseTypeOptions(): Array<SelectOption> {
110111
const options = [{ value: '', name: `- ${this.$t('common.select')} -`, isDisabled: true }];
111112
const licenseTypes = this.$tm('licensing.licenseTypes') || [];
112-
113-
licenseTypes.forEach((licenseType) => {
114-
options.push({
115-
value: licenseType.key,
116-
name: licenseType.name,
117-
isDisabled: false,
113+
const enabledCompacts = [
114+
CompactType.ASLP,
115+
CompactType.OT,
116+
CompactType.COUNSELING,
117+
];
118+
119+
licenseTypes
120+
.filter((licenseType) => enabledCompacts.includes(licenseType.compactKey))
121+
.forEach((licenseType) => {
122+
options.push({
123+
value: licenseType.key,
124+
name: licenseType.name,
125+
isDisabled: false,
126+
});
118127
});
119-
});
120128

121129
return options;
122130
}

webroot/src/pages/MfaResetStartLicensee/MfaResetStartLicensee.vue

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -230,21 +230,6 @@
230230
</Transition>
231231
</Card>
232232
<div ref="recaptcha"></div>
233-
<div class="recaptcha-terms">
234-
{{ $t('recaptcha.googleDesc') }}
235-
<a
236-
href="https://policies.google.com/privacy"
237-
rel="noopener noreferrer"
238-
class="recaptcha-link"
239-
>{{ $t('recaptcha.privacyPolicy') }}</a>
240-
{{ $t('recaptcha.and') }}
241-
<a
242-
href="https://policies.google.com/terms"
243-
rel="noopener noreferrer"
244-
class="recaptcha-link"
245-
>{{ $t('recaptcha.terms') }}</a>
246-
{{ $t('recaptcha.apply') }}.
247-
</div>
248233
</Section>
249234
</template>
250235

0 commit comments

Comments
 (0)