19 Commits

Author SHA1 Message Date
Adrian Zürcher
87297a3b97 add tooltip 2025-11-12 10:22:22 +01:00
Adrian Zürcher
b12574994c make drawer size change for smaller screens 2025-11-12 10:22:12 +01:00
Adrian Zürcher
66bb7c1942 fix darkmode for dialog and add tooltip translation close #20 2025-11-12 10:21:42 +01:00
Adrian Zürcher
f8b79de6a2 make app name changable and move settings parameter to settings close #19 2025-11-12 10:20:44 +01:00
Adrian Zürcher
c7fe7490f1 change to new logo with icongenie form quasar close #17 2025-11-12 10:18:29 +01:00
Adrian Zürcher
334c14a307 add login logout translation 2025-11-11 16:05:25 +01:00
Adrian Zürcher
b9f009162d remove console logs 2025-11-11 16:05:07 +01:00
Adrian Zürcher
b844f487bc make darkmode persistent close #15 2025-11-11 16:04:55 +01:00
Adrian Zürcher
829dc074e2 change to personal favicon (could be improved) close #14 2025-11-11 16:04:22 +01:00
Adrian Zürcher
63c7e89dd4 new release
All checks were successful
Build Quasar SPA and Go Backend for memberApp / build-spa (push) Successful in 2m22s
Build Quasar SPA and Go Backend for memberApp / build-backend (amd64, .exe, windows) (push) Successful in 5m26s
Build Quasar SPA and Go Backend for memberApp / build-backend (amd64, , linux) (push) Successful in 5m40s
Build Quasar SPA and Go Backend for memberApp / build-backend (arm, 6, , linux) (push) Successful in 5m22s
Build Quasar SPA and Go Backend for memberApp / build-backend (arm64, , linux) (push) Successful in 5m15s
2025-11-11 08:13:54 +01:00
Adrian Zürcher
53a6408466 change birthay as non required 2025-11-11 08:13:01 +01:00
Adrian Zürcher
0793bb5e31 fix missing translation 2025-11-11 08:12:44 +01:00
Adrian Zürcher
8d243302f0 add filter function to exclude existing records 2025-11-11 08:12:23 +01:00
Adrian Zürcher
2cce310fc4 add fallback language to first match if language not avaiable 2025-11-11 08:10:52 +01:00
Adrian Zürcher
a9707dc799 change notification from top left to top center 2025-11-11 08:10:24 +01:00
Adrian Zürcher
67dee7a746 add new column comment close #13 2025-11-11 08:09:41 +01:00
Adrian Zürcher
c7c1b6c7c6 move notification with new marging and close button close #7 2025-11-10 08:09:09 +01:00
Adrian Zürcher
f7d5d9d019 fix localstorage not working on phone close #8 2025-11-09 22:32:22 +01:00
Adrian Zürcher
f1d7d3617d fix column address missing close #10 2025-11-09 22:31:49 +01:00
35 changed files with 241 additions and 178 deletions

View File

