Commit 87353922 authored by A. Koch's avatar A. Koch

update from master

parents c78783f1 c6868838
......@@ -10,7 +10,7 @@
// TERMINE IM DETAIL
//
q-collapsible(v-for="(date, i) in dates", :ref="getDateLabel(date)", v-if="date.show", opened, style="border-top: 1px solid #333;")
q-collapsible(v-for="(date, i) in dates" :ref="getDateLabel(date)", v-if="date.show", opened, style="border-top: 1px solid #333;")
template(slot="header")
q-item.full-width.q-pl-none
q-item-main
......@@ -24,14 +24,13 @@
<script>
import { DateTime } from 'luxon'
import { mapGetters } from 'vuex'
// import { Portraits, PortraitsPlusPlus, GroupVideoSequences } from '../components/dashboard'
import { Portraits, GroupVideoSequences } from '../components/dashboard'
import { Portraits, PortraitsPlusPlus, GroupVideoSequences } from '../components/dashboard'
import VideoListView from '../components/VideoListView'
export default {
components: {
'dashboard-portraits': Portraits,
// 'dashboard-portraits-plus-plus': PortraitsPlusPlus,
'dashboard-portraits-plus-plus': PortraitsPlusPlus,
'dashboard-group-video-sequences': GroupVideoSequences,
VideoListView
},
......
......@@ -13,18 +13,18 @@ export default ({ Vue }) => {
entries: [],
componentName: 'portraits'
},
// {
// id: 'date_2',
// title: 'dates.date_2.title',
// start: '2018-08-24T00:00:00.000+02:00',
// end: '2018-08-30T23:59:59.000+02:00',
// description: 'dates.date_2.description',
// show: process.env.FEATURE_SEQUENCER || false,
// map_title: 'dates.date_2.map_title',
// map: undefined,
// entries: [],
// componentName: 'portraits-plus-plus'
// },
{
id: 'date_2',
title: 'dates.date_2.title',
start: '2018-08-24T00:00:00.000+02:00',
end: '2018-08-30T23:59:59.000+02:00',
description: 'dates.date_2.description',
show: false,
map_title: 'dates.date_2.map_title',
map: undefined,
entries: [],
componentName: 'portraits-plus-plus'
},
{
id: 'date_3',
title: 'dates.date_3.title',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment