From 36bbda05e0971b57244e3c2b31811049b2b8e786 Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Tue, 20 Sep 2016 11:56:26 +0530 Subject: [PATCH 01/10] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 5a28644db4..9c6371afd9 100644 --- a/ui/index.html +++ b/ui/index.html @@ -9,7 +9,7 @@

- Hi! I am your webapp. + Hi! I am George. This will be awesome

From 673233721f357b92cc694f6d5d688365affd0b35 Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Tue, 20 Sep 2016 12:04:54 +0530 Subject: [PATCH 02/10] [imad-console] Updates ui/index.html --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 9c6371afd9..82e37d73db 100644 --- a/ui/index.html +++ b/ui/index.html @@ -9,7 +9,7 @@

- Hi! I am George. This will be awesome + Hi! I am Tijo. This will be awesome

From bfa9483a2958707e9f54cbf89e71163b30829993 Mon Sep 17 00:00:00 2001 From: TT Date: Tue, 20 Sep 2016 14:40:56 +0530 Subject: [PATCH 03/10] Tried some changes --- ui/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/index.html b/ui/index.html index 82e37d73db..4623c26279 100644 --- a/ui/index.html +++ b/ui/index.html @@ -10,6 +10,8 @@ Hi! I am Tijo. This will be awesome + A new heading + Checking new forms! From e19259ef8d10a8049f1cb2d54bceb32375bca223 Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Tue, 20 Sep 2016 15:41:55 +0530 Subject: [PATCH 04/10] [imad-console] Updates server.js --- server.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server.js b/server.js index 3d5cece3ab..d208910b8d 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')); }); From 3048cf137ae01434d1e6d7e9abb9923461f53448 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 30 Sep 2016 10:41:46 +0530 Subject: [PATCH 05/10] Colour Change --- ui/index.html | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/ui/index.html b/ui/index.html index 4623c26279..ed214e241b 100644 --- a/ui/index.html +++ b/ui/index.html @@ -1,19 +1,18 @@ - - - - - - - - - - - - Hi! I am Tijo. This will be awesome - A new heading - Checking new forms! - - - - + + + + + + + + + + + + Hi! I am Tijo. This will be awesome + Building this up! + + + + From 4d4904715767c02cf873aa6fda75d484dd64bbef Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 30 Sep 2016 17:36:24 +0530 Subject: [PATCH 06/10] Colour Change --- .gitignore | 2 +- package.json | 30 +++++++++++++++--------------- server.js | 48 ++++++++++++++++++++++++------------------------ ui/main.js | 2 +- ui/style.css | 44 ++++++++++++++++++++++---------------------- 5 files changed, 63 insertions(+), 63 deletions(-) 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..aeb32bd7d3 100644 --- a/server.js +++ b/server.js @@ -1,24 +1,24 @@ -var express = require('express'); -var morgan = require('morgan'); -var path = require('path'); - -var app = express(); -app.use(morgan('combined')); - -app.get('/', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'index.html')); -}); - -app.get('/ui/style.css', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'style.css')); -}); - -app.get('/ui/madi.png', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'madi.png')); -}); - - -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}!`); -}); +var express = require('express'); +var morgan = require('morgan'); +var path = require('path'); + +var app = express(); +app.use(morgan('combined')); + +app.get('/', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'index.html')); +}); + +app.get('/ui/style.css', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'style.css')); +}); + +app.get('/ui/madi.png', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'madi.png')); +}); + + +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}!`); +}); 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..fa30cdf31c 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: lightgrey; + margin-top: 75px; +} + +.center { + text-align: center; +} + +.text-big { + font-size: 300%; +} + +.bold { + font-weight: bold; +} + +.img-medium { + height: 200px; +} + From 8103c26db2b76b68cf2ca1fcac4b1b03cd7d945e Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Fri, 30 Sep 2016 18:45:00 +0530 Subject: [PATCH 07/10] [imad-console] Updates server.js --- server.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/server.js b/server.js index 43802aea21..024568c8d8 100644 --- a/server.js +++ b/server.js @@ -1,29 +1,3 @@ -<<<<<<< HEAD -var express = require('express'); -var morgan = require('morgan'); -var path = require('path'); - -var app = express(); -app.use(morgan('combined')); - -app.get('/', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'index.html')); -}); - -app.get('/ui/style.css', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'style.css')); -}); - -app.get('/ui/madi.png', function (req, res) { - res.sendFile(path.join(__dirname, 'ui', 'madi.png')); -}); - - -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}!`); -}); -======= var express = require('express'); var morgan = require('morgan'); var path = require('path'); @@ -59,5 +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}!`); -}); ->>>>>>> e19259ef8d10a8049f1cb2d54bceb32375bca223 +}); \ No newline at end of file From f4f7c35699aa63139d2bd0515395936c52892c21 Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Fri, 30 Sep 2016 18:49:07 +0530 Subject: [PATCH 08/10] [imad-console] Updates ui/style.css --- ui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/style.css b/ui/style.css index fa30cdf31c..ff5015061c 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: lightgrey; + background-color: white; margin-top: 75px; } From beb86a1f82d1edf684897cb94e0163fa4e71674d Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Fri, 30 Sep 2016 18:54:48 +0530 Subject: [PATCH 09/10] Create article-1.html --- ui/article-1.html | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 ui/article-1.html diff --git a/ui/article-1.html b/ui/article-1.html new file mode 100644 index 0000000000..90531a4b3e --- /dev/null +++ b/ui/article-1.html @@ -0,0 +1,2 @@ + + From a42b2333609d32ff857ae99347e18ede1921d172 Mon Sep 17 00:00:00 2001 From: tijothomas11 Date: Fri, 30 Sep 2016 21:51:23 +0530 Subject: [PATCH 10/10] [imad-console] Updates ui/article-1.html --- ui/article-1.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/article-1.html b/ui/article-1.html index 90531a4b3e..bd54434b15 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -1,2 +1,3 @@ +