diff --git a/package.json b/package.json index 3d61a9f..be37bfd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lightcontrol", "version": "1.0.8", "description": "A Tecamino App", - "productName": "Member Database", + "productName": "Attendence Records", "author": "A. Zuercher", "type": "module", "private": true, diff --git a/src/boot/quasar-global.ts b/src/boot/quasar-global.ts index ab338b2..b7b2099 100644 --- a/src/boot/quasar-global.ts +++ b/src/boot/quasar-global.ts @@ -1,8 +1,7 @@ import { boot } from 'quasar/wrappers'; import { setQuasarInstance } from 'src/vueLib/utils/globalQ'; import { setRouterInstance } from 'src/vueLib/utils/globalRouter'; -import { databaseName } from 'src/vueLib/tables/members/MembersTable'; -import { Logo } from 'src/vueLib/models/logo'; +import { databaseName, logo, appName } from 'src/vueLib/models/settings'; import { Dark } from 'quasar'; export default boot(({ app, router }) => { @@ -10,11 +9,10 @@ export default boot(({ app, router }) => { const $q = app.config.globalProperties.$q; setQuasarInstance($q); - console.log(99, localStorage.getItem('mode')); - Dark.set(localStorage.getItem('mode') === 'true'); - Logo.value = localStorage.getItem('icon') ?? Logo.value; + logo.value = localStorage.getItem('icon') ?? logo.value; + appName.value = localStorage.getItem('appName') ?? appName.value; databaseName.value = localStorage.getItem('databaseName') ?? databaseName.value; let primaryColor = localStorage.getItem('primaryColor'); if (primaryColor == null || primaryColor === 'undefined' || primaryColor.trim() === '') { diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue index 6a7b27a..092a589 100644 --- a/src/pages/SettingsPage.vue +++ b/src/pages/SettingsPage.vue @@ -7,6 +7,18 @@

{{ $t('general') }}

+ -import { databaseName } from 'src/vueLib/tables/members/MembersTable'; -import { Logo } from 'src/vueLib/models/logo'; +import { logo, appName, databaseName } from 'src/vueLib/models/settings'; import { reactive, ref, watch } from 'vue'; import { appApi } from 'src/boot/axios'; import { useNotify } from 'src/vueLib/general/useNotify'; @@ -146,7 +157,8 @@ const colorGroup = ref(false); const user = useUserStore(); const settings = reactive({ - icon: Logo.value, + appName: appName.value, + icon: logo.value, databaseName: databaseName.value, primaryColor: document.documentElement.style.getPropertyValue('--q-primary'), primaryColorText: document.documentElement.style.getPropertyValue('--q-primary-text'), @@ -155,7 +167,8 @@ const settings = reactive({ }); watch(settings, (newSettings) => { - Logo.value = newSettings.icon; + logo.value = newSettings.icon; + appName.value = newSettings.appName; databaseName.value = newSettings.databaseName; }); @@ -175,8 +188,10 @@ function save() { document.documentElement.style.setProperty('--q-primary-text', settings.primaryColorText); document.documentElement.style.setProperty('--q-secondary', settings.secondaryColor); document.documentElement.style.setProperty('--q-secondary-text', settings.secondaryColorText); - Logo.value = settings.icon; + appName.value = settings.appName; + logo.value = settings.icon; localStorage.setItem('icon', settings.icon); + localStorage.setItem('appName', settings.appName); localStorage.setItem('databaseName', settings.databaseName); localStorage.setItem('primaryColor', settings.primaryColor); localStorage.setItem('primaryColorText', settings.primaryColorText); diff --git a/src/vueLib/login/LoginForm.vue b/src/vueLib/login/LoginForm.vue index 67ad030..3027e5a 100644 --- a/src/vueLib/login/LoginForm.vue +++ b/src/vueLib/login/LoginForm.vue @@ -3,7 +3,7 @@ -
{{ productName }}
+
{{ appName }}