From be1f04f4b21343378caf006e353cda9993c9693f Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Thu, 29 Aug 2024 14:08:10 +0200 Subject: [PATCH 01/15] feat(dashboard/profile-view): started work on concept of user settings component --- .../user/components/UserSettingsComponent.vue | 33 ++++++++++++++++ .../modules/user/views/UserProfileView.vue | 38 ++++++++++--------- 2 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 apps/dashboard/src/modules/user/components/UserSettingsComponent.vue diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue new file mode 100644 index 00000000..8cc40fcd --- /dev/null +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/apps/dashboard/src/modules/user/views/UserProfileView.vue b/apps/dashboard/src/modules/user/views/UserProfileView.vue index fe2f959a..d9bb7fec 100644 --- a/apps/dashboard/src/modules/user/views/UserProfileView.vue +++ b/apps/dashboard/src/modules/user/views/UserProfileView.vue @@ -3,24 +3,25 @@
{{ t('profile.myProfile')}}
-
-
- -
-
- -
-
- -
-
- -
-

{{ t('profile.extensiveDataAnalysis') }}

- -
-
-
+ + + + + + + + + + + + + + + + + + + @@ -40,6 +41,7 @@ import router from "@/router"; import { useToast } from "primevue/usetoast"; import { useI18n } from "vue-i18n"; import { handleError } from "@/utils/errorUtils"; +import UserSettingsComponent from "@/modules/user/components/UserSettingsComponent.vue"; const userStore = useUserStore(); const authStore = useAuthStore(); From 670b8e1d7c62b2f18e69d6ab3330dba060c3706c Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Thu, 29 Aug 2024 22:37:53 +0200 Subject: [PATCH 02/15] feat(dashboard/user): Finalized outer look of user settings card feat(dashboard/user): added change pin dialog to user settings card --- apps/dashboard/src/components/InputSpan.vue | 9 +++ apps/dashboard/src/locales/en.json | 14 +++- apps/dashboard/src/locales/nl.json | 14 +++- .../user/components/UserSettingsComponent.vue | 76 +++++++++++++++---- .../modules/user/views/UserProfileView.vue | 36 ++------- apps/dashboard/src/utils/validation-schema.ts | 5 +- 6 files changed, 105 insertions(+), 49 deletions(-) diff --git a/apps/dashboard/src/components/InputSpan.vue b/apps/dashboard/src/components/InputSpan.vue index b08e1e1d..2397b7f5 100644 --- a/apps/dashboard/src/components/InputSpan.vue +++ b/apps/dashboard/src/components/InputSpan.vue @@ -46,6 +46,15 @@ v-model="internalValue as number" :placeholder="placeholder" :disabled="disabled"/> + +
diff --git a/apps/dashboard/src/locales/en.json b/apps/dashboard/src/locales/en.json index e8338cb0..6913b9d2 100644 --- a/apps/dashboard/src/locales/en.json +++ b/apps/dashboard/src/locales/en.json @@ -277,7 +277,8 @@ "waiveFinesSuccess": "Successfully waived fines.", "waiveFinesRejected": "Canceled waiving fines.", "canceled": "Canceled", - "userUpdated": "Successfully updated user." + "userUpdated": "Successfully updated user.", + "pinUpdated": "Successfully updated pin." }, "termsOfService": { "acceptFirst": "Accept the Terms of Service", @@ -329,6 +330,17 @@ "userInfoUpdated": "User information successfully updated", "userInformation": "User information" }, + "userSettings": { + "userSettings": "User settings", + "changeCredentials": "Change credentials", + "changePin": "Change pin", + "changePassword": "Change password", + "apiKeys": "API keys", + "changeApiKey": "Change API key", + "deleteApiKey": "Delete API key", + "preferences": "Preferences", + "dataAnalysis": "Extensive Data Analysis" + }, "contact": { "Contact": "Contact", "Main contact": "Main contact", diff --git a/apps/dashboard/src/locales/nl.json b/apps/dashboard/src/locales/nl.json index a0148bd2..2c56ed1d 100644 --- a/apps/dashboard/src/locales/nl.json +++ b/apps/dashboard/src/locales/nl.json @@ -278,7 +278,8 @@ "waiveFinesSuccess": "Boetes zijn succesvol kwijtgescholden.", "waiveFinesRejected": "Boetes zijn succesvol afgewezen.", "canceled": "Geannuleerd", - "userUpdated": "Gebruiker is succesvol geüpdatet." + "userUpdated": "Gebruiker is succesvol geüpdatet.", + "pinUpdated": "Pincode is succesvol geüpdatet." }, "termsOfService": { "acceptFirst": "Accepteer de Voorwaarden", @@ -330,6 +331,17 @@ "userInfoUpdated": "Profiel is succesvol aangepast", "userInformation": "Gebruikersinformatie" }, + "userSettings": { + "userSettings": "Gebruikersinstellingen", + "changeCredentials": "Wijzig inloggegevens", + "changePin": "Wijzig pincode", + "changePassword": "Wijzig wachtwoord", + "apiKeys": "API-sleutels", + "changeApiKey": "Wijzig API-sleutel", + "deleteApiKey": "Verwijder API-sleutel", + "preferences": "Voorkeuren", + "dataAnalysis": "Uitgebreide Data Analyse" + }, "validation": { "number": { "min": "Dit veld moet groter zijn dan ${min}" diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue index 8cc40fcd..8dd3d54b 100644 --- a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -3,31 +3,81 @@ :header="$t('userSettings.userSettings')" :func="undefined" :action="undefined" - class="w-2" - > + class="w-5" + >
-

{{ $t('userSettings.changeCredentials') }}

-
-

{{ $t('userSettings.changePin') }}

- +

{{ t('userSettings.changeCredentials') }}

+
+

{{ t('userSettings.changePin') }}

+ +
+
+

{{ t('userSettings.changePassword') }}

+ +
+ +

{{ t('userSettings.apiKeys') }}

+
+

{{ t('userSettings.changeApiKey') }}

+ +
+
+

{{ t('userSettings.deleteApiKey') }}

+ +
+ +

{{ t('userSettings.preferences') }}

+
+

{{ t('userSettings.dataAnalysis') }}

+
+ + + + - + diff --git a/apps/dashboard/src/modules/user/views/UserProfileView.vue b/apps/dashboard/src/modules/user/views/UserProfileView.vue index d9bb7fec..6d1899b6 100644 --- a/apps/dashboard/src/modules/user/views/UserProfileView.vue +++ b/apps/dashboard/src/modules/user/views/UserProfileView.vue @@ -1,41 +1,18 @@ - - From 8483bf2bad906322a9db0623acdce9908c5a2438 Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Thu, 29 Aug 2024 22:39:46 +0200 Subject: [PATCH 04/15] feat(dashboard/user): added change pin form --- .../user/components/forms/ChangePinForm.vue | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue diff --git a/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue b/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue new file mode 100644 index 00000000..f82c994c --- /dev/null +++ b/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue @@ -0,0 +1,68 @@ + + + + + From f1fe628fa7ae1de031dc19cbcb709fffc95189c5 Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Fri, 30 Aug 2024 13:44:20 +0200 Subject: [PATCH 05/15] feat(dashboard/components): added FormSection component feat(dashboard/user-profile): removed dialog for changing pin, added form section for changing pin --- apps/dashboard/src/components/FormSection.vue | 77 +++++++++++++++++++ .../user/components/UserSettingsComponent.vue | 26 ++++--- .../user/components/forms/ChangePinForm.vue | 13 +++- 3 files changed, 104 insertions(+), 12 deletions(-) create mode 100644 apps/dashboard/src/components/FormSection.vue diff --git a/apps/dashboard/src/components/FormSection.vue b/apps/dashboard/src/components/FormSection.vue new file mode 100644 index 00000000..4366efa2 --- /dev/null +++ b/apps/dashboard/src/components/FormSection.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue index 8dd3d54b..e442344e 100644 --- a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -5,15 +5,18 @@ :action="undefined" class="w-5" > +
-

{{ t('userSettings.changeCredentials') }}

-
-

{{ t('userSettings.changePin') }}

- -
+ + +

{{ t('userSettings.changePassword') }}

- + @@ -32,6 +36,11 @@ const props = defineProps({ type: Object as PropType>>, required: true, }, + edit: { + type: Boolean, + required: false, + default: false, + }, }); const { t } = useI18n(); From e5c8892f077efa6ac981ba7dcc623ec09136d7df Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Fri, 30 Aug 2024 19:09:54 +0200 Subject: [PATCH 06/15] feat(dashboard/profile-view): created ChangePasswordForm --- apps/dashboard/.eslintrc.cjs | 1 + .../components/forms/ChangePasswordForm.vue | 76 +++++++++++++++++++ .../user/components/forms/ChangePinForm.vue | 1 - apps/dashboard/src/utils/validation-schema.ts | 5 +- 4 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue diff --git a/apps/dashboard/.eslintrc.cjs b/apps/dashboard/.eslintrc.cjs index 05c45212..263fb743 100644 --- a/apps/dashboard/.eslintrc.cjs +++ b/apps/dashboard/.eslintrc.cjs @@ -16,6 +16,7 @@ module.exports = { '@typescript-eslint/no-unused-vars': 'off', 'vue/multi-word-component-names': 'off', 'vue/no-reserved-component-names': 'off', + 'no-console': 'error', }, } ], diff --git a/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue b/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue new file mode 100644 index 00000000..82c37f26 --- /dev/null +++ b/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue b/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue index e358325b..fab88ed1 100644 --- a/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue +++ b/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue @@ -62,7 +62,6 @@ setSubmit(props.form, props.form.context.handleSubmit(async (values) => { life: 3000, }); props.form.context.resetForm(); - console.error("closed dialog"); }) .catch((err) => { emit('submit:error', err); diff --git a/apps/dashboard/src/utils/validation-schema.ts b/apps/dashboard/src/utils/validation-schema.ts index 5e8ed423..2ca3861d 100644 --- a/apps/dashboard/src/utils/validation-schema.ts +++ b/apps/dashboard/src/utils/validation-schema.ts @@ -30,12 +30,11 @@ export const simpleUserDetailsSchema = email: yup.string().email(), }); -export const editPasswordSchema = toTypedSchema( +export const editPasswordSchema = yup.object({ password: yup.string().required(), passwordConfirm: yup.string().required().oneOf([yup.ref('password')], t('validation.password.match')), - }) -); + }); export const updateInvoiceSettingsObject = yup.object({ reference: yup.string().required(), From cd91714ef6d389272a9e8d817c8ed525dbe02df5 Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Fri, 30 Aug 2024 19:44:40 +0200 Subject: [PATCH 07/15] feat(dashboard/profile-view): added password change dialog --- apps/dashboard/src/components/InputSpan.vue | 9 ++++++++- .../user/components/UserSettingsComponent.vue | 17 +++++++++-------- .../components/forms/ChangePasswordForm.vue | 2 -- .../user/components/forms/ChangePinForm.vue | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/apps/dashboard/src/components/InputSpan.vue b/apps/dashboard/src/components/InputSpan.vue index 2397b7f5..7f498fca 100644 --- a/apps/dashboard/src/components/InputSpan.vue +++ b/apps/dashboard/src/components/InputSpan.vue @@ -55,6 +55,13 @@ v-model="internalValue" v-bind="attributes" :disabled="disabled"/> +
@@ -114,7 +121,7 @@ const props = defineProps({ const emit = defineEmits(['update:value']); -const stringInputs = ['text', 'textarea']; +const stringInputs = ['text', 'textarea', 'pin', 'password']; const numberInputs = ['currency', 'number', 'usertype', 'percentage']; const booleanInputs = ['boolean']; diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue index e442344e..7193ddd8 100644 --- a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -21,6 +21,7 @@

{{ t('userSettings.changePassword') }}

@@ -44,15 +45,14 @@
- @@ -67,9 +67,10 @@ import Divider from "primevue/divider"; import InputSwitch from "primevue/inputswitch"; import ChangePinForm from "@/modules/user/components/forms/ChangePinForm.vue"; import FormDialog from "@/components/FormDialog.vue"; -import { editPinSchema } from "@/utils/validation-schema"; +import {editPasswordSchema, editPinSchema} from "@/utils/validation-schema"; import { schemaToForm } from "@/utils/formUtils"; import FormSection from "@/components/FormSection.vue"; +import ChangePasswordForm from "@/modules/user/components/forms/ChangePasswordForm.vue"; defineProps({ user: { @@ -79,11 +80,11 @@ defineProps({ }); const { t } = useI18n(); -const showPinDialog = ref(false); +const showPasswordDialog = ref(false); const pinForm = schemaToForm(editPinSchema); +const passwordForm = schemaToForm(editPasswordSchema); const editPin = ref(true); - diff --git a/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue b/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue index 82c37f26..2297e6c0 100644 --- a/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue +++ b/apps/dashboard/src/modules/user/components/forms/ChangePasswordForm.vue @@ -6,7 +6,6 @@ @update:value="form.context.setFieldValue('password', $event)" :errors="form.context.errors.value.password" id="password" type="password" - :disabled="!edit" /> diff --git a/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue b/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue index fab88ed1..b43d202b 100644 --- a/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue +++ b/apps/dashboard/src/modules/user/components/forms/ChangePinForm.vue @@ -1,7 +1,7 @@ + From 7c52d4396f96b07a38951642037a3cc28b0a8d19 Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Fri, 30 Aug 2024 21:10:23 +0200 Subject: [PATCH 09/15] feat(dashboard/profile-view): added extensive data processing logic to user settings component --- .../user/components/UserSettingsComponent.vue | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue index 2617a285..25b0d144 100644 --- a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -44,7 +44,10 @@

{{ t('userSettings.preferences') }}

{{ t('userSettings.dataAnalysis') }}

- +
@@ -70,16 +73,16 @@ import Divider from "primevue/divider"; import InputSwitch from "primevue/inputswitch"; import ChangePinForm from "@/modules/user/components/forms/ChangePinForm.vue"; import FormDialog from "@/components/FormDialog.vue"; -import {editPasswordSchema, editPinSchema} from "@/utils/validation-schema"; +import { editPasswordSchema, editPinSchema } from "@/utils/validation-schema"; import { schemaToForm } from "@/utils/formUtils"; import FormSection from "@/components/FormSection.vue"; import ChangePasswordForm from "@/modules/user/components/forms/ChangePasswordForm.vue"; -import {useConfirm} from "primevue/useconfirm"; -import {useToast} from "primevue/usetoast"; +import { useConfirm } from "primevue/useconfirm"; +import { useToast } from "primevue/usetoast"; import apiService from "@/services/ApiService"; -import {handleError} from "@/utils/errorUtils"; +import { handleError } from "@/utils/errorUtils"; -const props =defineProps({ +const props = defineProps({ user: { type: Object as PropType, required: true, @@ -93,6 +96,23 @@ const passwordForm = schemaToForm(editPasswordSchema); const editPin = ref(true); const confirm = useConfirm(); const toast = useToast(); +const dataAnalysis = ref(props.user.extensiveDataProcessing); + +const handleChangeDataAnalysis = (value: boolean) => { + apiService.user.updateUser(props.user.id, { extensiveDataProcessing: value }) + .then(() => { + dataAnalysis.value = value; + toast.add({ + severity: "success", + summary: t('successMessages.success'), + detail: t('successMessages.dataAnalysisChanged'), + life: 5000, + }); + }) + .catch((err) => { + handleError(err, toast); + }); +}; const confirmChangeApiKey = () => { confirm.require({ From 414468fd22bcffbbdf0df8c7de4d56c58ceeaef1 Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Fri, 30 Aug 2024 21:17:53 +0200 Subject: [PATCH 10/15] feat(dashboard/profile-view): added translations --- apps/dashboard/src/locales/en.json | 13 ++++++++++--- apps/dashboard/src/locales/nl.json | 13 ++++++++++--- .../user/components/UserSettingsComponent.vue | 3 +-- .../src/modules/user/views/UserProfileView.vue | 2 +- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/apps/dashboard/src/locales/en.json b/apps/dashboard/src/locales/en.json index 6913b9d2..a582ea04 100644 --- a/apps/dashboard/src/locales/en.json +++ b/apps/dashboard/src/locales/en.json @@ -244,7 +244,8 @@ "pinChange": "Change pin code", "pinConfirm": "Confirm new pin code", "pinNew": "New pin code", - "updateInfo": "Update user information" + "updateInfo": "Update user information", + "passwordNew": "New password" }, "quickOverview": { "quickOverviewMessage": "Show this at the bar so we can help you faster", @@ -278,7 +279,11 @@ "waiveFinesRejected": "Canceled waiving fines.", "canceled": "Canceled", "userUpdated": "Successfully updated user.", - "pinUpdated": "Successfully updated pin." + "pinUpdated": "Successfully updated pin.", + "dataAnalysisChanged": "Successfully changed data analysis preference.", + "apiKeyChanged": "Successfully changed API key.", + "apiKeyDeleted": "Successfully deleted API key.", + "passwordUpdated": "Successfully changed password." }, "termsOfService": { "acceptFirst": "Accept the Terms of Service", @@ -339,7 +344,9 @@ "changeApiKey": "Change API key", "deleteApiKey": "Delete API key", "preferences": "Preferences", - "dataAnalysis": "Extensive Data Analysis" + "dataAnalysis": "Extensive Data Analysis", + "confirmChangeApiKey": "Are you sure you want to change your API key? This cannot be undone!", + "confirmDeleteApiKey": "Are you sure you want to delete your API key? This cannot be undone!" }, "contact": { "Contact": "Contact", diff --git a/apps/dashboard/src/locales/nl.json b/apps/dashboard/src/locales/nl.json index 2c56ed1d..76276817 100644 --- a/apps/dashboard/src/locales/nl.json +++ b/apps/dashboard/src/locales/nl.json @@ -249,7 +249,8 @@ "pinChange": "Verander PIN code", "pinConfirm": "Bevestig nieuwe PIN code", "pinNew": "Nieuwe PIN code", - "updateInfo": "Update gebruikersinformatie" + "updateInfo": "Update gebruikersinformatie", + "passwordNew": "Nieuw wachtwoord" }, "quickOverview": { "quickOverviewMessage": "Laat dit aan de bar zien zodat we je sneller kunnen helpen.", @@ -279,7 +280,11 @@ "waiveFinesRejected": "Boetes zijn succesvol afgewezen.", "canceled": "Geannuleerd", "userUpdated": "Gebruiker is succesvol geüpdatet.", - "pinUpdated": "Pincode is succesvol geüpdatet." + "pinUpdated": "Pincode is succesvol geüpdatet.", + "dataAnalysisChanged": "Extensieve dataverwerking is succesvol gewijzigd.", + "apiKeyChanged": "API-sleutel is succesvol gewijzigd.", + "apiKeyDeleted": "API-sleutel is succesvol verwijderd.", + "passwordUpdated": "Wachtwoord is succesvol gewijzigd." }, "termsOfService": { "acceptFirst": "Accepteer de Voorwaarden", @@ -340,7 +345,9 @@ "changeApiKey": "Wijzig API-sleutel", "deleteApiKey": "Verwijder API-sleutel", "preferences": "Voorkeuren", - "dataAnalysis": "Uitgebreide Data Analyse" + "dataAnalysis": "Uitgebreide Data Analyse", + "confirmChangeApiKey": "Weet je zeker dat je de API-sleutel wilt wijzigen? Dit kan niet ongedaan worden gemaakt!", + "confirmDeleteApiKey": "Weet je zeker dat je de API-sleutel wilt verwijderen? Dit kan niet ongedaan worden gemaakt!" }, "validation": { "number": { diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue index 25b0d144..5372c744 100644 --- a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -1,11 +1,10 @@ @@ -19,6 +22,7 @@ import { useToast } from "primevue/usetoast"; import { useI18n } from "vue-i18n"; import { handleError } from "@/utils/errorUtils"; import UserSettingsComponent from "@/modules/user/components/UserSettingsComponent.vue"; +import UserInfo from "@/modules/user/components/UserInfo.vue"; const userStore = useUserStore(); const authStore = useAuthStore(); From c1c5a86ec0b046cee4f70626fc29946ea34a292e Mon Sep 17 00:00:00 2001 From: CodeNamedRobin Date: Wed, 4 Sep 2024 19:36:43 +0200 Subject: [PATCH 12/15] fix(dashboard/user-profile-view): max length for pincode showing dollar sign fix(dashboard/user-profile-view): cursor not showing pointer on change api key and change password buttons --- apps/dashboard/src/locales/en.json | 8 ++++---- apps/dashboard/src/locales/nl.json | 8 ++++---- .../src/modules/user/components/UserSettingsComponent.vue | 8 ++++---- apps/dashboard/src/modules/user/views/UserProfileView.vue | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/dashboard/src/locales/en.json b/apps/dashboard/src/locales/en.json index a582ea04..e9ccf7c0 100644 --- a/apps/dashboard/src/locales/en.json +++ b/apps/dashboard/src/locales/en.json @@ -361,7 +361,7 @@ }, "validation": { "number": { - "min": "This field must be greater than ${min}" + "min": "This field must be greater than {min}" }, "password": { "match": "Passwords must match." @@ -372,9 +372,9 @@ }, "required": "This field is required", "string": { - "exact": "This field must be exactly ${len} characters", - "max": "This field can't be greater than ${max} characters", - "min": "This field must be at least ${min} characters" + "exact": "This field must be exactly {len} characters", + "max": "This field can't be greater than {max} characters", + "min": "This field must be at least {min} characters" } }, "tooltip": { diff --git a/apps/dashboard/src/locales/nl.json b/apps/dashboard/src/locales/nl.json index 76276817..877b52f2 100644 --- a/apps/dashboard/src/locales/nl.json +++ b/apps/dashboard/src/locales/nl.json @@ -351,7 +351,7 @@ }, "validation": { "number": { - "min": "Dit veld moet groter zijn dan ${min}" + "min": "Dit veld moet groter zijn dan {min}" }, "password": { "match": "Wachtwoorden moeten overeenkomen." @@ -362,9 +362,9 @@ }, "required": "Dit veld is verplicht", "string": { - "exact": "Dit veld moet precies ${len} tekens bevatten.", - "max": "Dit veld mag maximaal ${max} tekens bevatten.", - "min": "Dit veld moet minimaal ${min} tekens bevatten." + "exact": "Dit veld moet precies {len} tekens bevatten.", + "max": "Dit veld mag maximaal {max} tekens bevatten.", + "min": "Dit veld moet minimaal {min} tekens bevatten." } }, "tooltip": { diff --git a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue index b650f9a7..180ea167 100644 --- a/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue +++ b/apps/dashboard/src/modules/user/components/UserSettingsComponent.vue @@ -19,7 +19,7 @@

{{ t('userSettings.changePassword') }}

@@ -28,14 +28,14 @@

{{ t('userSettings.changeApiKey') }}

{{ t('userSettings.deleteApiKey') }}

@@ -53,7 +53,7 @@