Calendar

kkretsch · Feb 15, 2017 · e0188dd · e0188dd
1 parent c0d8659
commit e0188dd
Show file tree

Hide file tree

Showing 9 changed files with 609 additions and 3 deletions.
diff --git a/application/routes.js b/application/routes.js
@@ -98,6 +98,23 @@ module.exports = function(app, passport, myConnectionPool) {
 	// real Routes HOME
 	app.get('/', routes.index);
 	app.get('/my', routes.myhome);
+	app.get('/my/calendar', routes.mycalendar);
+	app.get('/my/calenderevents', function(req, res) {
+		if(!req.isAuthenticated()) {
+			return res.redirect('/');
+		} // if
+		res.setHeader('Content-Type', 'text/json');
+		res.setHeader('Cache-Control', 'private, max-age=60');
+
+		myConnectionPool.query("SELECT id,ts,ipv4,ipv6 FROM entries WHERE fkuser=?", [req.user.id], function(err, rows) {
+			for(var i=0; i<rows.length; i++) {
+				rows[i].title = rows[i].ipv4 + " / " + rows[i].ipv6; 
+				rows[i].allDay = false;
+				rows[i].start = rows[i].ts;
+			} // for
+			return res.json(rows);
+		});
+	});
 	app.get('/mail', routes.mailtest);
 	app.get('/dyn.js', function(req, res) {
 		res.setHeader('Content-Type', 'application/javascript');

diff --git a/mailtpl/forgot.mjml b/mailtpl/forgot.mjml
@@ -19,7 +19,7 @@
 
         <mj-column width="600">
 
-          <mj-text align="center" color="#fff" font-size="40" font-family="Helvetica Neue">Your dynamic IP history</mj-text>
+          <mj-text align="center" color="#333" font-size="40" font-family="Helvetica Neue">Your dynamic IP history</mj-text>
 
           <mj-button background-color="#F63A4D" href="https://blog.alibip.de/">
             About

diff --git a/public/assets/js/main.js b/public/assets/js/main.js
@@ -53,6 +53,10 @@ $(document).ready(function() {
 		return false; // prevent default
 	});
 
+	$('#calendar').fullCalendar({
+		firstDay: 1,
+		events: '/my/calenderevents'
+    });
 
 	$('form#loginform input#email').on('keyup', function(e) {
 		var sTmp = $(this).val();

diff --git a/public/assets/js/moment.min.js b/public/assets/js/moment.min.js
diff --git a/routes/index.js b/routes/index.js
@@ -48,6 +48,16 @@ MyRoutes.prototype.myhome = function(req, res) {
 	} // if
 };
 
+MyRoutes.prototype.mycalendar = function(req, res) {
+	if(req.isAuthenticated()) {
+		console.log("show entries for user " + req.user.id);
+		res.render('pages/calendar', { title: 'Calendar', user: req.user, ip: req.ip});
+	} else {
+		res.redirect('/');
+		res.end();
+	} // if
+};
+
 MyRoutes.prototype.mailtest = function(req, res) {
 	var sFilepath = appRoot + '/mailrun/register.html';
 

diff --git a/views/pages/calendar.ejs b/views/pages/calendar.ejs
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="<%= projectlang %>">
+<% include ../partials/header %>
+<body class="homepage">
+    <% include ../partials/navbar %>
+
+    <main class="container">
+	  	<% include ../partials/flash %>
+
+		<h1>Calendar</h1>
+		<div id="calendar"></div>
+
+    </main>
+
+    <% include ../partials/footer %>
+
+    <% include ../partials/webstats %>
+    <% include ../partials/footerlibs %>
+</body>
+</html>
diff --git a/views/partials/footerlibs.ejs b/views/partials/footerlibs.ejs
@@ -7,5 +7,7 @@
     <!-- Latest compiled and minified JavaScript -->
     <script src="/assets/js/jquery.cookie.js"></script>
     <script src="/assets/js/shariff.min.js"></script>
-    <script src="/assets/js/main.js"></script>
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js" integrity="sha384-s1ITto93iSMDxlp/79qhWHi+LsIi9Gx6yL+cOKDuymvihkfol83TYbLbOw+W/wv4" crossorigin="anonymous"></script>
+    <script src="/assets/js/moment.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.2.0/fullcalendar.min.js" integrity="sha384-yeKeZPr3QyC5n8p+7DuGsRGfQ/nLn2U7W72CgOdS5AS9a67AvtcjKzv9RVIdb3Zj" crossorigin="anonymous"></script>
+    <script src="/assets/js/main.js"></script>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
@@ -34,7 +34,8 @@
 <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" integrity="sha384-IS73LIqjtYesmURkDE9MXKbXqYA8rvKEp/ghicjem7Vc3mGRdQRptJSz60tvrB6+" crossorigin="anonymous">
 <!-- Optional theme -->
 <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css" integrity="sha384-pIrFIoLkb4ShAzISGfPaqiBdVEfrWuOg97ThMRufKm9YjlXIYWIR8sEYI3IwosS6" crossorigin="anonymous">
-
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.2.0/fullcalendar.min.css" integrity="sha384-XIJyO34tFkKlJRHQjqqPOKahz2es1oE6lXR2AdZqEHOJwi0V9wI9QasoGnR4hzl9" crossorigin="anonymous">
+
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
       <script src="/assets/js/html5shiv.min.js"></script>

diff --git a/views/partials/navbar.ejs b/views/partials/navbar.ejs
@@ -20,6 +20,7 @@
 <%
 if(typeof(user) != 'undefined') {
 %>
+                <li id="mycalendar"><a href="/my/calendar" title="Calendar">Calendar</a></li>
                 <li id="logout"><a href="/u/logout" title="Logout from <%= user.email %>">Logout</a></li>
 <%
 } else {