.
This commit is contained in:
lesion
90
.vscode/vscode-kanban.json
vendored
90
.vscode/vscode-kanban.json
vendored
@@ -52,6 +52,24 @@
|
||||
"prio": 0,
|
||||
"references": [],
|
||||
"title": "export lista"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-04-30T12:46:42.208Z",
|
||||
"id": "16",
|
||||
"references": [],
|
||||
"title": "riesco a rimuovere bootstrap-vue e usare solo element ?"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-04-28T09:25:50.701Z",
|
||||
"id": "13",
|
||||
"references": [],
|
||||
"title": "test altra visualizzazione"
|
||||
}
|
||||
],
|
||||
"in-progress": [
|
||||
@@ -123,6 +141,42 @@
|
||||
"title": "risolvere le modali quando il js e' disabilitato",
|
||||
"type": "bug"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-05-27T15:42:35.467Z",
|
||||
"id": "21",
|
||||
"references": [],
|
||||
"title": "all'admin deve mostrare un badge se ci sono pending operation"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-05-27T15:16:22.839Z",
|
||||
"id": "20",
|
||||
"references": [],
|
||||
"title": "check password reset"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-05-27T15:45:39.093Z",
|
||||
"id": "23",
|
||||
"references": [],
|
||||
"title": "colori te prego!"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-05-27T15:45:18.012Z",
|
||||
"id": "22",
|
||||
"references": [],
|
||||
"title": "filtri per luogo!"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
@@ -132,6 +186,24 @@
|
||||
"references": [],
|
||||
"title": "gestione errori quando non c'e' un evento"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-05-02T16:15:07.106Z",
|
||||
"id": "19",
|
||||
"references": [],
|
||||
"title": "modifica eventi multigiorno"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-05-02T11:50:28.476Z",
|
||||
"id": "18",
|
||||
"references": [],
|
||||
"title": "notifiche email / iscrizione / evento da confermare"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
@@ -146,19 +218,19 @@
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-04-27T19:44:33.769Z",
|
||||
"id": "12",
|
||||
"creation_time": "2019-04-30T22:00:29.237Z",
|
||||
"id": "17",
|
||||
"references": [],
|
||||
"title": "rifare il calendario o solo il popup"
|
||||
"title": "porcoddio la config arriva anche al client ovviamente, devo separare!"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-04-28T09:25:50.701Z",
|
||||
"id": "13",
|
||||
"creation_time": "2019-04-27T19:44:33.769Z",
|
||||
"id": "12",
|
||||
"references": [],
|
||||
"title": "test altra visualizzazione"
|
||||
"title": "rifare il calendario o solo il popup"
|
||||
},
|
||||
{
|
||||
"assignedTo": {
|
||||
@@ -187,10 +259,10 @@
|
||||
"assignedTo": {
|
||||
"name": "lesion"
|
||||
},
|
||||
"creation_time": "2019-04-30T12:46:42.208Z",
|
||||
"id": "16",
|
||||
"creation_time": "2019-05-27T20:42:22.581Z",
|
||||
"id": "24",
|
||||
"references": [],
|
||||
"title": "riesco a rimuovere bootstrap-vue e usare solo element ?"
|
||||
"title": "copy to clipboard"
|
||||
}
|
||||
]
|
||||
}
|
||||
30
README.md
30
README.md
@@ -1,22 +1,34 @@
|
||||
# gancio
|
||||
## gancio
|
||||
### event manager for radical communities
|
||||
|
||||
> My well-made Nuxt.js project
|
||||
> :warning: Gancio is under heavy development,
|
||||
> if something is not working as expected, it's expected :D
|
||||
|
||||
## Build Setup
|
||||
|
||||
## Install
|
||||
``` bash
|
||||
# install dependencies
|
||||
$ yarn install
|
||||
|
||||
# serve with hot reload at localhost:3000
|
||||
$ yarn run dev
|
||||
|
||||
# build for production and launch server
|
||||
$ yarn run build
|
||||
$ yarn build
|
||||
$ yarn start
|
||||
|
||||
# generate static project
|
||||
$ yarn run generate
|
||||
```
|
||||
|
||||
##### nginx setup
|
||||
https://nuxtjs.org/faq/nginx-proxy
|
||||
|
||||
For detailed explanation on how things work, checkout [Nuxt.js docs](https://nuxtjs.org).
|
||||
|
||||
|
||||
## Hacking
|
||||
|
||||
``` bash
|
||||
$ yarn dev
|
||||
|
||||
```
|
||||
|
||||
#### Add a new icon
|
||||
|
||||
plugin/vue-awesome.js
|
||||
|
||||
55
assets/style.less
Normal file
55
assets/style.less
Normal file
@@ -0,0 +1,55 @@
|
||||
html, body {
|
||||
margin: 0px;
|
||||
background-color: #222C32 !important;
|
||||
width: 100%;
|
||||
overflow-x: hidden;
|
||||
box-sizing: border-box;
|
||||
font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif !important;
|
||||
}
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.el-dialog {
|
||||
margin-top: 0px !important;
|
||||
border-radius: 0px;
|
||||
width: 100%;
|
||||
|
||||
.el-dialog__body {
|
||||
word-break: break-word;
|
||||
}
|
||||
}
|
||||
|
||||
.el-select-dropdown {
|
||||
max-width: 100%;
|
||||
left: 0px;
|
||||
}
|
||||
|
||||
.page-enter-active, .page-leave-active {
|
||||
transition: opacity .2s, transform .3s;
|
||||
}
|
||||
.page-enter, .page-leave-active {
|
||||
transition: opacity .3s, transform .2s;
|
||||
opacity: 0;
|
||||
// transform: translateY(30px);
|
||||
}
|
||||
|
||||
pre {
|
||||
font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif !important;
|
||||
margin-bottom: 0px;
|
||||
white-space: pre-line;
|
||||
font-family: unset;
|
||||
}
|
||||
|
||||
.el-popover {
|
||||
word-break: normal;
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 768px) {
|
||||
.el-dialog {
|
||||
margin-top: 10vh !important;
|
||||
width: 700px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
}
|
||||
@@ -1,37 +1,29 @@
|
||||
<template lang="pug">
|
||||
v-calendar#calendar.card(
|
||||
#calendar
|
||||
v-calendar(
|
||||
title-position='left'
|
||||
locale='it'
|
||||
is-dark
|
||||
show-caps
|
||||
:attributes='attributes'
|
||||
:from-page.sync='page'
|
||||
is-expanded is-inline)
|
||||
div(slot='popover', slot-scope='{ customData, attributes }')
|
||||
p {{attributes}}
|
||||
//- router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}}
|
||||
//- div(v-if='customData.days && customData.days[selectedEvent]')
|
||||
p {{customData.days[customData.selectedEvent].title}}
|
||||
p {{customData.days[customData.selectedEvent].tags}}
|
||||
el-button(@click='customData.selectedEvent=customData.selectedEvent+1') {{customData.selectedEvent}}/{{customData.days.length}}
|
||||
v-icon(name='clock' @click='customData.selectedEvent=customData.selectedEvent+1')
|
||||
//- @{{customData.place.name}}
|
||||
is-expanded
|
||||
show-clear-margin
|
||||
is-inline
|
||||
@dayclick='click')
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapActions } from 'vuex'
|
||||
import { mapState, mapActions, mapGetters } from 'vuex'
|
||||
import moment from 'dayjs'
|
||||
import { intersection } from 'lodash'
|
||||
|
||||
export default {
|
||||
name: 'Calendar',
|
||||
// filters,
|
||||
data () {
|
||||
const month = moment().month()+1
|
||||
const year = moment().year()
|
||||
return {
|
||||
page: { month, year},
|
||||
selectedEvent: {},
|
||||
daysWithEvents: {}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -42,8 +34,9 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['updateEvents']),
|
||||
nextEvent () {
|
||||
|
||||
click (day) {
|
||||
const element = document.getElementById(day.day)
|
||||
if (element) element.scrollIntoView(); //Even IE6 supports this
|
||||
},
|
||||
eventToAttribute(event) {
|
||||
let e = {
|
||||
@@ -52,18 +45,6 @@ export default {
|
||||
order: event.start_datetime,
|
||||
}
|
||||
const day = moment(event.start_datetime).date()
|
||||
if (!this.daysWithEvents[day]) {
|
||||
this.daysWithEvents[day] = []
|
||||
e.popover = {
|
||||
slot: 'popover',
|
||||
visibility: 'hover',
|
||||
isInteractive: true,
|
||||
hideIndicator: true,
|
||||
}
|
||||
e.customData.days = this.daysWithEvents[day]
|
||||
}
|
||||
this.daysWithEvents[day].push({title: event.title, when: event.start_datetime, tags: event.tags })
|
||||
|
||||
let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
|
||||
if (event.past) color = 'rgba(200,200,200,0.5)'
|
||||
if (event.multidate) {
|
||||
@@ -71,7 +52,7 @@ export default {
|
||||
start: event.start_datetime, end: event.end_datetime
|
||||
}
|
||||
e.highlight = { backgroundColor: color,
|
||||
borderColor: 'transparent',
|
||||
// borderColor: 'transparent',
|
||||
borderWidth: '4px' }
|
||||
} else {
|
||||
e.dates = event.start_datetime
|
||||
@@ -81,17 +62,13 @@ export default {
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
filteredEvents () {
|
||||
return this.$store.getters.filteredEvents
|
||||
},
|
||||
...mapState(['events', 'filters']),
|
||||
...mapGetters(['filteredEvents']),
|
||||
attributes () {
|
||||
return [
|
||||
{ key: 'today', dates: new Date(),
|
||||
highlight: {
|
||||
backgroundColor: '#aaffaa'
|
||||
},
|
||||
popover: {label: this.$t('common.today')}
|
||||
},
|
||||
...this.filteredEvents.map(this.eventToAttribute)
|
||||
]
|
||||
@@ -102,11 +79,9 @@ export default {
|
||||
|
||||
<style>
|
||||
#calendar {
|
||||
margin-bottom: 0em;
|
||||
margin-top: 0.3em;
|
||||
margin: 0 auto;
|
||||
max-width: 500px;
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
#calendar a {
|
||||
color: blue;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,65 +1,139 @@
|
||||
<template lang="pug">
|
||||
nuxt-link(:to='`/event/${event.id}`')
|
||||
//- @click='$router.push("/event/" + event.id)'
|
||||
b-card(bg-variant='dark' text-variant='white' :class="{ withImg: event.image_path ? true : false }"
|
||||
:img-src='imgPath')
|
||||
strong {{event.title}}
|
||||
div <v-icon name='clock'/> {{event.start_datetime|datetime}}
|
||||
span <v-icon name='map-marker-alt'/> {{event.place.name}}
|
||||
br
|
||||
el-tag.mr-1(:color='tag.color' v-for='tag in event.tags' :key='tag.tag'
|
||||
size='small' @click.stop='addSearchTag(tag)') {{tag.tag}}
|
||||
nuxt-link.event(:to='`event/${event.id}`' :class='{ withImg: event.image_path }')
|
||||
//- image
|
||||
img(v-if='showImage && event.image_path' :src='`/media/thumb/${event.image_path}`')
|
||||
|
||||
.event-info
|
||||
.content-info
|
||||
|
||||
//- title
|
||||
h2 {{event.title}}
|
||||
|
||||
//- date / place
|
||||
.date
|
||||
div {{event|event_when}}
|
||||
div {{event.place.name}}
|
||||
|
||||
//- p(v-if='showDescription') {{event.description}}
|
||||
|
||||
//- div(v-if='event.comments && event.comments.length')
|
||||
//- v-icon(name='comments' color='dark')
|
||||
//- span {{event.comments.length}} {{$t('common.comments')}}
|
||||
|
||||
ul.tags(v-if='showTags && event.tags')
|
||||
li(v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapActions } from 'vuex'
|
||||
// import api from '@/server/api'
|
||||
// import filters from '@/filters'
|
||||
|
||||
export default {
|
||||
props: ['event'],
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
imgPath() {
|
||||
return this.event.image_path && '/media/thumb/' + this.event.image_path
|
||||
props: {
|
||||
event: Object,
|
||||
showTags: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
mine() {
|
||||
return this.event.userId === this.user.id
|
||||
showImage: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
showDescription: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
selected: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
// filters: {
|
||||
// datetime: this.datetime
|
||||
// },
|
||||
methods: {
|
||||
...mapActions(['delEvent', 'addSearchTag']),
|
||||
async remove() {
|
||||
// await api.delEvent(this.event.id)
|
||||
// this.delEvent(this.event.id)
|
||||
computed: {
|
||||
date () {
|
||||
return new Date(this.event.start_datetime).getDate()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
/* .card::before {
|
||||
border-top: 4px solid black;
|
||||
content: ''
|
||||
} */
|
||||
<style lang='less'>
|
||||
|
||||
.el-card {
|
||||
border: none;
|
||||
@media only screen and (min-width: 574px) {
|
||||
.event {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
.event {
|
||||
padding: 3px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
// height: 100%;
|
||||
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
max-height: 200px;
|
||||
object-fit: cover;
|
||||
object-position: top;
|
||||
}
|
||||
|
||||
.event-info {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
background-color: #222;
|
||||
|
||||
}
|
||||
|
||||
.content-info {
|
||||
font-size: 12px;
|
||||
font-size: 0.8em;
|
||||
padding: 0.8em 1em;
|
||||
max-height: 200px;
|
||||
color: rgb(255, 122, 204);
|
||||
|
||||
h2 {
|
||||
color: yellow;
|
||||
font-size: 16px;
|
||||
font-size: 1.1rem;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
p {
|
||||
max-height: 92px;
|
||||
overflow: hidden;
|
||||
color: white;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
.date {
|
||||
font-weight: 800;
|
||||
font-size: 16px;
|
||||
font-size: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.tags {
|
||||
font-size: 12px;
|
||||
padding: 1px;
|
||||
margin-bottom: 0;
|
||||
display:flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
|
||||
li {
|
||||
background: #40484D;
|
||||
display: inline-block;
|
||||
padding: 2px 10px;
|
||||
color: rgba(255,255,255,0.7);
|
||||
margin: 1px;
|
||||
text-align: center;
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.el-card img {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.card-columns .card {
|
||||
margin-top: 0.2em;
|
||||
margin-bottom: 0em;
|
||||
}
|
||||
|
||||
.card-img {
|
||||
height: 180px;
|
||||
|
||||
object-fit: cover;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,108 +1,40 @@
|
||||
<template lang="pug">
|
||||
div(v-loading='loading')
|
||||
magic-grid(:animate="true" useMin :gap=5 :maxCols=4
|
||||
:maxColWidth='400' ref='magicgrid')
|
||||
div.mt-1.item
|
||||
//- Search#search
|
||||
no-ssr
|
||||
Calendar
|
||||
Event.item.mt-1(v-for='event in events'
|
||||
:key='event.id'
|
||||
:event='event')
|
||||
section
|
||||
|
||||
.row.m-0
|
||||
no-ssr
|
||||
Calendar.col-sm-12.col-lg-8.col-xl-6
|
||||
.p-0.col-sm-6.col-lg-4.col-xl-3(v-for='event in filteredEvents')
|
||||
a(:id='event.newDay' v-if='event.newDay')
|
||||
.d-block.d-sm-none
|
||||
el-divider {{event.start_datetime|day}}
|
||||
Event(
|
||||
:id='event.start_datetime'
|
||||
:key='event.id'
|
||||
:event='event'
|
||||
)
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapState, mapActions } from 'vuex'
|
||||
import axios from 'axios'
|
||||
// import filters from '@/filters.js'
|
||||
import { mapGetters } from 'vuex'
|
||||
import Event from '@/components/Event'
|
||||
import Calendar from '@/components/Calendar'
|
||||
// import { intersection } from 'lodash'
|
||||
// import moment from 'dayjs'
|
||||
// import Search from '@/components/Search'
|
||||
import Search from '@/components/Search'
|
||||
|
||||
export default {
|
||||
name: 'Home',
|
||||
data () {
|
||||
return { loading: true }
|
||||
return { }
|
||||
},
|
||||
// created () {
|
||||
// const now = new Date()
|
||||
// const page = { month: now.getMonth() - 1, year: now.getFullYear() }
|
||||
// this.updateEvents(page)
|
||||
// },
|
||||
components: { Event, Calendar }, // , Calendar, Search },
|
||||
computed: {
|
||||
...mapState(['events', 'filters']),
|
||||
filteredEvents() {
|
||||
return this.events
|
||||
// return this.$store.getters.filteredEvents
|
||||
.filter(e => !e.past)
|
||||
.sort((a, b) => a.start_datetime > b.start_datetime)
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
this.loading = false
|
||||
},
|
||||
methods: mapActions(['updateEvents']),
|
||||
watch: {
|
||||
filteredEvents() {
|
||||
this.$nextTick(this.$refs.magicgrid.positionItems)
|
||||
this.loading = false
|
||||
}
|
||||
}
|
||||
components: { Calendar, Event, Search },
|
||||
computed: mapGetters(['filteredEvents']),
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
#search {
|
||||
display: inline-flex;
|
||||
}
|
||||
|
||||
.item {
|
||||
<style lang="less">
|
||||
section {
|
||||
width: 100%;
|
||||
max-width: 400px;
|
||||
margin-top: 4px;
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
max-width: 1500px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.card-columns {
|
||||
column-count: 1;
|
||||
column-gap: 0.2em;
|
||||
}
|
||||
@media (min-width: 576px) {
|
||||
.container {
|
||||
max-width: none;
|
||||
}
|
||||
.card-columns {
|
||||
column-count: 2;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 950px) {
|
||||
.container {
|
||||
max-width: 1400px;
|
||||
}
|
||||
.card-columns {
|
||||
column-count: 3;
|
||||
}
|
||||
}
|
||||
|
||||
/* .item {
|
||||
transition: all .2s;
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
} */
|
||||
/* .list-enter, .list-leave-to {
|
||||
opacity: 0;
|
||||
transform: translateY(30px);
|
||||
}
|
||||
.list-leave-active {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
width: 0px;
|
||||
left: 0px;
|
||||
height: 0px;
|
||||
z-index: -10;
|
||||
} */
|
||||
</style>
|
||||
|
||||
@@ -1,34 +1,83 @@
|
||||
<template lang="pug">
|
||||
div#gancio-widget
|
||||
//- el-card.mb-1(no-body header='Eventi')
|
||||
//- b-list-group#list(flush)
|
||||
p minimal {{minimal}}
|
||||
ul
|
||||
li.flex-column.align-items-start(v-for="event in events" :key='event.id'
|
||||
:to='`/event/${event.id}`' target='_parent')
|
||||
img(v-if='event.image_path' slot="aside" :src="`http://localhost:3000/media/${event.image_path}`" alt="Meia Aside" style='max-height: 60px')
|
||||
strong.mb-1 {{event.title}}
|
||||
br
|
||||
small.float-right {{event.place.name}}
|
||||
//- el-tag.mr-1(v-if='showtags' :color='tag.color || "rgba(64,158,255,.1)"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
|
||||
div#list
|
||||
el-divider {{title}}
|
||||
el-timeline
|
||||
el-timeline-item(
|
||||
v-for='event in events'
|
||||
:key='event.id'
|
||||
:timestamp='event|event_when'
|
||||
placement='top' icon='el-icon-arrow-down' size='large'
|
||||
)
|
||||
|
||||
div.float-right
|
||||
small @{{event.place.name}}
|
||||
|
||||
a(:href='"/event/" + event.id' target='_blank') {{event.title}}
|
||||
hr
|
||||
</template>
|
||||
<script>
|
||||
import axios from 'axios'
|
||||
import { mapGetters } from 'vuex'
|
||||
const { SHARED_CONF } = require('@/config')
|
||||
|
||||
export default {
|
||||
name: 'List',
|
||||
data () {
|
||||
return {
|
||||
events: []
|
||||
}
|
||||
return { SHARED_CONF }
|
||||
},
|
||||
props: {
|
||||
title: {
|
||||
type: String,
|
||||
default: SHARED_CONF.title
|
||||
},
|
||||
events: {
|
||||
type: Array,
|
||||
default: () => {
|
||||
return []
|
||||
}
|
||||
},
|
||||
maxEvents: {
|
||||
type: Number,
|
||||
default: 0
|
||||
},
|
||||
minimal: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
showTags: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
showImage: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
showDescription: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
async mounted () {
|
||||
this.events = (await axios.get('http://localhost:3000/api/export/json')).data
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
<style lang='less'>
|
||||
#list {
|
||||
max-width: 500px;
|
||||
|
||||
.el-timeline {
|
||||
padding-left: 5px;
|
||||
|
||||
hr {
|
||||
margin-top: 4px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.el-timeline-item {
|
||||
padding-bottom: 1px;
|
||||
}
|
||||
|
||||
.el-timeline-item__timestamp {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,51 +1,59 @@
|
||||
<template lang="pug">
|
||||
b-navbar(type="dark" variant="dark" toggleable='md')
|
||||
b-navbar-toggle(target='nav_collapse')
|
||||
b-navbar-brand(to='/') <img id='logo' src='gancio_logo.svg'/>
|
||||
b-collapse#nav_collapse(is-nav)
|
||||
b-navbar-nav
|
||||
b-nav-item(v-if='!$auth.loggedIn' to='/login' v-b-tooltip :title='$t("common.login")') <v-icon color='lightgreen' name='lock' />
|
||||
span.d-md-none {{$t('common.login')}}
|
||||
b-nav-item(to='/add' v-b-tooltip :title='$t("common.add_event")' ) <v-icon color='lightgreen' name='plus'/>
|
||||
span.d-md-none {{$t('common.add_event')}}
|
||||
b-nav-item(v-if='$auth.loggedIn' to='/settings' v-b-tooltip :title='$t("common.settings")') <v-icon color='orange' name='cog'/>
|
||||
span.d-md-none {{$t('common.settings')}}
|
||||
b-nav-item(v-if='$auth.user && $auth.user.is_admin' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
|
||||
span.d-md-none {{$t('common.admin')}}
|
||||
b-nav-item(to='/export' v-b-tooltip :title='$t("common.export")') <v-icon name='file-export' color='yellow'/>
|
||||
span.d-md-none {{$t('common.export')}}
|
||||
b-nav-item(v-if='$auth.loggedIn' @click='logout' v-b-tooltip :title='$t("common.logout")') <v-icon color='red' name='sign-out-alt'/>
|
||||
span.d-md-none {{$t('common.logout')}}
|
||||
b-nav-item
|
||||
b-navbar-nav.ml-auto
|
||||
b-nav-item(to='/about')
|
||||
span {{$t('common.info')}} <v-icon color='#ff9fc4' name='question-circle'/>
|
||||
el-menu.d-grid.nav(mode='horizontal' router background-color="#222C32")
|
||||
|
||||
el-menu-item(v-if='!$auth.loggedIn' index='/login' :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')
|
||||
|
||||
el-popover(
|
||||
placement="bottom"
|
||||
trigger="click")
|
||||
Search
|
||||
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')
|
||||
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import {mapState, mapActions} from 'vuex'
|
||||
import { Message } from 'element-ui'
|
||||
import Search from '@/components/Search'
|
||||
|
||||
export default {
|
||||
name: 'Nav',
|
||||
computed: {
|
||||
...mapState(['filters']),
|
||||
filters_tags: {
|
||||
set (value) {
|
||||
this.setSearchTags(value)
|
||||
},
|
||||
get () {
|
||||
return this.filters.tags
|
||||
}
|
||||
},
|
||||
filters_places: {
|
||||
set (value) {
|
||||
this.setSearchPlaces(value)
|
||||
},
|
||||
get () {
|
||||
return this.filters.places
|
||||
}
|
||||
},
|
||||
},
|
||||
methods: mapActions(['logout']),
|
||||
components: { Search },
|
||||
methods: {
|
||||
logout () {
|
||||
Message({
|
||||
message: this.$t('common.logout_ok'),
|
||||
type: 'success'
|
||||
})
|
||||
this.$auth.logout()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
.el-menu.el-menu--horizontal {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@@ -1,23 +1,64 @@
|
||||
<template lang="pug">
|
||||
div
|
||||
el-select.mr-1(v-model='filters_places' multiple filterable collapse-tags
|
||||
default-first-option :placeholder='$t("Where")')
|
||||
el-option(v-for='place in places' :value='place.name'
|
||||
:label='place.name' :key='place.id')
|
||||
el-select(v-model='filters_tags' multiple filterable collapse-tags
|
||||
default-first-option :placeholder='$t("Tags")')
|
||||
el-option(v-for='tag in tags' :key='tag.tag'
|
||||
:label='tag.tag' :value='tag.tag')
|
||||
div.ml-2.mt-1
|
||||
el-switch.mb-1(v-if='$auth.loggedIn'
|
||||
active-text='solo miei'
|
||||
inactive-text='tutti'
|
||||
inactive-color='lightgreen'
|
||||
v-model='onlyMine'
|
||||
)
|
||||
el-switch.mt-1.mb-1.ml-2.d-block(
|
||||
inactive-text='futuri'
|
||||
active-text='anche passati'
|
||||
inactive-color='lightgreen'
|
||||
v-model='showPast'
|
||||
)
|
||||
|
||||
el-select.search(v-model='filter' multiple
|
||||
filterable collapse-tags default-first-option
|
||||
:placeholder='$t("common.search")')
|
||||
el-option(v-for='(keyword, id) in keywords' :key='keyword.value'
|
||||
:label='keyword.label' :value='keyword.value')
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapState, mapActions} from 'vuex'
|
||||
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
onlyMine: false,
|
||||
withPast: true,
|
||||
}
|
||||
},
|
||||
name :'Search',
|
||||
methods: mapActions(['setSearchPlaces', 'setSearchTags']),
|
||||
methods: mapActions(['setSearchPlaces', 'setSearchTags', 'showPastEvents']),
|
||||
computed: {
|
||||
...mapState(['tags', 'places', 'filters']),
|
||||
...mapState(['tags', 'places', 'filters', 'show_past_events']),
|
||||
keywords () {
|
||||
const tags = this.tags.map( t => ({ value: 't' + t.tag, label: t.tag, count: +t.eventsCount }))
|
||||
const places = this.places.map( p => ({ value: 'p' + p.id, label: p.name, count: +p.eventsCount }))
|
||||
return tags.concat(places)
|
||||
},
|
||||
showPast : {
|
||||
set (value) {
|
||||
this.showPastEvents(value)
|
||||
},
|
||||
get () {
|
||||
return this.show_past_events
|
||||
}
|
||||
},
|
||||
filter: {
|
||||
set (filters) {
|
||||
const tags = filters.filter(f => f[0] === 't').map(t => t.slice(1))
|
||||
this.setSearchTags(tags)
|
||||
const places = filters.filter(f => f[0] === 'p').map(p => +p.slice(1))
|
||||
this.setSearchPlaces(places)
|
||||
},
|
||||
get () {
|
||||
return this.filters.tags.map(t => 't' + t).concat(this.filters.places.map(p => 'p' + p))
|
||||
}
|
||||
},
|
||||
filters_tags: {
|
||||
set (value) {
|
||||
this.setSearchTags(value)
|
||||
@@ -37,3 +78,5 @@ export default {
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="less">
|
||||
</style>
|
||||
|
||||
@@ -1,71 +1,6 @@
|
||||
<template lang='pug'>
|
||||
#app
|
||||
Nav
|
||||
Home
|
||||
transition(name="fade" mode="out-in")
|
||||
nuxt
|
||||
<template>
|
||||
<nuxt/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Home from '~/components/Home.vue'
|
||||
import Nav from '~/components/Nav.vue'
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
components: { Nav, Home },
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
#logo {
|
||||
max-height: 40px;
|
||||
}
|
||||
|
||||
.navbar-brand {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
#search,
|
||||
#search ul {
|
||||
align-items: baseline;
|
||||
}
|
||||
|
||||
html, body {
|
||||
scrollbar-face-color: #313543;
|
||||
scrollbar-track-color: rgba(0, 0, 0, 0.1);
|
||||
font-family: Lato,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
|
||||
color: #2c3e50;
|
||||
background: black;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar {
|
||||
width: 7px;
|
||||
height: 7px; }
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #313543;
|
||||
border: 0px none #ffffff;
|
||||
border-radius: 6px; }
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #353a49; }
|
||||
::-webkit-scrollbar-thumb:active {
|
||||
background: #313543; }
|
||||
::-webkit-scrollbar-track {
|
||||
border: 0px none #ffffff;
|
||||
border-radius: 6px;
|
||||
background: rgba(0, 0, 0, 0.1); }
|
||||
::-webkit-scrollbar-track:hover {
|
||||
background: #282c37; }
|
||||
::-webkit-scrollbar-track:active {
|
||||
background: #282c37; }
|
||||
::-webkit-scrollbar-corner {
|
||||
background: transparent; }
|
||||
|
||||
|
||||
/* .column {
|
||||
margin-top: 3px;
|
||||
margin-right: 3px;
|
||||
margin-bottom: 3px;
|
||||
width: 350px;
|
||||
} */
|
||||
|
||||
<style lang="less">
|
||||
@import '../assets/style.less';
|
||||
</style>
|
||||
|
||||
5
locales/email/en.json
Normal file
5
locales/email/en.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"registration_email": "registration_email",
|
||||
"recover_email": "recover_email",
|
||||
"press here": "press here"
|
||||
}
|
||||
5
locales/email/es.json
Normal file
5
locales/email/es.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"registration_email": "registration_email",
|
||||
"recover_email": "recover_email",
|
||||
"press here": "press here"
|
||||
}
|
||||
5
locales/email/it.json
Normal file
5
locales/email/it.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"registration_email": "registration_email",
|
||||
"recover_email": "recover_email",
|
||||
"press here": "press here"
|
||||
}
|
||||
5
locales/email/zh.json
Normal file
5
locales/email/zh.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"registration_email": "registration_email",
|
||||
"recover_email": "recover_email",
|
||||
"press here": "press here"
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
{
|
||||
"common": {
|
||||
"login": "Entra",
|
||||
"email": "Email",
|
||||
"password": "Password",
|
||||
"register": "Registrati",
|
||||
"send": "Invia",
|
||||
"description": "Descrizione",
|
||||
"info": "Info",
|
||||
"add_event": "Aggiungi evento",
|
||||
"export": "Esporta",
|
||||
"settings": "Impostazioni",
|
||||
"admin": "Amministra",
|
||||
"logout": "Esci",
|
||||
"where": "Dove",
|
||||
"when": "Quando",
|
||||
"next": "Avanti",
|
||||
"what": "Cosa",
|
||||
"address": "Indirizzo",
|
||||
"media": "Media",
|
||||
"today": "Oggi",
|
||||
"users": "Utenti",
|
||||
"places": "Posti",
|
||||
"events": "Eventi",
|
||||
"tags": "Etichette",
|
||||
"deactivate": "Disattiva",
|
||||
"activate": "Attiva",
|
||||
"remove_admin": "Rimuovi Admin",
|
||||
"name": "Nome",
|
||||
"save": "Salva",
|
||||
"confirm": "Conferma",
|
||||
"tag": "Etichetta",
|
||||
"color": "Colore",
|
||||
"associate": "Associa",
|
||||
"hide": "Nascondi",
|
||||
"remove": "Elimina",
|
||||
"edit": "Modifica",
|
||||
"actions": "Azioni",
|
||||
"resources": "Risorse",
|
||||
"add": "Aggiungi"
|
||||
},
|
||||
|
||||
"login": {
|
||||
"description": "Entrando puoi pubblicare nuovi eventi.",
|
||||
"not_registered": "Non sei registrata?",
|
||||
"forgot_password": "Ho dimenticato la password",
|
||||
"insert_email": "Inserisci la mail",
|
||||
"check_email": "Controlla la tua casella di posta (anche la cartella spam)",
|
||||
"error": "Errore nel login"
|
||||
},
|
||||
|
||||
"register": {
|
||||
"description": "I movimenti hanno bisogno di organizzarsi e autofinanziarsi. <br/>Questo è un dono per voi, usatelo solo per eventi non commerciali e ovviamente antifascisti, antisessisti, antirazzisti. <br/>Prima di poter pubblicare <strong>dobbiamo approvare l'account</strong>, considera che <strong>dietro questo sito ci sono delle persone</strong> di carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.",
|
||||
"complete": "",
|
||||
"admin_complete": ""
|
||||
},
|
||||
|
||||
"event": {
|
||||
"anon": "",
|
||||
"anon_description": "",
|
||||
"where_description" : "Dov'è il gancio? Se è un luogo fisico, scrivi il suo nome del per esteso (tipo 'Mezcal Squat'), se è una Piazza/Via metti quella (tipo 'Piazza Castello, Torino'). Se trovi già il luogo dell'evento premilo e l'indirizzo verrà autocompletato.",
|
||||
"address_description": "",
|
||||
"tag_description": "Puoi inserire un tag (es. concerto, corteo)",
|
||||
"added": "Avento aggiunto"
|
||||
},
|
||||
|
||||
"admin": {
|
||||
"event_confirm_description": "Qui puoi confermare gli eventi inseriti da utenti non iscritti",
|
||||
"tag_description": "Cambia il colore delle etichette",
|
||||
"place_description": "Modifica l'indirizzo di un posto",
|
||||
"mastodon_description": "Puoi associare un account mastodon a questa istanza di gancio. Tutti gli eventi verranno pubblicati li'",
|
||||
"mastodon_instance": "Istanza mastodon"
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
const pkg = require('./package')
|
||||
const { SHARED_CONF } = require('./config')
|
||||
|
||||
module.exports = {
|
||||
mode: 'universal',
|
||||
@@ -7,11 +7,11 @@ module.exports = {
|
||||
** Headers of the page
|
||||
*/
|
||||
head: {
|
||||
title: pkg.name,
|
||||
title: SHARED_CONF.title,
|
||||
meta: [
|
||||
{ charset: 'utf-8' },
|
||||
{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
|
||||
{ hid: 'description', name: 'description', content: pkg.description }
|
||||
{ hid: 'description', name: 'description', content: SHARED_CONF.description }
|
||||
],
|
||||
link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
|
||||
},
|
||||
@@ -23,27 +23,26 @@ module.exports = {
|
||||
/*
|
||||
** Customize the progress-bar color
|
||||
*/
|
||||
loading: { color: '#fff' },
|
||||
// loading: { color: '#fff' },
|
||||
|
||||
/*
|
||||
** Global CSS
|
||||
*/
|
||||
css: [
|
||||
'element-ui/lib/theme-chalk/index.css',
|
||||
'bootstrap/dist/css/bootstrap.css',
|
||||
'bootstrap-vue/dist/bootstrap-vue.css',
|
||||
'v-calendar/lib/v-calendar.min.css'
|
||||
'element-ui/lib/theme-chalk/index.css',
|
||||
],
|
||||
|
||||
/*
|
||||
** Plugins to load before mounting the App
|
||||
*/
|
||||
plugins: ['@/plugins/element-ui', '@/plugins/filters',
|
||||
'@/plugins/i18n', '@/plugins/bootstrap-vue',
|
||||
'@/plugins/vue-awesome',
|
||||
{ src: '@/plugins/v-calendar', ssr: false },
|
||||
{ src: '@/plugins/vuex-persist.js', ssr: false },
|
||||
'@/plugins/magic-grid'],
|
||||
plugins: [
|
||||
'@/plugins/element-ui', // UI library -> https://element.eleme.io/#/en-US/
|
||||
'@/plugins/filters', // text filters, datetime, etc.
|
||||
'@/plugins/i18n', // localization plugin
|
||||
'@/plugins/vue-awesome', // icon
|
||||
{ src: '@/plugins/v-calendar', ssr: false }, // calendar, TO-REDO
|
||||
'@/plugins/initialize'
|
||||
],
|
||||
|
||||
/*
|
||||
** Nuxt.js modules
|
||||
@@ -57,18 +56,18 @@ module.exports = {
|
||||
** Axios module configuration
|
||||
*/
|
||||
axios: {
|
||||
baseURL: '',
|
||||
baseURL: SHARED_CONF.baseurl + '/api',
|
||||
browserBaseURL: SHARED_CONF.baseurl + '/api',
|
||||
prefix: '/api',
|
||||
credentials: true
|
||||
// credentials: true
|
||||
// See https://github.com/nuxt-community/axios-module#options
|
||||
},
|
||||
|
||||
auth: {
|
||||
strategies: {
|
||||
local: {
|
||||
endpoints: {
|
||||
login: { url: '/auth/login', method: 'post', propertyName: 'token' },
|
||||
logout: { url: '/auth/logout', method: 'post' },
|
||||
logout: false,
|
||||
user: { url: '/auth/user', method: 'get', propertyName: false }
|
||||
},
|
||||
}
|
||||
@@ -80,12 +79,14 @@ module.exports = {
|
||||
** Build configuration
|
||||
*/
|
||||
build: {
|
||||
transpile: [/^element-ui/, /^vue-awesome/, /^vue-magic-grid/, /^vuex-persist/],
|
||||
|
||||
transpile: [/^element-ui/, /^vue-awesome/],
|
||||
splitChunks: {
|
||||
layouts: true
|
||||
}
|
||||
/*
|
||||
** You can extend webpack config here
|
||||
*/
|
||||
extend(config, ctx) {
|
||||
// extend(config, ctx) {
|
||||
// Run ESLint on save
|
||||
// if (ctx.isDev && ctx.isClient) {
|
||||
// config.module.rules.push({
|
||||
@@ -95,6 +96,6 @@ module.exports = {
|
||||
// exclude: /(node_modules)/
|
||||
// })
|
||||
// }
|
||||
}
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
10
package.json
10
package.json
@@ -18,31 +18,33 @@
|
||||
"axios": "^0.18.0",
|
||||
"bcrypt": "^3.0.5",
|
||||
"body-parser": "^1.18.3",
|
||||
"bootstrap-vue": "^2.0.0-rc.16",
|
||||
"bootstrap": "4.3.1",
|
||||
"cookie-parser": "^1.4.4",
|
||||
"cors": "^2.8.5",
|
||||
"cross-env": "^5.2.0",
|
||||
"dayjs": "^1.8.11",
|
||||
"element-ui": "^2.4.11",
|
||||
"element-ui": "^2.8.2",
|
||||
"email-templates": "^5.0.4",
|
||||
"express": "^4.16.4",
|
||||
"express-jwt": "^5.3.1",
|
||||
"ics": "^2.13.2",
|
||||
"js-cookie": "^2.2.0",
|
||||
"jsonwebtoken": "^8.5.1",
|
||||
"less": "^3.9.0",
|
||||
"less-loader": "^5.0.0",
|
||||
"mastodon-api": "^1.3.0",
|
||||
"morgan": "^1.9.1",
|
||||
"multer": "^1.4.1",
|
||||
"nuxt": "^2.4.0",
|
||||
"pg": "^7.10.0",
|
||||
"sequelize": "^5.2.1",
|
||||
"sequelize-cli": "^5.4.0",
|
||||
"sharp": "^0.22.0",
|
||||
"sqlite3": "^4.0.6",
|
||||
"v-calendar": "^0.9.7",
|
||||
"v-calendar": "^1.0.0-beta.10",
|
||||
"vue-awesome": "^3.5.1",
|
||||
"vue-custom-element": "^3.2.6",
|
||||
"vue-i18n": "^8.10.0",
|
||||
"vue-magic-grid": "^0.0.4",
|
||||
"vuex-persist": "^2.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template lang="pug">
|
||||
b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("About")'
|
||||
:visible='true' size='lg')
|
||||
el-dialog(:title='$t("common.info")' visible
|
||||
:before-close='close')
|
||||
h5 Chi siamo
|
||||
p.
|
||||
Gancio e' un progetto dell'<a href='https://autistici.org/underscore'>underscore hacklab</a> e uno dei
|
||||
@@ -18,11 +18,9 @@
|
||||
blockquote.
|
||||
Se vieni a Torino e dici: "ehi, ci diamo un gancio alle 8?" nessuno si presenterà con i guantoni per fare a mazzate.
|
||||
Darsi un gancio vuol dire beccarsi alle ore X in un posto Y
|
||||
p
|
||||
small A: a che ora è il gancio in radio per andare al presidio?
|
||||
p
|
||||
small B: non so ma domani non posso venire, ho gia' un gancio per caricare il bar.
|
||||
|
||||
li A: a che ora è il gancio in radio per andare al presidio?
|
||||
li B: non so ma domani non posso venire, ho gia' un gancio per caricare il bar.
|
||||
br
|
||||
|
||||
h5 Contatti
|
||||
p.
|
||||
@@ -31,4 +29,19 @@
|
||||
<a href='https://git.lattuga.net/cisti/gancio'>qui</a>. Aiuti e suggerimenti sono sempre benvenuti, puoi scriverci
|
||||
su underscore chicciola autistici.org
|
||||
|
||||
</template>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
open: true,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
close (done) {
|
||||
this.$router.replace('/')
|
||||
done()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
<template lang="pug">
|
||||
b-modal(ref='modal' @hidden='$router.replace("/")' size='lg' :visible='true'
|
||||
:title="edit?$t('common.edit_event'):$t('common.add_event')" hide-footer)
|
||||
el-form
|
||||
el-tabs.mb-2(v-model='activeTab' v-loading='sending')
|
||||
el-dialog(:before-close='close' :visible='open' :title="edit?$t('common.edit_event'):$t('common.add_event')")
|
||||
el-form(v-loading='loading')
|
||||
el-tabs.mb-2(v-model='activeTab')
|
||||
|
||||
//- NOT LOGGED EVENT
|
||||
el-tab-pane(v-if='!$auth.loggedIn')
|
||||
@@ -12,19 +11,28 @@
|
||||
|
||||
//- WHERE
|
||||
el-tab-pane
|
||||
span(slot='label') {{$t('common.where')}} <v-icon name='map-marker-alt'/>
|
||||
div {{$t('common.where')}}
|
||||
span(slot='label') <v-icon name='map-marker-alt'/> {{$t('common.where')}}
|
||||
div {{$t('common.where')}}
|
||||
el-popover(
|
||||
placement="top-start"
|
||||
width="400"
|
||||
trigger="hover")
|
||||
trigger="click")
|
||||
v-icon(slot='reference' color='#ff9fc4' name='question-circle')
|
||||
slot
|
||||
p {{$t('event.where_description')}}
|
||||
el-select.mb-3(v-model='event.place.name' @change='placeChoosed' filterable allow-create default-first-option)
|
||||
p(v-html="$t('event.where_description')")
|
||||
|
||||
el-select.mb-3(v-model='event.place.name'
|
||||
@change='placeChoosed'
|
||||
filterable allow-create
|
||||
default-first-option
|
||||
)
|
||||
el-option(v-for='place in places_name' :label='place' :value='place' :key='place.id')
|
||||
div {{$t("common.address")}}
|
||||
el-input.mb-3(ref='address' v-model='event.place.address' :disabled='places_name.indexOf(event.place.name)>-1' @keydown.native.enter='next')
|
||||
br
|
||||
br
|
||||
div {{$t("common.address")}} {{event.place.name}}
|
||||
el-input.mb-3(ref='address' v-model='event.place.address'
|
||||
:disabled='places_name.indexOf(event.place.name)>-1'
|
||||
@keydown.native.enter='next')
|
||||
el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
|
||||
|
||||
//- WHEN
|
||||
@@ -32,15 +40,27 @@
|
||||
span(slot='label') {{$t('common.when')}} <v-icon name='clock'/>
|
||||
span {{event.multidate ? $t('event.dates_description') : $t('event.date_description')}}
|
||||
el-switch.float-right(v-model='event.multidate' :active-text="$t('event.multidate_description')")
|
||||
v-date-picker.mb-3(:mode='event.multidate ? "range" : "single"' v-model='date' is-inline
|
||||
is-expanded :min-date='new Date()' @input='date ? $refs.time_start.focus() : false')
|
||||
div {{$t('event.time_start_description')}}
|
||||
el-time-select.mb-3(ref='time_start'
|
||||
v-model="time.start"
|
||||
:picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
|
||||
div {{$t('event.time_end_description')}}
|
||||
el-time-select(v-model='time.end'
|
||||
:picker-options="{start: '00:00', step: '00:30', end: '24:00'}")
|
||||
|
||||
v-date-picker.mb-3(
|
||||
:mode='event.multidate ? "range" : "single"'
|
||||
:attributes='attributes'
|
||||
v-model='date'
|
||||
is-inline
|
||||
is-expanded
|
||||
:min-date='new Date()'
|
||||
)
|
||||
|
||||
el-row
|
||||
el-col(:span='12')
|
||||
div {{$t('event.time_start_description')}}
|
||||
el-time-select.mb-3(ref='time_start'
|
||||
v-model="time.start"
|
||||
:picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
|
||||
div {{$t('event.time_end_description')}}
|
||||
el-time-select(v-model='time.end'
|
||||
:picker-options="{start: '00:00', step: '00:30', end: '24:00'}")
|
||||
el-col(:span='12')
|
||||
List(:events='todayEvents' :title='$t("event.same_day")')
|
||||
el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
|
||||
|
||||
//- WHAT
|
||||
@@ -61,35 +81,45 @@
|
||||
|
||||
el-tab-pane
|
||||
span(slot='label') {{$t('common.media')}} <v-icon name='image'/>
|
||||
span {{$t('event.media_description')}}
|
||||
b-form-file.mb-2(v-model='event.image', :placeholder='$t("common.poster")' accept='image/*')
|
||||
el-button.float-right(@click='done') {{edit?$t('common.edit'):$t('common.send')}}
|
||||
|
||||
|
||||
el-upload.text-center(
|
||||
action=''
|
||||
:limit="1"
|
||||
:auto-upload='false'
|
||||
drag
|
||||
:on-change='uploadedFile'
|
||||
:multiple='false'
|
||||
:file-list="fileList"
|
||||
)
|
||||
i.el-icon-upload
|
||||
div.el-upload__text {{$t('event.media_description')}}
|
||||
el-button.float-right(@click='done' :disabled='!couldProceed') {{edit?$t('common.edit'):$t('common.send')}}
|
||||
|
||||
</template>
|
||||
<script>
|
||||
// import api from '@/plugins/api'
|
||||
import { mapActions, mapState } from 'vuex'
|
||||
import { mapActions, mapState, mapGetters } from 'vuex'
|
||||
import moment from 'dayjs'
|
||||
import Calendar from '@/components/Calendar'
|
||||
import List from '@/components/List'
|
||||
import { Message } from 'element-ui'
|
||||
|
||||
export default {
|
||||
components: { Calendar },
|
||||
name: 'Add',
|
||||
components: { List },
|
||||
data() {
|
||||
return {
|
||||
event: {
|
||||
place: { name: '', address: '' },
|
||||
title: '', description: '', tags: [],
|
||||
multidate: false,
|
||||
image: false
|
||||
},
|
||||
visible: true,
|
||||
fileList: [],
|
||||
open: true,
|
||||
id: null,
|
||||
activeTab: "0",
|
||||
date: null,
|
||||
time: { start: '20:00', end: null },
|
||||
edit: false,
|
||||
sending: false,
|
||||
loading: true,
|
||||
}
|
||||
},
|
||||
name: 'newEvent',
|
||||
@@ -100,11 +130,10 @@ export default {
|
||||
}
|
||||
},
|
||||
async mounted () {
|
||||
if (this.$route.params.id) {
|
||||
this.id = this.$route.params.id
|
||||
if (this.$route.params.edit) {
|
||||
this.id = this.$route.params.edit
|
||||
this.edit = true
|
||||
const event = await api.getEvent(this.id)
|
||||
// this.event.place = {name: event.place.name, address: event.place.address }
|
||||
const event = await this.$axios.$get('/event/'+ this.id)
|
||||
this.event.place.name = event.place.name
|
||||
this.event.place.address = event.place.address || ''
|
||||
this.event.multidate = event.multidate
|
||||
@@ -119,6 +148,7 @@ export default {
|
||||
}
|
||||
}
|
||||
this.updateMeta()
|
||||
this.loading = false
|
||||
},
|
||||
computed: {
|
||||
...mapState({
|
||||
@@ -126,12 +156,18 @@ export default {
|
||||
places_name: state => state.places.map(p => p.name ),
|
||||
places: state => state.places,
|
||||
user: state => state.user,
|
||||
events: state => state.events
|
||||
}),
|
||||
todayEvents () {
|
||||
const date = moment(this.date)
|
||||
return this.events.filter(e => date.isSame(moment(e.start_datetime), 'day'))
|
||||
},
|
||||
...mapGetters(['filteredEvents']),
|
||||
attributes () {
|
||||
return this.events.filter(e => !e.past).map(this.eventToAttribute)
|
||||
},
|
||||
disableAddress () {
|
||||
console.log('dentro disable Address')
|
||||
const ret = this.places_name.find(p => p.name === this.event.place.name)
|
||||
console.log(ret)
|
||||
return ret
|
||||
return this.places_name.find(p => p.name === this.event.place.name)
|
||||
},
|
||||
couldProceed () {
|
||||
const t = this.$auth.loggedIn ? -1 : 0
|
||||
@@ -143,18 +179,45 @@ export default {
|
||||
this.event.place.address.length>0
|
||||
case 2+t:
|
||||
if (this.date && this.time.start) return true
|
||||
break
|
||||
case 3+t:
|
||||
return this.event.title.length>0
|
||||
break
|
||||
case 4+t:
|
||||
return true
|
||||
break
|
||||
return this.event.place.name.length>0 &&
|
||||
this.event.place.address.length>0 &&
|
||||
(this.date && this.time.start) &&
|
||||
this.event.title.length>0
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['addEvent', 'updateEvent', 'updateMeta']),
|
||||
close (done) {
|
||||
|
||||
this.$router.replace('/')
|
||||
done()
|
||||
},
|
||||
eventToAttribute(event) {
|
||||
let e = {
|
||||
key: event.id,
|
||||
customData: event,
|
||||
order: event.start_datetime,
|
||||
}
|
||||
const day = moment(event.start_datetime).date()
|
||||
let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
|
||||
if (event.past) color = 'rgba(200,200,200,0.5)'
|
||||
if (event.multidate) {
|
||||
e.dates = {
|
||||
start: event.start_datetime, end: event.end_datetime
|
||||
}
|
||||
e.highlight = { backgroundColor: color,
|
||||
// borderColor: 'transparent',
|
||||
borderWidth: '4px' }
|
||||
} else {
|
||||
e.dates = event.start_datetime
|
||||
e.dot = { backgroundColor: color, borderColor: color, borderWidth: '3px' }
|
||||
}
|
||||
return e
|
||||
},
|
||||
next () {
|
||||
this.activeTab = String(Number(this.activeTab)+1)
|
||||
if (this.activeTab === "2") {
|
||||
@@ -171,6 +234,9 @@ export default {
|
||||
}
|
||||
this.$refs.address.focus()
|
||||
},
|
||||
uploadedFile(file, fileList) {
|
||||
this.event.image = file
|
||||
},
|
||||
async done () {
|
||||
let start_datetime, end_datetime
|
||||
const [ start_hour, start_minute ] = this.time.start.split(':')
|
||||
@@ -191,7 +257,7 @@ export default {
|
||||
const formData = new FormData()
|
||||
|
||||
if (this.event.image) {
|
||||
formData.append('image', this.event.image, this.event.image.name)
|
||||
formData.append('image', this.event.image.raw, this.event.image.name)
|
||||
}
|
||||
formData.append('title', this.event.title)
|
||||
formData.append('place_name', this.event.place.name)
|
||||
@@ -205,7 +271,7 @@ export default {
|
||||
}
|
||||
if (this.event.tags)
|
||||
this.event.tags.forEach(tag => formData.append('tags[]', tag))
|
||||
this.sending = true
|
||||
this.loading = true
|
||||
try {
|
||||
if (this.edit) {
|
||||
await this.updateEvent(formData)
|
||||
@@ -213,11 +279,11 @@ export default {
|
||||
await this.addEvent(formData)
|
||||
}
|
||||
this.updateMeta()
|
||||
this.sending = false
|
||||
this.$refs.modal.hide()
|
||||
this.loading = false
|
||||
this.$router.replace('/')
|
||||
Message({ type: 'success', message: this.$auth.loggedIn ? this.$t('event.added') : this.$t('event.added_anon')})
|
||||
} catch (e) {
|
||||
this.sending = false
|
||||
this.loading = false
|
||||
console.error(e)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template lang="pug">
|
||||
b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("common.admin")'
|
||||
:visible='true' size='lg')
|
||||
el-dialog(:title='$t("common.admin")' width='80%' :visible='open' :before-close='close')
|
||||
el-tabs(tabPosition='left' v-model='tab')
|
||||
|
||||
//- USERS
|
||||
@@ -35,7 +34,7 @@
|
||||
el-form-item(:label="$t('common.address')")
|
||||
el-input.mr-1(:placeholder='$t("common.address")' v-model='place.address')
|
||||
el-button(variant='primary' @click='savePlace') {{$t('common.save')}}
|
||||
el-table(:data='paginatedPlaces' small)
|
||||
el-table(:data='paginatedPlaces' small @current-change="val => place=val")
|
||||
el-table-column(:label="$t('common.name')")
|
||||
template(slot-scope='data') {{data.row.name}}
|
||||
el-table-column(:label="$t('common.address')")
|
||||
@@ -61,26 +60,26 @@
|
||||
el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length')
|
||||
|
||||
//- TAGS
|
||||
el-tab-pane.pt-1
|
||||
template(slot='label')
|
||||
v-icon(name='tag')
|
||||
span {{$t('common.tags')}}
|
||||
p {{$t('admin.tag_description')}}
|
||||
el-tag(v-if='tag.tag' :color='tag.color' size='mini') {{tag.tag}}
|
||||
el-form(:inline='true' label-width='120px')
|
||||
el-form-item(:label="$t('common.color')")
|
||||
el-color-picker(v-model='tag.color' @change='updateColor')
|
||||
el-table(:data='paginatedTags' striped small hover
|
||||
highlight-current-row @current-change="tagSelected")
|
||||
el-table-column(:label="$t('common.tag')")
|
||||
template(slot-scope='data')
|
||||
el-tag(:color='data.row.color' size='mini') {{data.row.tag}}
|
||||
el-pagination(:page-size='perPage' :currentPage.sync='tagPage' :total='tags.length')
|
||||
//- el-tab-pane.pt-1
|
||||
//- template(slot='label')
|
||||
//- v-icon(name='tags')
|
||||
//- span {{$t('common.tags')}}
|
||||
//- p {{$t('admin.tag_description')}}
|
||||
//- el-tag(v-if='tag.tag' :color='tag.color' size='mini') {{tag.tag}}
|
||||
//- el-form(:inline='true' label-width='120px')
|
||||
//- el-form-item(:label="$t('common.color')")
|
||||
//- el-color-picker(v-model='tag.color' @change='updateColor')
|
||||
//- el-table(:data='paginatedTags' striped small hover
|
||||
//- highlight-current-row @current-change="tagSelected")
|
||||
//- el-table-column(:label="$t('common.tag')")
|
||||
//- template(slot-scope='data')
|
||||
//- el-tag(:color='data.row.color' size='mini') {{data.row.tag}}
|
||||
//- el-pagination(:page-size='perPage' :currentPage.sync='tagPage' :total='tags.length')
|
||||
|
||||
//- SETTINGS
|
||||
el-tab-pane.pt-1
|
||||
template(slot='label')
|
||||
v-icon(name='tools')
|
||||
v-icon(name='cog')
|
||||
span {{$t('common.settings')}}
|
||||
el-form(inline @submit.prevent.stop='associatemastodon_instance')
|
||||
span {{$t('admin.mastodon_description')}}
|
||||
@@ -91,7 +90,6 @@
|
||||
</template>
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
import api from '@/plugins/api'
|
||||
import { Message } from 'element-ui'
|
||||
|
||||
export default {
|
||||
@@ -116,22 +114,18 @@ export default {
|
||||
mastodon_instance: '',
|
||||
settings: {},
|
||||
tab: "0",
|
||||
open: true
|
||||
}
|
||||
},
|
||||
async mounted () {
|
||||
console.log('sono dentro mounted', this.$route)
|
||||
const code = this.$route.query.code
|
||||
|
||||
if (code) {
|
||||
this.tab = "4"
|
||||
const instance = await this.$axios.$post('/user/code', {code, is_admin: true})
|
||||
}
|
||||
// // this.users = await api.getUsers()
|
||||
// // this.events = await api.getUnconfirmedEvents()
|
||||
// // this.settings = await api.getAdminSettings()
|
||||
},
|
||||
async asyncData ({ $axios, params, store }) {
|
||||
console.log(store.state)
|
||||
try {
|
||||
const users = await $axios.$get('/users')
|
||||
const events = await $axios.$get('/event/unconfirmed')
|
||||
@@ -158,7 +152,7 @@ export default {
|
||||
paginatedPlaces () {
|
||||
return this.places.slice((this.placePage-1) * this.perPage,
|
||||
this.placePage * this.perPage)
|
||||
},
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
placeSelected (items) {
|
||||
@@ -175,15 +169,15 @@ export default {
|
||||
this.tag = { color: tag.color, tag: tag.tag }
|
||||
},
|
||||
async savePlace () {
|
||||
const place = await api.updatePlace(this.place)
|
||||
// const place = await api.updatePlace(this.place)
|
||||
},
|
||||
async toggle(user) {
|
||||
user.is_active = !user.is_active
|
||||
const newuser = await api.updateUser(user)
|
||||
// const newuser = await api.updateUser(user)
|
||||
},
|
||||
async toggleAdmin(user) {
|
||||
user.is_admin = !user.is_admin
|
||||
const newuser = await api.updateUser(user)
|
||||
// const newuser = await api.updateUser(user)
|
||||
},
|
||||
async updateColor () {
|
||||
// try {
|
||||
@@ -198,7 +192,7 @@ export default {
|
||||
async associate () {
|
||||
if (!this.mastodon_instance) return
|
||||
|
||||
const url = await this.$axios.$post('/user/getauthurl', {instance: this.mastodon_instance, admin: true})
|
||||
const url = await this.$axios.$post('/settings/getauthurl', {instance: this.mastodon_instance})
|
||||
setTimeout( () => window.location.href=url, 100);
|
||||
},
|
||||
async confirm (id) {
|
||||
@@ -207,13 +201,18 @@ export default {
|
||||
await this.$axios.$get(`/event/confirm/${id}`)
|
||||
this.loading = false
|
||||
Message({
|
||||
message: this.$t('event_confirmed'),
|
||||
message: this.$t('common.event_confirmed'),
|
||||
type: 'success'
|
||||
})
|
||||
this.events = this.events.filter(e => e.id !== id)
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
},
|
||||
close (done) {
|
||||
console.log('oppure qui !')
|
||||
this.$router.replace('/')
|
||||
// done()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1,22 +1,26 @@
|
||||
<template lang="pug">
|
||||
div
|
||||
p porcodio
|
||||
List(:events="events" :title='title')
|
||||
</template>
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
// import List from '../../components/List'
|
||||
import { SHARED_CONF } from '../../config'
|
||||
import List from '../../components/List'
|
||||
import moment from 'dayjs'
|
||||
|
||||
export default {
|
||||
name: 'diocane',
|
||||
layout: 'iframe',
|
||||
// components: { List },
|
||||
components: { List },
|
||||
async asyncData ({ $axios, req, res }) {
|
||||
const title = req.query.title || SHARED_CONF.title
|
||||
const show_tags = req.query.showtags
|
||||
const tags = req.query.tags
|
||||
const places = req.query.places
|
||||
const events = await $axios.$get('/export/json')
|
||||
return { events, show_tags }
|
||||
const now = new Date()
|
||||
|
||||
// TODO: filter future events based on tags/places/userid
|
||||
const events = await $axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
|
||||
|
||||
return { show_tags, events, title }
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,54 +1,81 @@
|
||||
<template lang="pug">
|
||||
b-modal#eventDetail(ref='eventDetail' hide-body hide-header hide-footer @hidden='$router.replace("/")' size='lg' :visible='true')
|
||||
b-card(no-body, :img-src='imgPath' v-loading='loading')
|
||||
nuxt-link(to='/')
|
||||
el-button.close_button(circle icon='el-icon-close' type='success'
|
||||
@click.prevent='$refs.eventDetail.hide()')
|
||||
b-card-header
|
||||
h3 {{event.title}}
|
||||
v-icon(name='clock')
|
||||
span {{event.start_datetime|datetime}}
|
||||
br
|
||||
v-icon(name='map-marker-alt')
|
||||
span {{event.place.name}} - {{event.place.address}}
|
||||
br
|
||||
b-card-body(v-if='event.description || event.tags')
|
||||
pre(v-html='event.description')
|
||||
el-tag.mr-1(:color='tag.color' v-for='tag in event.tags'
|
||||
size='mini' :key='tag.tag') {{tag.tag}}
|
||||
div(v-if='mine')
|
||||
hr
|
||||
el-button(v-if='event.is_visible' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('common.hide')}}
|
||||
el-button(v-else plain type='success' @click.prevents='toggle' icon='el-icon-view') {{$t('common.confirm')}}
|
||||
el-button(plain type='danger' @click.prevent='remove' icon='el-icon-remove') {{$t('common.remove')}}
|
||||
el-button(plain type='primary' @click='$router.replace("/edit/"+event.id)') <v-icon color='orange' name='edit'/> {{$t('common.edit')}}
|
||||
el-card#eventDetail(
|
||||
visible hide-header
|
||||
no-header :show-close='false'
|
||||
top='0vh !important'
|
||||
:appendToBody='true')
|
||||
|
||||
b-card-body(v-if='event.activitypub_id')
|
||||
strong {{$t('common.resources')}} -
|
||||
//- close button
|
||||
nuxt-link.float-right(to='/')
|
||||
el-button(circle icon='el-icon-close' type='danger' size='small' plain)
|
||||
|
||||
//- title, where, when
|
||||
h5.text-center {{event.title}}
|
||||
div.nextprev
|
||||
nuxt-link(v-if='prev' :to='`/event/${prev.id}`')
|
||||
el-button(icon='el-icon-arrow-left' round size='small' type='success' plain)
|
||||
nuxt-link.float-right(v-if='next' :to='`/event/${next.id}`')
|
||||
el-button(icon='el-icon-arrow-right' round size='small' plain type='success')
|
||||
|
||||
//- image
|
||||
img(:src='imgPath' v-if='event.image_path')
|
||||
|
||||
.info
|
||||
div {{event|event_when}}
|
||||
div {{event.place.name}} - {{event.place.address}}
|
||||
|
||||
//- description and tags
|
||||
div(v-if='event.description || event.tags')
|
||||
pre(v-html='event.description')
|
||||
el-tag.mr-1(v-for='tag in event.tags'
|
||||
size='mini' :key='tag.tag') {{tag.tag}}
|
||||
|
||||
//- show hide, confirm, delete, edit buttons when allowed
|
||||
div(v-if='mine')
|
||||
hr
|
||||
el-button(v-if='event.is_visible' size='mini' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('common.hide')}}
|
||||
el-button(v-else plain type='success' size='mini' @click.prevents='toggle' icon='el-icon-view') {{$t('common.confirm')}}
|
||||
el-button(plain type='danger' size='mini' @click.prevent='remove' icon='el-icon-remove') {{$t('common.remove')}}
|
||||
el-button(plain type='primary' size='mini' @click='$router.replace(`/add/${event.id}`)' icon='el-icon-edit') {{$t('common.edit')}}
|
||||
|
||||
//- comments
|
||||
.card-body(v-if='event.activitypub_id')
|
||||
strong {{$t('common.related')}} -
|
||||
a(:href='`https://mastodon.cisti.org/web/statuses/${event.activitypub_id}`') {{$t('common.add')}}
|
||||
b-card-header(v-for='comment in event.comments' :key='comment.id')
|
||||
.card-header(v-for='comment in event.comments' :key='comment.id')
|
||||
img.avatar(:src='comment.data.last_status.account.avatar')
|
||||
strong {{comment.author}}
|
||||
a.float-right(:href='comment.data.last_status.url')
|
||||
small {{comment.data.last_status.created_at|datetime}}
|
||||
div.mt-1(v-html='comment_filter(comment.text)')
|
||||
img(v-for='img in comment.data.last_status.media_attachments' :src='img.preview_url')
|
||||
//- span {{comment}}
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapActions } from 'vuex';
|
||||
// import api from '@/plugins/api'
|
||||
//import filters from '@/filters'
|
||||
import { mapState, mapActions, mapGetters } from 'vuex'
|
||||
import config from '@/config'
|
||||
|
||||
export default {
|
||||
name: 'Event',
|
||||
// transition: null,
|
||||
// Watch for $route.query.page to call Component methods (asyncData, fetch, validate, layout, etc.)
|
||||
// watchQuery: ['id'],
|
||||
// Key for <NuxtChild> (transitions)
|
||||
// key: to => to.fullPath,
|
||||
// Called to know which transition to apply
|
||||
// transition(to, from) {
|
||||
// console.log('dentro transition')
|
||||
// if (!from) return 'slide-left'
|
||||
// return +to.params.id < +from.params.id ? 'slide-right' : 'slide-left'
|
||||
// },
|
||||
|
||||
head () {
|
||||
return {
|
||||
title: this.event.title,
|
||||
meta: [
|
||||
// hid is used as unique identifier. Do not use `vmid` for it as it will not work
|
||||
{ hid: 'description', name: 'description', content: this.event.description },
|
||||
{ hid: 'og-description', name: 'og:description', content: this.event.description },
|
||||
// { hid: 'description', name: 'description', content: this.event.description },
|
||||
// { hid: 'og-description', name: 'og:description', content: this.event.description },
|
||||
{ hid: 'og-title', property: 'og:title', content: this.event.title },
|
||||
{ hid: 'og-url', property: 'og:url', content: `event/${this.event.id}` },
|
||||
{ property: 'og:type', content: 'event'},
|
||||
@@ -57,33 +84,43 @@ export default {
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState([]),
|
||||
...mapGetters(['filteredEvents']),
|
||||
next () {
|
||||
let found = false
|
||||
return this.filteredEvents.find(e => {
|
||||
if (found) return e
|
||||
if (e.id === this.event.id) found = true
|
||||
})
|
||||
},
|
||||
prev () {
|
||||
let prev = false
|
||||
this.filteredEvents.find(e => {
|
||||
if (e.id === this.event.id) return true
|
||||
prev = e
|
||||
})
|
||||
return prev
|
||||
},
|
||||
imgPath () {
|
||||
return this.event.image_path && '/media/' + this.event.image_path
|
||||
},
|
||||
mine () {
|
||||
if (!this.$auth.user) return false
|
||||
return this.event.userId === this.$auth.user.id || this.$auth.user.is_admin
|
||||
},
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
event: { comments: [], place: {}, title: ''},
|
||||
id: null,
|
||||
loading: true,
|
||||
}
|
||||
},
|
||||
async asyncData ( { $axios, params }) {
|
||||
const event = await $axios.$get(`/event/${params.id}`)
|
||||
return { event, id: params.id, loading: false }
|
||||
return { event, id: params.id}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['delEvent']),
|
||||
keydown (e) {
|
||||
console.error(e)
|
||||
},
|
||||
comment_filter (value) {
|
||||
console.log('dentro comment_filter')
|
||||
return value.replace(/<a.*href="([^">]+).*>(?:.(?!\<\/a\>))*.<\/a>/, (orig, url) => {
|
||||
// get extension
|
||||
const ext = url.slice(-4)
|
||||
console.log('dentro il replace ', ext)
|
||||
if (['.mp3', '.ogg'].indexOf(ext)>-1) {
|
||||
return `<audio controls><source src='${url}'></audio>`
|
||||
} else {
|
||||
@@ -92,9 +129,13 @@ export default {
|
||||
})
|
||||
},
|
||||
async remove () {
|
||||
await api.delEvent(this.event.id)
|
||||
this.delEvent(this.event.id)
|
||||
this.$refs.eventDetail.hide()
|
||||
try {
|
||||
await this.$axios.delete(`/user/event/${this.id}`)
|
||||
this.delEvent(Number(this.id))
|
||||
this.$router.back()
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
}
|
||||
},
|
||||
async toggle () {
|
||||
try {
|
||||
@@ -106,49 +147,60 @@ export default {
|
||||
this.event.is_visible = true
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
console.error(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
<style lang='less'>
|
||||
|
||||
#eventDetail .avatar {
|
||||
height: 40px;
|
||||
border-radius: 5px;
|
||||
#eventDetail {
|
||||
max-width: 1000px;
|
||||
border-radius: 0px;
|
||||
margin: 0 auto;
|
||||
|
||||
pre {
|
||||
color: #404246;
|
||||
font-size: 1em;
|
||||
font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif !important;
|
||||
}
|
||||
|
||||
h5 {
|
||||
font-size: 1.4em;
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.info {
|
||||
margin: 10px;
|
||||
font-size: 1.3em;
|
||||
font-weight: 600;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
max-height: 89vh;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.avatar {
|
||||
width: auto;
|
||||
height: 40px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.nextprev {
|
||||
font-size: 10px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
#eventDetail .image {
|
||||
max-height: 200px;
|
||||
@media only screen and (max-width: 768px) {
|
||||
#eventDetail {
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
/* #eventDetail {
|
||||
display: block !important;
|
||||
opacity: 1;
|
||||
} */
|
||||
|
||||
#eventDetail .modal-body {
|
||||
padding: 0px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#eventDetail .close_button:hover {
|
||||
background-color: rgba(200, 100, 100, 0.4);
|
||||
}
|
||||
|
||||
#eventDetail .card {
|
||||
border: 0px;
|
||||
}
|
||||
|
||||
#eventDetail .close_button {
|
||||
background-color: rgba(100, 100, 100, 0.3);
|
||||
color: red;
|
||||
font-size: 20px;
|
||||
border: 1px dashed rgba(20,20,20,0.3);
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 10px;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
112
pages/export.vue
112
pages/export.vue
@@ -1,13 +1,12 @@
|
||||
<template lang="pug">
|
||||
b-modal(ref='modal' @hidden='$router.replace("/")'
|
||||
:title='$t("common.export")' :visible='true' size='lg' hide-footer)
|
||||
el-dialog(:title='$t("common.export")' visible :before-close='close')
|
||||
p {{$t('export.intro')}}
|
||||
|
||||
li(v-if='filters.tags.length') {{$t('common.tags')}}:
|
||||
el-tag.ml-1(color='#409EFF' size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
|
||||
el-tag.ml-1(size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
|
||||
li(v-if='filters.places.length') {{$t('common.places')}}:
|
||||
el-tag.ml-1(color='#409EFF' size='mini' v-for='place in filters.places' :key='place.id') {{place}}
|
||||
el-tabs.mt-2(tabPosition='left' v-model='type')
|
||||
el-tag.ml-1(size='mini' v-for='place in filters.places' :key='place.id') {{place}}
|
||||
el-tabs.mt-2(v-model='type')
|
||||
|
||||
el-tab-pane.pt-1(label='email' name='email')
|
||||
p(v-html='$t(`export.email_description`)')
|
||||
@@ -15,57 +14,50 @@
|
||||
//- el-switch(v-model='notification.notify_on_add' :active-text="$t('notify_on_insert')")
|
||||
//- br
|
||||
//- el-switch.mt-2(v-model='notification.send_notification' :active-text="$t('send_notification')")
|
||||
el-input.mt-2(v-model='notification.email' :placeholder="$t('common.insert_your_address')" ref='email')
|
||||
el-button.mt-2.float-right(native-type= 'submit' type='success' @click='add_notification') {{$t('Send')}}
|
||||
el-input.mt-2(v-model='notification.email' :placeholder="$t('export.insert_your_address')" ref='email')
|
||||
el-button.mt-2.float-right(native-type= 'submit' type='success' @click='add_notification') {{$t('common.send')}}
|
||||
|
||||
el-tab-pane.pt-1(label='feed rss' name='feed')
|
||||
span(v-html='$t(`export.feed_description`)')
|
||||
el-input(v-model='link')
|
||||
el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("common.copy")}}
|
||||
el-button(slot='append' plain type="primary" icon='el-icon-document' ) {{$t("common.copy")}}
|
||||
|
||||
el-tab-pane.pt-1(label='ics/ical' name='ics')
|
||||
p(v-html='$t(`export.ical_description`)')
|
||||
el-input(v-model='link')
|
||||
el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("common.opy")}}
|
||||
el-button(slot='append' plain type="primary" icon='el-icon-document') {{$t("common.copy")}}
|
||||
|
||||
el-tab-pane.pt-1(label='list' name='list')
|
||||
p(v-html='$t(`export.list_description`)')
|
||||
//- el-form-item(:label="$t('export.show_tags')")
|
||||
el-switch(v-model='list.show_tags')
|
||||
|
||||
iframe(:src='`http://localhost:3000/embed/list?tags=cia&showtags=${list.show_tags?"true":""}`' height='300')
|
||||
//- el-card.mb-1(no-body header='Eventi')
|
||||
//- b-list-group#list(flush)
|
||||
//- b-list-group-item.flex-column.align-items-start(v-for="event in filteredEvents" :key='event.id'
|
||||
//- :to='`/event/${event.id}`')
|
||||
//- //- b-media
|
||||
//- img(v-if='event.image_path' slot="aside" :src="imgPath(event)" alt="Meia Aside" style='max-height: 60px')
|
||||
//- small.float-right {{event.start_datetime|datetime}}
|
||||
//- strong.mb-1 {{event.title}}
|
||||
//- br
|
||||
//- small.float-right {{event.place.name}}
|
||||
//- el-tag.mr-1(:color='tag.color || "grey"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
|
||||
el-input.mb-1(type='textarea' v-model='script')
|
||||
el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
|
||||
|
||||
el-row
|
||||
el-col.mr-2(:span='11')
|
||||
el-input(v-model='list.title') Title
|
||||
el-col.float-right(:span='12')
|
||||
List(
|
||||
:title='list.title'
|
||||
:events='filteredEvents'
|
||||
)
|
||||
el-input.mb-1(type='textarea' v-model='listScript' readonly )
|
||||
el-button.float-right(plain type="primary" icon='el-icon-document') {{$t('common.copy')}}
|
||||
|
||||
|
||||
el-tab-pane.pt-1(label='calendar' name='calendar')
|
||||
p(v-html='$t(`export.calendar_description`)')
|
||||
//- no-ssr
|
||||
Calendar.mb-1
|
||||
el-input.mb-1(type='textarea' v-model='script')
|
||||
el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
|
||||
//- el-tab-pane.pt-1(label='calendar' name='calendar')
|
||||
//- p(v-html='$t(`export.calendar_description`)')
|
||||
//- //- no-ssr
|
||||
//- Calendar.mb-1
|
||||
//- el-input.mb-1(type='textarea' v-model='script')
|
||||
//- el-button.float-right(plain type="primary" icon='el-icon-document') Copy
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
import { mapState, mapGetters } from 'vuex'
|
||||
import path from 'path'
|
||||
// import filters from '../filters'
|
||||
import Calendar from '@/components/Calendar'
|
||||
import List from '@/components/List'
|
||||
import {intersection} from 'lodash'
|
||||
// import api from '@/api'
|
||||
import { Message } from 'element-ui'
|
||||
const { SHARED_CONF } = require('@/config')
|
||||
|
||||
export default {
|
||||
name: 'Export',
|
||||
@@ -73,33 +65,40 @@ export default {
|
||||
data () {
|
||||
return {
|
||||
type: 'email',
|
||||
link: '',
|
||||
export_list: true,
|
||||
script: `<iframe>Ti piacerebbe</iframe>`,
|
||||
notification: { email: '' },
|
||||
list: { show_tags: true },
|
||||
list: { title: SHARED_CONF.title },
|
||||
}
|
||||
},
|
||||
// filters,
|
||||
mounted () {
|
||||
this.link = this.loadLink()
|
||||
},
|
||||
watch: {
|
||||
type (value) {
|
||||
this.link = this.loadLink()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async add_notification () {
|
||||
if (!this.notification.email){
|
||||
Message({message:'Inserisci una mail', type: 'error'})
|
||||
return this.$refs.email.focus()
|
||||
}
|
||||
await api.addNotification({ ...this.notification, filters: this.filters})
|
||||
this.$refs.modal.hide()
|
||||
// await api.addNotification({ ...this.notification, filters: this.filters})
|
||||
// this.$refs.modal.hide()
|
||||
Message({message: this.$t('email_notification_activated'), type: 'success'})
|
||||
},
|
||||
loadLink () {
|
||||
imgPath (event) {
|
||||
return event.image_path && event.image_path
|
||||
},
|
||||
close (done) {
|
||||
this.$router.replace('/')
|
||||
done()
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState(['filters', 'events']),
|
||||
...mapGetters(['filteredEvents']),
|
||||
listScript () {
|
||||
const params = []
|
||||
if (this.list.title) {
|
||||
params.push(`title=${this.list.title}`)
|
||||
}
|
||||
return `<iframe src="${SHARED_CONF.baseurl}/embed/list?${params.join('&')}"></iframe>`
|
||||
},
|
||||
link () {
|
||||
const tags = this.filters.tags.join(',')
|
||||
const places = this.filters.places.join(',')
|
||||
let query = ''
|
||||
@@ -113,17 +112,8 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
return `${process.env.VUE_APP_API}/api/export/${this.type}${query}`
|
||||
},
|
||||
imgPath (event) {
|
||||
return event.image_path && event.image_path
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
...mapState(['filters', 'events']),
|
||||
filteredEvents () {
|
||||
return this.$store.getters.filteredEvents.filter(e => !e.past)
|
||||
},
|
||||
return `${SHARED_CONF.baseurl}/api/export/${this.type}${query}`
|
||||
},
|
||||
showLink () {
|
||||
return (['feed', 'ics'].indexOf(this.type)>-1)
|
||||
},
|
||||
|
||||
@@ -1,2 +1,15 @@
|
||||
<template lang="pug">
|
||||
#home
|
||||
Nav
|
||||
Home
|
||||
</template>
|
||||
<script>
|
||||
import Home from '~/components/Home.vue'
|
||||
import Nav from '~/components/Nav.vue'
|
||||
|
||||
export default {
|
||||
name: 'Index',
|
||||
components: { Nav, Home },
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
<template lang='pug'>
|
||||
b-modal(@shown="$refs.email.focus()" :title='$t("common.login")' hide-footer
|
||||
@hidden='$router.replace("/")' :visible='true' ref='modal')
|
||||
|
||||
el-dialog(:title='$t("common.login")' :before-close='close' visible)
|
||||
|
||||
el-form(v-loading='loading')
|
||||
p(v-html="$t('login.description')")
|
||||
|
||||
el-input.mb-2(v-model='email' type='email' :placeholder='$t("common.email")' autocomplete='email' ref='email')
|
||||
v-icon(name='user' slot='prepend')
|
||||
i.el-icon-user(slot='prepend')
|
||||
|
||||
el-input.mb-1(v-model='password' @keyup.enter.native="submit" type='password' :placeholder='$t("common.password")')
|
||||
v-icon(name="lock" slot='prepend')
|
||||
el-button.mr-1(plain type="success" @click='submit') {{$t('common.login')}}
|
||||
router-link(to='/register')
|
||||
i.el-icon-lock(slot='prepend')
|
||||
|
||||
el-button.mr-1(plain type="success" :disabled='!email || !password' @click='submit') {{$t('common.login')}}
|
||||
|
||||
nuxt-link(to='/register')
|
||||
el-button.mt-1(plain type="primary") {{$t('login.not_registered')}}
|
||||
|
||||
a.float-right(href='#' @click='forgot') {{$t('login.forgot_password')}}
|
||||
</template>
|
||||
|
||||
@@ -17,18 +23,22 @@
|
||||
const Cookie = process.client ? require('js-cookie') : undefined
|
||||
import { mapActions } from 'vuex'
|
||||
import { Message } from 'element-ui'
|
||||
// import api from '@/plugins/api'
|
||||
import get from 'lodash/get'
|
||||
|
||||
export default {
|
||||
name: 'Login',
|
||||
data () {
|
||||
return {
|
||||
open: true,
|
||||
password: '',
|
||||
email: '',
|
||||
loading: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
close () {
|
||||
this.$router.replace('/')
|
||||
},
|
||||
...mapActions(['login']),
|
||||
async forgot () {
|
||||
if (!this.email) {
|
||||
@@ -37,7 +47,7 @@ export default {
|
||||
return
|
||||
}
|
||||
this.loading = true
|
||||
// await api.forgotPassword(this.email)
|
||||
await this.$axios.$post('/user/recover', { email: this.email })
|
||||
this.loading = false
|
||||
Message({ message: this.$t('login.check_email'), type: 'success' })
|
||||
},
|
||||
@@ -49,12 +59,12 @@ export default {
|
||||
this.loading = false
|
||||
Message({ message: this.$t('login.ok'), type: 'success' })
|
||||
} catch (e) {
|
||||
Message({ message: this.$t('login.error') + e, type: 'error' })
|
||||
e = get(e, 'response.data.message', e)
|
||||
Message({ message: this.$t('login.error') + this.$t(e), type: 'error' })
|
||||
this.loading = false
|
||||
return
|
||||
}
|
||||
this.email = this.password = ''
|
||||
this.$refs.modal.hide()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
<template lang='pug'>
|
||||
b-modal(hide-footer @hidden='$router.replace("/")' ref='modal'
|
||||
:title="$t('common.register')" :visible='true' @shown='$refs.email.focus()')
|
||||
el-dialog(:title="$t('common.register')" visible :before-close='() => $router.replace("/")' @open='$refs.email.focus()')
|
||||
el-form
|
||||
p(v-html="$t('register.description')")
|
||||
el-input.mb-2(ref='email' v-model='user.email' type='email'
|
||||
el-input.mb-2(ref='email' v-model='user.email' type='email' required
|
||||
:placeholder='$t("common.email")' autocomplete='email')
|
||||
span(slot='prepend') @
|
||||
|
||||
@@ -13,11 +12,10 @@
|
||||
el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('common.description')")
|
||||
v-icon(name='envelope-open-text')
|
||||
|
||||
el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='register') {{$t('common.send')}}
|
||||
el-button(plain type="success" icon='el-icon-arrow-right' :disabled='!user.password || !user.email || !user.description' @click='register') {{$t('common.send')}}
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import api from '@/plugins/api'
|
||||
import { mapActions } from 'vuex'
|
||||
import { Message } from 'element-ui'
|
||||
|
||||
@@ -28,23 +26,29 @@ export default {
|
||||
error: {},
|
||||
user: { }
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['login']),
|
||||
async register () {
|
||||
try {
|
||||
const user = await this.$axios.$post('/user', this.user)
|
||||
this.$refs.modal.hide()
|
||||
Message({
|
||||
message: this.$t(`register.${user.is_admin && 'admin_'}complete`),
|
||||
type: 'success'
|
||||
})
|
||||
this.$router.replace("/")
|
||||
} catch (e) {
|
||||
console.log('DENTRO CATCH!!!', e)
|
||||
const error = e && e.response && e.response.data && e.response.data.errors[0].message || e
|
||||
console.error(error)
|
||||
console.error(e)
|
||||
Message({
|
||||
message: this.$t('register.error') + e,
|
||||
message: this.$t('register.error') + error,
|
||||
type: 'error'
|
||||
})
|
||||
console.error(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,58 +1,40 @@
|
||||
<template lang="pug">
|
||||
b-modal(:title="$t('common.settings')" hide-footer @hidden='$router.replace("/")' :visible='true')
|
||||
h5 {{user.name}}
|
||||
el-input(v-model="mastodon_instance" @enter.native='associate')
|
||||
span(slot='prepend') {{$t('settings.mastodon_instance')}}
|
||||
el-button(v-if='!user.mastodon_auth' slot='append' @click='associate' type='success') {{$t('settings.associate')}}
|
||||
el-button(v-else slot='append' @click='deassociate' variant='success') {{$t('settings.unassociate')}}
|
||||
el-input.mt-2(v-model='password' type='password')
|
||||
span(slot='prepend') {{$t('settings.change_password')}}
|
||||
el-button(slot='append' @click='change' type='success') {{$t('settings.change')}}
|
||||
el-dialog(:title="$t('common.settings')" :before-close='close' visible)
|
||||
//- el-form
|
||||
//- el-form-item {{$t('settings.change_password')}}
|
||||
el-divider {{$t('settings.change_password')}}
|
||||
el-input(v-model='password' type='password')
|
||||
el-button(slot='append' @click='change' type='success') {{$t('common.send')}}
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapActions } from 'vuex'
|
||||
export default {
|
||||
props: ['code'],
|
||||
data () {
|
||||
return {
|
||||
mastodon_instance: '',
|
||||
password: '',
|
||||
user: {}
|
||||
}
|
||||
},
|
||||
computed: mapState(['oauth', 'user']),
|
||||
async asyncData ({ $axios, params }) {
|
||||
// const code = this.$route.query.code
|
||||
// if (code) {
|
||||
// const res = await api.setCode({code})
|
||||
// }
|
||||
const user = await $axios.$get('/auth/user')
|
||||
user.mastodon_auth = ''
|
||||
return { user } //, mastodon_instance: user.mastodon_auth.instance }
|
||||
// this.user = user
|
||||
// this.mastodon_instance = user.mastodon_auth.instance
|
||||
},
|
||||
// computed: mapState(['user']),
|
||||
// async asyncData ({ $axios, params }) {
|
||||
// const user = await $axios.$get('/auth/user')
|
||||
// user.mastodon_auth = ''
|
||||
// return { user }
|
||||
// },
|
||||
methods: {
|
||||
async change () {
|
||||
if (!this.password) return
|
||||
const user = this.user
|
||||
user.password = this.password
|
||||
try {
|
||||
await api.updateUser(user)
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
},
|
||||
async deassociate () {
|
||||
const user = this.user
|
||||
user.mastodon_auth = ''
|
||||
this.mastodon_instance = ''
|
||||
await api.updateUser(user)
|
||||
},
|
||||
async associate () {
|
||||
if (!this.mastodon_instance) return
|
||||
const url = await this.$axios.$post('/user/getauthurl', {instance: this.mastodon_instance})
|
||||
setTimeout( () => window.location.href=url, 100);
|
||||
async change () {
|
||||
if (!this.password) return
|
||||
const user = this.user
|
||||
user.password = this.password
|
||||
try {
|
||||
// this.$axios.
|
||||
// await api.updateUser(user)
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
},
|
||||
close (done) {
|
||||
this.$router.back()
|
||||
done()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
// import axios from 'axios'
|
||||
// import { getters } from '@/store'
|
||||
// const api = axios.create({
|
||||
// baseURL: process.env.NODE_ENV === 'development' ? 'http://localhost:3000/api' : '/api',
|
||||
// withCredentials: true,
|
||||
// responseType: 'json',
|
||||
// headers: {
|
||||
// // 'Access-Control-Allow-Origin': '*',
|
||||
// // 'Access-Control-Allow-Credentials': 'true',
|
||||
// // 'Accept': 'application/json',
|
||||
// 'Content-Type': 'application/json'
|
||||
// }
|
||||
// })
|
||||
|
||||
// export default function ({ $axios }) {
|
||||
// function get(path) {
|
||||
// return $axios.$get(path, { headers: { 'Authorization': 'Bearer ' + getters.token } })
|
||||
// }
|
||||
|
||||
// function post(path, data) {
|
||||
// return $axios.$post(path, data)
|
||||
// }
|
||||
|
||||
// function post(path, data) {
|
||||
// return api.post(path, data) // , { headers: { 'Authorization': getters.token } })
|
||||
// .then(res => res.data)
|
||||
// .catch((e) => {
|
||||
// console.error(e)
|
||||
// if (e.response.status === 403) {
|
||||
// // store.commit('logout') // TOFIX
|
||||
// return false
|
||||
// }
|
||||
// throw e.response && e.response.data &&
|
||||
// e.response.data.errors && e.response.data.errors[0].message
|
||||
// })
|
||||
// }
|
||||
// function put(path, data) {
|
||||
// return api.put(path, data, { headers: { 'Authorization': getters.token } })
|
||||
// .then(ret => ret.data)
|
||||
// }
|
||||
|
||||
// function del(path) {
|
||||
// return api.delete(path, { headers: { 'Authorization': getters.token } }).then(ret => ret.data)
|
||||
// }
|
||||
|
||||
// return {
|
||||
// login: (email, password) => post('/login', { email, password }),
|
||||
// register: user => post('/user', user)
|
||||
|
||||
// // password recovery
|
||||
// forgotPassword: email => post('/user/recover', { email }),
|
||||
// checkRecoverCode: recover_code => post('/user/check_recover_code', { recover_code }),
|
||||
// recoverPassword: (recover_code, password) => post('/user/recover_password', { recover_code, password }),
|
||||
|
||||
// getAllEvents: (month, year) => get(`/event/${year}/${month}`),
|
||||
// getUnconfirmedEvents: () => get('/event/unconfirmed'),
|
||||
|
||||
// confirmEvent: id => get(`/event/confirm/${id}`),
|
||||
// unconfirmEvent: id => get(`/event/unconfirm/${id}`),
|
||||
|
||||
// addNotification: notification => post('/event/notification', notification),
|
||||
// delNotification: code => del(`/event/notification/${code}`),
|
||||
|
||||
// addEvent: event => post('/user/event', event),
|
||||
// updateEvent: event => put('/user/event', event),
|
||||
|
||||
// updatePlace: place => put('/place', place),
|
||||
// delEvent: eventId => del(`/user/event/${eventId}`),
|
||||
// getEvent: eventId => get(`/event/${eventId}`),
|
||||
// getMeta: () => get('/event/meta'),
|
||||
// getUser: () => get('/user'),
|
||||
// getUsers: () => get('/users'),
|
||||
// updateTag: tag => put('/tag', tag),
|
||||
// updateUser: user => put('/user', user),
|
||||
// getAuthURL: mastodonInstance => post('/user/getauthurl', mastodonInstance),
|
||||
// setCode: code => post('/user/code', code),
|
||||
// getAdminSettings: () => get('/settings')
|
||||
// // setAdminSetting: (key, value) => post('/settings', { key, value })
|
||||
// }
|
||||
// }
|
||||
6
plugins/bootstrap-vue.js
vendored
6
plugins/bootstrap-vue.js
vendored
@@ -1,6 +0,0 @@
|
||||
import Vue from 'vue'
|
||||
import BootstrapVue from 'bootstrap-vue'
|
||||
|
||||
export default () => {
|
||||
Vue.use(BootstrapVue)
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
import Vue from 'vue'
|
||||
import { Button, Select, Tag, Option, Table, FormItem, Card,
|
||||
Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect,
|
||||
TableColumn, ColorPicker, Pagination, Popover, Tooltip,
|
||||
Container, Footer , Timeline, TimelineItem} from 'element-ui'
|
||||
import { Button, Select, Tag, Option, Table, FormItem, Card, Row, Col, Upload, Checkbox,
|
||||
Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect, Badge, ButtonGroup, Divider,
|
||||
TableColumn, ColorPicker, Pagination, Popover, Tooltip, Dialog, Calendar, Carousel, CarouselItem,
|
||||
Container, Footer , Timeline, TimelineItem, Menu, MenuItem } from 'element-ui'
|
||||
import localeEn from 'element-ui/lib/locale/lang/en'
|
||||
import localeIt from 'element-ui/lib/locale/lang/it'
|
||||
import locale from 'element-ui/lib/locale'
|
||||
@@ -10,6 +10,19 @@ locale.use(localeIt)
|
||||
|
||||
export default () => {
|
||||
Vue.use(Button)
|
||||
Vue.use(Divider)
|
||||
Vue.use(Checkbox)
|
||||
Vue.use(Upload)
|
||||
Vue.use(ButtonGroup)
|
||||
Vue.use(Calendar)
|
||||
Vue.use(Row)
|
||||
Vue.use(Col)
|
||||
Vue.use(Carousel)
|
||||
Vue.use(CarouselItem)
|
||||
Vue.use(Badge)
|
||||
Vue.use(Dialog)
|
||||
Vue.use(Menu)
|
||||
Vue.use(MenuItem)
|
||||
Vue.use(Container)
|
||||
Vue.use(Timeline)
|
||||
Vue.use(TimelineItem)
|
||||
|
||||
@@ -3,6 +3,21 @@ import moment from 'dayjs'
|
||||
import 'dayjs/locale/it'
|
||||
moment.locale('it')
|
||||
|
||||
Vue.filter('datetime', value => moment(value).format('ddd, D MMMM HH:mm'))
|
||||
Vue.filter('short_datetime', value => moment(value).format('D/MM HH:mm'))
|
||||
Vue.filter('hour', value => moment(value).format('HH:mm'))
|
||||
export default (a) => {
|
||||
|
||||
Vue.filter('datetime', value => moment(value).format('ddd, D MMMM HH:mm'))
|
||||
Vue.filter('short_datetime', value => moment(value).format('D/MM HH:mm'))
|
||||
Vue.filter('hour', value => moment(value).format('HH:mm'))
|
||||
Vue.filter('day', value => moment(value).format('ddd, D MMM'))
|
||||
Vue.filter('month', value => moment(value).format('MMM'))
|
||||
Vue.filter('event_when', event => {
|
||||
if (event.multidate) {
|
||||
return moment(event.start_datetime).format('dddd, D MMMM HH:mm') + ' - ' + moment(event.end_datetime).format('ddd, D MMMM')
|
||||
} else {
|
||||
if (event.end_datetime && event.end_datetime !== event.start_datetime)
|
||||
return moment(event.start_datetime).format('dddd, D MMMM HH:mm') + '-' + moment(event.end_datetime).format('HH:mm')
|
||||
else
|
||||
return moment(event.start_datetime).format('dddd, D MMMM HH:mm')
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import Vue from 'vue'
|
||||
import VueI18n from 'vue-i18n'
|
||||
import it from '@/locales/it.js'
|
||||
|
||||
Vue.use(VueI18n)
|
||||
|
||||
@@ -10,7 +11,7 @@ export default ({ app, store }) => {
|
||||
locale: store.state.locale,
|
||||
fallbackLocale: 'it',
|
||||
messages: {
|
||||
'it': require('~/locales/it.json')
|
||||
it
|
||||
// 'fr': require('~/locales/fr.json')
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
import Vue from 'vue'
|
||||
import MagicGrid from 'vue-magic-grid'
|
||||
|
||||
export default () => {
|
||||
Vue.use(MagicGrid)
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
import Vue from 'vue'
|
||||
import VCalendar from 'v-calendar'
|
||||
// import 'v-calendar/lib/v-calendar.min.css'
|
||||
|
||||
export default () => {
|
||||
Vue.use(VCalendar, {
|
||||
|
||||
@@ -17,6 +17,14 @@ import 'vue-awesome/icons/edit'
|
||||
import 'vue-awesome/icons/envelope-open-text'
|
||||
import 'vue-awesome/icons/user-secret'
|
||||
import 'vue-awesome/icons/question-circle'
|
||||
import 'vue-awesome/icons/share'
|
||||
import 'vue-awesome/icons/comment'
|
||||
import 'vue-awesome/icons/comments'
|
||||
import 'vue-awesome/icons/tags'
|
||||
import 'vue-awesome/icons/chevron-right'
|
||||
import 'vue-awesome/icons/chevron-left'
|
||||
import 'vue-awesome/icons/search'
|
||||
|
||||
import Icon from 'vue-awesome/components/Icon'
|
||||
|
||||
export default () => {
|
||||
|
||||
@@ -4,7 +4,7 @@ const User = require('./models/user')
|
||||
|
||||
const Auth = {
|
||||
async fillUser(req, res, next) {
|
||||
if (!req.user) return next(new Error('ERROR! No user'))
|
||||
if (!req.user) return next()
|
||||
req.user = await User.findOne({
|
||||
where: { id: { [Op.eq]: req.user.id }, is_active: true }
|
||||
})
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
const { User, Event, Comment, Tag } = require('../model')
|
||||
const config = require('../../../config')
|
||||
const { SHARED_CONF } = require('../../../config')
|
||||
const Mastodon = require('mastodon-api')
|
||||
// const Sequelize = require('sequelize')
|
||||
// const Op = Sequelize.Op
|
||||
@@ -13,7 +13,7 @@ const botController = {
|
||||
bot: null,
|
||||
async initialize () {
|
||||
const settings = await settingsController.settings()
|
||||
if (!settings.mastodon_auth) return
|
||||
if (!settings.mastodon_auth || !settings.mastodon_auth.access_token) return
|
||||
const mastodon_auth = settings.mastodon_auth
|
||||
botController.bot = new Mastodon({
|
||||
access_token: mastodon_auth.access_token,
|
||||
@@ -46,7 +46,7 @@ const botController = {
|
||||
const { access_token, instance } = mastodon_auth
|
||||
const bot = new Mastodon({ access_token, api_url: `https://${instance}/api/v1/` })
|
||||
const status = `${event.title} @ ${event.place.name} ${moment(event.start_datetime).format('ddd, D MMMM HH:mm')} -
|
||||
${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${config.baseurl}/event/${event.id}`
|
||||
${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${SHARED_CONF.baseurl}/event/${event.id}`
|
||||
|
||||
let media
|
||||
if (event.image_path) {
|
||||
|
||||
@@ -3,6 +3,7 @@ const moment = require('moment')
|
||||
const { Op } = require('sequelize')
|
||||
const lodash = require('lodash')
|
||||
const { User, Event, Comment, Tag, Place, Notification } = require('../model')
|
||||
const Sequelize = require('sequelize')
|
||||
|
||||
const eventController = {
|
||||
|
||||
@@ -19,8 +20,26 @@ const eventController = {
|
||||
},
|
||||
|
||||
async getMeta(req, res) {
|
||||
const places = await Place.findAll()
|
||||
const tags = await Tag.findAll()
|
||||
const places = await Place.findAll({
|
||||
group: ['place.id'],
|
||||
order: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'DESC']],
|
||||
attributes: {
|
||||
include: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'eventsCount']],
|
||||
exclude: ['createdAt', 'updatedAt']
|
||||
},
|
||||
include: { model: Event, attributes: [] }
|
||||
})
|
||||
|
||||
const tags = await Tag.findAll({
|
||||
group: ['tag'],
|
||||
order: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'DESC']],
|
||||
includeIgnoreAttributes:false,
|
||||
attributes: {
|
||||
include: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'eventsCount']],
|
||||
exclude: ['createdAt', 'updatedAt']
|
||||
},
|
||||
include: { model: Event, attributes: [] }})
|
||||
|
||||
res.json({ tags, places })
|
||||
},
|
||||
|
||||
@@ -67,7 +86,14 @@ const eventController = {
|
||||
|
||||
async get(req, res) {
|
||||
const id = req.params.event_id
|
||||
const event = await Event.findByPk(id, { include: [User, Tag, Comment, Place] })
|
||||
const event = await Event.findByPk(id, { include:
|
||||
[
|
||||
Tag,
|
||||
Comment,
|
||||
{ model: Place, attributes: ['name', 'address'] }
|
||||
] ,
|
||||
order: [ [Comment, 'id', 'DESC'] ]
|
||||
})
|
||||
res.json(event)
|
||||
},
|
||||
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
const { Settings } = require('../model')
|
||||
const { SHARED_CONF } = require('../../../config')
|
||||
const Mastodon = require('mastodon-api')
|
||||
|
||||
const settingsController = {
|
||||
async setAdminSetting (key, value) {
|
||||
@@ -14,6 +16,42 @@ const settingsController = {
|
||||
res.json(settings)
|
||||
},
|
||||
|
||||
async getAuthURL(req, res) {
|
||||
const instance = req.body.instance
|
||||
const callback = `${SHARED_CONF.baseurl}/api/settings/oauth`
|
||||
const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
|
||||
SHARED_CONF.title, 'read write', callback)
|
||||
const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
|
||||
`https://${instance}`, 'read write', callback)
|
||||
|
||||
await settingsController.setAdminSetting('mastodon_auth', { client_id, client_secret, instance })
|
||||
res.json(url)
|
||||
},
|
||||
|
||||
async code(req, res) {
|
||||
const code = req.query.code
|
||||
let client_id, client_secret, instance
|
||||
const callback = `${SHARED_CONF.baseurl}/api/settings/oauth`
|
||||
console.error('sono dentro CODEEEEEEEEEE', code)
|
||||
|
||||
const settings = await settingsController.settings()
|
||||
|
||||
console.log(settings);
|
||||
({ client_id, client_secret, instance } = settings.mastodon_auth)
|
||||
|
||||
try {
|
||||
const token = await Mastodon.getAccessToken(client_id, client_secret, code,
|
||||
`https://${instance}`, callback)
|
||||
const mastodon_auth = { client_id, client_secret, access_token: token, instance }
|
||||
console.error(mastodon_auth)
|
||||
await settingsController.setAdminSetting('mastodon_auth', mastodon_auth)
|
||||
|
||||
res.redirect('/admin')
|
||||
} catch (e) {
|
||||
res.json(e)
|
||||
}
|
||||
},
|
||||
|
||||
async settings () {
|
||||
const settings = await Settings.findAll()
|
||||
const map = {}
|
||||
|
||||
@@ -2,14 +2,12 @@ const fs = require('fs')
|
||||
const path = require('path')
|
||||
const crypto = require('crypto')
|
||||
const jwt = require('jsonwebtoken')
|
||||
const Mastodon = require('mastodon-api')
|
||||
const { Op } = require('sequelize')
|
||||
const jsonwebtoken = require('jsonwebtoken')
|
||||
const User = require('../models/user')
|
||||
const config = require('../../../config')
|
||||
const { SECRET_CONF, SHARED_CONF } = require('../../../config')
|
||||
const mail = require('../mail')
|
||||
const { Event, Tag, Place } = require('../models/event')
|
||||
const settingsController = require('./settings')
|
||||
const eventController = require('./event')
|
||||
|
||||
const userController = {
|
||||
@@ -17,13 +15,13 @@ const userController = {
|
||||
// find the user
|
||||
const user = await User.findOne({ where: { email: { [Op.eq]: req.body && req.body.email } } })
|
||||
if (!user) {
|
||||
res.status(404).json({ success: false, message: 'AUTH_FAIL' })
|
||||
res.status(403).json({ success: false, message: 'auth.fail' })
|
||||
} else if (user) {
|
||||
if (!user.is_active) {
|
||||
res.status(403).json({ success: false, message: 'NOT_CONFIRMED' })
|
||||
res.status(403).json({ success: false, message: 'auth.not_confirmed' })
|
||||
// check if password matches
|
||||
} else if (!await user.comparePassword(req.body.password)) {
|
||||
res.status(403).json({ success: false, message: 'AUTH_FAIL' })
|
||||
res.status(403).json({ success: false, message: 'auth.fail' })
|
||||
} else {
|
||||
// if user is found and password is right
|
||||
// create a token
|
||||
@@ -33,7 +31,7 @@ const userController = {
|
||||
email: user.email,
|
||||
scope: [user.is_admin ? 'admin' : 'user']
|
||||
},
|
||||
config.secret
|
||||
SECRET_CONF.secret
|
||||
)
|
||||
|
||||
res.json({token: accessToken})
|
||||
@@ -58,8 +56,12 @@ const userController = {
|
||||
if (event.image_path) {
|
||||
const old_path = path.resolve(__dirname, '..', '..', 'uploads', event.image_path)
|
||||
const old_thumb_path = path.resolve(__dirname, '..', '..', 'uploads', 'thumb', event.image_path)
|
||||
await fs.unlink(old_path)
|
||||
await fs.unlink(old_thumb_path)
|
||||
try {
|
||||
await fs.unlink(old_path)
|
||||
await fs.unlink(old_thumb_path)
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
}
|
||||
}
|
||||
await event.destroy()
|
||||
res.sendStatus(200)
|
||||
@@ -160,61 +162,14 @@ const userController = {
|
||||
return res.json(newEvent)
|
||||
},
|
||||
|
||||
async getAuthURL(req, res) {
|
||||
const instance = req.body.instance
|
||||
const is_admin = req.body.admin && req.user.is_admin
|
||||
const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
|
||||
const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
|
||||
config.title, 'read write', callback)
|
||||
const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
|
||||
`https://${instance}`, 'read write', callback)
|
||||
|
||||
if (is_admin) {
|
||||
await settingsController.setAdminSetting('mastodon_auth', { client_id, client_secret, instance })
|
||||
} else {
|
||||
req.user.mastodon_auth = { client_id, client_secret, instance }
|
||||
await req.user.save()
|
||||
}
|
||||
res.json(url)
|
||||
},
|
||||
|
||||
async code(req, res) {
|
||||
const { code, is_admin } = req.body
|
||||
let client_id, client_secret, instance
|
||||
const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
|
||||
|
||||
if (is_admin) {
|
||||
const settings = await settingsController.settings();
|
||||
({ client_id, client_secret, instance } = settings.mastodon_auth)
|
||||
} else {
|
||||
({ client_id, client_secret, instance } = req.user.mastodon_auth)
|
||||
}
|
||||
|
||||
try {
|
||||
const token = await Mastodon.getAccessToken(client_id, client_secret, code,
|
||||
`https://${instance}`, callback)
|
||||
const mastodon_auth = { client_id, client_secret, access_token: token, instance }
|
||||
if (is_admin) {
|
||||
await settingsController.setAdminSetting('mastodon_auth', mastodon_auth)
|
||||
res.json(instance)
|
||||
} else {
|
||||
req.user.mastodon_auth = mastodon_auth
|
||||
await req.user.save()
|
||||
// await bot.add(req.user, token)
|
||||
res.json(req.user)
|
||||
}
|
||||
} catch (e) {
|
||||
res.json(e)
|
||||
}
|
||||
},
|
||||
|
||||
async forgotPassword(req, res) {
|
||||
const email = req.body.email
|
||||
const user = await User.findOne({ where: { email: { [Op.eq]: email } } })
|
||||
if (!user) return res.sendStatus(200)
|
||||
|
||||
user.recover_code = crypto.randomBytes(16).toString('hex')
|
||||
mail.send(user.email, 'recover', { user, config })
|
||||
mail.send(user.email, 'recover', { user, config: SHARED_CONF })
|
||||
|
||||
await user.save()
|
||||
res.sendStatus(200)
|
||||
},
|
||||
@@ -229,13 +184,17 @@ const userController = {
|
||||
|
||||
async updatePasswordWithRecoverCode(req, res) {
|
||||
const recover_code = req.body.recover_code
|
||||
if (!recover_code) return res.sendStatus(400)
|
||||
const password = req.body.password
|
||||
if (!recover_code || !password) return res.sendStatus(400)
|
||||
const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } })
|
||||
if (!user) return res.sendStatus(400)
|
||||
user.password = password
|
||||
await user.save()
|
||||
res.sendStatus(200)
|
||||
try {
|
||||
await user.save()
|
||||
res.sendStatus(200)
|
||||
} catch(e) {
|
||||
res.sendStatus(400)
|
||||
}
|
||||
},
|
||||
|
||||
async current(req, res) {
|
||||
@@ -253,7 +212,7 @@ const userController = {
|
||||
const user = await User.findByPk(req.body.id)
|
||||
if (user) {
|
||||
if (!user.is_active && req.body.is_active) {
|
||||
await mail.send(user.email, 'confirm', { user, config })
|
||||
await mail.send(user.email, 'confirm', { user, config: SHARED_CONF })
|
||||
}
|
||||
await user.update(req.body)
|
||||
res.json(user)
|
||||
@@ -263,25 +222,29 @@ const userController = {
|
||||
},
|
||||
|
||||
async register(req, res) {
|
||||
console.error('register !!', req)
|
||||
|
||||
const n_users = await User.count()
|
||||
try {
|
||||
|
||||
// the first registered user will be an active admin
|
||||
if (n_users === 0) {
|
||||
// the first registered user will be an active admin
|
||||
req.body.is_active = req.body.is_admin = true
|
||||
} else {
|
||||
req.body.is_active = false
|
||||
}
|
||||
|
||||
const user = await User.create(req.body)
|
||||
try {
|
||||
mail.send([user.email, config.admin], 'register', { user, config })
|
||||
mail.send([user.email, SECRET_CONF.admin], 'register', { user, config: SHARED_CONF })
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
return res.status(400).json(e)
|
||||
}
|
||||
const payload = { email: user.email }
|
||||
const token = jwt.sign(payload, config.secret)
|
||||
const token = jwt.sign(payload, SECRET_CONF.secret)
|
||||
res.json({ user, token })
|
||||
} catch (e) {
|
||||
console.error(e)
|
||||
res.status(404).json(e)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
const Sequelize = require('sequelize')
|
||||
const conf = require('../../config.js')
|
||||
const db = new Sequelize(conf.db)
|
||||
db.sync()
|
||||
const { SECRET_CONF } = require('../../config.js')
|
||||
|
||||
const db = new Sequelize(SECRET_CONF.db)
|
||||
// db.sync()
|
||||
module.exports = db
|
||||
|
||||
@@ -5,10 +5,23 @@ const eventController = require('./controller/event')
|
||||
const exportController = require('./controller/export')
|
||||
const userController = require('./controller/user')
|
||||
const settingsController = require('./controller/settings')
|
||||
const config = require('../../config')
|
||||
const { SECRET_CONF } = require('../../config')
|
||||
const cookieParser = require('cookie-parser')
|
||||
|
||||
const botController = require('./controller/bot')
|
||||
const jwt = require('express-jwt')({secret: config.secret})
|
||||
const expressJwt = require('express-jwt')
|
||||
const jwt = expressJwt({
|
||||
secret: SECRET_CONF.secret,
|
||||
credentialsRequired: false,
|
||||
getToken: req => {
|
||||
if (req.headers.authorization && req.headers.authorization.split(' ')[0] === 'Bearer') {
|
||||
return req.headers.authorization.split(' ')[1];
|
||||
} else if (req.cookies && req.cookies['auth._token.local']) {
|
||||
const tmp = req.cookies['auth._token.local'].split(' ');
|
||||
return tmp[1]
|
||||
}
|
||||
return null
|
||||
}
|
||||
})
|
||||
|
||||
const storage = require('./storage')({
|
||||
destination: 'uploads/'
|
||||
@@ -16,7 +29,7 @@ const storage = require('./storage')({
|
||||
|
||||
const upload = multer({ storage })
|
||||
const api = express.Router()
|
||||
|
||||
api.use(cookieParser())
|
||||
// AUTH
|
||||
api.post('/auth/login', userController.login)
|
||||
api.post('/auth/logout', userController.logout)
|
||||
@@ -81,7 +94,7 @@ api.get('/export/:type', exportController.export)
|
||||
api.get('/event/:month/:year', eventController.getAll)
|
||||
|
||||
// mastodon oauth auth
|
||||
api.post('/user/getauthurl', jwt, isAuth, userController.getAuthURL)
|
||||
api.post('/user/code', jwt, isAuth, userController.code)
|
||||
api.post('/settings/getauthurl', jwt, isAuth, isAdmin, settingsController.getAuthURL)
|
||||
api.get('/settings/oauth', jwt, isAuth, isAdmin, settingsController.code)
|
||||
|
||||
module.exports = api
|
||||
|
||||
@@ -1,40 +1,40 @@
|
||||
const Email = require('email-templates')
|
||||
const path = require('path')
|
||||
const config = require('../../config')
|
||||
const { SECRET_CONF, SHARED_CONF } = require('../../config')
|
||||
const moment = require('moment')
|
||||
moment.locale(config.locale)
|
||||
moment.locale(SHARED_CONF.locale)
|
||||
|
||||
const mail = {
|
||||
send (addresses, template, locals) {
|
||||
const email = new Email({
|
||||
views: { root: path.join(__dirname, 'emails') },
|
||||
views: { root: path.join(__dirname, '..', 'emails') },
|
||||
juice: true,
|
||||
juiceResources: {
|
||||
preserveImportant: true,
|
||||
webResources: {
|
||||
relativeTo: path.join(__dirname, 'emails')
|
||||
relativeTo: path.join(__dirname, '..', 'emails')
|
||||
}
|
||||
},
|
||||
message: {
|
||||
from: `${config.title} <${config.smtp.auth.user}>`
|
||||
from: `${SHARED_CONF.title} <${SECRET_CONF.smtp.auth.user}>`
|
||||
},
|
||||
send: true,
|
||||
i18n: {
|
||||
locales: ['en', 'es', 'it'],
|
||||
defaultLocale: config.locale
|
||||
directory: path.join(__dirname, '..', '..', 'locales', 'email'),
|
||||
defaultLocale: SHARED_CONF.locale
|
||||
},
|
||||
transport: config.smtp
|
||||
transport: SECRET_CONF.smtp
|
||||
})
|
||||
return email.send({
|
||||
template,
|
||||
message: {
|
||||
to: addresses,
|
||||
bcc: config.admin
|
||||
bcc: SECRET_CONF.admin
|
||||
},
|
||||
locals: {
|
||||
...locals,
|
||||
locale: config.locale,
|
||||
config,
|
||||
locale: SHARED_CONF.locale,
|
||||
config: SHARED_CONF,
|
||||
datetime: datetime => moment(datetime).format('ddd, D MMMM HH:mm')
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,19 +10,23 @@ const Event = db.define('event', {
|
||||
end_datetime: { type: Sequelize.DATE, index: true },
|
||||
image_path: Sequelize.STRING,
|
||||
is_visible: Sequelize.BOOLEAN,
|
||||
activitypub_id: { type: Sequelize.STRING, index: true },
|
||||
// activitypub_ids: { type: Sequelize.ARRAY, index}
|
||||
activitypub_id: { type: Sequelize.BIGINT, index: true },
|
||||
activitypub_ids: {
|
||||
type: Sequelize.ARRAY(Sequelize.BIGINT),
|
||||
index: true,
|
||||
defaultValue: []
|
||||
}
|
||||
})
|
||||
|
||||
const Tag = db.define('tag', {
|
||||
tag: { type: Sequelize.STRING, index: true, unique: true, primaryKey: true },
|
||||
tag: { type: Sequelize.STRING, index: true, unique: true, },
|
||||
color: { type: Sequelize.STRING }
|
||||
})
|
||||
|
||||
const Comment = db.define('comment', {
|
||||
activitypub_id: { type: Sequelize.STRING, index: true },
|
||||
activitypub_id: { type: Sequelize.BIGINT, index: true },
|
||||
data: Sequelize.JSON,
|
||||
url: Sequelize.STRING,
|
||||
// url: Sequelize.STRING,
|
||||
author: Sequelize.STRING,
|
||||
text: Sequelize.STRING
|
||||
})
|
||||
|
||||
@@ -28,8 +28,8 @@ DiskStorage.prototype._handleFile = function _handleFile(req, file, cb) {
|
||||
const thumbPath = path.join(destination, 'thumb', filename)
|
||||
const outStream = fs.createWriteStream(finalPath)
|
||||
const thumbStream = fs.createWriteStream(thumbPath)
|
||||
const resizer = sharp().resize(800).jpeg({ quality: 80 })
|
||||
const thumbnailer = sharp().resize(400).jpeg({ quality: 60 })
|
||||
const resizer = sharp().resize(800).jpeg({ quality: 90 })
|
||||
const thumbnailer = sharp().resize(400).jpeg({ quality: 90 })
|
||||
|
||||
file.stream.pipe(thumbnailer).pipe(thumbStream)
|
||||
thumbStream.on('error', e => console.log('thumbStream error ', e))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// const mail = require('./mail')
|
||||
const bot = require('./api/controller/bot')
|
||||
const settingsController = require('./api/controller/settings')
|
||||
const config = require('./api/config.js')
|
||||
// const config = require('./api/config.js')
|
||||
|
||||
const { Event, Notification, EventNotification,
|
||||
User, Place, Tag } = require('./api/model')
|
||||
@@ -25,15 +25,6 @@ async function sendNotification (notification, event, eventNotification) {
|
||||
})
|
||||
promises.push(b)
|
||||
}
|
||||
// user publish
|
||||
if (event.user && event.user.mastodon_auth && event.user.mastodon_auth.access_token) {
|
||||
const b = bot.post(event.user.mastodon_auth, event).then(ret => {
|
||||
event.activitypub_id = ret.id
|
||||
return event.save()
|
||||
})
|
||||
promises.push(b)
|
||||
}
|
||||
break
|
||||
}
|
||||
return Promise.all(promises)
|
||||
}
|
||||
|
||||
101
store/index.js
101
store/index.js
@@ -1,6 +1,7 @@
|
||||
import moment from 'dayjs'
|
||||
import { intersection } from 'lodash'
|
||||
import Vue from 'vue'
|
||||
import intersection from 'lodash/intersection'
|
||||
import map from 'lodash/map'
|
||||
|
||||
|
||||
export const state = () => ({
|
||||
events: [],
|
||||
@@ -13,51 +14,61 @@ export const state = () => ({
|
||||
filters: {
|
||||
tags: [],
|
||||
places: []
|
||||
}
|
||||
},
|
||||
show_past_events: false,
|
||||
})
|
||||
|
||||
export const getters = {
|
||||
token: state => state.token,
|
||||
// filter current + future events only
|
||||
// plus, filter matches search tag/place
|
||||
|
||||
filteredEvents: (state) => {
|
||||
const events = state.events.map((e) => {
|
||||
const end_datetime = e.end_datetime || moment(e.start_datetime).add('3', 'hour')
|
||||
const past = (moment().diff(end_datetime, 'minutes') > 0)
|
||||
e.past = past
|
||||
|
||||
let events = state.events
|
||||
|
||||
// TOFIX: use lodash
|
||||
if (state.filters.tags.length || state.filters.places.length){
|
||||
events = events.filter((e) => {
|
||||
if (state.filters.tags.length) {
|
||||
const m = intersection(e.tags.map(t => t.tag), state.filters.tags)
|
||||
if (m.length > 0) return true
|
||||
}
|
||||
if (state.filters.places.length) {
|
||||
if (state.filters.places.find(p => p === e.place.id)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return 0
|
||||
})
|
||||
}
|
||||
|
||||
if (!state.show_past_events) {
|
||||
events = events.filter( e => !e.past )
|
||||
}
|
||||
|
||||
let lastDay = null
|
||||
events = map(events, e => {
|
||||
const currentDay = moment(e.start_datetime).date()
|
||||
console.log(currentDay)
|
||||
e.newDay = (!lastDay || lastDay!==currentDay) && currentDay
|
||||
lastDay = currentDay
|
||||
return e
|
||||
})
|
||||
if (!state.filters.tags.length && !state.filters.places.length) {
|
||||
return events
|
||||
}
|
||||
return events.filter((e) => {
|
||||
if (state.filters.tags.length) {
|
||||
const m = intersection(e.tags.map(t => t.tag), state.filters.tags)
|
||||
if (m.length > 0) return true
|
||||
}
|
||||
if (state.filters.places.length) {
|
||||
if (state.filters.places.find(p => p === e.place.name)) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return 0
|
||||
})
|
||||
|
||||
return events
|
||||
}
|
||||
}
|
||||
|
||||
export const mutations = {
|
||||
logout(state) {
|
||||
state.logged = false
|
||||
state.token = ''
|
||||
state.user = {}
|
||||
},
|
||||
login(state, user) {
|
||||
state.logged = true
|
||||
state.user = user.user
|
||||
state.token = user.token
|
||||
},
|
||||
setEvents(state, events) {
|
||||
state.events = events
|
||||
// set a `past` flag
|
||||
state.events = events.map((e) => {
|
||||
const end_datetime = e.end_datetime || moment(e.start_datetime).add('3', 'hour')
|
||||
const past = (moment().diff(end_datetime, 'minutes') > 0)
|
||||
e.past = !!past
|
||||
return e
|
||||
})
|
||||
},
|
||||
addEvent(state, event) {
|
||||
state.events.push(event)
|
||||
@@ -69,7 +80,9 @@ export const mutations = {
|
||||
})
|
||||
},
|
||||
delEvent(state, eventId) {
|
||||
state.events = state.events.filter(ev => ev.id !== eventId)
|
||||
state.events = state.events.filter(ev => {
|
||||
return ev.id !== eventId
|
||||
})
|
||||
},
|
||||
update(state, { tags, places }) {
|
||||
state.tags = tags
|
||||
@@ -93,21 +106,13 @@ export const mutations = {
|
||||
},
|
||||
setSearchPlaces(state, places) {
|
||||
state.filters.places = places
|
||||
},
|
||||
showPastEvents (state, show) {
|
||||
state.show_past_events = show
|
||||
}
|
||||
}
|
||||
|
||||
export const actions = {
|
||||
// called on server request
|
||||
// get current month's event
|
||||
async nuxtServerInit({ commit }, { req }) {
|
||||
// set user if logged! TODO
|
||||
const now = new Date()
|
||||
// const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
|
||||
const events = await this.$axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
|
||||
commit('setEvents', events)
|
||||
const { tags, places } = await this.$axios.$get('/event/meta')
|
||||
commit('update', { tags, places })
|
||||
},
|
||||
async updateEvents({ commit }, page) {
|
||||
const events = await this.$axios.$get(`/event/${page.month-1}/${page.year}`)
|
||||
commit('setEvents', events)
|
||||
@@ -139,8 +144,8 @@ export const actions = {
|
||||
},
|
||||
setSearchPlaces({ commit }, places) {
|
||||
commit('setSearchPlaces', places)
|
||||
},
|
||||
showPastEvents({ commit }, show) {
|
||||
commit('showPastEvents', show)
|
||||
}
|
||||
}
|
||||
// export const getters = {
|
||||
// filteredEvents: state => state.events
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user