Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next

2021-02-03 20:07:49 +01:00 · 2021-02-03 20:07:49 +01:00 · e03b2f20ff
parent 8dbd6cc5eb 3283d8a862
commit e03b2f20ff
11 changed files with 31 additions and 69 deletions
--- a/public/icons/favicon-128x128.png
+++ b/public/icons/favicon-128x128.png
--- a/public/favicon-256x256.png
+++ b/public/favicon-256x256.png
--- a/public/icons/favicon-16x16.png
+++ b/public/icons/favicon-16x16.png
--- a/public/icons/favicon-32x32.png
+++ b/public/icons/favicon-32x32.png
--- a/public/icons/favicon-96x96.png
+++ b/public/icons/favicon-96x96.png
--- a/public/logo-dark.svg
+++ b/public/logo-dark.svg
--- a/public/logo.svg
+++ b/public/logo.svg
--- 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'
-          }
        ]
      }
    },
--- 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<% } %>"
    />

+    <link rel="icon" type="image/svg+xml" href="flaschengeist-logo.svg">
+    <link rel="alternate icon" type="image/ico" href="favicon.ico" />
    <link
-      rel="icon"
+      rel="apple-touch-icon"
      type="image/png"
      sizes="128x128"
-      href="icons/favicon-128x128.png"
+      href="favicon-128x128.png"
    />
    <link
-      rel="icon"
+    rel="apple-touch-icon"
    type="image/png"
-      sizes="32x32"
-      href="icons/favicon-32x32.png"
+    sizes="256x256"
+    href="favicon-256x256.png"
  />
-    <link rel="icon" type="image/ico" href="favicon.ico" />
  </head>

  <body>
--- 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',
--- 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] },