Skip to content
Permalink
Browse files

Merge pull request #1401 from leider/master

GDCR & deps bump
  • Loading branch information...
NicoleRauch committed Sep 27, 2019
2 parents d87f930 + d515545 commit ba2f5075eb0c52567084b2cfa597d57ea84d3137
Showing with 45 additions and 51 deletions.
  1. +26 −34 package-lock.json
  2. +6 −6 package.json
  3. +4 −2 softwerkskammer/lib/activities/index.js
  4. +9 −9 softwerkskammer/lib/site/views/index.pug

Some generated files are not rendered by default. Learn more.

@@ -23,7 +23,7 @@
"node": ">=6.0"
},
"dependencies": {
"@fortawesome/fontawesome-free": "5.10.2",
"@fortawesome/fontawesome-free": "5.11.2",
"@fullcalendar/bootstrap": "4.3.0",
"@fullcalendar/core": "4.3.1",
"@fullcalendar/daygrid": "4.3.0",
@@ -49,9 +49,9 @@
"full-icu": "1.3.0",
"glob": "7.1.4",
"guillotine": "1.3.1",
"i18next": "17.0.13",
"i18next": "17.0.16",
"i18next-express-middleware": "1.8.2",
"i18next-intervalplural-postprocessor": "1.0.2",
"i18next-intervalplural-postprocessor": "1.0.3",
"i18next-node-fs-backend": "2.1.3",
"icalendar": "0.7.1",
"iconv-lite": "0.5.0",
@@ -61,7 +61,7 @@
"jquery-validation": "1.19.1",
"jsonwebtoken": "8.5.1",
"leaflet": "1.5.1",
"luxon": "1.17.2",
"luxon": "1.19.3",
"marked": "0.7.0",
"mime-types": "2.1.24",
"mongodb": "3.3.2",
@@ -122,8 +122,8 @@
"mocha": "6.2.0",
"must-dist": "0.12.0",
"proxyquire": "2.1.3",
"puppeteer": "1.19.0",
"sinon": "7.4.1",
"puppeteer": "1.20.0",
"sinon": "7.5.0",
"supertest": "4.0.2"
},
"scripts": {
@@ -83,7 +83,7 @@ function renderGdcrFor(gdcrDay, res, next) {
res.render('gdcr', {
activities,
year: String(gdcrYear),
previousYears: R.range(2013, gdcrYear).map(year => String(year))
previousYears: R.range(2013, gdcrYear).map(year => String(year)).reverse()
});
});
}
@@ -98,7 +98,9 @@ app.get('/gdcr2016', (req, res, next) => renderGdcrFor('2016-10-22', res, next))

app.get('/gdcr2017', (req, res, next) => renderGdcrFor('2017-11-18', res, next));

app.get('/gdcr', (req, res, next) => renderGdcrFor('2018-11-17', res, next));
app.get('/gdcr2018', (req, res, next) => renderGdcrFor('2018-11-17', res, next));

app.get('/gdcr', (req, res, next) => renderGdcrFor('2019-11-16', res, next));

app.get('/upcoming', (req, res, next) => activitiesForDisplay(activitystore.upcomingActivities, next, res, req.i18n.t('activities.upcoming')));

@@ -4,23 +4,23 @@ include ../../groups/views/group-mixins

block title
| #{t('general.welcome')}

block head
+addMapStyle

block content
.row
.col-12
.page-header
h1 Softwerkskammer <br>
small #{t('general.communities')}
//.row
// .col-md-12
// h2 Aktuell: Der Global Day of Coderetreat am 17. November 2018
// p
// | Hier findest Du&nbsp;
// a(href='activities/gdcr') die meisten der Veranstaltungen im Softwerkskammer-Einzugsgebiet.
// hr
.row
.col-md-12
h2 Aktuell: Der Global Day of Coderetreat am 16. November 2019
p
| Hier findest Du&nbsp;
a(href='activities/gdcr') die meisten der Veranstaltungen im Softwerkskammer-Einzugsgebiet.
hr
.row
.col-lg-6
!=t('general.about_us_text', { postProcess: 'pug' })

0 comments on commit ba2f507

Please sign in to comment.
You can’t perform that action at this time.