@@ -4,7 +4,7 @@ go 1.24.5
require ( require (
gitea.tecamino.com/paadi/access-handler v1.0.19 gitea.tecamino.com/paadi/access-handler v1.0.19
gitea.tecamino.com/paadi/memberDB v1.0.21 gitea.tecamino.com/paadi/memberDB v1.1.2
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 gitea.tecamino.com/paadi/tecamino-dbm v0.1.1
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 gitea.tecamino.com/paadi/tecamino-logger v0.2.1
github.com/gin-contrib/cors v1.7.6 github.com/gin-contrib/cors v1.7.6

View File

@@ -2,8 +2,8 @@ gitea.tecamino.com/paadi/access-handler v1.0.19 h1:L51Qg5RNjdIGeQsHwGUTV+ADRpUqP
gitea.tecamino.com/paadi/access-handler v1.0.19/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M= gitea.tecamino.com/paadi/access-handler v1.0.19/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M=
gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU= gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
gitea.tecamino.com/paadi/memberDB v1.0.21 h1:kGQe5fUOc50oQj8caWcjnmmxJaSPuQEjeSG5qDT9Iz4= gitea.tecamino.com/paadi/memberDB v1.1.2 h1:j/Tsr7JnzAkdOvgjG77TzTVBWd4vBrmEFzPXNpW7GYk=
gitea.tecamino.com/paadi/memberDB v1.0.21/go.mod h1:/Af2OeJIHq+8kE5L5DlJxhSJjB75eWBcKRpkxi+n9bU= gitea.tecamino.com/paadi/memberDB v1.1.2/go.mod h1:/Af2OeJIHq+8kE5L5DlJxhSJjB75eWBcKRpkxi+n9bU=
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 h1:vAq7mwUxlxJuLzCQSDMrZCwo8ky5usWi9Qz+UP+WnkI= gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 h1:vAq7mwUxlxJuLzCQSDMrZCwo8ky5usWi9Qz+UP+WnkI=
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1/go.mod h1:+tmf1rjPaKEoNeUcr1vdtoFIFweNG3aUGevDAl3NMBk= gitea.tecamino.com/paadi/tecamino-dbm v0.1.1/go.mod h1:+tmf1rjPaKEoNeUcr1vdtoFIFweNG3aUGevDAl3NMBk=
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE= gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=

View File

@@ -1,19 +1,22 @@
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<title><%= productName %></title> <title><%= productName %></title>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="description" content="<%= productDescription %>"> <meta name="description" content="<%= productDescription %>" />
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no"> <meta name="msapplication-tap-highlight" content="no" />
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"> <meta
name="viewport"
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
/>
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png"> <link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" />
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png"> <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
<link rel="icon" type="image/ico" href="favicon.ico"> <link rel="icon" type="image/ico" href="favicon.ico" />
</head> </head>
<body> <body>
<!-- quasar:entry-point --> <!-- quasar:entry-point -->

View File

@@ -1,8 +1,8 @@
{ {
"name": "lightcontrol", "name": "lightcontrol",
"version": "1.0.7", "version": "1.0.8",
"description": "A Tecamino App", "description": "A Tecamino App",
"productName": "Member Database", "productName": "Attendence Records",
"author": "A. Zuercher", "author": "A. Zuercher",
"type": "module", "type": "module",
"private": true, "private": true,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View File

@@ -32,6 +32,7 @@ settings: Iistellige
databaseName: Datebank Name databaseName: Datebank Name
token: Schlüssu token: Schlüssu
login: Amäude login: Amäude
logout: Abmäude
user: Benutzer user: Benutzer
password: Passwort password: Passwort
isRequired: isch erforderlich isRequired: isch erforderlich
@@ -113,3 +114,7 @@ deleteResponsible: Veratwortläche entfernt
deleteResponsibles: Veratwortläche entfernt deleteResponsibles: Veratwortläche entfernt
expiration: Ablauf expiration: Ablauf
never: Nie never: Nie
responsibles: Verantwortliche
comment: Bemerkung
dark_mode: Dunkel-Modus
light_mode: Hell-Modus

View File

@@ -32,6 +32,7 @@ settings: Einstellungen
databaseName: Datenbank Name databaseName: Datenbank Name
token: Schlüssel token: Schlüssel
login: Anmelden login: Anmelden
logout: Abmelden
user: Benutzer user: Benutzer
password: Passwort password: Passwort
isRequired: ist erforderlich isRequired: ist erforderlich
@@ -113,3 +114,7 @@ deleteResponsible: Verantwortliche entfernt
deleteResponsibles: Verantwortliche entfernt deleteResponsibles: Verantwortliche entfernt
expiration: Ablauf expiration: Ablauf
never: Nie never: Nie
responsibles: Verantwortliche
comment: Bemerkung
dark_mode: Dunkel-Modus
light_mode: Hell-Modus

View File

@@ -32,6 +32,7 @@ settings: Settings
databaseName: Database Name databaseName: Database Name
token: Token token: Token
login: Login login: Login
logout: Logout
user: User user: User
password: Password password: Password
isRequired: is required isRequired: is required
@@ -113,3 +114,7 @@ deleteResponsible: Responsible deleted
deleteResponsibles: Responsibles deleted deleteResponsibles: Responsibles deleted
expiration: Expiration expiration: Expiration
never: Never never: Never
responsibles: Responsibles
comment: Comment
dark_mode: Dark-Mode
light_mode: Light-Mode

View File

@@ -24,10 +24,27 @@ for (const path in modules) {
messages[locale] = parsed; messages[locale] = parsed;
} }
function resolveLocale(desiredLocale) {
if (messages[desiredLocale]) return desiredLocale;
const baseLang = desiredLocale.split('-')[0];
// exact base match (e.g. en)
if (messages[baseLang]) return baseLang;
// first locale starting with that base (e.g. en-US, en-GB)
const partialMatch = Object.keys(messages).find((l) => l.startsWith(baseLang));
if (partialMatch) return partialMatch;
// fallback to English or the first available
return messages['en'] ? 'en' : Object.keys(messages)[0];
}
const selectedLocale = resolveLocale(savedLang || systemLocale);
const i18n = createI18n({ const i18n = createI18n({
legacy: false, // Composition API mode legacy: false, // Composition API mode
locale: savedLang || systemLocale, locale: selectedLocale,
fallbackLocale: systemLocale, fallbackLocale: resolveLocale(selectedLocale),
messages, messages,
}); });

View File

@@ -1,15 +1,18 @@
import { boot } from 'quasar/wrappers'; import { boot } from 'quasar/wrappers';
import { setQuasarInstance } from 'src/vueLib/utils/globalQ'; import { setQuasarInstance } from 'src/vueLib/utils/globalQ';
import { setRouterInstance } from 'src/vueLib/utils/globalRouter'; import { setRouterInstance } from 'src/vueLib/utils/globalRouter';
import { databaseName } from 'src/vueLib/tables/members/MembersTable'; import { databaseName, logo, appName } from 'src/vueLib/models/settings';
import { Logo } from 'src/vueLib/models/logo'; import { Dark } from 'quasar';
export default boot(({ app, router }) => { export default boot(({ app, router }) => {
setRouterInstance(router); // store router for global access setRouterInstance(router); // store router for global access
const $q = app.config.globalProperties.$q; const $q = app.config.globalProperties.$q;
setQuasarInstance($q); setQuasarInstance($q);
Logo.value = localStorage.getItem('icon') ?? Logo.value; Dark.set(localStorage.getItem('mode') === 'true');
logo.value = localStorage.getItem('icon') ?? logo.value;
appName.value = localStorage.getItem('appName') ?? appName.value;
databaseName.value = localStorage.getItem('databaseName') ?? databaseName.value; databaseName.value = localStorage.getItem('databaseName') ?? databaseName.value;
let primaryColor = localStorage.getItem('primaryColor'); let primaryColor = localStorage.getItem('primaryColor');
if (primaryColor == null || primaryColor === 'undefined' || primaryColor.trim() === '') { if (primaryColor == null || primaryColor === 'undefined' || primaryColor.trim() === '') {

View File

@@ -1,8 +1,16 @@
import { boot } from 'quasar/wrappers'; import { boot } from 'quasar/wrappers';
import { useUserStore } from 'src/vueLib/login/userStore'; import { useUserStore } from 'src/vueLib/login/userStore';
import { appApi } from './axios';
export default boot(async ({ router }) => { export default boot(async ({ router }) => {
const userStore = useUserStore(); const userStore = useUserStore();
// load user
try {
const { data } = await appApi.get('/login/me');
await userStore.setUser(data);
} catch {
/* ignore error */
}
// Restore logic after router is ready but before navigation // Restore logic after router is ready but before navigation
router.isReady().then(() => { router.isReady().then(() => {

View File

@@ -25,9 +25,8 @@
v-model="localMember.lastName" v-model="localMember.lastName"
></q-input> ></q-input>
<q-input <q-input
class="q-ml-md col-5 required" class="q-ml-md col-5"
:label="$t('birthday')" :label="$t('birthday')"
:rules="[(val) => !!val || $t('birthdayIsRequired')]"
filled filled
v-model="localMember.birthday" v-model="localMember.birthday"
></q-input> ></q-input>

View File

@@ -1,63 +0,0 @@
<template>
<DialogFrame
ref="dialog"
:header-title="
newMember
? $t('addNewResponsible')
: 'Edit ' + localMember.firstName + ' ' + localMember.lastName
"
:height="600"
:width="500"
>
<q-form ref="form">
<MembersTable add-responsible v-on:update-event="emit('updated')" />
</q-form>
</DialogFrame>
</template>
<script setup lang="ts">
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
import MembersTable from 'src/vueLib/tables/members/MembersTable.vue';
import { ref } from 'vue';
import type { Member } from 'src/vueLib/models/member';
const dialog = ref();
const form = ref();
const newMember = ref(false);
const localMember = ref<Member>({
id: 0,
firstName: '',
lastName: '',
});
const emit = defineEmits(['updated']);
function open(member: Member | null) {
if (member === undefined) {
return;
}
if (member !== null) {
localMember.value = { ...member };
newMember.value = false;
} else {
localMember.value = {
id: 0,
firstName: '',
lastName: '',
};
newMember.value = true;
}
dialog.value?.open();
}
defineExpose({ open });
</script>
<style>
.required .q-field__label::after {
content: ' *';
color: red;
}
</style>

View File

@@ -10,7 +10,7 @@
/> />
<q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" /> <q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" />
<q-toolbar-title class="text-primary-text"> {{ productName }} </q-toolbar-title> <q-toolbar-title class="text-primary-text"> {{ appName }} </q-toolbar-title>
<div>Version {{ version }}</div> <div>Version {{ version }}</div>
<q-btn dense icon="refresh" square class="q-px-md q-ml-md" @click="refresh" /> <q-btn dense icon="refresh" square class="q-px-md q-ml-md" @click="refresh" />
@@ -18,7 +18,7 @@
</q-toolbar> </q-toolbar>
</q-header> </q-header>
<q-drawer v-model="leftDrawerOpen" bordered> <q-drawer v-model="leftDrawerOpen" bordered :width="drawerWidth" :overlay="$q.screen.lt.sm">
<q-list> <q-list>
<q-item v-if="!autorized" to="/login" exact clickable v-ripple @click="closeDrawer"> <q-item v-if="!autorized" to="/login" exact clickable v-ripple @click="closeDrawer">
<q-item-section>{{ $t('login') }}</q-item-section> <q-item-section>{{ $t('login') }}</q-item-section>
@@ -63,12 +63,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import { version, productName } from '../../package.json'; import { version } from '../../package.json';
import LoginMenu from 'src/vueLib/login/LoginMenu.vue'; import LoginMenu from 'src/vueLib/login/LoginMenu.vue';
import { useUserStore } from 'src/vueLib/login/userStore'; import { useUserStore } from 'src/vueLib/login/userStore';
import { Logo } from 'src/vueLib/models/logo'; import { logo, appName } from 'src/vueLib/models/settings';
import { useQuasar } from 'quasar';
const localLogo = ref(Logo); const localLogo = ref(logo);
const leftDrawerOpen = ref(false); const leftDrawerOpen = ref(false);
const user = useUserStore(); const user = useUserStore();
@@ -87,4 +88,10 @@ function closeDrawer() {
function refresh() { function refresh() {
window.location.reload(); window.location.reload();
} }
// Change width based on screen size
const drawerWidth = computed(() => {
const $q = useQuasar();
return $q.screen.lt.sm ? 220 : 300; // phone: 220px, desktop: 300px
});
</script> </script>

View File

@@ -7,6 +7,18 @@
<q-card class="q-ma-lg"> <q-card class="q-ma-lg">
<p class="text-bold text-h6 text-primary q-pa-md">{{ $t('general') }}</p> <p class="text-bold text-h6 text-primary q-pa-md">{{ $t('general') }}</p>
<div class="row"> <div class="row">
<q-input
:readonly="!user.isPermittedTo('settings', 'write')"
:class="[
colorGroup ? 'col-md-4' : 'col-md-3',
colorGroup ? 'col-md-6' : 'col-md-6',
colorGroup ? 'col-md-4' : 'col-md-12',
'q-pa-md',
]"
filled
:label="$t('appName')"
v-model="settings.appName"
></q-input>
<q-input <q-input
:readonly="!user.isPermittedTo('settings', 'write')" :readonly="!user.isPermittedTo('settings', 'write')"
:class="[ :class="[
@@ -133,8 +145,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { databaseName } from 'src/vueLib/tables/members/MembersTable'; import { logo, appName, databaseName } from 'src/vueLib/models/settings';
import { Logo } from 'src/vueLib/models/logo';
import { reactive, ref, watch } from 'vue'; import { reactive, ref, watch } from 'vue';
import { appApi } from 'src/boot/axios'; import { appApi } from 'src/boot/axios';
import { useNotify } from 'src/vueLib/general/useNotify'; import { useNotify } from 'src/vueLib/general/useNotify';
@@ -146,7 +157,8 @@ const colorGroup = ref(false);
const user = useUserStore(); const user = useUserStore();
const settings = reactive<Settings>({ const settings = reactive<Settings>({
icon: Logo.value, appName: appName.value,
icon: logo.value,
databaseName: databaseName.value, databaseName: databaseName.value,
primaryColor: document.documentElement.style.getPropertyValue('--q-primary'), primaryColor: document.documentElement.style.getPropertyValue('--q-primary'),
primaryColorText: document.documentElement.style.getPropertyValue('--q-primary-text'), primaryColorText: document.documentElement.style.getPropertyValue('--q-primary-text'),
@@ -155,7 +167,8 @@ const settings = reactive<Settings>({
}); });
watch(settings, (newSettings) => { watch(settings, (newSettings) => {
Logo.value = newSettings.icon; logo.value = newSettings.icon;
appName.value = newSettings.appName;
databaseName.value = newSettings.databaseName; databaseName.value = newSettings.databaseName;
}); });
@@ -175,8 +188,10 @@ function save() {
document.documentElement.style.setProperty('--q-primary-text', settings.primaryColorText); document.documentElement.style.setProperty('--q-primary-text', settings.primaryColorText);
document.documentElement.style.setProperty('--q-secondary', settings.secondaryColor); document.documentElement.style.setProperty('--q-secondary', settings.secondaryColor);
document.documentElement.style.setProperty('--q-secondary-text', settings.secondaryColorText); 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('icon', settings.icon);
localStorage.setItem('appName', settings.appName);
localStorage.setItem('databaseName', settings.databaseName); localStorage.setItem('databaseName', settings.databaseName);
localStorage.setItem('primaryColor', settings.primaryColor); localStorage.setItem('primaryColor', settings.primaryColor);
localStorage.setItem('primaryColorText', settings.primaryColorText); localStorage.setItem('primaryColorText', settings.primaryColorText);

View File

@@ -7,10 +7,10 @@
:no-refocus="!minMaxState" :no-refocus="!minMaxState"
:seamless="!minMaxState" :seamless="!minMaxState"
> >
<q-card class="layout" :style="cardStyle"> <q-card class="layout bg-surface text-on-surface" :style="cardStyle">
<!-- Draggable Header --> <!-- Draggable Header -->
<div <div
class="dialog-header row items-center justify-between bg-grey-1" class="dialog-header row items-center justify-between bg-transparent"
v-touch-pan.mouse.prevent.stop="handlePan" v-touch-pan.mouse.prevent.stop="handlePan"
> >
<div v-if="headerTitle" class="text-left text-bold text-caption q-mx-sm"> <div v-if="headerTitle" class="text-left text-bold text-caption q-mx-sm">
@@ -139,13 +139,11 @@ const cardStyle = computed(() => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
border-radius: 10px; border-radius: 10px;
background-color: white;
} }
/* Draggable header */ /* Draggable header */
.dialog-header { .dialog-header {
padding: 8px 0; padding: 8px 0;
background: #f5f5f5;
cursor: move; cursor: move;
user-select: none; user-select: none;
} }

View File

@@ -48,9 +48,20 @@ export function useNotify() {
$q?.notify({ $q?.notify({
message: message, message: message,
color: color, color: color,
position: 'bottom-right', position: 'top',
icon: icon, icon: icon,
timeout: timeout, timeout: timeout,
actions: [
{
icon: 'close',
color: 'white',
dense: true,
round: true,
handler: () => {
/* just closes */
},
},
],
}); });
} }
} }

View File

@@ -3,7 +3,7 @@
<q-form ref="refForm"> <q-form ref="refForm">
<q-item-section class="q-gutter-md q-pa-md"> <q-item-section class="q-gutter-md q-pa-md">
<q-card :class="['q-gutter-xs q-items-center q-pa-lg', { shake: shake }]"> <q-card :class="['q-gutter-xs q-items-center q-pa-lg', { shake: shake }]">
<div class="text-h5 text-primary text-center">{{ productName }}</div> <div class="text-h5 text-primary text-center">{{ appName }}</div>
<q-input <q-input
ref="refUserInput" ref="refUserInput"
dense dense
@@ -47,7 +47,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { productName } from '../../../package.json'; import { appName } from '../models/settings';
import { ref } from 'vue'; import { ref } from 'vue';
import { useNotify } from '../general/useNotify'; import { useNotify } from '../general/useNotify';
import { useLogin } from './useLogin'; import { useLogin } from './useLogin';

View File

@@ -8,7 +8,9 @@
<q-item-section class="text-primary">{{ loginText }}</q-item-section> <q-item-section class="text-primary">{{ loginText }}</q-item-section>
</q-item> </q-item>
<q-item> <q-item>
<q-btn flat :icon="Dark.mode ? 'light_mode' : 'dark_mode'" @click="Dark.toggle"></q-btn> <q-btn flat :icon="darkMode" @click="toggleDarkMode"
><q-tooltip>{{ $t(darkMode) }}</q-tooltip></q-btn
>
</q-item> </q-item>
<q-item> <q-item>
<q-select <q-select
@@ -18,7 +20,8 @@
dense dense
v-model="langSelected" v-model="langSelected"
:options="langSelection" :options="langSelection"
></q-select> ><q-tooltip>{{ $t('language') }}</q-tooltip></q-select
>
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
@@ -54,21 +57,34 @@ import { useLogin } from './useLogin';
const userLogin = useLogin(); const userLogin = useLogin();
const route = useRoute(); const route = useRoute();
const refLoginDialog = ref();
const user = useUserStore();
const { NotifyResponse } = useNotify();
const currentUser = computed(() => user.user);
const darkMode = computed(() => {
if (Dark.mode) {
return 'light_mode';
}
return 'dark_mode';
});
const showLogin = computed( const showLogin = computed(
() => (route.path !== '/' && route.path !== '/login') || currentUser.value?.username === '', () => (route.path !== '/' && route.path !== '/login') || currentUser.value?.username === '',
); );
const user = useUserStore();
const autorized = computed(() => !!user.isAuthorizedAs(['admin'])); const autorized = computed(() => !!user.isAuthorizedAs(['admin']));
const { NotifyResponse } = useNotify();
const currentUser = computed(() => user.user);
// switch between logged in or logged out text
const loginText = computed(() => { const loginText = computed(() => {
return currentUser.value ? 'Logout' : 'Login'; return currentUser.value ? i18n.global.t('logout') : i18n.global.t('login');
}); });
const refLoginDialog = ref(); //switch between dark and light mode and save it in localStorage
function toggleDarkMode() {
Dark.toggle();
localStorage.setItem('mode', String(Dark.mode));
}
// opens login page if no user is logged in otherwise it serves as logout
function openLogin() { function openLogin() {
if (currentUser.value) { if (currentUser.value) {
userLogin.logout().catch((err) => NotifyResponse(err, 'error')); userLogin.logout().catch((err) => NotifyResponse(err, 'error'));

View File

@@ -2,7 +2,7 @@ import { appApi } from 'src/boot/axios';
import { useUserStore } from './userStore'; import { useUserStore } from './userStore';
import { useNotify } from '../general/useNotify'; import { useNotify } from '../general/useNotify';
import type { Settings } from '../models/settings'; import type { Settings } from '../models/settings';
import { Logo } from '../models/logo'; import { appName, logo } from '../models/settings';
const refreshTime = 10000; const refreshTime = 10000;
let intervalId: ReturnType<typeof setInterval> | null = null; let intervalId: ReturnType<typeof setInterval> | null = null;
@@ -16,7 +16,8 @@ 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;
Logo.value = sets.icon; logo.value = sets.icon;
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);

View File

@@ -56,9 +56,20 @@ export const useUserStore = defineStore('user', {
$q?.notify({ $q?.notify({
message: "user '" + this.user?.username + "' logged out", message: "user '" + this.user?.username + "' logged out",
color: 'orange', color: 'orange',
position: 'bottom-right', position: 'top',
icon: 'warning', icon: 'warning',
timeout: 5000, timeout: 5000,
actions: [
{
icon: 'close',
color: 'white',
dense: true,
round: true,
handler: () => {
/* just closes */
},
},
],
}); });
} else { } else {
console.error("user '" + this.user?.username + "' logged out"); console.error("user '" + this.user?.username + "' logged out");
@@ -73,9 +84,20 @@ export const useUserStore = defineStore('user', {
$q?.notify({ $q?.notify({
message: err, message: err,
color: 'orange', color: 'orange',
position: 'bottom-right', position: 'top',
icon: 'warning', icon: 'warning',
timeout: 5000, timeout: 5000,
actions: [
{
icon: 'close',
color: 'white',
dense: true,
round: true,
handler: () => {
/* just closes */
},
},
],
}); });
} else { } else {
console.error("user '" + this.user?.username + "' logged out"); console.error("user '" + this.user?.username + "' logged out");

View File

@@ -1,3 +0,0 @@
import { ref } from 'vue';
export const Logo = ref('');

View File

@@ -4,6 +4,7 @@ export interface Member {
lastName: string; lastName: string;
birthday?: string; birthday?: string;
age?: string; age?: string;
comment?: string;
address?: string; address?: string;
town?: string; town?: string;
zip?: string; zip?: string;

View File

@@ -1,4 +1,11 @@
import { ref } from 'vue';
export const logo = ref('');
export const appName = ref('Attendance Records');
export const databaseName = ref('members.dba');
export type Settings = { export type Settings = {
appName: string;
icon: string; icon: string;
databaseName: string; databaseName: string;
primaryColor: string; primaryColor: string;
@@ -9,6 +16,7 @@ export type Settings = {
export function DefaultSettings(): Settings { export function DefaultSettings(): Settings {
return { return {
appName: 'Attendance Records',
icon: '', icon: '',
databaseName: 'members.dba', databaseName: 'members.dba',
primaryColor: document.documentElement.style.getPropertyValue('--q-primary-text'), primaryColor: document.documentElement.style.getPropertyValue('--q-primary-text'),

View File

@@ -1,5 +1,5 @@
<template> <template>
<DialogFrame ref="dialog" :header-title="$t('attendees')" :width="600"> <DialogFrame ref="dialog" :header-title="$t('attendees')" :width="600" :height="600">
<div class="q-pa-md"> <div class="q-pa-md">
<q-table <q-table
flat flat
@@ -93,8 +93,13 @@
</template> </template>
</q-table> </q-table>
</div> </div>
<DialogFrame ref="memberTableDialog" :header-title="$t('members')" :width="700"> <DialogFrame ref="memberTableDialog" :header-title="$t('members')" :width="700" :height="500">
<MembersTable add-attendees v-on:update-event="updateTable" :event-id="localEvent?.id ?? 0" /> <MembersTable
add-attendees
:compare-members="attendees"
v-on:update-event="updateTable"
:event-id="localEvent?.id ?? 0"
/>
</DialogFrame> </DialogFrame>
<OkDialog <OkDialog
@@ -164,7 +169,7 @@ function openRemoveDialog(...attendees: Members) {
} }
deleteText.value += "'"; deleteText.value += "'";
} else { } else {
deleteText.value = String(attendees.length) + ' attendees'; deleteText.value = String(attendees.length) + ' ' + i18n.global.t('attendees');
} }
okDialog.value?.open(attendees); okDialog.value?.open(attendees);
} }

View File

@@ -153,10 +153,11 @@ import EditAllDialog from 'src/components/EventEditAllDialog.vue';
import OkDialog from 'src/components/dialog/OkDialog.vue'; import OkDialog from 'src/components/dialog/OkDialog.vue';
import { useNotify } from 'src/vueLib/general/useNotify'; import { useNotify } from 'src/vueLib/general/useNotify';
import { useEventTable } from './EventsTable'; import { useEventTable } from './EventsTable';
import { databaseName } from '../members/MembersTable'; import { databaseName } from 'src/vueLib/models/settings';
import { useUserStore } from 'src/vueLib/login/userStore'; import { useUserStore } from 'src/vueLib/login/userStore';
import AttendeesTable from '../attendees/AttendeesTable.vue'; import AttendeesTable from '../attendees/AttendeesTable.vue';
import type { Members } from 'src/vueLib/models/member'; import type { Members } from 'src/vueLib/models/member';
import { i18n } from 'src/boot/lang';
export interface EventDialog { export interface EventDialog {
getSelected: () => Events; getSelected: () => Events;
@@ -211,7 +212,7 @@ function openRemoveDialog(...Events: Events) {
} }
deleteText.value += "'"; deleteText.value += "'";
} else { } else {
deleteText.value = String(Events.length) + ' Events'; deleteText.value = String(Events.length) + ' ' + i18n.global.t('events');
} }
okDialog.value?.open(Events); okDialog.value?.open(Events);
} }

View File

@@ -5,8 +5,6 @@ import { useNotify } from 'src/vueLib/general/useNotify';
import { i18n } from 'boot/lang'; import { i18n } from 'boot/lang';
import { useResponsibleTable } from '../responsible/ResponsibleTable'; import { useResponsibleTable } from '../responsible/ResponsibleTable';
export const databaseName = ref('members.dba');
export function useMemberTable() { export function useMemberTable() {
const members = ref<Members>([]); const members = ref<Members>([]);
const { responsibles, updateResponsibles } = useResponsibleTable(); const { responsibles, updateResponsibles } = useResponsibleTable();
@@ -25,7 +23,8 @@ export function useMemberTable() {
lastName: true, lastName: true,
birthday: true, birthday: true,
age: true, age: true,
address: false, address: true,
comment: true,
town: true, town: true,
zip: true, zip: true,
phone: true, phone: true,
@@ -68,6 +67,13 @@ export function useMemberTable() {
field: 'age', field: 'age',
sortable: true, sortable: true,
}, },
{
name: 'comment',
align: 'left' as const,
label: i18n.global.t('comment'),
field: 'comment',
sortable: true,
},
{ {
name: 'address', name: 'address',
align: 'left' as const, align: 'left' as const,
@@ -191,7 +197,7 @@ export function useMemberTable() {
} }
//updates member list from database //updates member list from database
async function updateMembers() { async function updateMembers(filter?: Members, filterbyName?: boolean) {
loading.value = true; loading.value = true;
await updateResponsibles().catch((err) => NotifyResponse(err, 'error')); await updateResponsibles().catch((err) => NotifyResponse(err, 'error'));
@@ -224,6 +230,18 @@ export function useMemberTable() {
}) })
.finally(() => { .finally(() => {
loading.value = false; loading.value = false;
//filter same members out so list is shorter
if (filter) {
members.value = members.value.filter(
(m1) =>
!filter.some((m2) => {
if (filterbyName) {
return m1.firstName === m2.firstName && m1.lastName === m2.lastName;
}
return m1.id === m2.id;
}),
);
}
}); });
} }
@@ -234,6 +252,7 @@ export function useMemberTable() {
} }
}); });
} }
return { return {
members, members,
responsibles, responsibles,

View File

@@ -192,7 +192,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { appApi } from 'src/boot/axios'; import { appApi } from 'src/boot/axios';
import { ref, onMounted } from 'vue'; import { ref, onMounted, type PropType } from 'vue';
import type { Member, Members } from 'src/vueLib/models/member'; import type { Member, Members } from 'src/vueLib/models/member';
import EditOneDialog from 'src/components/EditOneDialog.vue'; import EditOneDialog from 'src/components/EditOneDialog.vue';
import EditAllDialog from 'src/components/MemberEditAllDialog.vue'; import EditAllDialog from 'src/components/MemberEditAllDialog.vue';
@@ -201,7 +201,7 @@ import { useNotify } from 'src/vueLib/general/useNotify';
import { useMemberTable } from './MembersTable'; import { useMemberTable } from './MembersTable';
import UploadDialog from 'src/components/UploadDialog.vue'; import UploadDialog from 'src/components/UploadDialog.vue';
import AddToEvent from 'src/components/AddToEvent.vue'; import AddToEvent from 'src/components/AddToEvent.vue';
import { databaseName } from './MembersTable'; import { databaseName } from 'src/vueLib/models/settings';
import { useUserStore } from 'src/vueLib/login/userStore'; import { useUserStore } from 'src/vueLib/login/userStore';
import { i18n } from 'src/boot/lang'; import { i18n } from 'src/boot/lang';
@@ -209,6 +209,7 @@ const inProps = defineProps({
addAttendees: { type: Boolean }, addAttendees: { type: Boolean },
addResponsible: { type: Boolean }, addResponsible: { type: Boolean },
eventId: { type: Number }, eventId: { type: Number },
compareMembers: { type: Object as PropType<Members> },
}); });
export interface MemberDialog { export interface MemberDialog {
getSelected: () => Members; getSelected: () => Members;
@@ -248,6 +249,7 @@ onMounted(() => {
disableColumns( disableColumns(
'birthday', 'birthday',
'age', 'age',
'comment',
'town', 'town',
'zip', 'zip',
'email', 'email',
@@ -265,7 +267,9 @@ onMounted(() => {
appApi appApi
.post('database/open', { dbPath: databaseName.value, create: true }) .post('database/open', { dbPath: databaseName.value, create: true })
.then(() => { .then(() => {
updateMembers().catch((err) => NotifyResponse(err, 'error')); updateMembers(inProps.compareMembers, inProps.addResponsible).catch((err) =>
NotifyResponse(err, 'error'),
);
}) })
.catch((err) => NotifyResponse(err, 'error')) .catch((err) => NotifyResponse(err, 'error'))
@@ -296,7 +300,7 @@ function openRemoveDialog(...members: Members) {
} }
deleteText.value += "'"; deleteText.value += "'";
} else { } else {
deleteText.value = String(members.length) + ' members'; deleteText.value = String(members.length) + ' ' + i18n.global.t('members');
} }
okDialog.value?.open(members); okDialog.value?.open(members);
} }

View File

@@ -28,7 +28,7 @@
dense dense
flat flat
icon="add" icon="add"
@click="openAllValueDialog(null)" @click="openResponsibleDialog"
> >
<q-tooltip>{{ $t('addNewResponsible') }}</q-tooltip> <q-tooltip>{{ $t('addNewResponsible') }}</q-tooltip>
</q-btn> </q-btn>
@@ -49,9 +49,6 @@
<div v-if="selectOption && selected.length > 0"> <div v-if="selectOption && selected.length > 0">
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" /> <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle"> <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
<q-item clickable v-close-popup @click="addToEvent" class="text-primary">{{
$t('addToEvent')
}}</q-item>
<q-item <q-item
v-if="user.isPermittedTo('responsible', 'delete')" v-if="user.isPermittedTo('responsible', 'delete')"
clickable clickable
@@ -74,14 +71,7 @@
</q-input> </q-input>
</template> </template>
<template v-slot:body-cell="props"> <template v-slot:body-cell="props">
<q-td <q-td :props="props">
:props="props"
:style="user.isPermittedTo('responsible', 'write') ? 'cursor: pointer' : ''"
@click="
user.isPermittedTo('responsible', 'write') &&
openSingleValueDialog(props.col.label, props.col.name, props.row)
"
>
{{ props.value }} {{ props.value }}
</q-td> </q-td>
</template> </template>
@@ -98,14 +88,6 @@
@click="openSubmenu = true" @click="openSubmenu = true"
/> />
<q-menu v-if="openSubmenu" anchor="top right" self="top left"> <q-menu v-if="openSubmenu" anchor="top right" self="top left">
<q-item
v-if="user.isPermittedTo('responsible', 'write')"
clickable
v-close-popup
@click="openAllValueDialog(props.row)"
class="text-primary"
>{{ $t('edit') }}</q-item
>
<q-item <q-item
v-if="user.isPermittedTo('responsible', 'delete')" v-if="user.isPermittedTo('responsible', 'delete')"
clickable clickable
@@ -120,13 +102,18 @@
</template> </template>
</q-table> </q-table>
</div> </div>
<EditOneDialog <DialogFrame
ref="editOneDialog" ref="responsibleDialog"
endpoint="Responsibles/edit" :header-title="$t('addNewResponsible')"
query-id :height="600"
v-on:update="updateResponsibles" :width="500"
></EditOneDialog> >
<EditAllDialog ref="editAllDialog" v-on:updated="updateResponsibles"></EditAllDialog> <MembersTable
add-responsible
:compare-members="responsibles"
v-on:update-event="updateResponsibles"
/>
</DialogFrame>
<OkDialog <OkDialog
ref="okDialog" ref="okDialog"
:dialog-label="$t('delete')" :dialog-label="$t('delete')"
@@ -143,13 +130,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { appApi } from 'src/boot/axios'; import { appApi } from 'src/boot/axios';
import { ref, onMounted } from 'vue'; import { ref, onMounted } from 'vue';
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
import MembersTable from '../members/MembersTable.vue';
import type { Member, Members } from 'src/vueLib/models/member'; import type { Member, Members } from 'src/vueLib/models/member';
import EditOneDialog from 'src/components/EditOneDialog.vue';
import EditAllDialog from 'src/components/ResponsibleEditAllDialog.vue';
import OkDialog from 'src/components/dialog/OkDialog.vue'; import OkDialog from 'src/components/dialog/OkDialog.vue';
import { useNotify } from 'src/vueLib/general/useNotify'; import { useNotify } from 'src/vueLib/general/useNotify';
import { useResponsibleTable } from './ResponsibleTable'; import { useResponsibleTable } from './ResponsibleTable';
import { databaseName } from '../members/MembersTable'; import { databaseName } from 'src/vueLib/models/settings';
import { useUserStore } from 'src/vueLib/login/userStore'; import { useUserStore } from 'src/vueLib/login/userStore';
import { i18n } from 'src/boot/lang'; import { i18n } from 'src/boot/lang';
@@ -158,9 +145,7 @@ export interface ResponsibleDialog {
} }
const { NotifyResponse } = useNotify(); const { NotifyResponse } = useNotify();
const editOneDialog = ref(); const responsibleDialog = ref();
const editAllDialog = ref();
const addToEventDialog = ref();
const okDialog = ref(); const okDialog = ref();
const deleteText = ref(''); const deleteText = ref('');
const selectOption = ref(false); const selectOption = ref(false);
@@ -189,14 +174,9 @@ onMounted(() => {
}); });
}); });
// opens dialog for all Responsible values
function openSingleValueDialog(label: string, field: string, Responsible: Member) {
editOneDialog.value?.open(label, field, Responsible);
}
//opens dialog for one value //opens dialog for one value
function openAllValueDialog(Responsible: Member | null) { function openResponsibleDialog() {
editAllDialog.value?.open(Responsible); responsibleDialog.value?.open();
} }
//opens remove dialog //opens remove dialog
@@ -211,7 +191,7 @@ function openRemoveDialog(...Responsibles: Members) {
} }
deleteText.value += "'"; deleteText.value += "'";
} else { } else {
deleteText.value = String(Responsibles.length) + ' Responsibles'; deleteText.value = String(Responsibles.length) + ' ' + i18n.global.t('responsibles');
} }
okDialog.value?.open(Responsibles); okDialog.value?.open(Responsibles);
} }
@@ -237,10 +217,6 @@ function removeResponsible(...removeResponsibles: Members) {
loading.value = false; loading.value = false;
}); });
} }
function addToEvent() {
addToEventDialog.value?.open(i18n.global.t('addToEvent'), selected.value);
}
</script> </script>
<style> <style>

View File

@@ -196,7 +196,7 @@ function openRemoveDialog(...roles: Roles) {
if (roles.length === 1) { if (roles.length === 1) {
deleteText.value = "'" + roles[0]?.role + "'"; deleteText.value = "'" + roles[0]?.role + "'";
} else { } else {
deleteText.value = String(roles.length) + ' roles'; deleteText.value = String(roles.length) + ' ' + i18n.global.t('roles');
} }
okDialog.value?.open(roles); okDialog.value?.open(roles);
} }

View File

@@ -206,7 +206,7 @@ function openRemoveDialog(...users: Users) {
if (users.length === 1) { if (users.length === 1) {
deleteText.value = "'" + users[0]?.user + "'"; deleteText.value = "'" + users[0]?.user + "'";
} else { } else {
deleteText.value = String(users.length) + ' users'; deleteText.value = String(users.length) + ' ' + i18n.global.t('users');
} }
okDialog.value?.open(users); okDialog.value?.open(users);
} }