diff --git a/.gitignore b/.gitignore index 8412a7ad..7b99f646 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ # Created by .ignore support plugin (hsz.mobi) +### Gancio production configuration +server/config.js + ### Node template # Logs logs diff --git a/.sequelizerc b/.sequelizerc new file mode 100644 index 00000000..cf1a6883 --- /dev/null +++ b/.sequelizerc @@ -0,0 +1,7 @@ +const path = require('path') + +module.exports = { + 'config': path.resolve('server' ,'config.js'), + 'migrations-path': path.resolve('server', 'migrations'), + 'models-path': path.resolve('server', 'api', 'models') +} diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json index afb914a9..a487fe65 100644 --- a/.vscode/vscode-kanban.json +++ b/.vscode/vscode-kanban.json @@ -150,6 +150,15 @@ "title": "risolvere le modali quando il js e' disabilitato", "type": "bug" }, + { + "assignedTo": { + "name": "lesion" + }, + "creation_time": "2019-06-01T21:00:22.155Z", + "id": "28", + "references": [], + "title": "activitypub stream" + }, { "assignedTo": { "name": "lesion" @@ -168,6 +177,15 @@ "references": [], "title": "check password reset" }, + { + "assignedTo": { + "name": "lesion" + }, + "creation_time": "2019-06-01T21:23:46.941Z", + "id": "30", + "references": [], + "title": "choose listening port" + }, { "assignedTo": { "name": "lesion" @@ -195,6 +213,15 @@ "references": [], "title": "creazione script di backup" }, + { + "assignedTo": { + "name": "lesion" + }, + "creation_time": "2019-06-01T21:00:07.431Z", + "id": "27", + "references": [], + "title": "eventi ricorrenti" + }, { "assignedTo": { "name": "lesion" @@ -250,6 +277,15 @@ "references": [], "title": "rifare il calendario o solo il popup" }, + { + "assignedTo": { + "name": "lesion" + }, + "creation_time": "2019-06-01T21:15:42.190Z", + "id": "29", + "references": [], + "title": "settings di istanza (default filter, eg, eventi ricorrenti)" + }, { "assignedTo": { "name": "lesion" @@ -261,6 +297,15 @@ "references": [], "title": "traduzione in inglese" }, + { + "assignedTo": { + "name": "lesion" + }, + "creation_time": "2019-05-29T13:10:04.463Z", + "id": "26", + "references": [], + "title": "v-calendar colori e eventi multidays..." + }, { "assignedTo": { "name": "lesion" @@ -277,10 +322,10 @@ "assignedTo": { "name": "lesion" }, - "creation_time": "2019-05-29T13:10:04.463Z", - "id": "26", + "creation_time": "2019-06-05T20:39:59.287Z", + "id": "31", "references": [], - "title": "v-calendar colori e eventi multidays..." + "title": "scroll h su mobile" } ] } \ No newline at end of file diff --git a/assets/style.less b/assets/style.less index f185afee..09f8e442 100644 --- a/assets/style.less +++ b/assets/style.less @@ -1,6 +1,10 @@ +@background: #222C32; +@success: #c7ffbc; +// @info + html, body { margin: 0px; - background-color: #222C32 !important; + background-color: @background !important; width: 100%; overflow-x: hidden; box-sizing: border-box; @@ -11,6 +15,20 @@ html, body { box-sizing: border-box; } +.el-form-item { + margin-bottom: 5px; +} +.el-divider__text { + background-color: @background; + color: white; + border-radius: 5px; +} + +.el-card { + max-width: 600px; + margin: 30px auto; +} + .el-dialog { margin-top: 0px !important; border-radius: 0px; diff --git a/components/Calendar.vue b/components/Calendar.vue index 5ecd0b44..e42e27f4 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -52,17 +52,18 @@ export default { start: event.start_datetime, end: event.end_datetime } e.highlight = { - color: 'red' // : sample(['purple', 'red', 'green', 'blue']), + color: sample(['purple', 'red', 'green', 'blue']), } } else { e.dates = event.start_datetime - e.dot = { color: 'rgba(102,10,20)' } + e.dot = { color: sample(['purple', 'red', 'green', 'blue']) } } return e } }, computed: { ...mapGetters(['filteredEvents']), + ...mapState(['events']), attributes () { return [ { key: 'today', dates: new Date(), diff --git a/components/Event.vue b/components/Event.vue index dd2fa9fc..c65600ef 100644 --- a/components/Event.vue +++ b/components/Event.vue @@ -12,7 +12,7 @@ //- date / place .date div {{event|event_when}} - div {{event.place.name}} + div @{{event.place.name}} //- p(v-if='showDescription') {{event.description}} @@ -54,6 +54,7 @@ export default { }