fix at initial start undefined app name

This commit is contained in:
Adrian Zürcher
2025-11-29 15:59:45 +01:00
parent bdcceb53e0
commit dae921528e
3 changed files with 25 additions and 9 deletions

View File

@@ -14,8 +14,12 @@ export default boot(({ app, router }) => {
const settings = getLocalSettings(); const settings = getLocalSettings();
logo.value = settings.icon ?? logo.value; if (settings.icon) {
appName.value = settings.appName ?? appName.value; logo.value = settings.icon;
}
if (settings.appName) {
appName.value = settings.appName;
}
databaseName.value = settings.databaseName ?? databaseName.value; databaseName.value = settings.databaseName ?? databaseName.value;
document.documentElement.style.setProperty('--q-primary', settings.primaryColor ?? '#1976d2'); document.documentElement.style.setProperty('--q-primary', settings.primaryColor ?? '#1976d2');

View File

@@ -1,5 +1,5 @@
import { Dark } from 'quasar'; import { Dark } from 'quasar';
import type { Settings } from 'src/vueLib/models/settings'; import { appName, databaseName, type Settings } from 'src/vueLib/models/settings';
import { updateOrAddObject } from 'src/vueLib/utils/utils'; import { updateOrAddObject } from 'src/vueLib/utils/utils';
import { ref } from 'vue'; import { ref } from 'vue';
@@ -16,8 +16,8 @@ export function setLocalSettings(settings: Settings) {
export function getLocalSettings(): Settings { export function getLocalSettings(): Settings {
return <Settings>{ return <Settings>{
icon: localStorage.getItem('icon'), icon: localStorage.getItem('icon'),
appName: localStorage.getItem('appName'), appName: localStorage.getItem('appName') || appName.value,
databaseName: localStorage.getItem('databaseName'), databaseName: localStorage.getItem('databaseName') || databaseName.value,
primaryColor: localStorage.getItem('primaryColor'), primaryColor: localStorage.getItem('primaryColor'),
primaryColorText: localStorage.getItem('primaryColorText'), primaryColorText: localStorage.getItem('primaryColorText'),
secondaryColor: localStorage.getItem('secondaryColor'), secondaryColor: localStorage.getItem('secondaryColor'),

View File

@@ -17,8 +17,12 @@ export function useLogin() {
await appApi.post('/login', { user, password }).then((resp) => { await appApi.post('/login', { user, password }).then((resp) => {
const sets = resp.data.settings as Settings; const sets = resp.data.settings as Settings;
if (sets.icon) {
logo.value = sets.icon; logo.value = sets.icon;
}
if (sets.appName) {
appName.value = sets.appName; appName.value = sets.appName;
}
document.documentElement.style.setProperty('--q-primary', sets.primaryColor); document.documentElement.style.setProperty('--q-primary', sets.primaryColor);
document.documentElement.style.setProperty('--q-primary-text', sets.primaryColorText); document.documentElement.style.setProperty('--q-primary-text', sets.primaryColorText);
document.documentElement.style.setProperty('--q-secondary', sets.secondaryColor); document.documentElement.style.setProperty('--q-secondary', sets.secondaryColor);
@@ -28,7 +32,11 @@ export function useLogin() {
const resp = await appApi.get('/login/me'); const resp = await appApi.get('/login/me');
await userStore await userStore
.setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role }) .setUser({
id: resp.data.id,
username: resp.data.user,
role: { role: resp.data.role, permissions: [] },
})
.catch((err) => NotifyResponse(err, 'error')); .catch((err) => NotifyResponse(err, 'error'));
startRefreshInterval(); startRefreshInterval();
@@ -57,7 +65,11 @@ export function useLogin() {
.get('/login/me') .get('/login/me')
.then((resp) => { .then((resp) => {
userStore userStore
.setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role }) .setUser({
id: resp.data.id,
username: resp.data.user,
role: { role: resp.data.role, permissions: [] },
})
.catch((err) => NotifyResponse(err, 'error')); .catch((err) => NotifyResponse(err, 'error'));
if (!intervalId) { if (!intervalId) {
startRefreshInterval(); startRefreshInterval();