From 4a7e139b6b92ff8463345670a0fd7682d026fe2d Mon Sep 17 00:00:00 2001 From: Henri Bergius Date: Mon, 24 Dec 2018 16:59:11 +0100 Subject: [PATCH 1/3] Add c-base local events to calendar --- 35c3-events/c-base.js | 37 +++++++++++++++++++++++++++++++++++++ 35c3-events/calendar.js | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 35c3-events/c-base.js diff --git a/35c3-events/c-base.js b/35c3-events/c-base.js new file mode 100644 index 0000000..56449b4 --- /dev/null +++ b/35c3-events/c-base.js @@ -0,0 +1,37 @@ +module.exports = [ + { + allDay: true, + start: '2018-12-25T15:24:51+0000', + end: '2018-12-25T15:24:51+0000', + title: 'Alle Safeties checken', + id: 'c-base', + }, + { + allDay: true, + start: '2018-12-25T15:24:51+0000', + end: '2018-12-25T15:24:51+0000', + title: 'Tische aufbauen', + id: 'c-base', + }, + { + allDay: true, + start: '2018-12-25T15:24:51+0000', + end: '2018-12-25T15:24:51+0000', + title: 'Monitore anhängen mit dazz)', + id: 'c-base', + }, + { + allDay: true, + start: '2018-12-25T15:24:51+0000', + end: '2018-12-25T15:24:51+0000', + title: 'projection mapping von riot platzieren', + id: 'c-base', + }, + { + allDay: false, + start: '2018-12-25T18:00:00+0000', + end: '2018-12-25T18:00:00+0000', + title: 'Abnahme', + id: 'c-base', + }, +]; diff --git a/35c3-events/calendar.js b/35c3-events/calendar.js index b1b8af7..cf8c2c5 100644 --- a/35c3-events/calendar.js +++ b/35c3-events/calendar.js @@ -1,4 +1,5 @@ import dateformat from 'dateformat'; +import baseevents from './c-base'; import '../elements/time'; function sortEvents(a, b) { @@ -47,6 +48,7 @@ function getEvents(number) { }); return talks; }) + .then(talks => baseevents.concat(talks)) .then(talks => fetch('https://launchlibrary.net/1.3/launch/next/2') .then(res => res.json()) .then((res) => { From f314e450faff12d7f03e27186ffbd336b662e4e4 Mon Sep 17 00:00:00 2001 From: cannonerd Date: Mon, 24 Dec 2018 17:09:49 +0100 Subject: [PATCH 2/3] 24th tasks --- 35c3-events/c-base.js | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/35c3-events/c-base.js b/35c3-events/c-base.js index 56449b4..5f98802 100644 --- a/35c3-events/c-base.js +++ b/35c3-events/c-base.js @@ -1,4 +1,39 @@ module.exports = [ + { + allDay: true, + start: "2018-12-24T15:24:51+0000", + end: "2018-12-24T15:24:51+0000", + title: "Gitterboxen durchfengeln lassen", + id: "c-base", + }, + { + allDay: true, + start: "2018-12-24T15:24:51+0000", + end: "2018-12-24T15:24:51+0000", + title: "Lict planen", + id: "c-base", + }, + { + allDay: true, + start: "2018-12-24T15:24:51+0000", + end: "2018-12-24T15:24:51+0000", + title: "Tischbeine holen, 22x4", + id: "c-base", + }, + { + allDay: true, + start: "2018-12-24T15:24:51+0000", + end: "2018-12-24T15:24:51+0000", + title: "c-cretariat zuende bauen", + id: "c-base", + }, + { + allDay: true, + start: "2018-12-24T15:24:51+0000", + end: "2018-12-24T15:24:51+0000", + title: "DMX-Kabel mit Gaffer/Teppich zur Antenne legen, von Fengel absegnen lassen", + id: "c-base", + }, { allDay: true, start: '2018-12-25T15:24:51+0000', From 30055dbee85a711ab55c591c418644e94b90d14b Mon Sep 17 00:00:00 2001 From: Henri Bergius Date: Mon, 24 Dec 2018 17:12:37 +0100 Subject: [PATCH 3/3] Make eslint happy --- 35c3-events/c-base.js | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/35c3-events/c-base.js b/35c3-events/c-base.js index 5f98802..473877b 100644 --- a/35c3-events/c-base.js +++ b/35c3-events/c-base.js @@ -1,38 +1,38 @@ module.exports = [ { - allDay: true, - start: "2018-12-24T15:24:51+0000", - end: "2018-12-24T15:24:51+0000", - title: "Gitterboxen durchfengeln lassen", - id: "c-base", - }, - { - allDay: true, - start: "2018-12-24T15:24:51+0000", - end: "2018-12-24T15:24:51+0000", - title: "Lict planen", - id: "c-base", + allDay: true, + start: '2018-12-24T15:24:51+0000', + end: '2018-12-24T15:24:51+0000', + title: 'Gitterboxen durchfengeln lassen', + id: 'c-base', }, { allDay: true, - start: "2018-12-24T15:24:51+0000", - end: "2018-12-24T15:24:51+0000", - title: "Tischbeine holen, 22x4", - id: "c-base", + start: '2018-12-24T15:24:51+0000', + end: '2018-12-24T15:24:51+0000', + title: 'Lict planen', + id: 'c-base', }, { allDay: true, - start: "2018-12-24T15:24:51+0000", - end: "2018-12-24T15:24:51+0000", - title: "c-cretariat zuende bauen", - id: "c-base", + start: '2018-12-24T15:24:51+0000', + end: '2018-12-24T15:24:51+0000', + title: 'Tischbeine holen, 22x4', + id: 'c-base', }, { allDay: true, - start: "2018-12-24T15:24:51+0000", - end: "2018-12-24T15:24:51+0000", - title: "DMX-Kabel mit Gaffer/Teppich zur Antenne legen, von Fengel absegnen lassen", - id: "c-base", + start: '2018-12-24T15:24:51+0000', + end: '2018-12-24T15:24:51+0000', + title: 'c-cretariat zuende bauen', + id: 'c-base', + }, + { + allDay: true, + start: '2018-12-24T15:24:51+0000', + end: '2018-12-24T15:24:51+0000', + title: 'DMX-Kabel mit Gaffer/Teppich zur Antenne legen, von Fengel absegnen lassen', + id: 'c-base', }, { allDay: true,