Merge branch 'frontend/kathy' into develop

This commit is contained in:
Katharina Will 2019-03-27 19:51:39 +01:00
commit 6233d89802
4 changed files with 171 additions and 166 deletions

View File

@ -62,7 +62,7 @@ module.exports = function (ctx) {
'QAvatar', 'QAvatar',
'QSpinnerPuff', 'QSpinnerPuff',
'QExpansionItem', 'QExpansionItem',
'QParallax', 'QParallax'
], ],
directives: [ directives: [

View File

@ -22,7 +22,8 @@
</q-header> </q-header>
<q-drawer <q-drawer
v-model="leftDrawerOpen" side="right"
v-model="rightDrawerOpen"
bordered bordered
show-if-above show-if-above
content-class=""> content-class="">

View File

@ -1,30 +1,18 @@
<template>
<div class="q-pa-md">
<div class="q-gutter-y-md" style="max-width: 1200px">
<q-tabs
v-model="tab"
dense
align="justify"
class="bg-white text-green-8 shadow-2"
:breakpoint="0"
>
<q-tab name="table" icon="mail" />
<q-tab name="map" icon="map" />
</q-tabs>
<template> <template>
<div class="q-pa-md"> <q-card>
<q-tab-panels v-model="tab" animated>
<q-tab-panel name="list">
<q-table <q-table
title="Caches" title="Caches"
:data="data" :data="data"
:columns="columns" :columns="columns"
row-key="name" row-key="name"
selection="single" selection="multiple"
:selected.sync="selected" :selected.sync="selected"
:filter="filter" :filter="filter"
grid grid
hide-header hide-header>
>
<template v-slot:top-right> <template v-slot:top-right>
<q-input borderless dense debounce="300" v-model="filter" placeholder="Search"> <q-input borderless dense debounce="300" v-model="filter" placeholder="Search">
<template v-slot:append> <template v-slot:append>
@ -36,13 +24,13 @@
<template v-slot:item="props"> <template v-slot:item="props">
<div <div
class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3 grid-style-transition" class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3 grid-style-transition"
:style="props.selected ? 'transform: scale(0.95);' : ''"
> >
<q-card :class="props.selected ? 'bg-grey-2' : ''"> <q-expansion-item
expand-separator
:label="props.row.name"
>
<q-card>
<q-card-section> <q-card-section>
<q-checkbox :dense="denseOn" v-model="props.selected" :label="props.row.name" />
</q-card-section>
<q-separator />
<q-list dense> <q-list dense>
<q-item v-for="col in props.cols.filter(col => col.name !== 'desc')" :key="col.name"> <q-item v-for="col in props.cols.filter(col => col.name !== 'desc')" :key="col.name">
<q-item-section> <q-item-section>
@ -53,24 +41,39 @@
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-card-section>
</q-card> </q-card>
</q-expansion-item>
</div> </div>
</template> </template>
</q-table> </q-table>
</div> </q-tab-panel>
</template>
</div> <q-tab-panel name="map">
</div> <img src="https://www.buga2019.de/we-bilder/3.Gartenausstellung/Gelaendeplan/190320_Gelaendeplan-quadratisch.jpg?m=1553094677" />
</q-tab-panel>
</q-tab-panels>
<q-separator />
<q-tabs
v-model="tab"
dense
class="bg-white text-green-8 shadow-2"
align="justify"
narrow-indicator
>
<q-tab name="list" icon="list" />
<q-tab name="map" icon="map" />
</q-tabs>
</q-card>
</template> </template>
<script> <script>
export default { export default {
data () { data () {
return { return {
tab: 'mails', tab: 'list',
panel: 'mails',
denseOn: true,
filter: '', filter: '',
selected: [], selected: [],
columns: [ columns: [
@ -131,8 +134,8 @@ export default {
sodium: 413, sodium: 413,
calcium: '3%', calcium: '3%',
iron: '8%' iron: '8%'
}, },
{ {
name: 'Gingerbread', name: 'Gingerbread',
calories: 356, calories: 356,
fat: 16.0, fat: 16.0,
@ -141,8 +144,8 @@ export default {
sodium: 327, sodium: 327,
calcium: '7%', calcium: '7%',
iron: '16%' iron: '16%'
}, },
{ {
name: 'Jelly bean', name: 'Jelly bean',
calories: 375, calories: 375,
fat: 0.0, fat: 0.0,
@ -151,7 +154,7 @@ export default {
sodium: 50, sodium: 50,
calcium: '0%', calcium: '0%',
iron: '0%' iron: '0%'
}, },
{ {
name: 'Lollipop', name: 'Lollipop',
calories: 392, calories: 392,
@ -161,8 +164,8 @@ export default {
sodium: 38, sodium: 38,
calcium: '0%', calcium: '0%',
iron: '2%' iron: '2%'
}, },
{ {
name: 'Honeycomb', name: 'Honeycomb',
calories: 408, calories: 408,
fat: 3.2, fat: 3.2,
@ -171,7 +174,7 @@ export default {
sodium: 562, sodium: 562,
calcium: '0%', calcium: '0%',
iron: '45%' iron: '45%'
}, },
{ {
name: 'Donut', name: 'Donut',
calories: 452, calories: 452,
@ -181,8 +184,8 @@ export default {
sodium: 326, sodium: 326,
calcium: '2%', calcium: '2%',
iron: '22%' iron: '22%'
}, },
{ {
name: 'KitKat', name: 'KitKat',
calories: 518, calories: 518,
fat: 26.0, fat: 26.0,
@ -191,8 +194,8 @@ export default {
sodium: 54, sodium: 54,
calcium: '12%', calcium: '12%',
iron: '6%' iron: '6%'
} }
] ]
} }
} }
} }

View File

@ -5,6 +5,7 @@ const routes = [
children: [{ path: "", component: () => import("pages/Index.vue") }] children: [{ path: "", component: () => import("pages/Index.vue") }]
}, },
{ {
path: "/overview/", path: "/overview/",
component: () => import("layouts/MyLayout.vue"), component: () => import("layouts/MyLayout.vue"),
children: [{ path: "", component: () => import("pages/Overview.vue") }] children: [{ path: "", component: () => import("pages/Overview.vue") }]