Skip to content

Commit

Permalink
Merge branch 'main' into feat/forms-1240-external-api
Browse files Browse the repository at this point in the history
  • Loading branch information
usingtechnology authored May 30, 2024
2 parents 93bd0b4 + c582213 commit 754cbd4
Show file tree
Hide file tree
Showing 57 changed files with 372 additions and 55 deletions.
7 changes: 6 additions & 1 deletion app/frontend/src/components/admin/AddOwner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ export default {
/>
</v-col>
<v-col cols="3" md="2">
<v-btn color="primary" :disabled="!valid" @click="addOwner">
<v-btn
color="primary"
:disabled="!valid"
:title="$t('trans.addOwner.addowner')"
@click="addOwner"
>
<span :lang="lang">{{ $t('trans.addOwner.addowner') }}</span>
</v-btn>
</v-col>
Expand Down
14 changes: 12 additions & 2 deletions app/frontend/src/components/admin/AdminFormsTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,12 @@ export default {
</template>
<template #item.actions="{ item }">
<router-link :to="{ name: 'AdministerForm', query: { f: item.id } }">
<v-btn color="primary" variant="text" size="small">
<v-btn
color="primary"
variant="text"
size="small"
:title="$t('trans.adminFormsTable.admin')"
>
<v-icon class="mr-1" icon="mdi:mdi-wrench"></v-icon>
<span class="d-none d-sm-flex" :lang="lang">{{
$t('trans.adminFormsTable.admin')
Expand All @@ -146,7 +151,12 @@ export default {
}"
target="_blank"
>
<v-btn color="primary" variant="text" size="small">
<v-btn
color="primary"
variant="text"
size="small"
:title="$t('trans.adminFormsTable.launch')"
>
<v-icon class="mr-1" icon="mdi:mdi-note-plus"></v-icon>
<span class="d-none d-sm-flex" :lang="lang">{{
$t('trans.adminFormsTable.launch')
Expand Down
7 changes: 6 additions & 1 deletion app/frontend/src/components/admin/AdminUsersTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ export default {
</template>
<template #item.actions="{ item }">
<router-link :to="{ name: 'AdministerUser', query: { u: item.id } }">
<v-btn color="primary" variant="text" size="small">
<v-btn
color="primary"
variant="text"
size="small"
:title="$t('trans.adminUsersTable.admin')"
>
<v-icon class="mr-1" icon="mdi:mdi-wrench"></v-icon>
<span class="d-none d-sm-flex" :lang="lang">{{
$t('trans.adminUsersTable.admin')
Expand Down
1 change: 1 addition & 0 deletions app/frontend/src/components/admin/AdminVersions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ export default {
class="mx-1"
icon
v-bind="props"
:title="$t('trans.documentTemplate.download')"
@click="onExportClick(item.id, item.isDraft)"
>
<v-icon icon="mdi:mdi-download"></v-icon>
Expand Down
2 changes: 2 additions & 0 deletions app/frontend/src/components/admin/AdministerForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export default {
class="mt-0"
variant="text"
size="small"
:title="$t('trans.administerForm.restoreForm')"
@click="showRestoreDialog = true"
>
<v-icon class="mr-1" icon="mdi:mdi-wrench"></v-icon>
Expand All @@ -108,6 +109,7 @@ export default {
class="mt-6 mb-6"
color="primary"
:disabled="!apiKey"
:title="$t('trans.administerForm.deleteApiKey')"
@click="showDeleteDialog = true"
>
<span :lang="lang">{{
Expand Down
2 changes: 2 additions & 0 deletions app/frontend/src/components/base/BaseAuthButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const hasLogin = computed(() => useRoute()?.meta?.hasLogin);
id="logoutButton"
color="white"
variant="outlined"
:title="$t('trans.baseAuthButton.logout')"
@click="authStore.logout"
>
<span :lang="lang">{{ $t('trans.baseAuthButton.logout') }}</span>
Expand All @@ -29,6 +30,7 @@ const hasLogin = computed(() => useRoute()?.meta?.hasLogin);
id="loginButton"
color="white"
variant="outlined"
:title="$t('trans.baseAuthButton.login')"
@click="authStore.login"
>
<span :lang="lang">{{ $t('trans.baseAuthButton.login') }}</span>
Expand Down
1 change: 1 addition & 0 deletions app/frontend/src/components/base/BaseCopyToClipboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ function onError(e) {
icon
v-bind="props"
size="x-small"
:title="buttonText"
>
<v-icon icon="mdi:mdi-content-copy"></v-icon>
<span v-if="buttonText">{{ buttonText }}</span>
Expand Down
14 changes: 13 additions & 1 deletion app/frontend/src/components/base/BaseDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ defineExpose({ RTL });
class="mb-5"
color="primary"
variant="flat"
:title="$t('trans.baseDialog.ok')"
@click="closeDialog"
>
<slot name="button-text">
Expand All @@ -109,6 +110,7 @@ defineExpose({ RTL });
class="mb-5"
color="primary"
variant="flat"
:title="$t('trans.baseDialog.continue')"
@click="continueDialog"
>
<slot name="button-text-continue">
Expand All @@ -120,6 +122,7 @@ defineExpose({ RTL });
class="mb-5"
:class="RTL"
variant="outlined"
:title="$t('trans.baseDialog.cancel')"
@click="closeDialog"
>
<slot name="button-text-cancel">
Expand All @@ -133,6 +136,7 @@ defineExpose({ RTL });
:class="RTL"
color="primary"
variant="flat"
:title="$t('trans.baseDialog.continue')"
@click="continueDialog"
>
<slot name="button-text-continue">
Expand All @@ -143,6 +147,7 @@ defineExpose({ RTL });
data-test="saveddelete-btn-cancel"
class="mb-5"
variant="outlined"
:title="$t('trans.baseDialog.cancel')"
@click="deleteDialog"
>
<slot name="button-text-delete">
Expand All @@ -155,6 +160,7 @@ defineExpose({ RTL });
class="mb-5 mr-5"
color="primary"
variant="flat"
:title="$t('trans.baseDialog.continue')"
@click="continueDialog"
>
<slot name="button-text-continue">
Expand All @@ -167,13 +173,19 @@ defineExpose({ RTL });
class="mb-5 mr-5"
color="primary"
variant="flat"
:title="$t('trans.baseDialog.custom')"
@click="customDialog"
>
<slot name="button-text-custom">
<span :lang="lang">{{ $t('trans.baseDialog.custom') }}</span>
</slot>
</v-btn>
<v-btn class="mb-5" variant="outlined" @click="closeDialog">
<v-btn
class="mb-5"
variant="outlined"
:title="$t('trans.baseDialog.cancel')"
@click="closeDialog"
>
<slot name="button-text-cancel">
<span :lang="lang">{{ $t('trans.baseDialog.cancel') }}</span>
</slot>
Expand Down
3 changes: 3 additions & 0 deletions app/frontend/src/components/base/BaseFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ defineExpose({ selectedData, inputFilter });
class="mx-1 align-self-center mb-3"
icon
v-bind="props"
:title="$t('trans.baseFilter.resetColumns')"
@click="onResetColumns"
>
<v-icon
Expand Down Expand Up @@ -151,6 +152,7 @@ defineExpose({ selectedData, inputFilter });
data-test="save-btn"
class="bg-primary mt-3"
:lang="lang"
:title="inputSaveButtonText"
@click="savingFilterData"
>
{{ inputSaveButtonText }}
Expand All @@ -161,6 +163,7 @@ defineExpose({ selectedData, inputFilter });
:class="RTL"
variant="outlined"
:lang="lang"
:title="$t('trans.baseFilter.cancel')"
@click="cancelFilterData"
>{{ $t('trans.baseFilter.cancel') }}</v-btn
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ function languageSelected(lang) {
<div class="text-center">
<v-menu>
<template #activator="{ props }">
<v-btn variant="outlined" color="white" v-bind="props" class="ml-3">
<v-btn
variant="outlined"
color="white"
v-bind="props"
class="ml-3"
:title="language"
>
<v-icon class="mr-1" icon="mdi:mdi-web" />
{{ language }}
<v-icon class="ml-3" icon="mdi:mdi-menu-down" />
Expand Down
1 change: 1 addition & 0 deletions app/frontend/src/components/base/BasePrintButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ function printSubmission() {
class="mx-1 d-print-none"
color="primary"
icon
:title="$t('trans.printOptions.print')"
@click="printSubmission"
>
<v-icon icon="mdi:mdi-printer"></v-icon>
Expand Down
1 change: 1 addition & 0 deletions app/frontend/src/components/base/BaseSecure.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const { lang } = storeToRefs(useFormStore());
color="primary"
class="login-btn"
size="large"
:title="$t('trans.baseSecure.login')"
@click="authStore.login"
>
<span :lang="lang">{{ $t('trans.baseSecure.login') }}</span>
Expand Down
19 changes: 17 additions & 2 deletions app/frontend/src/components/bcgov/BCGovFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,59 @@ const { lang } = storeToRefs(useFormStore());
absolute
>
<v-row no-gutters>
<v-btn id="footer-home" variant="text" href="https://www.gov.bc.ca/">
<v-btn
id="footer-home"
variant="text"
href="https://www.gov.bc.ca/"
:title="$t('trans.bCGovFooter.home')"
>
<span :lang="lang">{{ $t('trans.bCGovFooter.home') }}</span>
</v-btn>
<v-btn
id="footer-about"
variant="text"
href="https://www2.gov.bc.ca/gov/content/about-gov-bc-ca"
:title="$t('trans.bCGovFooter.about')"
>
<span :lang="lang">{{ $t('trans.bCGovFooter.about') }}</span>
</v-btn>
<v-btn
id="footer-disclaimer"
variant="text"
href="http://gov.bc.ca/disclaimer"
:title="$t('trans.bCGovFooter.disclaimer')"
>
<span :lang="lang">{{ $t('trans.bCGovFooter.disclaimer') }}</span>
</v-btn>
<v-btn id="footer-privacy" variant="text" href="http://gov.bc.ca/privacy">
<v-btn
id="footer-privacy"
variant="text"
href="http://gov.bc.ca/privacy"
:title="$t('trans.bCGovFooter.privacy')"
>
<span>{{ $t('trans.bCGovFooter.privacy') }}</span>
</v-btn>
<v-btn
id="footer-accessibility"
variant="text"
href="http://gov.bc.ca/webaccessibility"
:title="$t('trans.bCGovFooter.accessibility')"
>
<span :lang="lang">{{ $t('trans.bCGovFooter.accessibility') }}</span>
</v-btn>
<v-btn
id="footer-copyright"
variant="text"
href="http://gov.bc.ca/copyright"
:title="$t('trans.bCGovFooter.copyRight')"
>
<span :lang="lang">{{ $t('trans.bCGovFooter.copyRight') }}</span>
</v-btn>
<v-btn
id="footer-contact"
variant="text"
href="https://www2.gov.bc.ca/gov/content/home/contact-us"
:title="$t('trans.bCGovFooter.contactUs')"
>
<span :lang="lang">{{ $t('trans.bCGovFooter.contactUs') }}</span>
</v-btn>
Expand Down
43 changes: 37 additions & 6 deletions app/frontend/src/components/designer/FloatButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,11 @@ export default {
<div :class="{ 'dir-rtl': isRTL }" :style="computedStyles">
<div class="fabAction" :lang="lang" @click="onOpenFABActionItems">
<div class="text" :lang="lang" v-text="baseFABItemName" />
<v-btn class="fabItemsInverColor" :size="fabItemsSize">
<v-btn
class="fabItemsInverColor"
:size="fabItemsSize"
:title="baseFABItemName"
>
<v-icon
:color="baseIconColor"
:size="fabItemsIconsSize"
Expand Down Expand Up @@ -370,6 +374,7 @@ export default {
disabledInvertedFabItemsColor: !isPublishEnabled,
}"
:size="fabItemsSize"
:title="$t('trans.floatButton.publish')"
@click="navigate"
>
<v-icon
Expand Down Expand Up @@ -410,6 +415,7 @@ export default {
disabledInvertedFabItemsColor: !isManageEnabled,
}"
:size="fabItemsSize"
:title="$t('trans.floatButton.manage')"
@click="navigate"
>
<v-icon
Expand All @@ -433,7 +439,12 @@ export default {
:class="{ 'disabled-router': !redoEnabled }"
>
<div class="text" :lang="lang" v-text="$t('trans.floatButton.redo')" />
<v-btn class="fabItems" :size="fabItemsSize" @click="toParent('redo')">
<v-btn
class="fabItems"
:size="fabItemsSize"
:title="$t('trans.floatButton.redo')"
@click="toParent('redo')"
>
<v-icon
:color="redoEnabled ? fabItemsColor : disabledFabItemsColor"
:size="fabItemsIconsSize"
Expand All @@ -449,7 +460,12 @@ export default {
:class="{ 'disabled-router': !undoEnabled }"
>
<div class="text" :lang="lang" v-text="$t('trans.floatButton.undo')" />
<v-btn class="fabItems" :size="fabItemsSize" @click="toParent('undo')">
<v-btn
class="fabItems"
:size="fabItemsSize"
:title="$t('trans.floatButton.undo')"
@click="toParent('undo')"
>
<v-icon
:color="undoEnabled ? fabItemsColor : disabledFabItemsColor"
:size="fabItemsIconsSize"
Expand All @@ -469,7 +485,11 @@ export default {
:lang="lang"
v-text="$t('trans.floatButton.preview')"
/>
<v-btn class="fabItems" :size="fabItemsSize">
<v-btn
class="fabItems"
:size="fabItemsSize"
:title="$t('trans.floatButton.preview')"
>
<v-icon
:color="formId ? fabItemsColor : disabledFabItemsColor"
:size="fabItemsIconsSize"
Expand All @@ -488,6 +508,7 @@ export default {
<v-btn
class="fabItems"
:size="fabItemsSize"
:title="savedMsg"
@click="canSave ? toParent('save') : null"
>
<v-icon
Expand All @@ -512,7 +533,12 @@ export default {
<div class="fabAction">
<div :lang="lang">{{ scrollName }}</div>

<v-btn class="fabItems" :size="fabItemsSize" @click="onHandleScroll">
<v-btn
class="fabItems"
:size="fabItemsSize"
:title="scrollName"
@click="onHandleScroll"
>
<v-icon
:color="fabItemsColor"
:size="fabItemsIconsSize"
Expand All @@ -524,7 +550,12 @@ export default {
</div>
<div v-if="!isFABActionsOpen" class="fabAction">
<div :lang="lang">{{ scrollName }}</div>
<v-btn class="fabItems" :size="fabItemsSize" @click="onHandleScroll">
<v-btn
class="fabItems"
:size="fabItemsSize"
:title="scrollName"
@click="onHandleScroll"
>
<v-icon
:color="fabItemsColor"
:size="fabItemsIconsSize"
Expand Down
Loading

0 comments on commit 754cbd4

Please sign in to comment.