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

This commit is contained in:
Dominik 2021-02-03 20:07:49 +01:00
commit e03b2f20ff
11 changed files with 31 additions and 69 deletions

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
public/favicon-256x256.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 967 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 24 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 188 KiB

View File

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

View File

@ -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>

View File

@ -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',

View File

@ -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] },