new package dbHandler accesscontrol memeberdb and login with rights

src/assets/lang/de-CH.yaml

@@ -37,7 +37,9 @@ password: Passwort
 isRequired: isch erforderlich
 colors: Farbe
 primaryColor: Primär Farb
+primaryColorText: Primär Text Farb
 secondaryColor: Sekondär Farb
+secondaryColorText: Sekondär Text Farb
 database: Datebank
 general: Augemein
 setColors: Setz Farbe
@@ -51,12 +53,31 @@ role: Rolle
 addNewUser: Füeg neue Benutzer hinzue
 expires: Ablouf
 selectUserOptions: Wähle Benutzer Optione
-prenameIsRequired: Vorname ist erforderlich
-lastNameIsRequired: Nachname ist erforderlich
-birthdayIsRequired: Geburtstag ist erforderlich
-userIsRequired: Benutzer ist erforderlich
-emailIsRequired: Email ist erforderlich
-roleIsRequired: Rolle ist erforderlich
-rights: Recht
+prenameIsRequired: Vorname isch erforderlich
+lastNameIsRequired: Nachname isch erforderlich
+birthdayIsRequired: Geburtstag isch erforderlich
+userIsRequired: Benutzer isch erforderlich
+emailIsRequired: Email isch erforderlich
+roleIsRequired: Rolle isch erforderlich
+permissions: Recht
 selectRoleOptions: Wähle Roue Optione
 addNewRole: Füeg neui Roue hinzue
+veryWeak: sehr Schwach
+weak: Schwach
+fair: So so
+good: Guet
+strong: Stark
+passwordIsRequired: Password isch erforderlich
+passwordTooShort: Ds Passwort mues mindestens 8 Zeiche läng si
+passwordNeedsUppercase: Ds Passwort mues mindestens ei Grossbuechstabe enthaute
+passwordNeedsLowercase: Ds Passwort mues mindestens ei Chlibuechstabe enthaute
+passwordNeedsNumber: Ds Passwort mues mindestens ei Zau enthaute
+passwordNeedsSpecial: Ds Passwort mues mindestens eis Sonderzeiche enthaute
+passwordDoNotMatch: Passwörter stimme nid überei
+read: Lese
+write: Schribe
+userSettings: Benutzer Istellige
+members: Mitglider
+attendanceTable: Anweseheits Tabelle
+excursionTable: Usflugs Tabelle
+updated: aktualisiert

src/assets/lang/de-DE.yaml

@@ -37,7 +37,9 @@ password: Passwort
 isRequired: ist erforderlich
 colors: Farben
 primaryColor: Primär Farbe
+primaryColorText: Primär Text Farbe
 secondaryColor: Sekondär Farbe
+secondaryColorText: Sekondär Text Farbe
 database: Datenbank
 general: Allgemein
 setColors: Setze Farben
@@ -57,6 +59,25 @@ birthdayIsRequired: Geburtstag ist erforderlich
 userIsRequired: Benutzer ist erforderlich
 emailIsRequired: Email ist erforderlich
 roleIsRequired: Rolle ist erforderlich
-rights: Rechte
+permissions: Rechte
 selectRoleOptions: Wähle Rollen Option
 addNewRole: Füge neue Rolle hinzu
+veryWeak: sehr Schwach
+weak: Schwach
+fair: Ausreichend
+good: Gut
+strong:
+passwordIsRequired: Password ist erforderlich
+passwordTooShort: Das Passwort muss mindestens 8 Zeichen lang sein
+passwordNeedsUppercase: Das Passwort muss mindestens einen Großbuchstaben enthalten
+passwordNeedsLowercase: Das Passwort muss mindestens einen Kleinbuchstaben enthalten
+passwordNeedsNumber: Das Passwort muss mindestens eine Zahl enthalten
+passwordNeedsSpecial: Das Passwort muss mindestens ein Sonderzeichen enthalten
+passwordDoNotMatch: Passwörter stimmen nicht überein
+read: Lesen
+write: Schreiben
+userSettings: Benutzer Einstellungen
+members: Mitglieder
+attendanceTable: Anwesenheits Tabelle
+excursionTable: Ausflugs Tabelle
+updated: aktualisiert

src/assets/lang/en-US.yaml

@@ -37,7 +37,9 @@ password: Password
 isRequired: is required
 colors: Colors
 primaryColor: Primary Color
+primaryColorText: Primary Text Color
 secondaryColor: Secondary Color
+secondaryColorText: Secondary Text Color
 database: Database
 general: General
 setColors: Set Colors
@@ -57,6 +59,25 @@ birthdayIsRequired: Birthday is required
 userIsRequired: User is required
 emailIsRequired: Email is required
 roleIsRequired: Role is required
-rights: Rights
+permissions: Permissions
 selectRoleOptions: Select Role Options
 addNewRole: Add new Role
+veryWeak: very Weak
+weak: Weak
+fair: Fair
+good: Good
+strong: Strong
+passwordIsRequired: Password is required
+passwordTooShort: Password must be at least 8 characters long
+passwordNeedsUppercase: Password must contain at least one uppercase letter
+passwordNeedsLowercase: Password must contain at least one lowercase letter
+passwordNeedsNumber: Password must contain at least one number
+passwordNeedsSpecial: Password must contain at least one special character
+passwordDoNotMatch: Password do not match
+read: Read
+write: Write
+userSettings: User Settings
+members: Members
+attendanceTable: Attendance Table
+excursionTable: Excursion Table
+updated: updated

src/boot/auth.ts

