diff --git a/.gitignore b/.gitignore
index c2658d7d1b..bca51b352e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-node_modules/
+node_modules/
diff --git a/package.json b/package.json
index f9c4b46810..051fc4cf27 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
-{
- "name": "imad-2016-base",
- "version": "0.1.0",
- "description": "IMAD 2016 course app",
- "main": "server.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
- },
- "author": "",
- "license": "ISC",
- "dependencies": {
- "express": "^4.14.0",
- "morgan": "^1.7.0"
- }
-}
+{
+ "name": "imad-2016-base",
+ "version": "0.1.0",
+ "description": "IMAD 2016 course app",
+ "main": "server.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "express": "^4.14.0",
+ "morgan": "^1.7.0"
+ }
+}
diff --git a/server.js b/server.js
index 3d5cece3ab..024568c8d8 100644
--- a/server.js
+++ b/server.js
@@ -9,6 +9,18 @@ app.get('/', function (req, res) {
res.sendFile(path.join(__dirname, 'ui', 'index.html'));
});
+app.get('/article-1', function(req,res) {
+ res.send('Article one will be found here');
+});
+
+app.get('/article-2', function(req,res) {
+ res.send('Article two will be found here');
+});
+
+app.get('/article-3', function(req,res) {
+ res.send('Article three will be found here');
+});
+
app.get('/ui/style.css', function (req, res) {
res.sendFile(path.join(__dirname, 'ui', 'style.css'));
});
@@ -21,4 +33,4 @@ app.get('/ui/madi.png', function (req, res) {
var port = 8080; // Use 8080 for local development because you might already have apache running on 80
app.listen(8080, function () {
console.log(`IMAD course app listening on port ${port}!`);
-});
+});
\ No newline at end of file
diff --git a/ui/article-1.html b/ui/article-1.html
new file mode 100644
index 0000000000..bd54434b15
--- /dev/null
+++ b/ui/article-1.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/ui/index.html b/ui/index.html
index 5a28644db4..ed214e241b 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -1,17 +1,18 @@
-
-
-
-
-
-
-
-
-
-
- Hi! I am your webapp.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Hi! I am Tijo. This will be awesome
+
Building this up!
+
+
+
+
diff --git a/ui/main.js b/ui/main.js
index 4cf7ed58de..ccb0bf4dec 100644
--- a/ui/main.js
+++ b/ui/main.js
@@ -1 +1 @@
-console.log('Loaded!');
+console.log('Loaded!');
diff --git a/ui/style.css b/ui/style.css
index 71a5f6acc1..ff5015061c 100644
--- a/ui/style.css
+++ b/ui/style.css
@@ -1,22 +1,22 @@
-body {
- font-family: sans-serif;
- background-color: lightgrey;
- margin-top: 75px;
-}
-
-.center {
- text-align: center;
-}
-
-.text-big {
- font-size: 300%;
-}
-
-.bold {
- font-weight: bold;
-}
-
-.img-medium {
- height: 200px;
-}
-
+body {
+ font-family: sans-serif;
+ background-color: white;
+ margin-top: 75px;
+}
+
+.center {
+ text-align: center;
+}
+
+.text-big {
+ font-size: 300%;
+}
+
+.bold {
+ font-weight: bold;
+}
+
+.img-medium {
+ height: 200px;
+}
+