diff --git a/public/icons/favicon-128x128.png b/public/favicon-128x128.png similarity index 100% rename from public/icons/favicon-128x128.png rename to public/favicon-128x128.png diff --git a/public/favicon-256x256.png b/public/favicon-256x256.png new file mode 100644 index 0000000..2d376be Binary files /dev/null and b/public/favicon-256x256.png differ diff --git a/public/icons/favicon-16x16.png b/public/icons/favicon-16x16.png deleted file mode 100644 index d9ebe95..0000000 Binary files a/public/icons/favicon-16x16.png and /dev/null differ diff --git a/public/icons/favicon-32x32.png b/public/icons/favicon-32x32.png deleted file mode 100644 index b354d29..0000000 Binary files a/public/icons/favicon-32x32.png and /dev/null differ diff --git a/public/icons/favicon-96x96.png b/public/icons/favicon-96x96.png deleted file mode 100644 index 3db0650..0000000 Binary files a/public/icons/favicon-96x96.png and /dev/null differ diff --git a/public/logo-dark.svg b/public/logo-dark.svg deleted file mode 100644 index 378851d..0000000 --- a/public/logo-dark.svg +++ /dev/null @@ -1,40 +0,0 @@ - -image/svg+xml diff --git a/public/logo.svg b/public/logo.svg deleted file mode 100644 index ef3dda6..0000000 --- a/public/logo.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/quasar.conf.js b/quasar.conf.js index a807702..89f5b29 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -141,30 +141,20 @@ module.exports = configure(function(ctx) { theme_color: '#027be3', icons: [ { - src: 'icons/icon-128x128.png', + src: 'flaschengeist-logo.svg', + sizes: 'any', + type: 'image/svg+xml' + }, + { + src: 'favicon-128x128.png', sizes: '128x128', type: 'image/png' }, { - src: 'icons/icon-192x192.png', - sizes: '192x192', - type: 'image/png' - }, - { - src: 'icons/icon-256x256.png', + src: 'favicon-256x256.png', sizes: '256x256', type: 'image/png' }, - { - src: 'icons/icon-384x384.png', - sizes: '384x384', - type: 'image/png' - }, - { - src: 'icons/icon-512x512.png', - sizes: '512x512', - type: 'image/png' - } ] } }, diff --git a/src/index.template.html b/src/index.template.html index 576b093..aa31bff 100644 --- a/src/index.template.html +++ b/src/index.template.html @@ -12,19 +12,20 @@ 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<% } %>" /> + + - + rel="apple-touch-icon" + type="image/png" + sizes="256x256" + href="favicon-256x256.png" + /> diff --git a/src/plugins/balance/pages/Overview.vue b/src/plugins/balance/pages/Overview.vue index 50aba60..e88c78c 100644 --- a/src/plugins/balance/pages/Overview.vue +++ b/src/plugins/balance/pages/Overview.vue @@ -116,6 +116,20 @@ export default defineComponent({ sortable: true, format: (val: Date) => formatDateTime(new Date(val), true, true, true) }, + { + name: 'type', + label: 'Type', + format: (_: undefined, row: FG.Transaction) => { + if (row.sender_id == null) return 'Gutschrift'; + else { + if (row.receiver_id == null) return 'Angeschrieben'; + else { + if (row.receiver_id === store.state.user.currentUser?.userid) return 'Bekommen von X'; + else return 'Gesendet an X'; + } + } + } + }, { name: 'text', label: 'Text', diff --git a/src/plugins/balance/routes/index.ts b/src/plugins/balance/routes/index.ts index 358c7b0..30f5cd7 100644 --- a/src/plugins/balance/routes/index.ts +++ b/src/plugins/balance/routes/index.ts @@ -12,7 +12,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ children: [ { title: 'Übersicht', - icon: 'mdi-cash-plus', + icon: 'mdi-cash-check', path: 'overview', name: 'balance-view', meta: { permissions: [permissions.SHOW] },