Merge branch 'release/2.1.2' into master

calendz · Oct 16, 2020 · 12bb79c · 12bb79c
2 parents d12599f + 54712e4
commit 12bb79c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/Middleware/ConvertIcal.js b/app/Middleware/ConvertIcal.js
@@ -11,14 +11,14 @@ class ConvertIcal {
     const format = request.input('format')
 
     if (format === 'icalendar') {
-      const cal = ical()
+      const cal = ical({ name: 'Calendz - Cours', timezone: 'Europe/Paris' })
 
       const events = findValuesHelper(response._lazyBody, 'date', [])
 
       events.forEach(event => {
         cal.createEvent({
-          start: moment(event.date + ' ' + event.start, 'DD/MM/YYYY hh:mm').tz('Europe/Paris').toDate(),
-          end: moment(event.date + ' ' + event.end, 'DD/MM/YYYY hh:mm').tz('Europe/Paris').toDate(),
+          start: moment.tz(event.date + ' ' + event.start, 'DD/MM/YYYY hh:mm', 'Europe/Paris'),
+          end: moment.tz(event.date + ' ' + event.end, 'DD/MM/YYYY hh:mm', 'Europe/Paris'),
           summary: event.subject,
           description: event.professor,
           location: event.room

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "author": "Calendz",
   "license": "ISC",
   "private": true,
-  "version": "2.1.1",
+  "version": "2.1.2",
   "adonis-version": "4.1.0",
   "main": "index.js",
   "scripts": {