@@ -14,7 +14,9 @@ export default boot(async ({ app }) => {
   await appApi
     .get('/login/me')
     .then((resp) => {
-      useStore.setUser({ id: resp.data.id, username: resp.data.username, role: resp.data.role });
+      useStore
+        .setUser({ id: resp.data.id, username: resp.data.username, role: resp.data.role })
+        .catch((err) => console.log(err));
       login.refresh().catch((err) => console.error(err));
     })
     .catch(() => {

src/boot/axios.ts

@@ -17,7 +17,7 @@ interface RetryRequestConfig extends AxiosRequestConfig {
   _retry?: boolean;
 }
 
-const noRefreshEndpoints = ['/login', '/secure/login/refresh', '/logout'];
+const noRefreshEndpoints = ['/login', '/login/refresh', '/logout'];
 
 // ========= Refresh Queue Handling ========= //
 let isRefreshing = false;

src/boot/quasar-global.ts

@@ -1,6 +1,6 @@
 import { boot } from 'quasar/wrappers';
-import { setQuasarInstance } from 'src/utils/globalQ';
-import { setRouterInstance } from 'src/utils/globalRouter';
+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';
 
@@ -15,11 +15,29 @@ export default boot(({ app, router }) => {
   if (primaryColor == null || primaryColor === 'undefined' || primaryColor.trim() === '') {
     primaryColor = null;
   }
+  let primaryColorText = localStorage.getItem('primaryColorText');
+  if (
+    primaryColorText == null ||
+    primaryColorText === 'undefined' ||
+    primaryColorText.trim() === ''
+  ) {
+    primaryColorText = null;
+  }
   let secondaryColor = localStorage.getItem('secondaryColor');
   if (secondaryColor == null || secondaryColor === 'undefined' || secondaryColor.trim() === '') {
     secondaryColor = null;
   }
+  let secondaryColorText = localStorage.getItem('secondaryColorText');
+  if (
+    secondaryColorText == null ||
+    secondaryColorText === 'undefined' ||
+    secondaryColorText.trim() === ''
+  ) {
+    secondaryColorText = null;
+  }
 
   document.documentElement.style.setProperty('--q-primary', primaryColor ?? '#1976d2');
+  document.documentElement.style.setProperty('--q-primary-text', primaryColorText ?? '#ffffff');
   document.documentElement.style.setProperty('--q-secondary', secondaryColor ?? '#26a69a');
+  document.documentElement.style.setProperty('--q-secondary-text', secondaryColorText ?? '#ffffff');
 });

src/components/EditOneDialog.vue

@@ -29,6 +29,16 @@ const localTitle = ref('');
 const localField = ref('');
 const value = ref('');
 
+const props = defineProps({
+  endpoint: {
+    type: String,
+    required: true,
+  },
+  queryId: {
+    type: Boolean,
+  },
+});
+
 const emit = defineEmits(['update']);
 const { NotifyResponse } = useNotify();
 
@@ -42,7 +52,10 @@ function open(label: string, field: string, member: Member) {
 }
 
 function save() {
-  const query = 'secure/members/edit?id=' + localMember.value.id;
+  let query = props.endpoint;
+  if (props.queryId) {
+    query += '?id=' + localMember.value.id;
+  }
   let payload = {};
 
   if (value.value === localMember.value[localField.value]) {
@@ -50,13 +63,15 @@ function save() {
     return;
   }
   payload = {
+    id: localMember.value.id,
     [localField.value]: value.value,
   };
 
   appApi
     .post(query, payload)
-    .then(() => {
-      emit('update', '');
+    .then((resp) => {
+      emit('update');
+      NotifyResponse(resp.data);
       dialog.value.close();
     })
     .catch((err) => {

src/components/MemberEditAllDialog.vue

@@ -161,9 +161,9 @@ async function save() {
 
   if (!valid) return;
 
-  let query = 'secure/members/edit?id=' + localMember.value.id;
+  let query = 'members/edit?id=' + localMember.value.id;
   if (newMember.value) {
-    query = 'secure/members/add';
+    query = 'members/add';
   }
 
   appApi

src/components/RoleEditAllDialog.vue

@@ -2,18 +2,29 @@
   <DialogFrame
     ref="dialog"
     :header-title="newRole ? $t('addNewRole') : 'Edit ' + localRole.role"
-    :height="600"
+    :height="700"
     :width="500"
   >
-    <div class="row justify-center q-gutter-md">
+    <div class="row justify-center">
       <q-input
-        class="q-ml-md col-5 required"
+        v-if="showRoleField"
+        class="q-my-lg col-5 required"
         :label="$t('role')"
         filled
         :rules="[(val) => !!val || $t('roleIsRequired')]"
         v-model="localRole.role"
         autofocus
       ></q-input>
+      <q-card>
+        <q-card-section class="text-h5 text-bold text-primary flex justify-center">{{
+          $t('permissions')
+        }}</q-card-section>
+        <q-separator color="black" />
+        <PermissionsCheckBoxGroup
+          :permissions="localRole.permissions || []"
+          v-on:update="(val) => (localRole.permissions = val)"
+        />
+      </q-card>
     </div>
     <div class="row justify-center">
       <q-btn class="q-ma-md" color="primary" no-caps @click="save">Save</q-btn>
@@ -27,29 +38,35 @@ import { ref } from 'vue';
 import { appApi } from 'src/boot/axios';
 import type { Role } from 'src/vueLib/models/roles';
 import { useNotify } from 'src/vueLib/general/useNotify';
+import PermissionsCheckBoxGroup from 'src/vueLib/checkboxes/CheckBoxGroupPermissions.vue';
+import { defaultPermissions } from 'src/vueLib/checkboxes/permissions';
+import { i18n } from 'src/boot/lang';
 
 const { NotifyResponse } = useNotify();
 const dialog = ref();
 const newRole = ref(false);
+const showRoleField = ref(true);
 const localRole = ref<Role>({
   role: '',
-  rights: null,
+  permissions: [],
 });
 
-const emit = defineEmits(['update-role']);
+const emit = defineEmits(['update']);
 
-function open(role: Role | null) {
+function open(role: Role | null, typ?: 'permissions') {
   if (role === undefined) {
     return;
   }
 
+  showRoleField.value = typ !== 'permissions';
   if (role !== null) {
     localRole.value = role;
+    localRole.value.permissions = role.permissions || defaultPermissions;
     newRole.value = false;
   } else {
     localRole.value = {
       role: '',
-      rights: null,
+      permissions: defaultPermissions,
     };
     newRole.value = true;
   }
@@ -58,15 +75,23 @@ function open(role: Role | null) {
 }
 
 function save() {
-  let query = 'secure/roles/edit?id=' + localRole.value.id;
+  let query = 'roles/update?id=' + localRole.value.id;
+  let update = true;
   if (newRole.value) {
-    query = 'secure/roles/add';
+    query = 'roles/add';
+    update = false;
+    localRole.value.permissions = defaultPermissions;
   }
 
   appApi
     .post(query, JSON.stringify(localRole.value))
     .then(() => {
-      emit('update-role');
+      if (update) {
+        NotifyResponse(
+          i18n.global.t('role') + " '" + localRole.value.role + "' " + i18n.global.t('updated'),
+        );
+      }
+      emit('update');
       dialog.value.close();
     })
     .catch((err) => NotifyResponse(err, 'error'));

src/components/UploadDialog.vue

@@ -7,6 +7,7 @@
           :url="`https://0.0.0.0:` + portApp + `/api/members/import/csv`"
           label="Import CSV"
           multiple
+          :with-credentials="true"
           accept=".csv"
           field-name="file"
           method="POST"

src/components/UserEditAllDialog.vue

@@ -5,36 +5,100 @@
     :height="600"
     :width="500"
   >
-    <div class="row justify-center q-gutter-md">
-      <q-input
-        class="q-ml-md col-5 required"
-        :label="$t('user')"
-        filled
-        :rules="[(val) => !!val || $t('userIsRequired')]"
-        v-model="localUser.user"
-        autofocus
-      ></q-input>
-      <q-input
-        class="q-ml-md col-5 required"
-        :label="$t('email')"
-        filled
-        :rules="[(val) => !!val || $t('emailIsRequired')]"
-        v-model="localUser.email"
-      ></q-input>
-      <q-input
-        class="q-ml-md col-5 required"
-        :label="$t('role')"
-        filled
-        :rules="[(val) => !!val || $t('roleIsRequired')]"
-        v-model="localUser.role"
-      ></q-input>
-      <q-input
-        class="q-ml-md col-5"
-        :label="$t('expires')"
-        filled
-        v-model="localUser.expires"
-      ></q-input>
-    </div>
+    <q-form ref="form">
+      <div class="row justify-center q-gutter-md">
+        <q-input
+          class="col-5 required"
+          :label="$t('user')"
+          filled
+          :lazy-rules="false"
+          :rules="[(val) => !!val || $t('userIsRequired')]"
+          v-model="localUser.user"
+          autofocus
+        ></q-input>
+        <q-input
+          class="col-5 required"
+          :label="$t('email')"
+          filled
+          :lazy-rules="false"
+          :rules="[(val) => !!val || $t('emailIsRequired')]"
+          v-model="localUser.email"
+        ></q-input>
+        <div class="col-5">
+          <q-input
+            class="col-5 required"
+            :label="$t('password')"
+            filled
+            :lazy-rules="false"
+            :rules="[validatePassword]"
+            v-model="localUser.password"
+            @update:model-value="checkStrength"
+            :type="showPassword1 ? 'text' : 'password'"
+          >
+            <template v-slot:append>
+              <q-btn
+                flat
+                dense
+                :icon="showPassword1 ? 'visibility_off' : 'visibility'"
+                @mousedown.prevent="showPassword1 = true"
+                @mouseup.prevent="showPassword1 = false"
+                @mouseleave.prevent="showPassword1 = false"
+                @touchstart.prevent="showPassword1 = true"
+                @touchend.prevent="showPassword1 = false"
+                @touchcancel.prevent="showPassword1 = false"
+              ></q-btn>
+              <q-icon :name="strengthIcon" :color="strengthColor"></q-icon>
+            </template>
+          </q-input>
+
+          <div class="q-mt-md q-px-xl">
+            <q-linear-progress :value="strengthValue" :color="strengthColor" size="8px" rounded />
+            <div class="text-caption text-center q-mt-xs">
+              {{ strengthLabel }}
+            </div>
+          </div>
+          <q-input
+            class="col-5 required"
+            :label="$t('password')"
+            filled
+            :type="showPassword2 ? 'text' : 'password'"
+            :rules="[checkSamePassword]"
+            v-model="passwordCheck"
+          >
+            <template v-slot:append>
+              <q-btn
+                flat
+                dense
+                :icon="showPassword2 ? 'visibility_off' : 'visibility'"
+                @mousedown.prevent="showPassword2 = true"
+                @mouseup.prevent="showPassword2 = false"
+                @mouseleave.prevent="showPassword2 = false"
+                @touchstart.prevent="showPassword2 = true"
+                @touchend.prevent="showPassword2 = false"
+                @touchcancel.prevent="showPassword2 = false"
+              ></q-btn>
+            </template>
+          </q-input>
+        </div>
+
+        <div class="col-5">
+          <q-select
+            class="col-5 required"
+            :label="$t('role')"
+            filled
+            :options="props.roles"
+            :rules="[(val) => !!val || $t('roleIsRequired')]"
+            v-model="localUser.role"
+          ></q-select>
+          <q-input
+            class="col-5"
+            :label="$t('expires')"
+            filled
+            v-model="localUser.expires"
+          ></q-input>
+        </div>
+      </div>
+    </q-form>
     <div class="row justify-center">
       <q-btn class="q-ma-md" color="primary" no-caps @click="save">Save</q-btn>
     </div>
@@ -44,13 +108,25 @@
 <script setup lang="ts">
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import { ref } from 'vue';
+import zxcvbn from 'zxcvbn';
 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';
 
 const { NotifyResponse } = useNotify();
 const dialog = ref();
+const form = ref();
 const newUser = ref(false);
+const showPassword1 = ref(false);
+const showPassword2 = ref(false);
+const passwordCheck = ref('');
+const strengthValue = ref(0);
+const strengthLabel = ref('Enter a password');
+const strengthColor = ref('grey');
+const strengthIcon = ref('lock');
 const localUser = ref<User>({
   user: '',
   email: '',
@@ -58,9 +134,16 @@ const localUser = ref<User>({
   expires: '',
 });
 
-const emit = defineEmits(['update-user']);
+const props = defineProps({
+  roles: {
+    type: Array,
+    required: true,
+  },
+});
 
-function open(user: User | null) {
+const emit = defineEmits(['update']);
+
+async function open(user: User | null) {
   if (user === undefined) {
     return;
   }
@@ -78,19 +161,66 @@ function open(user: User | null) {
     newUser.value = true;
   }
 
-  dialog.value?.open();
+  await dialog.value?.open();
+  await validateQForm(form.value);
 }
 
-function save() {
-  let query = 'secure/users/edit?id=' + localUser.value.id;
+function checkStrength() {
+  const result = zxcvbn(localUser.value.password || '');
+  strengthValue.value = (result.score + 1) / 5;
+  const levels = [
+    i18n.global.t('veryWeak'),
+    i18n.global.t('weak'),
+    i18n.global.t('fair'),
+    i18n.global.t('good'),
+    i18n.global.t('strong'),
+  ];
+  const colors = ['red', 'orange', 'yellow', 'light-green', 'green'];
+  const icon = ['lock', 'warning', 'error_outline', 'check_circle_outline', 'verified_user'];
+
+  strengthLabel.value = levels[result.score] || i18n.global.t('veryWeak');
+  strengthColor.value = colors[result.score] || 'grey';
+  strengthIcon.value = icon[result.score] || 'lock';
+}
+
+function validatePassword(): string | boolean {
+  if (!localUser.value.password) return i18n.global.t('passwordIsRequired');
+
+  if (localUser.value.password.length < 8) {
+    return i18n.global.t('passwordTooShort');
+  } else if (!/[A-Z]/.test(localUser.value.password)) {
+    return i18n.global.t('passwordNeedsUppercase');
+  } else if (!/[a-z]/.test(localUser.value.password)) {
+    return i18n.global.t('passwordNeedsLowercase');
+  } else if (!/[0-9]/.test(localUser.value.password)) {
+    return i18n.global.t('passwordNeedsNumber');
+  } else if (!/[!@#$%^&*(),.?":{}|<>]/.test(localUser.value.password)) {
+    return i18n.global.t('passwordNeedsSpecial');
+  }
+
+  return true;
+}
+
+function checkSamePassword(): string | boolean {
+  if (localUser.value.password === passwordCheck.value) return true;
+  return i18n.global.t('passwordDoNotMatch');
+}
+
+async function save() {
+  if (!(await validateQForm(form.value))) {
+    NotifyResponse(i18n.global.t('notAllRequiredFieldsFilled'), 'error');
+    return;
+  }
+  let query = 'users/edit?id=' + localUser.value.id;
   if (newUser.value) {
-    query = 'secure/users/add';
+    query = 'users/add';
+    localUser.value.settings = DefaultSettings();
   }
 
   appApi
     .post(query, JSON.stringify(localUser.value))
     .then(() => {
-      emit('update-user');
+      emit('update');
       dialog.value.close();
     })
     .catch((err) => NotifyResponse(err, 'error'));

src/css/quasar.variables.scss

@@ -13,7 +13,9 @@
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
 $primary: #1976d2;
+$primary-text: #ffffff;
 $secondary: #26a69a;
+$secondary-text: #ffffff;
 $accent: #9c27b0;
 
 $dark: #1d1d1d;
@@ -23,3 +25,16 @@ $positive: #21ba45;
 $negative: #c10015;
 $info: #31ccec;
 $warning: #f2c037;
+
+:root {
+  --q-primary-text: #ffffff;
+  --q-secondary-text: #ffffff;
+}
+
+.text-primary-text {
+  color: var(--q-primary-text) !important;
+}
+
+.text-secondary-text {
+  color: var(--q-secondary-text) !important;
+}

src/layouts/MainLayout.vue

@@ -10,7 +10,7 @@
         />
         <q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" />
 
-        <q-toolbar-title> {{ productName }} </q-toolbar-title>
+        <q-toolbar-title class="text-primary-text"> {{ productName }} </q-toolbar-title>
 
         <div>Version {{ version }}</div>
         <q-btn dense icon="refresh" square class="q-px-md q-ml-md" @click="refresh" />
@@ -23,7 +23,14 @@
         <q-item v-if="!autorized" to="/login" exact clickable v-ripple @click="closeDrawer">
           <q-item-section>{{ $t('login') }}</q-item-section>
         </q-item>
-        <q-item v-if="autorized" to="/members" exact clickable v-ripple @click="closeDrawer">
+        <q-item
+          v-if="autorized || user.isPermittedTo('members', 'read')"
+          to="/members"
+          exact
+          clickable
+          v-ripple
+          @click="closeDrawer"
+        >
           <q-item-section>Members</q-item-section>
         </q-item>
       </q-list>
@@ -45,7 +52,9 @@ const localLogo = ref(Logo);
 
 const leftDrawerOpen = ref(false);
 const user = useUserStore();
-const autorized = computed(() => !!user.isAuthorizedAs(['admin']));
+const autorized = computed(
+  () => user.isAuthorizedAs(['admin']) || user.isPermittedTo('settings', 'read'),
+);
 
 function toggleLeftDrawer() {
   leftDrawerOpen.value = !leftDrawerOpen.value;

src/pages/LoginPage.vue

@@ -7,18 +7,20 @@
 <script setup lang="ts">
 import LoginForm from 'src/vueLib/login/LoginForm.vue';
 import { useUserStore } from 'src/vueLib/login/userStore';
-import { onMounted } from 'vue';
+import { nextTick, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 
 const router = useRouter();
 const userStore = useUserStore();
 
 onMounted(() => {
-  const user = userStore.getUser();
-  if (user?.username !== '' && user?.role !== '') {
+  if (userStore.user?.username !== '' && userStore.user?.role !== '') {
     forwardToPage().catch((err) => console.error(err));
   }
 });
 
-const forwardToPage = () => router.push('/members');
+const forwardToPage = async () => {
+  await nextTick();
+  await router.push('/members');
+};
 </script>

src/pages/SettingsPage.vue

@@ -8,6 +8,7 @@
           <p class="text-bold text-h6 text-primary q-pa-md">{{ $t('general') }}</p>
           <div class="row">
             <q-input
+              :readonly="!user.isPermittedTo('userSettings', 'write')"
               :class="[
                 colorGroup ? 'col-md-4' : 'col-md-3',
                 colorGroup ? 'col-md-6' : 'col-md-6',
@@ -24,6 +25,7 @@
           <p class="text-bold text-h6 text-primary q-pa-md">{{ $t('database') }}</p>
           <div class="row">
             <q-input
+              :readonly="!user.isPermittedTo('userSettings', 'write')"
               :class="[
                 colorGroup ? 'col-md-4' : 'col-md-3',
                 colorGroup ? 'col-md-6' : 'col-md-6',
@@ -52,18 +54,72 @@
             <div class="row">
               <div class="col-12 col-sm-6 col-md-3 q-px-md">
                 <p class="text-center text-bold text-h6 text-primary">{{ $t('primaryColor') }}</p>
-                <q-color bordered class="q-mx-md" v-model="settings.primaryColor"></q-color>
+                <q-color
+                  :disable="!user.isPermittedTo('userSettings', 'write')"
+                  bordered
+                  class="q-mx-md"
+                  v-model="settings.primaryColor"
+                ></q-color>
+              </div>
+              <div class="col-12 col-sm-6 col-md-3 q-px-md">
+                <p
+                  :class="[
+                    'text-center',
+                    'text-bold',
+                    'text-h6',
+                    'text-primary-text',
+                    settings.primaryColorText === '#ffffff' ? 'bg-black' : '',
+                  ]"
+                  :style="settings.primaryColorText === '#ffffff' ? 'opacity: 0.2;' : ''"
+                >
+                  {{ $t('primaryColorText') }}
+                </p>
+                <q-color
+                  :disable="!user.isPermittedTo('userSettings', 'write')"
+                  bordered
+                  class="q-mx-md"
+                  v-model="settings.primaryColorText"
+                ></q-color>
               </div>
               <div class="col-12 col-sm-6 col-md-3 q-px-md">
                 <p class="text-center text-bold text-h6 text-secondary">
                   {{ $t('secondaryColor') }}
                 </p>
-                <q-color class="q-mx-md" v-model="settings.secondaryColor"></q-color>
+                <q-color
+                  :disable="!user.isPermittedTo('userSettings', 'write')"
+                  class="q-mx-md"
+                  v-model="settings.secondaryColor"
+                ></q-color>
+              </div>
+              <div class="col-12 col-sm-6 col-md-3 q-px-md">
+                <p
+                  :class="[
+                    'text-center',
+                    'text-bold',
+                    'text-h6',
+                    'text-secondary-text',
+                    settings.secondaryColorText === '#ffffff' ? 'bg-black' : '',
+                  ]"
+                  :style="settings.secondaryColorText === '#ffffff' ? 'opacity: 0.2;' : ''"
+                >
+                  {{ $t('secondaryColorText') }}
+                </p>
+                <q-color
+                  :disable="!user.isPermittedTo('userSettings', 'write')"
+                  class="q-mx-md"
+                  v-model="settings.secondaryColorText"
+                ></q-color>
               </div>
             </div>
-            <q-btn class="q-my-md q-mx-md" color="secondary" dense no-caps @click="resetColors">{{
-              $t('resetColors')
-            }}</q-btn>
+            <q-btn
+              :disable="!user.isPermittedTo('userSettings', 'write')"
+              class="q-my-md q-mx-md"
+              color="secondary"
+              dense
+              no-caps
+              @click="resetColors"
+              >{{ $t('resetColors') }}</q-btn
+            >
           </div>
         </q-card>
         <div class="row justify-end">
@@ -83,15 +139,21 @@ import { reactive, ref, watch } from 'vue';
 import { appApi } from 'src/boot/axios';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { type Settings } from 'src/vueLib/models/settings';
+import { useLogin } from 'src/vueLib/login/useLogin';
+import { useUserStore } from 'src/vueLib/login/userStore';
 
 const { NotifyResponse } = useNotify();
+const { getUser } = useLogin();
 const colorGroup = ref(false);
+const user = useUserStore();
 
 const settings = reactive<Settings>({
   icon: Logo.value,
   databaseName: databaseName.value,
   primaryColor: document.documentElement.style.getPropertyValue('--q-primary'),
+  primaryColorText: document.documentElement.style.getPropertyValue('--q-primary-text'),
   secondaryColor: document.documentElement.style.getPropertyValue('--q-secondary'),
+  secondaryColorText: document.documentElement.style.getPropertyValue('--q-secondary-text'),
 });
 
 watch(settings, (newSettings) => {
@@ -101,20 +163,30 @@ watch(settings, (newSettings) => {
 
 function resetColors() {
   document.documentElement.style.setProperty('--q-primary', '#1976d2');
+  settings.primaryColor = '#1976d2';
+  document.documentElement.style.setProperty('--q-primary-text', '#ffffff');
+  settings.primaryColorText = '#ffffff';
   document.documentElement.style.setProperty('--q-secondary', '#26a69a');
+  settings.secondaryColor = '#26a69a';
+  document.documentElement.style.setProperty('--q-secondary-text', '#ffffff');
+  settings.secondaryColorText = '#ffffff';
 }
 
 function save() {
   document.documentElement.style.setProperty('--q-primary', settings.primaryColor);
+  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;
   localStorage.setItem('icon', settings.icon);
   localStorage.setItem('databaseName', settings.databaseName);
   localStorage.setItem('primaryColor', settings.primaryColor);
+  localStorage.setItem('primaryColorText', settings.primaryColorText);
   localStorage.setItem('secondaryColor', settings.secondaryColor);
+  localStorage.setItem('secondaryColorText', settings.secondaryColorText);
 
   appApi
-    .post('secure/settings/update', { user: 'admin', settings })
+    .post('settings/update', { user: getUser()?.username, settings })
     .then((resp) => NotifyResponse(resp.data.message))
     .catch((err) => NotifyResponse(err, 'error'));
 }

src/router/index.ts

@@ -36,13 +36,13 @@ export default defineRouter(function (/* { store, ssrContext } */) {
 
   Router.beforeEach((to, from, next) => {
     const userStore = useUserStore();
-
     const isLoggedIn = userStore.isAuthenticated;
-    const isAdmin = userStore.user?.role === 'admin';
-
     if (to.meta.requiresAuth && !isLoggedIn) {
       next('/login');
-    } else if (to.meta.requiresAdmin && !isAdmin) {
+    } else if (
+      to.meta.requiresAdmin &&
+      !userStore.isPermittedTo(to.path.replace('/', ''), 'read')
+    ) {
       next('/');
     } else {
       next();

src/router/routes.ts

@@ -10,21 +10,21 @@ const routes: RouteRecordRaw[] = [
         component: () => import('pages/LoginPage.vue'),
       },
       {
-        path: '/login',
+        path: 'login',
         component: () => import('pages/LoginPage.vue'),
       },
       {
-        path: '/members',
+        path: 'members',
         component: () => import('pages/MembersTable.vue'),
         meta: { requiresAuth: true, requiresAdmin: true },
       },
       {
-        path: '/settings',
+        path: 'settings',
         component: () => import('pages/SettingsPage.vue'),
         meta: { requiresAuth: true, requiresAdmin: true },
       },
       {
-        path: '/usersSettings',
+        path: 'userSettings',
         component: () => import('pages/UserSettings.vue'),
         meta: { requiresAuth: true, requiresAdmin: true },
       },

src/vueLib/checkboxes/CheckBoxGroupPermissions.vue

@@ -0,0 +1,67 @@
+<template>
+  <q-card>
+    <q-card bordered v-for="(permission, index) in localPermission" v-bind:key="index">
+      <q-card-section class="text-center">
+        <div class="text-h7 text-bold text-primary">{{ $t(permission.name) }}</div>
+      </q-card-section>
+      <q-separator></q-separator>
+      <div class="flex justify-center">
+        <q-checkbox
+          class="q-mx-md"
+          :model-value="isFlagSet(permission.permission, 1 << 0)"
+          @update:model-value="(val) => toggleBit(index, 0, val)"
+          >{{ i18n.global.t('read') }}</q-checkbox
+        >
+        <q-checkbox
+          class="q-mx-md"
+          :model-value="isFlagSet(permission.permission, 1 << 1)"
+          @update:model-value="(val) => toggleBit(index, 1, val)"
+          >{{ i18n.global.t('write') }}</q-checkbox
+        >
+        <q-checkbox
+          class="q-mx-md"
+          :model-value="isFlagSet(permission.permission, 1 << 2)"
+          @update:model-value="(val) => toggleBit(index, 2, val)"
+          >{{ i18n.global.t('delete') }}</q-checkbox
+        >
+      </div>
+    </q-card>
+  </q-card>
+</template>
+
+<script setup lang="ts">
+import { ref, type PropType } from 'vue';
+import type { Permissions } from './permissions';
+import { i18n } from 'src/boot/lang';
+
+const props = defineProps({
+  permissions: {
+    type: Object as PropType<Permissions>,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['update']);
+
+const localPermission = ref(
+  props.permissions.map((e) => ({
+    name: e.name,
+    permission: e.permission ?? 0,
+  })),
+);
+
+function isFlagSet(mask: number, flag: number) {
+  return (mask & flag) !== 0;
+}
+
+function toggleBit(index: number, bit: number, value: boolean) {
+  const item = localPermission.value[index];
+  if (!item) return; // guard against undefined index
+
+  const mask = 1 << bit;
+  const current = item.permission ?? 0;
+
+  item.permission = value ? current | mask : current & ~mask;
+  emit('update', localPermission.value);
+}
+</script>

src/vueLib/checkboxes/permissions.ts

@@ -0,0 +1,40 @@
+import { i18n } from 'src/boot/lang';
+import { ref } from 'vue';
+
+export interface Permission {
+  name: string;
+  label: string;
+  permission: number;
+}
+
+export type Permissions = Permission[];
+
+export const defaultPermissions = [
+  {
+    name: 'settings',
+    label: i18n.global.t('settings'),
+    permission: 0,
+  },
+  {
+    name: 'userSettings',
+    label: i18n.global.t('userSettings'),
+    permission: 0,
+  },
+  {
+    name: 'members',
+    label: i18n.global.t('members'),
+    permission: 0,
+  },
+  {
+    name: 'attendanceTable',
+    label: i18n.global.t('attendanceTable'),
+    permission: 0,
+  },
+  {
+    name: 'excursionTable',
+    label: i18n.global.t('excursionTable'),
+    permission: 0,
+  },
+];
+
+export const permissions = ref<Permissions>(defaultPermissions);

src/vueLib/db/db.ts

@@ -1,49 +0,0 @@
-import { CapacitorSQLite, SQLiteConnection } from '@capacitor-community/sqlite';
-import type { Settings } from '../models/settings';
-
-const sqlite = new SQLiteConnection(CapacitorSQLite);
-
-export async function initDB() {
-  const db = await sqlite.createConnection('membersDB', true, 'secreto_passwordo', 1, false);
-  await db.open();
-  await db.execute(`CREATE TABLE IF NOT EXISTS users (
-						id INTEGER PRIMARY KEY AUTOINCREMENT,
-						username TEXT NOT NULL,
-						role TEXT NOT NULL,
-						password TEXT NOT NULL,
-						settings TEXT NOT NULL
-						);`);
-
-  const result = await db.query(`SELECT * FROM users WHERE username = ?`, ['admin']);
-  if (result.values?.length === 0) {
-    await db.run(`INSERT INTO users (username, role, password, settings) VALUES (?, ?, ?, ?)`, [
-      'admin',
-      'admin',
-      'tecamino@2023',
-      {},
-    ]);
-  }
-  return db;
-}
-
-export async function addUser(user: string, role: string, password: string, settings: Settings) {
-  const db = await initDB();
-  await db.run(`INSERT INTO users (username, role, password, settings) VALUES (?, ?, ?, ?)`, [
-    user,
-    role,
-    password,
-    settings,
-  ]);
-}
-
-export async function getUsers() {
-  const db = await initDB();
-  const resp = await db.query(`SELECT * FROM users`);
-  return resp.values;
-}
-
-export async function getUser(user: string) {
-  const db = await initDB();
-  const resp = await db.query(`SELECT EXISTS(SELECT 1 FROM users WHERE username = ?)`, [user]);
-  return resp.values;
-}

src/vueLib/login/LoginForm.vue

@@ -8,6 +8,7 @@
           ref="refUserInput"
           dense
           filled
+          autocomplete="username"
           type="text"
           :label="$t('user')"
           v-model="user"
@@ -16,6 +17,7 @@
         <q-input
           dense
           filled
+          autocomplete="current-password"
           :type="showPassword ? 'text' : 'password'"
           :label="$t('password')"
           v-model="password"
@@ -27,14 +29,17 @@
               flat
               dense
               :icon="showPassword ? 'visibility_off' : 'visibility'"
-              @mousedown.left="showPassword = true"
-              @mouseup.left="showPassword = false"
-              @mouseleave="showPassword = false"
+              @mousedown.prevent="showPassword = true"
+              @mouseup.prevent="showPassword = false"
+              @mouseleave.prevent="showPassword = false"
+              @touchstart.prevent="showPassword = true"
+              @touchend.prevent="showPassword = false"
+              @touchcancel.prevent="showPassword = false"
             ></q-btn>
           </template>
         </q-input>
         <div class="q-pt-sm q-mr-md row justify-end">
-          <q-btn color="primary" :label="$t('login')" @click="onSubmit"></q-btn>
+          <q-btn no-caps color="primary" :label="$t('login')" @click="onSubmit"></q-btn>
         </div>
       </q-card>
     </q-item-section>
@@ -59,25 +64,24 @@ const { login } = useLogin();
 
 const emit = defineEmits(['update-close']);
 
-const onSubmit = () => {
-  refForm.value?.validate().then((success: boolean) => {
-    if (success) {
-      login(user.value, password.value)
-        .then(() => {
-          NotifyResponse("logged in as '" + user.value + "'");
-          emit('update-close');
-        })
-        .catch((err) => {
-          NotifyResponse(err, 'error');
-          shake.value = true;
-          setTimeout(() => {
-            shake.value = false;
-          }, 500);
-        });
-    } else {
-      NotifyResponse('error submitting login form', 'error');
-    }
-  });
+const onSubmit = async () => {
+  const valid = refForm.value?.validate();
+  if (!valid) {
+    NotifyResponse('error submitting login form', 'error');
+    return;
+  }
+  await login(user.value, password.value)
+    .then(() => {
+      NotifyResponse("logged in as '" + user.value + "'");
+    })
+    .catch((err) => {
+      NotifyResponse(err, 'error');
+      shake.value = true;
+      setTimeout(() => {
+        shake.value = false;
+      }, 500);
+    });
+  emit('update-close');
 };
 </script>
 

src/vueLib/login/LoginMenu.vue

@@ -9,6 +9,9 @@
           <q-item v-if="showLogin" clickable v-close-popup @click="openLogin">
             <q-item-section class="text-primary">{{ loginText }}</q-item-section>
           </q-item>
+          <q-item>
+            <q-btn flat :icon="Dark.mode ? 'light_mode' : 'dark_mode'" @click="Dark.toggle"></q-btn>
+          </q-item>
           <q-item>
             <q-select
               :label="$t('language')"
@@ -19,11 +22,20 @@
               :options="langSelection"
             ></q-select>
           </q-item>
-          <q-item v-if="autorized">
+          <q-item
+            v-if="
+              (autorized || user.isPermittedTo('settings', 'read')) && route.path !== '/settings'
+            "
+          >
             <q-btn flat color="secondary" icon="settings" to="/settings"></q-btn>
           </q-item>
-          <q-item v-if="autorized">
-            <q-btn flat color="secondary" icon="group" to="/usersSettings"></q-btn>
+          <q-item
+            v-if="
+              (autorized || user.isPermittedTo('userSettings', 'read')) &&
+              route.path !== '/userSettings'
+            "
+          >
+            <q-btn flat color="secondary" icon="group" to="/userSettings"></q-btn>
           </q-item>
         </q-list>
       </q-menu>
@@ -40,6 +52,7 @@ import { useNotify } from '../general/useNotify';
 import { lang, i18n } from 'src/boot/lang';
 import { useUserStore } from './userStore';
 import { useRoute } from 'vue-router';
+import { Dark } from 'quasar';
 
 const route = useRoute();
 const showLogin = computed(

src/vueLib/login/useLogin.ts

@@ -18,15 +18,21 @@ export function useLogin() {
 
         Logo.value = sets.icon;
         document.documentElement.style.setProperty('--q-primary', sets.primaryColor);
+        document.documentElement.style.setProperty('--q-primary-text', sets.primaryColorText);
         document.documentElement.style.setProperty('--q-secondary', sets.secondaryColor);
+        document.documentElement.style.setProperty('--q-secondary-text', sets.secondaryColorText);
         localStorage.setItem('icon', sets.icon);
         localStorage.setItem('databaseName', sets.databaseName);
         localStorage.setItem('primaryColor', sets.primaryColor);
+        localStorage.setItem('primaryColorText', sets.primaryColorText);
         localStorage.setItem('secondaryColor', sets.secondaryColor);
+        localStorage.setItem('secondaryColorText', sets.secondaryColorText);
       });
 
       const resp = await appApi.get('/login/me');
-      userStore.setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role });
+      await userStore
+        .setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role })
+        .catch((err) => console.log(err));
 
       startRefreshInterval();
       return true;
@@ -47,12 +53,14 @@ export function useLogin() {
 
   async function refresh() {
     await appApi
-      .post('secure/login/refresh', {}, { withCredentials: true })
+      .post('login/refresh', {}, { withCredentials: true })
       .then(() => {
         appApi
           .get('/login/me')
           .then((resp) => {
-            userStore.setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role });
+            userStore
+              .setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role })
+              .catch((err) => console.error(err));
             if (!intervalId) {
               startRefreshInterval();
             }
@@ -67,7 +75,7 @@ export function useLogin() {
     return false;
   }
   function getUser() {
-    return userStore.getUser();
+    return userStore.user;
   }
 
   function startRefreshInterval() {

src/vueLib/login/userStore.ts

@@ -1,30 +1,52 @@
 import { defineStore } from 'pinia';
-import { useGlobalRouter } from 'src/utils/globalRouter';
-import { useGlobalQ } from 'src/utils/globalQ';
+import { useGlobalRouter } from 'src/vueLib/utils/globalRouter';
+import { useGlobalQ } from 'src/vueLib/utils/globalQ';
+import { appApi } from 'src/boot/axios';
+import { useNotify } from '../general/useNotify';
+import type { Role } from '../models/roles';
+import type { UserState, User } from '../models/user';
+import type { Permission } from '../checkboxes/permissions';
 
-interface User {
-  id: number;
-  username: string;
-  role: string;
-}
-
-interface UserState {
-  user: User | null;
-}
+const { NotifyResponse } = useNotify();
 
 export const useUserStore = defineStore('user', {
   state: (): UserState => ({
     user: null,
   }),
   getters: {
-    isAuthenticated: (state): boolean => !!state.user,
+    isAuthenticated: (state: UserState): boolean => {
+      return !!state.user;
+    },
+
+    isAuthorizedAs: (state: UserState) => {
+      return (roles: string[]) => {
+        return state.user !== null && roles.includes(state.user.role);
+      };
+    },
+    isPermittedTo: (state: UserState) => {
+      return (name: string, type: 'read' | 'write' | 'delete'): boolean => {
+        const permission = state.user?.permissions?.find((r: Permission) => r.name === name);
+        switch (type) {
+          case 'read':
+            return permission?.permission ? (permission.permission & (1 << 0)) === 1 : false;
+          case 'write':
+            return permission?.permission ? (permission.permission & (1 << 1)) === 2 : false;
+          case 'delete':
+            return permission?.permission ? (permission.permission & (1 << 2)) === 4 : false;
+        }
+      };
+    },
   },
   actions: {
-    setUser(user: User) {
-      this.user = user;
-    },
-    getUser() {
-      return this.user;
+    async setUser(user: User) {
+      await appApi
+        .get('roles?role=' + user.role)
+        .then((resp) => {
+          const roleData = resp.data.find((role: Role) => role.role === user.role);
+          user.permissions = roleData?.permissions || [];
+          this.user = user;
+        })
+        .catch((err) => NotifyResponse(err, 'error'));
     },
     clearUser() {
       const $q = useGlobalQ();
@@ -60,9 +82,5 @@ export const useUserStore = defineStore('user', {
         }
       });
     },
-
-    isAuthorizedAs(roles: string[]) {
-      return this.user !== null && roles.includes(this.user.role);
-    },
   },
 });

src/vueLib/models/rights.ts

@@ -1,8 +0,0 @@
-export interface Right {
-  name: string;
-  read: boolean;
-  write: boolean;
-  delete: boolean;
-}
-
-export type Rights = Right[];

src/vueLib/models/roles.ts

@@ -1,9 +1,9 @@
-import type { Rights } from './rights';
+import type { Permissions } from '../checkboxes/permissions';
 
 export interface Role {
   id?: number;
   role: string;
-  rights: Rights | null;
+  permissions: Permissions;
 }
 
 export type Roles = Role[];

src/vueLib/models/settings.ts

@@ -2,5 +2,18 @@ export type Settings = {
   icon: string;
   databaseName: string;
   primaryColor: string;
+  primaryColorText: string;
   secondaryColor: string;
+  secondaryColorText: string;
 };
+
+export function DefaultSettings(): Settings {
+  return {
+    icon: '',
+    databaseName: 'members.dba',
+    primaryColor: document.documentElement.style.getPropertyValue('--q-primary-text'),
+    primaryColorText: document.documentElement.style.getPropertyValue('--q-primary'),
+    secondaryColor: document.documentElement.style.getPropertyValue('--q-secondary'),
+    secondaryColorText: document.documentElement.style.getPropertyValue('--q-secondary-text'),
+  };
+}

src/vueLib/models/user.ts

@@ -0,0 +1,12 @@
+import type { Permissions } from '../checkboxes/permissions';
+
+export interface User {
+  id: number;
+  username: string;
+  role: string;
+  permissions?: Permissions;
+}
+
+export interface UserState {
+  user: User | null;
+}

src/vueLib/models/users.ts

@@ -1,9 +1,13 @@
+import type { Settings } from './settings';
+
 export interface User {
   id?: number;
   user: string;
   email: string;
   role: string;
   expires: string;
+  password?: string;
+  settings?: Settings;
 }
 
 export type Users = User[];

src/vueLib/tables/members/MembersTable.ts

@@ -13,7 +13,7 @@ export function useMemberTable() {
     sortBy: 'firstName',
     descending: false,
     page: 1,
-    rowsPerPage: 10,
+    rowsPerPage: 20,
   });
 
   const columns = computed(() => [
@@ -171,7 +171,7 @@ export function useMemberTable() {
     loading.value = true;
 
     appApi
-      .get('secure/members')
+      .get('members')
       .then((resp) => {
         if (resp.data === null) {
           members.value = [];

src/vueLib/tables/members/MembersTable.vue

@@ -23,10 +23,17 @@
     >
       <template v-slot:top-left>
         <q-btn-group push flat style="color: grey">
-          <q-btn dense flat icon="add" @click="openAllValueDialog(null)">
+          <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
+            dense
+            flat
+            icon="add"
+            @click="openAllValueDialog(null)"
+          >
             <q-tooltip>{{ $t('addNewMember') }}</q-tooltip>
           </q-btn>
           <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
             dense
             flat
             style="color: grey"
@@ -35,7 +42,13 @@
           >
             <q-tooltip>{{ $t('selectMemberOptions') }}</q-tooltip>
           </q-btn>
-          <q-btn dense flat icon="upload" @click="openUploadDialog">
+          <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
+            dense
+            flat
+            icon="upload"
+            @click="openUploadDialog"
+          >
             <q-tooltip>{{ $t('importCSV') }}</q-tooltip>
           </q-btn>
         </q-btn-group>
@@ -66,7 +79,11 @@
         <q-td
           :props="props"
           :class="getRowClass(props.row)"
-          @click="openSingleValueDialog(props.col.label, props.col.name, props.row)"
+          :style="user.isPermittedTo('userSettings', 'write') ? 'cursor: pointer' : ''"
+          @click="
+            user.isPermittedTo('userSettings', 'write') &&
+            openSingleValueDialog(props.col.label, props.col.name, props.row)
+          "
         >
           {{ props.value }}
         </q-td>
@@ -82,9 +99,19 @@
       </template>
       <template v-slot:body-cell-option="props">
         <q-td :props="props">
-          <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
+          <q-btn
+            v-if="
+              user.isPermittedTo('userSettings', 'write') ||
+              user.isPermittedTo('userSettings', 'delete')
+            "
+            flat
+            dense
+            icon="more_vert"
+            @click="openSubmenu = true"
+          />
           <q-menu v-if="openSubmenu" anchor="top right" self="top left">
             <q-item
+              v-if="user.isPermittedTo('userSettings', 'write')"
               clickable
               v-close-popup
               @click="openAllValueDialog(props.row)"
@@ -92,6 +119,7 @@
               >{{ $t('edit') }}</q-item
             >
             <q-item
+              v-if="user.isPermittedTo('userSettings', 'delete')"
               clickable
               v-close-popup
               @click="openRemoveDialog(props.row)"
@@ -104,7 +132,12 @@
       </template>
     </q-table>
   </div>
-  <EditOneDialog ref="editOneDialog" v-on:update="updateMembers"></EditOneDialog>
+  <EditOneDialog
+    ref="editOneDialog"
+    endpoint="members/edit"
+    query-id
+    v-on:update="updateMembers"
+  ></EditOneDialog>
   <EditAllDialog ref="editAllDialog" v-on:update="updateMembers"></EditAllDialog>
   <OkDialog
     ref="okDialog"
@@ -131,6 +164,7 @@ import { useNotify } from 'src/vueLib/general/useNotify';
 import { useMemberTable } from './MembersTable';
 import UploadDialog from 'src/components/UploadDialog.vue';
 import { databaseName } from './MembersTable';
+import { useUserStore } from 'src/vueLib/login/userStore';
 
 export interface MemberDialog {
   getSelected: () => Members;
@@ -146,6 +180,7 @@ const selectOption = ref(false);
 const selected = ref<Members>([]);
 const openSubmenu = ref(false);
 const filter = ref('');
+const user = useUserStore();
 
 const {
   members,
@@ -162,7 +197,7 @@ onMounted(() => {
   loading.value = true;
 
   appApi
-    .post('secure/database/open', { dbPath: databaseName.value, create: true })
+    .post('database/open', { dbPath: databaseName.value, create: true })
     .then(() => {
       updateMembers();
     })
@@ -214,7 +249,7 @@ function removeMember(...removeMembers: Members) {
   });
 
   appApi
-    .post('secure/members/delete', { ids: memberIds })
+    .post('members/delete', { ids: memberIds })
     .then(() => {
       updateMembers();
       selected.value = [];

src/vueLib/tables/roles/RoleTable.ts

@@ -3,6 +3,8 @@ import { ref, computed } from 'vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { i18n } from 'boot/lang';
 import type { Roles } from 'src/vueLib/models/roles';
+import { useUserStore } from 'src/vueLib/login/userStore';
+import { useLogin } from 'src/vueLib/login/useLogin';
 
 export const roles = ref<Roles>([]);
 
@@ -31,11 +33,10 @@ export function useRoleTable() {
       sortable: true,
     },
     {
-      name: 'rights',
+      name: 'permissions',
       align: 'left' as const,
-      label: i18n.global.t('rights'),
-      field: 'rights',
-      sortable: true,
+      label: i18n.global.t('permissions'),
+      field: '',
       style: 'width: 120px; max-width: 120px;',
     },
     { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
@@ -44,18 +45,21 @@ export function useRoleTable() {
   const { NotifyResponse } = useNotify();
 
   const loading = ref(false);
+  const userStore = useUserStore();
+  const login = useLogin();
 
   //updates user list from database
-  function updateRoles() {
+  async function updateRoles() {
     loading.value = true;
-    appApi
-      .get('secure/roles')
+    await appApi
+      .get('roles?id=0')
       .then((resp) => {
         if (resp.data === null) {
           roles.value = [];
           return;
         }
         roles.value = resp.data as Roles;
+
         if (roles.value === null) {
           roles.value = [];
           return;
@@ -68,6 +72,17 @@ export function useRoleTable() {
       .finally(() => {
         loading.value = false;
       });
+    await appApi
+      .get('/login/me')
+      .then((resp) => {
+        userStore
+          .setUser({ id: resp.data.id, username: resp.data.username, role: resp.data.role })
+          .catch((err) => console.log(err));
+        login.refresh().catch((err) => console.error(err));
+      })
+      .catch(() => {
+        login.logout().catch((err) => console.error(err));
+      });
   }
   return {
     roles,

src/vueLib/tables/roles/RoleTable.vue

@@ -23,10 +23,17 @@
     >
       <template v-slot:top-left>
         <q-btn-group push flat style="color: grey">
-          <q-btn dense flat icon="add" @click="openAllValueDialog(null)">
+          <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
+            dense
+            flat
+            icon="add"
+            @click="openAllValueDialog(null)"
+          >
             <q-tooltip>{{ $t('addNewRole') }}</q-tooltip>
           </q-btn>
           <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
             dense
             flat
             style="color: grey"
@@ -62,21 +69,65 @@
       <template v-slot:body-cell="props">
         <q-td
           :props="props"
-          @click="openSingleValueDialog(props.col.label, props.col.name, props.row)"
+          :disable="!autorized(props.row)"
+          :style="
+            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+              ? 'cursor: pointer'
+              : ''
+          "
+          @click="
+            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+              ? openSingleValueDialog(props.col.label, props.col.name, props.row)
+              : ''
+          "
         >
           {{ props.value }}
         </q-td>
       </template>
+      <template v-slot:body-cell-permissions="props">
+        <q-td :props="props">
+          <q-btn
+            :disable="!autorized(props.row) || !user.isPermittedTo('userSettings', 'write')"
+            flat
+            dense
+            icon="rule"
+            :color="
+              autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+                ? 'secondary'
+                : 'grey'
+            "
+            @click="
+              user.isPermittedTo('userSettings', 'write') &&
+              openAllValueDialog(props.row, 'permissions')
+            "
+          >
+            <q-tooltip> {{ $t('permissions') }} </q-tooltip>
+          </q-btn>
+        </q-td>
+      </template>
       <template v-slot:body-cell-option="props">
         <q-td :props="props">
-          <q-btn flat dense icon="delete" color="negative" @click="openRemoveDialog(props.row)">
+          <q-btn
+            v-if="user.isPermittedTo('userSettings', 'delete')"
+            :disable="!autorized(props.row)"
+            flat
+            dense
+            icon="delete"
+            color="negative"
+            @click="openRemoveDialog(props.row)"
+          >
             <q-tooltip> {{ $t('delete') }} </q-tooltip>
           </q-btn>
         </q-td>
       </template>
     </q-table>
   </div>
-  <EditOneDialog ref="editOneDialog" v-on:update="updateRoles"></EditOneDialog>
+  <EditOneDialog
+    ref="editOneDialog"
+    endpoint="roles/update"
+    query-id
+    v-on:update="updateRoles"
+  ></EditOneDialog>
   <EditAllDialog ref="editAllDialog" v-on:update="updateRoles"></EditAllDialog>
   <OkDialog
     ref="okDialog"
@@ -101,6 +152,9 @@ import OkDialog from 'src/components/dialog/OkDialog.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { useRoleTable } from './RoleTable';
 import { useLogin } from 'src/vueLib/login/useLogin';
+import { i18n } from 'src/boot/lang';
+import { QTable } from 'quasar';
+import { useUserStore } from 'src/vueLib/login/userStore';
 
 const { NotifyResponse } = useNotify();
 const editOneDialog = ref();
@@ -110,24 +164,33 @@ const deleteText = ref('');
 const selectOption = ref(false);
 const selected = ref<Roles>([]);
 const openSubmenu = ref(false);
+const currentUser = ref();
 const filter = ref('');
+const user = useUserStore();
 
 const { roles, pagination, loading, columns, updateRoles } = useRoleTable();
 
 //load on mounting page
 onMounted(() => {
   loading.value = true;
-  updateRoles();
+  const login = useLogin();
+  currentUser.value = login.getUser();
+  updateRoles().catch((err) => console.error(err));
 });
 
+function autorized(role: Role): boolean {
+  if (role.id !== 1) return true;
+  return false;
+}
+
 // opens dialog for all role values
 function openSingleValueDialog(label: string, field: string, role: Role) {
   editOneDialog.value?.open(label, field, role);
 }
 
 //opens dialog for one value
-function openAllValueDialog(role: Role | null) {
-  editAllDialog.value?.open(role);
+function openAllValueDialog(role: Role | null, typ?: 'permissions') {
+  editAllDialog.value?.open(role, typ);
 }
 
 //opens remove dialog
@@ -145,18 +208,22 @@ function removeRole(...removeRoles: Roles) {
   const roles: string[] = [];
 
   removeRoles.forEach((role: Role) => {
-    if (role.role) {
+    if (role.role === currentUser.value.role) {
+      NotifyResponse(i18n.global.t('notPossibleToDeleteLoggedInRole'), 'error');
+    } else if (role.role) {
       roles.push(role.role);
     }
   });
 
-  const login = useLogin();
-  const user = login.getUser();
-
   appApi
-    .post('secure/roles/delete?role=' + user?.role, { roles: roles })
-    .then(() => {
-      updateRoles();
+    .post('roles/delete?role=' + currentUser.value.role, { roles: roles })
+    .then((resp) => {
+      updateRoles().catch((err) => console.error(err));
+      if (roles.length === 1) {
+        NotifyResponse("'" + roles[0] + "' " + i18n.global.t('deleted'), 'warning');
+      } else {
+        NotifyResponse(resp.data, 'warning');
+      }
       selected.value = [];
     })
     .catch((err) => NotifyResponse(err, 'error'))
@@ -169,6 +236,7 @@ function getSelected(): Roles {
   if (selected.value.length === 0) return [];
   return selected.value;
 }
+
 defineExpose({
   getSelected,
 });

src/vueLib/tables/users/UserTable.ts

@@ -55,9 +55,8 @@ export function useUserTable() {
   //updates user list from database
   function updateUsers() {
     loading.value = true;
-
     appApi
-      .get('secure/users')
+      .get('users')
       .then((resp) => {
         if (resp.data === null) {
           users.value = [];

src/vueLib/tables/users/UserTable.vue

@@ -23,10 +23,17 @@
     >
       <template v-slot:top-left>
         <q-btn-group push flat style="color: grey">
-          <q-btn dense flat icon="add" @click="openAllValueDialog(null)">
+          <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
+            dense
+            flat
+            icon="add"
+            @click="openAllValueDialog(null)"
+          >
             <q-tooltip>{{ $t('addNewUser') }}</q-tooltip>
           </q-btn>
           <q-btn
+            v-if="user.isPermittedTo('userSettings', 'write')"
             dense
             flat
             style="color: grey"
@@ -61,27 +68,55 @@
       </template>
       <template v-slot:body-cell="props">
         <q-td v-if="props.col.name === 'role'" :props="props">
-          <q-select dense v-model="props.row.role" :options="localRoles"></q-select>
+          <q-select
+            :readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
+            dense
+            v-model="props.row.role"
+            :options="localRoles"
+            @update:model-value="updateUser(props.row)"
+          ></q-select>
         </q-td>
         <q-td
           v-else
           :props="props"
-          @click="openSingleValueDialog(props.col.label, props.col.name, props.row)"
+          :style="
+            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+              ? 'cursor: pointer'
+              : ''
+          "
+          @click="
+            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+              ? openSingleValueDialog(props.col.label, props.col.name, props.row)
+              : ''
+          "
         >
           {{ props.value }}
         </q-td>
       </template>
       <template v-slot:body-cell-option="props">
         <q-td :props="props">
-          <q-btn flat dense icon="delete" color="negative" @click="openRemoveDialog(props.row)">
+          <q-btn
+            v-if="user.isPermittedTo('userSettings', 'delete')"
+            :disable="!autorized(props.row)"
+            flat
+            dense
+            icon="delete"
+            color="negative"
+            @click="openRemoveDialog(props.row)"
+          >
             <q-tooltip> {{ $t('delete') }} </q-tooltip>
           </q-btn>
         </q-td>
       </template>
     </q-table>
   </div>
-  <EditOneDialog ref="editOneDialog" v-on:update="updateUsers"></EditOneDialog>
-  <EditAllDialog ref="editAllDialog" v-on:update="updateUsers"></EditAllDialog>
+  <EditOneDialog
+    ref="editOneDialog"
+    endpoint="users/edit"
+    query-id
+    v-on:update="updateUsers"
+  ></EditOneDialog>
+  <EditAllDialog ref="editAllDialog" :roles="localRoles" v-on:update="updateUsers"></EditAllDialog>
   <OkDialog
     ref="okDialog"
     :dialog-label="$t('delete')"
@@ -105,27 +140,42 @@ import OkDialog from 'src/components/dialog/OkDialog.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { useUserTable } from './UserTable';
 import { useLogin } from 'src/vueLib/login/useLogin';
-import { roles } from '../roles/RoleTable';
+import { roles, useRoleTable } from '../roles/RoleTable';
+import { i18n } from 'src/boot/lang';
+import { useUserStore } from 'src/vueLib/login/userStore';
 
 const { NotifyResponse } = useNotify();
 const editOneDialog = ref();
 const editAllDialog = ref();
 const okDialog = ref();
 const deleteText = ref('');
-const localRoles = computed(() => roles.value.map((role) => role.role));
+const localRoles = computed(() => {
+  return roles.value.map((role) => role.role);
+});
 const selectOption = ref(false);
 const selected = ref<Users>([]);
 const openSubmenu = ref(false);
 const filter = ref('');
-
+const currentUser = ref();
 const { users, pagination, loading, columns, updateUsers } = useUserTable();
+const { updateRoles } = useRoleTable();
+const user = useUserStore();
 
 //load on mounting page
 onMounted(() => {
   loading.value = true;
+  const login = useLogin();
+  currentUser.value = login.getUser();
   updateUsers();
+  updateRoles().catch((err) => console.error(err));
 });
 
+//check authorization
+function autorized(user: User): boolean {
+  if (user.id !== 1) return true;
+  return false;
+}
+
 // opens dialog for all user values
 function openSingleValueDialog(label: string, field: string, user: User) {
   editOneDialog.value?.open(label, field, user);
@@ -151,16 +201,15 @@ function removeUser(...removeUsers: Users) {
   const userIds: number[] = [];
 
   removeUsers.forEach((user: User) => {
-    if (user.id) {
+    if (user.id === currentUser.value.id) {
+      NotifyResponse(i18n.global.t('notPossibleToDeleteLoggedInUser'), 'error');
+    } else if (user.id) {
       userIds.push(user.id);
     }
   });
 
-  const login = useLogin();
-  const user = login.getUser();
-
   appApi
-    .post('secure/users/delete?id=' + user?.id, { ids: userIds })
+    .post('users/delete?id=' + currentUser.value.id, { ids: userIds })
     .then(() => {
       updateUsers();
       selected.value = [];
@@ -171,10 +220,19 @@ function removeUser(...removeUsers: Users) {
     });
 }
 
+// update role select
+function updateUser(user: User) {
+  appApi
+    .post('/users/update', user)
+    .then((resp) => console.log(100, resp))
+    .catch((err) => console.log(101, err));
+}
+
 function getSelected(): Users {
   if (selected.value.length === 0) return [];
   return selected.value;
 }
+
 defineExpose({
   getSelected,
 });

src/vueLib/utils/validation.ts

@@ -0,0 +1,21 @@
+import type { QForm } from 'quasar';
+import { nextTick } from 'vue';
+
+export async function validateQForm(formRef: QForm | null | undefined): Promise<boolean> {
+  await nextTick(); // wait until all inputs are rendered
+  const components = formRef?.getValidationComponents?.();
+
+  if (!components) {
+    console.warn('No validation components found in form');
+    return true;
+  }
+
+  let allValid = true;
+
+  for (const comp of components) {
+    const valid = await comp.validate();
+    if (!valid) allValid = false;
+  }
+
+  return allValid;
+}