Merge branch 'next' of groeger-clan.duckdns.org:newgeruecht-vue into next
Dominik
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 526 B |
|
Before Width: | Height: | Size: 967 B |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 188 KiB |
|
|
@ -141,30 +141,20 @@ module.exports = configure(function(ctx) {
|
||||||
theme_color: '#027be3',
|
theme_color: '#027be3',
|
||||||
icons: [
|
icons: [
|
||||||
{
|
{
|
||||||
src: 'icons/icon-128x128.png',
|
src: 'flaschengeist-logo.svg',
|
||||||
|
sizes: 'any',
|
||||||
|
type: 'image/svg+xml'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
src: 'favicon-128x128.png',
|
||||||
sizes: '128x128',
|
sizes: '128x128',
|
||||||
type: 'image/png'
|
type: 'image/png'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
src: 'icons/icon-192x192.png',
|
src: 'favicon-256x256.png',
|
||||||
sizes: '192x192',
|
|
||||||
type: 'image/png'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: 'icons/icon-256x256.png',
|
|
||||||
sizes: '256x256',
|
sizes: '256x256',
|
||||||
type: 'image/png'
|
type: 'image/png'
|
||||||
},
|
},
|
||||||
{
|
|
||||||
src: 'icons/icon-384x384.png',
|
|
||||||
sizes: '384x384',
|
|
||||||
type: 'image/png'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: 'icons/icon-512x512.png',
|
|
||||||
sizes: '512x512',
|
|
||||||
type: 'image/png'
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -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<% } %>"
|
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
|
<link
|
||||||
rel="icon"
|
rel="apple-touch-icon"
|
||||||
type="image/png"
|
type="image/png"
|
||||||
sizes="128x128"
|
sizes="128x128"
|
||||||
href="icons/favicon-128x128.png"
|
href="favicon-128x128.png"
|
||||||
/>
|
/>
|
||||||
<link
|
<link
|
||||||
rel="icon"
|
rel="apple-touch-icon"
|
||||||
type="image/png"
|
type="image/png"
|
||||||
sizes="32x32"
|
sizes="256x256"
|
||||||
href="icons/favicon-32x32.png"
|
href="favicon-256x256.png"
|
||||||
/>
|
/>
|
||||||
<link rel="icon" type="image/ico" href="favicon.ico" />
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
|
||||||
|
|
@ -116,6 +116,20 @@ export default defineComponent({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
format: (val: Date) => formatDateTime(new Date(val), true, true, 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',
|
name: 'text',
|
||||||
label: 'Text',
|
label: 'Text',
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
title: 'Übersicht',
|
title: 'Übersicht',
|
||||||
icon: 'mdi-cash-plus',
|
icon: 'mdi-cash-check',
|
||||||
path: 'overview',
|
path: 'overview',
|
||||||
name: 'balance-view',
|
name: 'balance-view',
|
||||||
meta: { permissions: [permissions.SHOW] },
|
meta: { permissions: [permissions.SHOW] },
|
||||||
|
|
|
||||||