Skip to content

Commit

Permalink
Merge pull request #143 from bcgov/feat/ui-text-updates
Browse files Browse the repository at this point in the history
UI Text Updates
  • Loading branch information
kyle1morel authored Sep 4, 2024
2 parents 9a6ac4b + 649369e commit d724e78
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const props = withDefaults(defineProps<Props>(), {
v-if="showHomeLink"
class="mt-4"
>
<router-link :to="{ name: RouteName.HOME }">Go to Homepage</router-link>
<router-link :to="{ name: RouteName.HOUSING }">Back to Housing</router-link>
</div>
</div>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ async function checkActivityIdValidity(event: Event) {

<template>
<div v-if="!assignedActivityId">
<div class="mb-3 p-0">
<div class="mb-2 p-0">
<BackButton
:confirm-leave="editable && !!formUpdated"
confirm-message="Are you sure you want to leave this page?
Expand All @@ -273,6 +273,9 @@ async function checkActivityIdValidity(event: Event) {
text="Back to Housing"
/>
</div>
<div class="flex justify-content-center align-items-center app-primary-color mb-2 mt-3">
<h3>Enquiry Form</h3>
</div>

<CollectionDisclaimer />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function onDelete(enquiryId: string) {
</template>
<Column
field="activity.activityId"
header="Activity"
header="Confirmation ID"
:sortable="true"
frozen
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ const props = withDefaults(defineProps<Props>(), {});
<router-link :to="{ name: RouteName.HOUSING_SUBMISSIONS }">View my drafts and submissions page.</router-link>
Please check your email for the confirmation email and keep the confirmation ID for future reference
</div>
<div class="mt-4"><router-link :to="{ name: RouteName.HOME }">Go to Homepage</router-link></div>
<div class="mt-4"><router-link :to="{ name: RouteName.HOUSING }">Back to Housing</router-link></div>
</div>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ const props = withDefaults(defineProps<Props>(), {});
</Message>
<h3>Confirmation ID: {{ props.assignedActivityId }}</h3>
<div>
Your submission will be reviewed by a Housing Navigator. You may be contacted if needed. Please check your email
for the confirmation email and keep the confirmation ID for future reference.
Your submission will be reviewed and you will be contacted by a Housing Navigator. Please check your email for the
confirmation email and keep the confirmation ID for future reference.
</div>
<div class="mt-4"><router-link :to="{ name: RouteName.HOME }">Go to Homepage</router-link></div>
<div class="mt-4"><router-link :to="{ name: RouteName.HOUSING }">Back to Housing</router-link></div>
</div>
</template>
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ const props = withDefaults(defineProps<Props>(), {
const router = useRouter();
// Constants
const VALIDATION_BANNER_TEXT =
'One or more of the required fields are missing or contains invalid data. Please check the highlighted fields.';
// eslint-disable-next-line max-len
'One or more of the required fields are missing or contains invalid data. Please check the highlighted pages and fields in red.';
// Store
const submissionStore = useSubmissionStore();
Expand Down Expand Up @@ -445,6 +446,9 @@ onBeforeMount(async () => {
:route-name="RouteName.HOUSING"
text="Back to Housing"
/>
<div class="flex justify-content-center app-primary-color mt-3">
<h3>Project Investigation Form</h3>
</div>

<Form
id="form"
Expand Down Expand Up @@ -701,7 +705,7 @@ onBeforeMount(async () => {
<InputText
class="col-6"
name="housing.projectName"
label="Project name - well known title like Capital Park"
label="Project name - your preferred name for your project"
:bold="false"
:disabled="!editable"
/>
Expand Down Expand Up @@ -857,9 +861,7 @@ onBeforeMount(async () => {
<template #title>
<div class="flex align-items-center">
<div class="flex flex-grow-1">
<span class="section-header">
Is this project being financially supported by any of the following?
</span>
<span class="section-header">Is this project associated with any of the following?</span>
</div>
<Button
class="p-button-sm mr-3 p-button-danger"
Expand Down Expand Up @@ -1210,7 +1212,7 @@ onBeforeMount(async () => {
v-model:active-index="parcelAccordionIndex"
class="mb-3"
>
<AccordionTab header="Parcel ID">
<AccordionTab header="Parcel ID (PID Number)">
<Card class="no-shadow">
<template #content>
<div class="formgrid grid">
Expand Down Expand Up @@ -1301,7 +1303,7 @@ onBeforeMount(async () => {
<div class="flex align-items-center">
<div class="flex flex-grow-1">
<span class="section-header">
Is there anything else you would like to tell us about this project's location?
Is there anything else you would like to tell us about this project's location? (optional)
</span>
</div>
</div>
Expand Down Expand Up @@ -1401,7 +1403,7 @@ onBeforeMount(async () => {
class="col-12"
>
<div class="mb-2">
<span class="text-red-500">
<span class="app-primary-color">
* Sharing this information will authorize the navigators to seek additional information about
this permit.
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function onDelete(submissionId: string) {
</template>
<Column
field="activity.activityId"
header="Activity"
header="Confirmation ID"
:sortable="true"
frozen
>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/layout/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ onMounted(() => {
label: 'Housing',
items: [
{
label: 'Work with a Housing Navigator',
label: 'Start a new project investigation',
route: RouteName.HOUSING_SUBMISSION_INTAKE,
access: Permissions.NAVIGATION_HOUSING_INTAKE
},
Expand All @@ -45,12 +45,12 @@ onMounted(() => {
access: Permissions.NAVIGATION_HOUSING_ENQUIRY
},
{
label: 'Drafts and submissions',
label: 'View my drafts and previous entries',
route: RouteName.HOUSING_SUBMISSIONS,
access: Permissions.NAVIGATION_HOUSING_SUBMISSIONS_SUB
},
{
label: 'Status of application/permit',
label: 'Check the status of your applications/permits',
route: RouteName.HOUSING_PROJECTS_LIST,
access: Permissions.NAVIGATION_HOUSING_STATUS_TRACKER
}
Expand Down
1 change: 0 additions & 1 deletion frontend/src/services/permissionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ const PermissionMap = [
Permissions.NAVIGATION_HOUSING_DROPDOWN,
Permissions.NAVIGATION_HOUSING_ENQUIRY,
Permissions.NAVIGATION_HOUSING_INTAKE,
Permissions.NAVIGATION_HOUSING_STATUS_TRACKER,
Permissions.NAVIGATION_HOUSING_SUBMISSION,
Permissions.NAVIGATION_HOUSING_SUBMISSIONS_SUB
]
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/HomeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const toHousing = (): void => {
<div class="flex align-items-center justify-content-start h-full">
<div class="text-left text-white-alpha-90">
<h1 class="font-bold mb-0">Welcome to the</h1>
<h1 class="font-bold underline mt-0">Permit Connect Services</h1>
<h1 class="font-bold mt-0">Permit Connect Services</h1>
<h2 class="mb-3">Choose your project type</h2>
<Button @click="toHousing">
<font-awesome-icon
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/housing/HousingView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const items = ref([
route: RouteName.HOUSING_ENQUIRY_INTAKE
},
{
top: 'View my drafts and submissions',
top: 'View my drafts and previous entries',
icon: 'fa-pen-to-square',
route: RouteName.HOUSING_SUBMISSIONS
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/housing/SubmissionsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const permissionService = new PermissionService();
// Actions
const getTitle = computed(() =>
permissionService.can(Permissions.HOUSING_SUBMISSION_READ) ? 'Submissions' : 'My drafts and submissions'
permissionService.can(Permissions.HOUSING_SUBMISSION_READ) ? 'Submissions' : 'My drafts and previous entries'
);
</script>

Expand Down

0 comments on commit d724e78

Please sign in to comment.