release v2.0.0 #4

Merged
crimsen merged 481 commits from develop into master 2024-01-18 15:15:08 +00:00
11 changed files with 19 additions and 44 deletions
Showing only changes of commit eabc520762 - Show all commits

View File

@ -1,4 +1,5 @@
{
"singleQuote": true,
"semi": true
"semi": true,
"printWidth": 100
}

View File

@ -1,4 +1,5 @@
module.exports = {
singleQuote: true,
semi: true
semi: true,
printWidth: 100
};

View File

@ -15,7 +15,7 @@
<script lang="ts">
import { computed, defineComponent } from '@vue/composition-api';
import { hasPermissions } from 'src/components/permission';
import { hasPermissions } from 'src/utils/permission';
export default defineComponent({
name: 'EssentialLink',

View File

@ -4,7 +4,7 @@
<script lang="ts">
import { computed, defineComponent } from '@vue/composition-api';
import { hasPermissions } from 'src/components/permission';
import { hasPermissions } from 'src/utils/permission';
export default defineComponent({
name: 'ShortCutLink',

View File

@ -1,9 +1,6 @@
<template>
<q-layout view="hHh lpr lFf">
<q-header
elevated
class="bg-primary text-white"
>
<q-header elevated class="bg-primary text-white">
<q-toolbar>
<!-- Button um Navigationsleiset ein und auszublenden. Nötig bei Desktop? -->
<q-btn
@ -16,16 +13,11 @@
/>
<q-toolbar-title>
<router-link
:to="{ name: 'dashboard' }"
style="text-decoration: none; color: inherit;"
>
<router-link :to="{ name: 'dashboard' }" style="text-decoration: none; color: inherit">
<q-avatar>
<img src="logo.svg" />
</q-avatar>
<span class="gt-xs">
Flaschengeist
</span>
<span class="gt-xs"> Flaschengeist </span>
</router-link>
</q-toolbar-title>
@ -39,13 +31,7 @@
:permissions="shortcut.permissions"
/>
</div>
<q-btn
flat
round
dense
icon="mdi-exit-to-app"
@click="logout()"
/>
<q-btn flat round dense icon="mdi-exit-to-app" @click="logout()" />
</q-toolbar>
</q-header>
@ -83,10 +69,7 @@
/>
</q-list>
<div
class="q-mini-drawer-hide absolute"
style="top: 15px; right: -11px"
>
<div class="q-mini-drawer-hide absolute" style="top: 15px; right: -11px">
<q-btn
size="sm"
dense

View File

@ -16,7 +16,7 @@
<script lang="ts">
import { defineComponent, onMounted, ref } from '@vue/composition-api';
import { hasPermissions } from 'src/components/permission';
import { hasPermissions } from 'src/utils/permission';
import { AsyncComponentPromise } from 'vue/types/options';
export default defineComponent({

View File

@ -118,7 +118,7 @@ import {
} from '@vue/composition-api';
import { Store } from 'vuex';
import { StateInterface } from 'src/store';
import { hasPermission } from 'src/components/permission';
import { hasPermission } from 'src/utils/permission';
import IsoDateInput from 'src/components/utils/IsoDateInput.vue';
import { Notify } from 'quasar';

View File

@ -71,7 +71,7 @@ import UpdateUser from '../components/UpdateUser.vue';
import NewUser from '../components/NewUser.vue';
import { Store } from 'vuex';
import { StateInterface } from 'src/store';
import { hasPermission } from 'src/components/permission';
import { hasPermission } from 'src/utils/permission';
import { PERMISSIONS } from '../permissions';
import { Screen } from 'quasar';

View File

@ -1,23 +1,14 @@
<template>
<div>
<q-page
padding
class="fit row justify-center content-center items-center q-gutter-sm"
>
<q-page padding class="fit row justify-center content-center items-center q-gutter-sm">
<q-card class="col-12">
<q-card-section
class="fit row justify-start content-center items-center"
>
<q-card-section class="fit row justify-start content-center items-center">
<div class="col-12 text-center text-h6">Benutzereinstellungen</div>
</q-card-section>
<MainUserSettings :user="currentUser" @update:user="updateUser" />
</q-card>
<div class="col-12 text-left text-h6">Aktive Sessions:</div>
<sessions
v-for="(session, index) in sessions"
:key="'session' + index"
:session="session"
/>
<sessions v-for="(session, index) in sessions" :key="'session' + index" :session="session" />
</q-page>
</div>
</template>
@ -29,16 +20,15 @@ import {
onBeforeMount,
ref
} from '@vue/composition-api';
import CircularProgress from 'components/loading/CircularProgress.vue';
import Sessions from '../components/settings/Sessions.vue';
import MainUserSettings from '../components/settings/MainUserSettings.vue';
import { Store } from 'vuex';
import { StateInterface } from 'src/store';
import setLoadingBar from 'components/loading';
import setLoadingBar from 'src/utils/loading';
export default defineComponent({
// name: 'PageName'
components: { CircularProgress, Sessions, MainUserSettings },
components: { Sessions, MainUserSettings },
setup(_, { root }) {
const store = <Store<StateInterface>>root.$store;