encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
les
2020-10-28 01:30:37 +01:00
parent 344578103a
commit 8d83ec0358
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nuxt.config.js
View File

@@ -24,12 +24,12 @@ module.exports = {
** Global CSS ** Global CSS
*/ */
css: [ css: [
'@mdi/font/css/materialdesignicons.css' '@mdi/font/css/materialdesignicons.css',
'@/assets/style.less'
// 'bootstrap/dist/css/bootstrap.min.css', // 'bootstrap/dist/css/bootstrap.min.css',
// 'element-ui/lib/theme-chalk/index.css', // 'element-ui/lib/theme-chalk/index.css',
// 'element-ui/lib/theme-chalk/display.css', // 'element-ui/lib/theme-chalk/display.css',
// '@/assets/theme/index.css' // '@/assets/theme/index.css'
// '@/assets/style.less'
], ],
/* /*

3
pages/Admin.vue
View File

@@ -28,7 +28,8 @@
v-tab v-tab
v-badge(:value='!!unconfirmedEvents.length' :content='unconfirmedEvents.length') {{$t('common.events')}} v-badge(:value='!!unconfirmedEvents.length' :content='unconfirmedEvents.length') {{$t('common.events')}}
v-tab-item v-tab-item
Events(:unconfirmedEvents='unconfirmedEvents') Events(:unconfirmedEvents='unconfirmedEvents'
@confirmed='id => { unconfirmedEvents = unconfirmedEvents.filter(e => e.id !== id)}')
//- ANNOUNCEMENTS //- ANNOUNCEMENTS
v-tab {{$t('common.announcements')}} v-tab {{$t('common.announcements')}}

3
pages/add/WhereInput.vue
View File

@@ -7,7 +7,7 @@
:hide-no-data="!place._name" :hide-no-data="!place._name"
:search-input.sync="place._name" :search-input.sync="place._name"
persistent-hint persistent-hint
:value="value.place" :value="value.name"
:items="places" :items="places"
item-text='name' item-text='name'
@change='selectPlace') @change='selectPlace')
@@ -42,7 +42,6 @@ export default {
}, },
methods: { methods: {
selectPlace (p) { selectPlace (p) {
console.error(p)
const place = p && this.places.find(place => place.id === p.id) const place = p && this.places.find(place => place.id === p.id)
if (place && place.address) { if (place && place.address) {
this.place.name = p.name this.place.name = p.name

1
pages/add/_edit.vue
View File

@@ -66,7 +66,6 @@
</template> </template>
<script> <script>
import { mapActions, mapState } from 'vuex' import { mapActions, mapState } from 'vuex'
import _ from 'lodash'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import Editor from '@/components/Editor' import Editor from '@/components/Editor'
import List from '@/components/List' import List from '@/components/List'

4
pages/event/eventAdmin.vue
View File

@@ -1,7 +1,7 @@
<template lang='pug'> <template lang='pug'>
div div
v-btn(text color='primary' v-if='event.is_visible' @click='toggle(false)') {{$t(`common.${event.parentId?'skip':'hide'}`)}} v-btn(text color='primary' v-if='event.is_visible' @click='toggle(false)') {{$t(`common.${event.parentId?'skip':'hide'}`)}}
v-btn(text color='primary' v-else @click='toggle(false)') {{$t('common.confirm')}} v-btn(text color='success' v-else @click='toggle(false)') {{$t('common.confirm')}}
v-btn(text color='primary' @click='$router.push(`/add/${event.id}`)') {{$t('common.edit')}} v-btn(text color='primary' @click='$router.push(`/add/${event.id}`)') {{$t('common.edit')}}
v-btn(text color='primary' v-if='!event.parentId' @click='remove(false)') {{$t('common.remove')}} v-btn(text color='primary' v-if='!event.parentId' @click='remove(false)') {{$t('common.remove')}}
@@ -41,7 +41,7 @@ export default {
const is_visible = parent ? this.event.parent.is_visible : this.event.is_visible const is_visible = parent ? this.event.parent.is_visible : this.event.is_visible
const method = is_visible ? 'unconfirm' : 'confirm' const method = is_visible ? 'unconfirm' : 'confirm'
try { try {
await this.$axios.$get(`/event/${method}/${id}`) await this.$axios.$put(`/event/${method}/${id}`)
if (parent) { if (parent) {
this.event.parent.is_visible = !is_visible this.event.parent.is_visible = !is_visible
} else { } else {

4
server/api/index.js
View File

@@ -108,8 +108,8 @@ api.post('/settings', isAdmin, settingsController.setRequest)
api.post('/settings/logo', isAdmin, multer({ dest: config.upload_path }).single('logo'), settingsController.setLogo) api.post('/settings/logo', isAdmin, multer({ dest: config.upload_path }).single('logo'), settingsController.setLogo)
// confirm event // confirm event
api.get('/event/confirm/:event_id', hasPerm('event:write'), eventController.confirm) api.put('/event/confirm/:event_id', hasPerm('event:write'), eventController.confirm)
api.get('/event/unconfirm/:event_id', hasPerm('event:write'), eventController.unconfirm) api.put('/event/unconfirm/:event_id', hasPerm('event:write'), eventController.unconfirm)
// import event // import event