diff --git a/.gitignore b/.gitignore index 687e0f08..5f907638 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ uploads # local env files .env.production +db.sqlite + # Log files npm-debug.log* yarn-debug.log* diff --git a/README.md b/README.md index f5d43357..ca6bb614 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ an event manager for radical communities if something is not working as expected, it's expected :D #### Install -We provide a docker way to run **gancio**. +We provide a docker way to run **gancio** but you can also manually install it. ``` git clone https://git.lattuga.net/lesion/gancio.git cd gancio @@ -33,4 +33,9 @@ cd client yarn # run front-end in development mode yarn dev -``` \ No newline at end of file +``` + + +#### Migrate / Backup +- db +- images diff --git a/app/controller/event.js b/app/controller/event.js index 0db8dbe9..fd7054d3 100644 --- a/app/controller/event.js +++ b/app/controller/event.js @@ -30,7 +30,7 @@ const eventController = { if (!filters) return true // check for visibility - if (filters.is_visible && filters.is_visible !== event.is_visible) return false + if (typeof filters.is_visible !== 'undefined' && filters.is_visible !== event.is_visible) return false if (!filters.tags && !filters.places) return true if (!filters.tags.length && !filters.places.length) return true @@ -136,8 +136,13 @@ const eventController = { }, async getAll (req, res) { - const start = moment().year(req.params.year).month(req.params.month).startOf('month').subtract(1, 'week') - const end = moment().year(req.params.year).month(req.params.month).endOf('month').add(1, 'week') + // this is due how v-calendar shows dates + let start = moment().year(req.params.year).month(req.params.month) + .startOf('month').startOf('isoWeek') + let end = moment().year(req.params.year).month(req.params.month).endOf('month') + const shownDays = end.diff(start, 'days') + if (shownDays <= 34) end = end.add(1, 'week') + end = end.endOf('isoWeek') const events = await Event.findAll({ where: { is_visible: true, diff --git a/client/src/components/Calendar.vue b/client/src/components/Calendar.vue index ecc11c72..05f6eb59 100644 --- a/client/src/components/Calendar.vue +++ b/client/src/components/Calendar.vue @@ -45,7 +45,7 @@ export default { } } - let color = event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(200,200,200,0.5)' + let color = 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 = { diff --git a/docker-compose.yml b/docker-compose.yml index 1ae0558a..6cfce360 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: ports: - '12300:12300' volumes: - - ./app/uploads:/usr/src/app/app/uploads + - ./uploads:/usr/src/app/uploads links: - db