From 2bb72b97a122b7f9bf808fdf791d885320ff5433 Mon Sep 17 00:00:00 2001 From: Bram van der Veen <96aa48@gmail.com> Date: Sun, 14 Jun 2015 23:59:43 +0200 Subject: [PATCH] Added a link menu for quickly navigating school related websites --- configuration.js | 7 ++++++- resources/jade/homepage.jade | 2 ++ resources/jade/links.jade | 6 ++++++ resources/jade/schedule.jade | 4 +++- resources/less/style.less | 30 +++++++++++++++++++++++++++++- schedule.js | 1 - web.js | 8 +++----- 7 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 resources/jade/links.jade diff --git a/configuration.js b/configuration.js index 5b37980..ccc794b 100644 --- a/configuration.js +++ b/configuration.js @@ -18,7 +18,12 @@ module.exports = function () { '14:40 - 15:40', '15:40 - 16:40' ], - 'school_id' : 934 + 'school_id' : 934, + 'links' : { + 'Login': ['#', '#96AA48'], + 'Magister': ['http://werkman.magister.net', '#0C5489'], + 'Mail': ['https://login.microsoftonline.com/', '#C41824'] + } } fs.writeFileSync(__dirname + '/settings.json', JSON.stringify(settings, null, 2)); diff --git a/resources/jade/homepage.jade b/resources/jade/homepage.jade index f714a81..1399084 100644 --- a/resources/jade/homepage.jade +++ b/resources/jade/homepage.jade @@ -3,3 +3,5 @@ include header div.homepage input.search(type="text", name="searchterm", placeholder="Je naam, id, klassennaam, docentencode, lokaalcode") button.search Zoeken + +include links diff --git a/resources/jade/links.jade b/resources/jade/links.jade new file mode 100644 index 0000000..957e1f7 --- /dev/null +++ b/resources/jade/links.jade @@ -0,0 +1,6 @@ +//links.jade +div.links + each properties, name in links + div + a(href=properties[0], target='_blank' style='background-color:' + properties[1])=name + diff --git a/resources/jade/schedule.jade b/resources/jade/schedule.jade index a50c8d4..17ecd41 100644 --- a/resources/jade/schedule.jade +++ b/resources/jade/schedule.jade @@ -18,8 +18,10 @@ div.schedule span.course= hour.course if match.json.indexOf(day) == 0 - span.time= match.times[match.json[0].indexOf(hour)] + span.time= times[match.json[0].indexOf(hour)] else div.hour.changed span.free Vrij + +include links diff --git a/resources/less/style.less b/resources/less/style.less index ff7c522..bd07fbd 100644 --- a/resources/less/style.less +++ b/resources/less/style.less @@ -118,5 +118,33 @@ div.schedule { } } } - +} + +.links { + width: 100%; + position: fixed; + bottom: -90px; + transition: ease .5s; + + &:hover { + bottom: 0px; + transition: ease .5s; + } + + div { + height: 100px; + width: calc(100% / 3); + float: left; + + + a { + text-decoration: none; + height: 100%; + width: 100%; + display: inline-block; + color: #FFF; + text-align: center; + font-size: 60px; + } + } } diff --git a/schedule.js b/schedule.js index c47b0e9..b6185f9 100644 --- a/schedule.js +++ b/schedule.js @@ -7,7 +7,6 @@ var config = require('./configuration'); function schedule(req, res, next) { get(req.match.url, function (json) { req.match.json = json; - req.match.times = config().hour_times; next(); }); } diff --git a/web.js b/web.js index 0cd1f8a..b6d25e4 100644 --- a/web.js +++ b/web.js @@ -14,11 +14,9 @@ app.use('/css', less(__dirname + '/resources/less')); app.use('/js', express.static(__dirname + '/resources/js')); app.get('/', function (req, res) { - res.render('homepage'); -}); - -app.post('/', function (req, res) { - console.log(req); + req.links = config().links; + console.log(req.links); + res.render('homepage', req); }); app.get('/rooster/:search', function (req, res) {