This commit is contained in:
lesion
2019-06-09 00:45:50 +02:00
parent ccaf53aa24
commit 792bc64ce5
16 changed files with 144 additions and 105 deletions

View File

@@ -44,19 +44,18 @@ export default {
order: event.start_datetime,
}
const day = moment(event.start_datetime).date()
let color = event.past ? 'rgba(200,200,200,0.5)' : get(event, 'tags[0].color') || 'rgba(170,170,250,0.7)'
// let color = event.past ? 'rgba(200,200,200,0.5)' : get(event, 'tags[0].color') || 'rgba(170,170,250,0.7)'
console.error(color)
if (event.multidate) {
e.dates = {
start: event.start_datetime, end: event.end_datetime
}
e.highlight = {
color: sample(['purple', 'red', 'green', 'blue']),
color: sample(['purple', 'yellow', 'orange', 'red', 'green', 'blue']),
}
} else {
e.dates = event.start_datetime
e.dot = { color: sample(['purple', 'red', 'green', 'blue']) }
e.dot = { color: sample(['purple', 'red', 'orange', 'yellow', 'green', 'blue']) }
}
return e
}
@@ -85,11 +84,11 @@ export default {
align-self: center;
}
.vc-highlight {
/* color: red; */
/* .vc-highlight {
color: red;
height: 22px !important;
opacity: 0.4;
border-radius: 15px;
}
} */
</style>

View File

@@ -74,7 +74,7 @@ export default {
img {
width: 100%;
max-height: 200px;
max-height: 250px;
object-fit: cover;
object-position: top;
}
@@ -107,7 +107,7 @@ export default {
}
.date {
font-weight: 300;
font-weight: 400;
font-size: 12px;
font-size: 0.95rem;
color: #ff917a;
@@ -126,7 +126,7 @@ export default {
background: #1B1F21;
display: inline-block;
padding: 2px 10px;
color: rgba(255,255,255,0.7);
color: rgba(255,255,255,0.9);
margin: 1px;
text-align: center;
flex-grow: 1;

View File

@@ -1,24 +1,17 @@
<template lang="pug">
el-menu.d-grid.nav(mode='horizontal' router background-color="#222C32")
el-menu.d-flex.nav(mode='horizontal' router background-color="#222C32")
nuxt-link(to='/about')
el-menu-item(:title="$t('common.info')")
img#logo(src='/favicon.ico')
nuxt-link(to='/login')
el-menu-item(v-if='!$auth.loggedIn' index='/login' :title="$t('common.login')")
el-menu-item(v-if='!$auth.loggedIn' :title="$t('common.login')")
v-icon(color='lightgreen' name='user')
el-menu-item(index='/add' :title="$t('common.add_event')")
v-icon(color='lightgreen' name='plus')
el-menu-item(v-if='$auth.loggedIn' index='/settings' :title="$t('common.settings')")
v-icon(color='orange' name='cog')
el-menu-item(v-if='$auth.user && $auth.user.is_admin' index='/admin' :title="$t('common.admin')")
v-icon(color='lightblue' name='tools')
el-menu-item(index='/export' :title="$t('common.share')")
v-icon(name='share' color='yellow')
el-menu-item(v-if='$auth.loggedIn' @click='logout' :title="$t('common.logout')")
v-icon(color='red' name='sign-out-alt')
nuxt-link(to='/add')
el-menu-item(:title="$t('common.add_event')")
v-icon(color='lightgreen' name='plus')
el-popover(
placement="bottom"
@@ -27,9 +20,20 @@
el-menu-item(slot='reference')
v-icon(color='lightblue' name='search')
el-menu-item.float-right(index='/about' :title="$t('common.info')")
img#logo(src='/favicon.ico')
nuxt-link(to='/settings')
el-menu-item(v-if='$auth.loggedIn' :title="$t('common.settings')")
v-icon(color='orange' name='cog')
nuxt-link(to='/admin')
el-menu-item(v-if='$auth.user && $auth.user.is_admin' :title="$t('common.admin')")
v-icon(color='lightblue' name='tools')
nuxt-link(to='/export')
el-menu-item(:title="$t('common.share')")
v-icon(name='share' color='yellow')
el-menu-item(v-if='$auth.loggedIn' @click='logout' :title="$t('common.logout')")
v-icon(color='red' name='sign-out-alt')
</template>
<script>

View File

@@ -27,7 +27,6 @@ export default {
data () {
return {
onlyMine: false,
withPast: true,
}
},
name :'Search',
@@ -45,7 +44,7 @@ export default {
this.showPastEvents(value)
},
get () {
return this.show_past_events
return this.filters.show_past_events
}
},
filter: {