update memberdb package

backend/go.mod

@@ -1,10 +1,10 @@
 module backend
 
-go 1.24.5
+go 1.25.4
 
 require (
-	gitea.tecamino.com/paadi/access-handler v1.0.29
+	gitea.tecamino.com/paadi/access-handler v1.0.34
-	gitea.tecamino.com/paadi/memberDB v1.1.13
+	gitea.tecamino.com/paadi/memberDB v1.1.18
 	gitea.tecamino.com/paadi/tecamino-dbm v0.1.1
 	gitea.tecamino.com/paadi/tecamino-logger v0.2.1
 	github.com/gin-contrib/cors v1.7.6
@@ -14,7 +14,7 @@ require (
 )
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.1.7 // indirect
+	gitea.tecamino.com/paadi/dbHandler v1.1.10 // indirect
 	github.com/bytedance/sonic v1.14.0 // indirect
 	github.com/bytedance/sonic/loader v0.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect

backend/go.sum

@@ -1,9 +1,9 @@
-gitea.tecamino.com/paadi/access-handler v1.0.29 h1:FZ67co/rfJffftT6xOp6psZKFtdEReaAR7PnEZi7ltI=
+gitea.tecamino.com/paadi/access-handler v1.0.34 h1:6P65HiusSfvgv/ezOvxSahqyRJMK9UrxtGsz6loLoUk=
-gitea.tecamino.com/paadi/access-handler v1.0.29/go.mod h1:Dmme8URu3lENPhlkZcdEeIKm8VMlAgT/jNLECLLS7Vs=
+gitea.tecamino.com/paadi/access-handler v1.0.34/go.mod h1:HyMp1WvzmqLw8Ljt3r1qlF8fY+T5WFXr9Da/CTIM0H8=
-gitea.tecamino.com/paadi/dbHandler v1.1.7 h1:NqVbxbUwd7EZX6HYntyLYwwPbyTPevOhIBTFqoCVqOU=
+gitea.tecamino.com/paadi/dbHandler v1.1.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
-gitea.tecamino.com/paadi/dbHandler v1.1.7/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/dbHandler v1.1.10/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
-gitea.tecamino.com/paadi/memberDB v1.1.13 h1:P5UsTt3d8829H9d3vfMAWpDN7ONqwhr8ndIuL9lBuvQ=
+gitea.tecamino.com/paadi/memberDB v1.1.18 h1:BEOyPaJvlVYZfUHzHnXB12mvuI/3RzKBQnyISf0qoAw=
-gitea.tecamino.com/paadi/memberDB v1.1.13/go.mod h1:FRbhFgXq4jDpfCrCfHCVr7VcA44fR8J3XXQFeO6QSBk=
+gitea.tecamino.com/paadi/memberDB v1.1.18/go.mod h1:VBsORoIIhh0/RM5AvmaAjMEM2/cNaIT2TqDL1VDcov4=
 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-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=

backend/main.go

@@ -109,11 +109,8 @@ func main() {
 		allowOrigins = append(allowOrigins, fmt.Sprintf("%s%s:9000", httpString, localIP), fmt.Sprintf("%s%s:9500", httpString, localIP))
 	}
 
-	fmt.Println(100, allowOrigins)
-
 	s.Routes.Use(cors.New(cors.Config{
-		AllowOrigins: allowOrigins,
+		AllowOrigins:     allowOrigins,
-		//AllowOrigins:     []string{"*"},
 		AllowMethods:     []string{"POST", "GET", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length"},

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightcontrol",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A Tecamino App",
   "productName": "Attendence Records",
   "author": "A. Zuercher",

src/assets/lang/de-CH.yaml

@@ -140,3 +140,4 @@ Friday: Fritig
 Saturday: Samstig
 Sunday: Suntig
 currentPassword: Aktuelles Passwort
+addFirstUser: Füeg erste Admin Benutzer hinzu

src/assets/lang/de-DE.yaml

@@ -140,3 +140,4 @@ Friday: Freitag
 Saturday: Samstag
 Sunday: Sonntag
 currentPassword: Aktuelles Passwort
+addFirstUser: Füge erster Admin Benutzer hinzu

src/assets/lang/en-US.yaml

@@ -140,3 +140,4 @@ Friday: Friday
 Saturday: Saturday
 Sunday: Sunday
 currentPassword: Current Password
+addFirstUser: Add first Admin User

src/boot/restore-route.js

@@ -8,6 +8,7 @@ export default boot(async ({ router }) => {
   // load user
   try {
     const { data } = await appApi.get('/login/me');
+    userStore.setFirstLogin(data.newDatabase);
 
     data.role.role = data.role;
     await userStore.setUser(data);
@@ -36,7 +37,7 @@ export default boot(async ({ router }) => {
   // Save the route after every successful navigation
   router.afterEach((to) => {
     // Don't save login page as "last route"
-    if (to.path !== '/login' && to.path !== '/') {
+    if (to.path !== '/login' && to.path !== '/firstlogin' && to.path !== '/') {
       setLocalLastRoute(to.fullPath);
     }
   });

src/components/AddToEvent.vue

@@ -74,7 +74,7 @@ function open(title: string, members: Members) {
   appApi
     .get('events')
     .then((resp) => {
-      events.value.push(...resp.data);
+      events.value.push(...resp.data.map((e: Event) => (e.name = e.name + ' (' + e.date + ')')));
     })
     .catch((err) => {
       NotifyResponse(err, 'error');

src/components/EditOneDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <DialogFrame ref="dialog" :header-title="'Edit ' + localTitle">
+  <DialogFrame ref="dialog" :header-title="$t('edit') + ' ' + localTitle">
     <div class="row justify-center">
       <q-input autofocus :label="localTitle" filled v-model="value" @keyup.enter="save">
         <template

src/components/EventEditAllDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <DialogFrame
     ref="dialog"
-    :header-title="newEvent ? $t('addNewEvent') : 'Edit ' + localEvent.name"
+    :header-title="newEvent ? $t('addNewEvent') : $t('edit') + ' ' + localEvent.name"
     :height="250"
     :width="500"
   >

src/components/MemberEditAllDialog.vue

@@ -2,7 +2,9 @@
   <DialogFrame
     ref="dialog"
     :header-title="
-      newMember ? $t('addNewMember') : 'Edit ' + localMember.firstName + ' ' + localMember.lastName
+      newMember
+        ? $t('addNewMember')
+        : $t('edit') + ' ' + localMember.firstName + ' ' + localMember.lastName
     "
     :height="600"
     :width="500"

src/components/RoleEditAllDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <DialogFrame
     ref="dialog"
-    :header-title="newRole ? $t('addNewRole') : 'Edit ' + localRole.role"
+    :header-title="newRole ? $t('addNewRole') : $t('edit') + ' ' + localRole.role"
     :height="700"
     :width="700"
   >

src/components/UserEditAllDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <DialogFrame
     ref="dialog"
-    :header-title="newUser ? $t('addNewUser') : 'Edit ' + localUser.user"
+    :header-title="newUser ? $t('addNewUser') : $t('edit') + ' ' + localUser.user"
     :height="600"
     :width="500"
   >

src/localstorage/localStorage.ts

@@ -14,10 +14,20 @@ export function setLocalSettings(settings: Settings) {
 }
 
 export function getLocalSettings(): Settings {
+  let name = localStorage.getItem('appName');
+  if (name === undefined || name === 'undefined') {
+    name = appName.value;
+  }
+
+  let db = localStorage.getItem('databaseName');
+  if (db === undefined || db === 'undefined') {
+    db = databaseName.value;
+  }
+
   return <Settings>{
     icon: localStorage.getItem('icon'),
-    appName: localStorage.getItem('appName') || appName.value,
+    appName: name,
-    databaseName: localStorage.getItem('databaseName') || databaseName.value,
+    databaseName: db,
     primaryColor: localStorage.getItem('primaryColor'),
     primaryColorText: localStorage.getItem('primaryColorText'),
     secondaryColor: localStorage.getItem('secondaryColor'),

src/pages/FirstLogin.vue

@@ -0,0 +1,82 @@
+<template>
+  <SiteTitle :title="$t('addFirstUser')" />
+  <div :class="$q.screen.width > 600 ? 'q-ma-xl q-pa-xs' : 'q-ma-none q-pa-none'">
+    <q-card :class="$q.screen.width > 600 ? 'q-ma-xl q-pa-xl' : 'q-gutter-md'">
+      <q-form ref="form">
+        <div class="q-pt-md">
+          <div class="row justify-center q-gutter-md">
+            <q-input
+              class="col-6 required"
+              :label="$t('user')"
+              filled
+              :lazy-rules="false"
+              :rules="[(val) => !!val || $t('userIsRequired')]"
+              v-model="localUser.user"
+              autofocus
+            ></q-input>
+            <q-input
+              class="col-6 required"
+              :label="$t('email')"
+              filled
+              :lazy-rules="false"
+              :rules="[(val) => !!val || $t('emailIsRequired')]"
+              v-model="localUser.email"
+            ></q-input>
+            <EnterNewPassword class="col-6 required" v-model:password="localUser.password!" />
+          </div>
+          <div class="row justify-center">
+            <q-btn class="q-ma-md" color="primary" no-caps @click="save">{{ $t('save') }}</q-btn>
+          </div>
+        </div>
+      </q-form>
+    </q-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { appApi } from 'src/boot/axios';
+import type { User } from 'src/vueLib/models/users';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { validateQForm } from 'src/vueLib/utils/validation';
+import { i18n } from 'src/boot/lang';
+import { DefaultSettings } from 'src/vueLib/models/settings';
+import EnterNewPassword from 'src/vueLib/login/EnterNewPassword.vue';
+import { defaultPermissions } from 'src/vueLib/checkboxes/permissions';
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
+
+const { NotifyResponse } = useNotify();
+const form = ref();
+const localUser = ref<User>({
+  user: '',
+  email: '',
+});
+
+async function save() {
+  if (!(await validateQForm(form.value))) {
+    NotifyResponse(i18n.global.t('notAllRequiredFieldsFilled'), 'error');
+    return;
+  }
+
+  localUser.value.role = { role: 'admin', permissions: defaultPermissions };
+  localUser.value.role.permissions.forEach((p) => (p.permission = 31));
+  localUser.value.settings = DefaultSettings();
+
+  await appApi
+    .post('users/add', JSON.stringify(localUser.value))
+    .then(() => {
+      window.location.reload();
+    })
+    .catch((err) => {
+      NotifyResponse(err, 'error');
+      return;
+    });
+}
+</script>
+
+<style>
+.required .q-field__label::after {
+  content: ' *';
+  color: red;
+}
+</style>

src/router/index.ts

@@ -17,6 +17,8 @@ import { useUserStore } from 'src/vueLib/login/userStore';
  * with the Router instance.
  */
 
+export let routerInstance: ReturnType<typeof createRouter>;
+
 export default defineRouter(function (/* { store, ssrContext } */) {
   const createHistory = process.env.SERVER
     ? createMemoryHistory
@@ -34,10 +36,16 @@ export default defineRouter(function (/* { store, ssrContext } */) {
     history: createHistory(process.env.VUE_ROUTER_BASE),
   });
 
+  routerInstance = Router;
+
   Router.beforeEach((to, from, next) => {
     const userStore = useUserStore();
     const isLoggedIn = userStore.isAuthenticated;
-    if (to.meta.requiresAuth && !isLoggedIn) {
+    if (!userStore.$state.firstLogin && to.path === '/firstlogin') {
+      next('/login');
+    } else if (userStore.$state.firstLogin && to.path !== '/firstlogin') {
+      next('/firstlogin');
+    } else if (to.meta.requiresAuth && !isLoggedIn) {
       next('/login');
     } else if (
       to.meta.requiresAdmin &&

src/router/routes.ts

@@ -9,6 +9,10 @@ const routes: RouteRecordRaw[] = [
         path: '',
         component: () => import('pages/LoginPage.vue'),
       },
+      {
+        path: 'firstlogin',
+        component: () => import('pages/FirstLogin.vue'),
+      },
       {
         path: 'login',
         component: () => import('pages/LoginPage.vue'),

src/vueLib/login/useLogin.ts

@@ -4,6 +4,7 @@ import { useNotify } from '../general/useNotify';
 import type { Settings } from '../models/settings';
 import { appName, logo } from '../models/settings';
 import { clearLocalStorage, setLocalSettings } from 'src/localstorage/localStorage';
+import { routerInstance } from 'src/router';
 
 const refreshTime = 10000;
 let intervalId: ReturnType<typeof setInterval> | null = null;
@@ -55,6 +56,7 @@ export function useLogin() {
     userStore.clearUser();
     clearLocalStorage();
     stopRefreshInterval();
+    await routerInstance.push('/login');
   }
 
   async function refresh() {

src/vueLib/login/userStore.ts

@@ -12,6 +12,7 @@ const { NotifyResponse } = useNotify();
 export const useUserStore = defineStore('user', {
   state: (): UserState => ({
     user: null,
+    firstLogin: false,
   }),
   getters: {
     isAuthenticated: (state: UserState): boolean => {
@@ -42,6 +43,9 @@ export const useUserStore = defineStore('user', {
     },
   },
   actions: {
+    setFirstLogin(b: boolean) {
+      this.firstLogin = b;
+    },
     async setUser(user: User) {
       await appApi
         .get('roles?role=' + user.role?.role)

src/vueLib/models/user.ts

@@ -8,8 +8,10 @@ export interface User {
   role: Role;
   permissions?: Permissions;
   settings?: Settings;
+  newDatabase?: boolean;
 }
 
 export interface UserState {
   user: User | null;
+  firstLogin: boolean;
 }

src/vueLib/tables/attendees/AttendeesTableDialog.vue

@@ -91,7 +91,7 @@ const open = async (eventArray: number, event: Event) => {
 
   // get attendance
   await updateAttendees(eventArray);
-  //get missing attendance from memer updateTable
+  //get missing attendance from member updateTable
   await updateMembers(event.attendees);
 
   // set custom filter

src/vueLib/tables/components/FilterSelect.vue

@@ -26,7 +26,10 @@
   </q-card>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, ref, watch } from 'vue';
+
+// initialized only after first mount
+const isMounted = ref(false);
 
 const props = defineProps({
   columnFilter: String,
@@ -42,6 +45,18 @@ const columnFilter = computed({
   set: (v) => emit('update:columnFilter', v),
 });
 
+//reset column option
+watch(
+  () => props.columnFilter,
+  () => {
+    if (!isMounted.value) {
+      isMounted.value = true;
+      return;
+    }
+    emit('update:columnOption', []); // reset properly
+  },
+);
+
 const columnOption = computed({
   get: () => props.columnOption,
   set: (v) => emit('update:columnOption', v),

src/vueLib/tables/group/GroupTable.vue

@@ -64,7 +64,7 @@
           :td-props="props"
           :permitted="user.isPermittedTo('group', 'write')"
           v-on:onClick="openGroupDialog(props.col.label, props.row)"
-          :value="props.value"
+          :value="props.value + ' (' + getAmount(props.row.name) + ')'"
         />
       </template>
       <template v-slot:body-cell-option="props">
@@ -122,6 +122,8 @@ import { i18n } from 'src/boot/lang';
 import type { Group, Groups } from 'src/vueLib/models/group';
 import SearchableInput from '../components/SearchableInput.vue';
 import TopButtonGroup from '../components/TopButtonGroup.vue';
+import { getAllMembers } from '../members/MembersTable';
+import type { Members } from 'src/vueLib/models/member';
 
 const { NotifyResponse } = useNotify();
 const groupDialog = ref();
@@ -135,13 +137,16 @@ const selected = ref<Groups>([]);
 const openSubmenu = ref(false);
 const filter = ref('');
 const user = useUserStore();
+const members = ref<Members>([]);
 
 const { groups, pagination, loading, columns, updateGroups } = useGroupTable();
 
 //load on mounting page
-onMounted(() => {
+onMounted(async () => {
   loading.value = true;
 
+  members.value = await getAllMembers();
+
   appApi
     .post('database/open', { dbPath: databaseName.value, create: true })
     .then(() => {
@@ -216,6 +221,11 @@ async function save() {
     })
     .catch((err) => NotifyResponse(err, 'error'));
 }
+
+function getAmount(name: string) {
+  const amount = members.value.filter((e) => e.group?.name == name);
+  return amount.length;
+}
 </script>
 
 <style>

src/vueLib/tables/members/MembersTable.ts

@@ -306,6 +306,11 @@ export function useMemberTable() {
               if (typeof value === 'number') {
                 return keys.includes(value.toString());
               }
+              if (typeof value === 'object') {
+                if ('name' in value) {
+                  return keys.includes(value.name);
+                }
+              }
               if (typeof value === 'string') {
                 return keys.includes(value);
               }
@@ -397,3 +402,27 @@ export function useMemberTable() {
     exportCsv,
   };
 }
+
+export async function getAllMembers(): Promise<Members> {
+  const { NotifyResponse } = useNotify();
+
+  const allMembers = ref<Members>([]);
+
+  await appApi
+    .get('members')
+    .then((resp) => {
+      if (resp.data === null) {
+        return [];
+      }
+      allMembers.value = resp.data as Members;
+      if (allMembers.value === null) {
+        return [];
+      }
+    })
+
+    .catch((err) => {
+      NotifyResponse(err, 'error');
+    });
+
+  return allMembers.value;
+}

src/vueLib/tables/members/MembersTable.vue

@@ -76,12 +76,8 @@
           v-on:clear="selectedColumnOptions = []"
           v-model:column-filter="selectedColumnFilter"
           v-model:column-option="selectedColumnOptions"
-          @update:column-filter="
+          @update:column-filter="filterMembers"
-            filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
+          @update:column-option="filterMembers"
-          "
-          @update:column-option="
-            filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
-          "
         />
       </div>
       <div v-if="selectOption && selected.length > 0" class="text-weight-bold">
@@ -352,7 +348,14 @@ function setColumnOptions(columnName: string) {
   const values = allMembers.value
     .map((e) => e[columnName as keyof Member]) // could be undefined
     .filter((v): v is string | number => v !== null && v !== undefined)
-    .map((v) => String(v));
+    .map((v) => {
+      if (typeof v === 'string') {
+        return v;
+      } else if (typeof v === 'object') {
+        const obj = v as Record<string, unknown>;
+        return String(obj['name']);
+      }
+    });
 
   const selection = [...new Set(values)];
 
@@ -364,9 +367,9 @@ function setColumnOptions(columnName: string) {
   return selection;
 }
 
-async function filterMembers(field: string, ...keys: string[]) {
+async function filterMembers() {
-  setNewFilter(field, ...keys);
+  setNewFilter(selectedColumnFilter.value, ...(selectedColumnOptions.value || []));
-  setLocalPageDefaults(page.value, field, keys);
+  setLocalPageDefaults(page.value, selectedColumnFilter.value, selectedColumnOptions.value || []);
   await updateTable();
 }
 
@@ -479,7 +482,6 @@ async function updateMemberLastVisit(members: Members) {
     .catch((err) => NotifyResponse(err, 'error'));
   localCompareMembers.value?.push(...members);
   await updateTable().catch((err) => NotifyResponse(err, 'error'));
-
   emit('update-event', filteredMembers.value.length);
 }
 

src/vueLib/tables/users/UserTable.vue

@@ -227,16 +227,12 @@ function openPwdDialog(user: User) {
 
 //change password api request
 async function changePassword(user: User) {
-  console.log(8, user);
   if (user.password == user.newPassword) {
     NotifyResponse(i18n.global.t('samePasswordEntered'), 'error');
     return;
   }
 
-  await appApi
+  await appApi.post('/users/new/password', user).catch((err) => console.error(err));
-    .post('/users/new/password', user)
-    .then((resp) => console.log(67, resp))
-    .catch((err) => console.error(err));
   changePwdDialog.value.close();
 }