This commit is contained in:
lesion
2019-07-11 22:29:18 +02:00
parent cc3134124c
commit dc673b1f5b
8 changed files with 22 additions and 18 deletions

View File

@@ -29,7 +29,6 @@ import Calendar from '@/components/Calendar'
export default {
name: 'Home',
head () {
console.error(this.settings)
return {
title: this.settings.title,
meta: [
@@ -38,7 +37,7 @@ export default {
{ hid: 'og-description', name: 'og:description', content: this.settings.description },
{ hid: 'og-title', property: 'og:title', content: this.settings.title },
{ hid: 'og-url', property: 'og:url', content: this.settings.baseurl },
// { property: 'og:image', content: this.settings.baseurl }
{ property: 'og:image', content: this.settings.baseurl + '/favicon.ico' }
]
}
},

View File

@@ -60,6 +60,7 @@ export default {
<style lang='less'>
#list {
max-width: 500px;
margin: 0 auto;
.el-timeline {
padding-left: 5px;

View File

@@ -1,5 +1,5 @@
<template lang="pug">
el-menu.d-flex.nav(mode='horizontal' router background-color="#222C32")
el-menu.d-flex.nav(mode='horizontal' background-color="#222C32")
nuxt-link(to='/about')
el-menu-item(:title="$t('common.info')")
@@ -33,8 +33,9 @@
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')
nuxt-link(to='#')
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

@@ -40,18 +40,18 @@
"axios": "^0.19.0",
"bcryptjs": "^2.4.3",
"body-parser": "^1.18.3",
"bootstrap": "4.3.1",
"bootstrap": "^4.3.1",
"config": "^3.1.0",
"consola": "^2.9.0",
"cookie-parser": "^1.4.4",
"cors": "^2.8.5",
"cross-env": "^5.2.0",
"dayjs": "^1.8.14",
"dayjs": "^1.8.15",
"element-ui": "^2.9.1",
"email-templates": "^6.0.0",
"express": "^4.17.1",
"express-jwt": "^5.3.1",
"ics": "^2.13.2",
"ics": "^2.15.1",
"inquirer": "^6.3.1",
"jsonwebtoken": "^8.5.1",
"less": "^3.9.0",
@@ -71,14 +71,14 @@
"yargs": "^13.2.4"
},
"devDependencies": {
"@nuxtjs/eslint-config": "^0.0.1",
"@nuxtjs/eslint-config": "^1.0.1",
"babel-eslint": "^10.0.1",
"eslint": "^5.15.1",
"eslint-config-prettier": "^5.0.0",
"eslint": "^6.0.1",
"eslint-config-prettier": "^6.0.0",
"eslint-config-standard": ">=12.0.0",
"eslint-loader": "^2.1.2",
"eslint-loader": "^2.2.1",
"eslint-plugin-import": ">=2.17.3",
"eslint-plugin-jest": ">=22.6.4",
"eslint-plugin-jest": ">=22.7.2",
"eslint-plugin-node": ">=9.1.0",
"eslint-plugin-nuxt": ">=0.4.2",
"eslint-plugin-prettier": "^3.1.0",

View File

@@ -25,7 +25,6 @@
default-first-option
)
el-option(v-for='place in places' :label='place.name' :value='place.name' :key='place.id')
span {{place.name}}
div {{$t("common.address")}}
el-input.mb-3(ref='address' v-model='event.place.address'
:disabled='places_name.indexOf(event.place.name)>-1'

View File

@@ -1,6 +1,6 @@
import Vue from 'vue'
import { Button, Select, Tag, Option, Table, FormItem, Card, Row, Col, Upload, Checkbox,
Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect, Badge, ButtonGroup, Divider, Step, Steps,
import { Button, Select, Tag, Option, Table, FormItem, Card, Row, Col, Upload, Checkbox, RadioButton, RadioGroup,
Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect, Badge, ButtonGroup, Divider, Step, Steps, Radio,
TableColumn, ColorPicker, Pagination, Popover, Tooltip, Dialog, Image, Backtop, Collapse, CollapseItem,
Container, Footer, Timeline, TimelineItem, Menu, MenuItem } from 'element-ui'
import locale from 'element-ui/lib/locale'
@@ -13,6 +13,9 @@ const locales = {
export default ({ app, store }) => {
locale.use(locales[store.state.locale])
Vue.use(Button)
Vue.use(RadioButton)
Vue.use(RadioGroup)
Vue.use(Radio)
Vue.use(Collapse)
Vue.use(CollapseItem)
Vue.use(Backtop)

View File

@@ -1,6 +1,5 @@
import Vue from 'vue'
import VCalendar from 'v-calendar'
export default () => {
Vue.use(VCalendar, {
firstDayOfWeek: 2

View File

@@ -3,7 +3,9 @@ p Dove: #{event.place.name} - #{event.place.address}
p Quando: #{datetime(event.start_datetime*1000)}
br
if event.image_path
<img style="width: 100%; max-height: 89vh; margin: 0 auto;" src="#{config.baseurl}/media/#{event.image_path}" />
<center>
<img style="height: 89vh; margin: 0 auto;" src="#{config.baseurl}/media/#{event.image_path}" />
</center>
p #{event.description}
each tag in event.tags