From 7436a6752b63cd68916f4519cefd45e2dfcdf932 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 4 Aug 2017 21:16:44 +0530 Subject: [PATCH 01/72] [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 5a28644db45..cdc9f1c2d60 100644 --- a/ui/index.html +++ b/ui/index.html @@ -9,7 +9,7 @@
- Hi! I am your webapp. + Hi! I am Varun, and this is my first webapp.
From 8dddfe728a0efc0baae814e46e4d8c964d038eeb Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 4 Aug 2017 22:04:38 +0530 Subject: [PATCH 02/72] [imad-console] Updates ui/index.html --- ui/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/index.html b/ui/index.html index cdc9f1c2d60..782e322c8fa 100644 --- a/ui/index.html +++ b/ui/index.html @@ -10,6 +10,8 @@
Hi! I am Varun, and this is my first webapp. +

A new heading

+ I've made some few local changes
From e386cdd86b044a67f966986071f76857fab209a0 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 21:17:44 +0530 Subject: [PATCH 03/72] [imad-console] Updates server.js --- server.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server.js b/server.js index 2e386d0b041..663eb914d29 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-one', function (req, res){ + res.send('Article one requested and will be served here'); +}); + +app.get('/article-two', function (req, res){ + res.send('Article two requested and will be served here'); +}); + +app.get('/article-three', function (req, res){ + res.send('Article three requested and will be served here'); +}); + app.get('/ui/style.css', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); From 0ef5ef8e87870f6f6ee3323811eab45c94bc5321 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 21:46:34 +0530 Subject: [PATCH 04/72] Create Article-one.html --- Article-one.html | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Article-one.html diff --git a/Article-one.html b/Article-one.html new file mode 100644 index 00000000000..90531a4b3ed --- /dev/null +++ b/Article-one.html @@ -0,0 +1,2 @@ + + From c4779ca55fb335c0dc6bb12eb8714cda526dbe70 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 21:56:59 +0530 Subject: [PATCH 05/72] [imad-console] Updates Article-one.html --- Article-one.html | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Article-one.html b/Article-one.html index 90531a4b3ed..caffaf198dd 100644 --- a/Article-one.html +++ b/Article-one.html @@ -1,2 +1,35 @@ + + + Article one .. I'm Varun + + + +
+ Home +
+
+

+ Article One +

+
+ August 5,2017 +
+
+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+
+ + + + + + From 5122d2df8d922f83b4f9f6d866b51241f31a4265 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 21:57:17 +0530 Subject: [PATCH 06/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 663eb914d29..6398a670adc 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ app.get('/', function (req, res) { }); app.get('/article-one', function (req, res){ - res.send('Article one requested and will be served here'); + res.sendFile(path.join(__dirname, 'ui', 'Article-one.html')); }); app.get('/article-two', function (req, res){ From bb2bf71faaecf16d26f62882a47e3ee3474bf5ae Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:03:20 +0530 Subject: [PATCH 07/72] [imad-console] Updates server.js --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 6398a670adc..c6b1ba1b515 100644 --- a/server.js +++ b/server.js @@ -10,8 +10,8 @@ app.get('/', function (req, res) { }); app.get('/article-one', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'Article-one.html')); -}); + res.sendFile(path.join(__dirname, 'ui', 'Article-one.html')); + }); app.get('/article-two', function (req, res){ res.send('Article two requested and will be served here'); From 9b0d7d5f7bd739c9501464d45c97648c5a366acd Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:11:53 +0530 Subject: [PATCH 08/72] Rename Article-one.html to article-one.html --- Article-one.html => article-one.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Article-one.html => article-one.html (100%) diff --git a/Article-one.html b/article-one.html similarity index 100% rename from Article-one.html rename to article-one.html From b9dcd3ff34bba8d18694bb60b3e9de27c22405a3 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:12:20 +0530 Subject: [PATCH 09/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index c6b1ba1b515..d7dd83be4df 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ app.get('/', function (req, res) { }); app.get('/article-one', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'Article-one.html')); + res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); }); app.get('/article-two', function (req, res){ From fb1a906d370109b8451c4594a5ed1a915889d61d Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:15:52 +0530 Subject: [PATCH 10/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index d7dd83be4df..d57698b1126 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ app.get('/', function (req, res) { }); app.get('/article-one', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); + res.send('Article two requested and will be served here'); }); app.get('/article-two', function (req, res){ From 26cdff70a2f5fb7480c99aafa438352395eae071 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:18:52 +0530 Subject: [PATCH 11/72] Create article-1.html --- ui/article-1.html | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 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 00000000000..caffaf198dd --- /dev/null +++ b/ui/article-1.html @@ -0,0 +1,35 @@ + + + + Article one .. I'm Varun + + + +
+ Home +
+
+

+ Article One +

+
+ August 5,2017 +
+
+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+
+ + + + + + + From 6b0540dd24692dad27bf64233390b9af00a7c00c Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:18:59 +0530 Subject: [PATCH 12/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index d57698b1126..bf596e298a2 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ app.get('/', function (req, res) { }); app.get('/article-one', function (req, res){ - res.send('Article two requested and will be served here'); + res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); }); app.get('/article-two', function (req, res){ From 79a0e46f7f5d9eae243ab039997d2c66a1e6aa28 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:19:44 +0530 Subject: [PATCH 13/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index bf596e298a2..9691f020a48 100644 --- a/server.js +++ b/server.js @@ -10,7 +10,7 @@ app.get('/', function (req, res) { }); app.get('/article-one', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'article-one.html')); + res.sendFile(path.join(__dirname, 'ui', 'article-1.html')); }); app.get('/article-two', function (req, res){ From 223922964f71a2d85620ebacdfb44dd4367d474d Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:21:10 +0530 Subject: [PATCH 14/72] Delete article-one.html --- article-one.html | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 article-one.html diff --git a/article-one.html b/article-one.html deleted file mode 100644 index caffaf198dd..00000000000 --- a/article-one.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - Article one .. I'm Varun - - - -
- Home -
-
-

- Article One -

-
- August 5,2017 -
-
-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-
- - - - - - - From 4ebe82e9e3f46935c9c3137fe730340cbdf9d061 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:23:10 +0530 Subject: [PATCH 15/72] Update style.css --- ui/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/style.css b/ui/style.css index 71a5f6acc1e..6ab4229be56 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { - font-family: sans-serif; - background-color: lightgrey; + font-Segoe Script: sans-serif; + background-color: red; margin-top: 75px; } @@ -9,7 +9,7 @@ body { } .text-big { - font-size: 300%; + font-size: 350%; } .bold { From 131d2a89688c0f5f2e8051e3667a1e6f13dd9794 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:25:48 +0530 Subject: [PATCH 16/72] [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 6ab4229be56..41fb59e5130 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,5 +1,5 @@ body { - font-Segoe Script: sans-serif; + font-family: sans-serif; background-color: red; margin-top: 75px; } From 8525551ad25fe37f2b12311bca4992c6d6b06d11 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:26:11 +0530 Subject: [PATCH 17/72] [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 41fb59e5130..b93c036aaf5 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: red; + background-color: blue; margin-top: 75px; } From 1e126e2efcb192b15e2d573774f9cb948bf21f85 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:26:27 +0530 Subject: [PATCH 18/72] [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 b93c036aaf5..c99d44bf30d 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: blue; + background-color: violet; margin-top: 75px; } From 317ed306e023d0ac6bda69ace2753f56a5c8c4e1 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:26:47 +0530 Subject: [PATCH 19/72] [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 c99d44bf30d..fa5f05fc945 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: violet; + background-color: orange; margin-top: 75px; } From eb9cea3af6d63906756ad82bd44d127f5f4f6cf4 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:27:03 +0530 Subject: [PATCH 20/72] [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 fa5f05fc945..a2e71a43b80 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: orange; + background-color: pink; margin-top: 75px; } From e5c0e066b01395bf041436d2f3889f5a1a2d5aed Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:27:35 +0530 Subject: [PATCH 21/72] [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 a2e71a43b80..ae6ca35967c 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: pink; + background-color: yellow; margin-top: 75px; } From dea7e851928f68b5baee8d38268aee9ebf5f14ed Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:27:56 +0530 Subject: [PATCH 22/72] [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 ae6ca35967c..3253429fe26 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: yellow; + background-color: lightblue; margin-top: 75px; } From ca4be8f8c5b726e3f00a2e9cdede14d436549284 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:28:20 +0530 Subject: [PATCH 23/72] [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 3253429fe26..9c57f4a95e5 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: lightblue; + background-color: black; margin-top: 75px; } From 76d12284f0dd0e16e6cc0b74ad102bc7d27a92b7 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:30:25 +0530 Subject: [PATCH 24/72] [imad-console] Updates ui/style.css --- ui/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/style.css b/ui/style.css index 9c57f4a95e5..6b1113166d5 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,7 @@ body { font-family: sans-serif; background-color: black; + color: white; margin-top: 75px; } From 4be273e496f8b85be8a98a5573f34b82e80e21fb Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:35:13 +0530 Subject: [PATCH 25/72] [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 caffaf198dd..24858913a37 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -3,6 +3,7 @@ Article one .. I'm Varun +
From 89931198d03f71bd5475140e302fd1158bea46cb Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:38:51 +0530 Subject: [PATCH 26/72] Create article-2.html --- ui/article-2.html | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ui/article-2.html diff --git a/ui/article-2.html b/ui/article-2.html new file mode 100644 index 00000000000..4d591481dfa --- /dev/null +++ b/ui/article-2.html @@ -0,0 +1,30 @@ + + + + Article two .. I'm Varun + + + + +
+ Home +
+
+

+ Article two +

+
+ August 5,2017 +
+
+

+ This is the conent for my second article. +

+
+ + + + + + + From b83096aca5abdcc6cd5ae09d4ab349901dab5c7b Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:40:56 +0530 Subject: [PATCH 27/72] Create article-3.html --- ui/article-3.html | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ui/article-3.html diff --git a/ui/article-3.html b/ui/article-3.html new file mode 100644 index 00000000000..a9f2335bbd3 --- /dev/null +++ b/ui/article-3.html @@ -0,0 +1,30 @@ + + + + Article three .. I'm Varun + + + + +
+ Home +
+
+

+ Article three +

+
+ August 5,2017 +
+
+

+ This is the conent for my third article. +

+
+ + + + + + + From 1941b4282bc82ee21b3a9d7ce5f776c6c82c559e Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:41:10 +0530 Subject: [PATCH 28/72] Update article-2.html --- ui/article-2.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-2.html b/ui/article-2.html index 4d591481dfa..f6450dd3d79 100644 --- a/ui/article-2.html +++ b/ui/article-2.html @@ -14,7 +14,7 @@

Article two

- August 5,2017 + August 15,2017

From 14803339586cd6c83657f938c83242fed140714a Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:41:44 +0530 Subject: [PATCH 29/72] Update article-3.html --- ui/article-3.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-3.html b/ui/article-3.html index a9f2335bbd3..c7bbad81191 100644 --- a/ui/article-3.html +++ b/ui/article-3.html @@ -14,7 +14,7 @@

Article three

- August 5,2017 + August 23,2017

From bb27d677fbe3d8d406d4e3008c974e9f55de4c7b Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sat, 5 Aug 2017 22:42:39 +0530 Subject: [PATCH 30/72] [imad-console] Updates server.js --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 9691f020a48..f5ac6ec4541 100644 --- a/server.js +++ b/server.js @@ -14,11 +14,11 @@ app.get('/article-one', function (req, res){ }); app.get('/article-two', function (req, res){ - res.send('Article two requested and will be served here'); + res.sendFile(path.join(__dirname, 'ui', 'article-2.html')); }); app.get('/article-three', function (req, res){ - res.send('Article three requested and will be served here'); + res.sendFile(path.join(__dirname, 'ui', 'article-3.html')); }); app.get('/ui/style.css', function (req, res) { From 1930a8fce57d33e4bae380fc52081baaa6bded42 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sun, 6 Aug 2017 21:09:14 +0530 Subject: [PATCH 31/72] [imad-console] Updates ui/article-1.html --- ui/article-1.html | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/ui/article-1.html b/ui/article-1.html index 24858913a37..f18ab1b577f 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -4,8 +4,18 @@ Article one .. I'm Varun + +

Home
@@ -16,16 +26,17 @@

August 5,2017
-
-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

+
+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+
From 466b9678a52577d28b3a48f0ab318d1c2a8cc8d2 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sun, 6 Aug 2017 21:09:44 +0530 Subject: [PATCH 32/72] [imad-console] Updates ui/article-1.html --- ui/article-1.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-1.html b/ui/article-1.html index f18ab1b577f..16eec9c46e5 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -8,7 +8,7 @@ .container { max-width: 800px; margin: 0 auto; - color: grey; + color: blue; font-family: Segoe Script; } From 86f89b9ff2075556044d00a91e60dd6c8f7430e8 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sun, 6 Aug 2017 21:10:23 +0530 Subject: [PATCH 33/72] [imad-console] Updates ui/article-1.html --- ui/article-1.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/article-1.html b/ui/article-1.html index 16eec9c46e5..faf6c026a02 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -8,7 +8,7 @@ .container { max-width: 800px; margin: 0 auto; - color: blue; + color: green; font-family: Segoe Script; } From 700ba4961721b2cfd9a0aee487184937878b1364 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Sun, 6 Aug 2017 21:20:47 +0530 Subject: [PATCH 34/72] [imad-console] Updates ui/article-1.html --- ui/article-1.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/article-1.html b/ui/article-1.html index faf6c026a02..4834abecc9a 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -6,11 +6,13 @@ From 209fac00860c82fe859027229423b63719c5aa2b Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:00:29 +0530 Subject: [PATCH 35/72] [imad-console] Updates ui/article-2.html --- ui/article-2.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ui/article-2.html b/ui/article-2.html index f6450dd3d79..3f96d5c6331 100644 --- a/ui/article-2.html +++ b/ui/article-2.html @@ -4,8 +4,20 @@ Article two .. I'm Varun + +
@@ -21,6 +33,7 @@

This is the conent for my second article.

+

From c6ba7d1423a7a8cd73c8c8ac8947387bdfcf9ddc Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:00:37 +0530 Subject: [PATCH 36/72] [imad-console] Updates ui/article-3.html --- ui/article-3.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ui/article-3.html b/ui/article-3.html index c7bbad81191..e01080de7de 100644 --- a/ui/article-3.html +++ b/ui/article-3.html @@ -4,8 +4,20 @@ Article three .. I'm Varun + +
Home
@@ -21,6 +33,8 @@

This is the conent for my third article.

+
+ From 38689bb0ccb60cae82fae23005e7c75aeba1f161 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:51:10 +0530 Subject: [PATCH 37/72] [imad-console] Updates ui/article-1.html --- ui/article-1.html | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ui/article-1.html b/ui/article-1.html index 4834abecc9a..9e8de11043e 100644 --- a/ui/article-1.html +++ b/ui/article-1.html @@ -4,17 +4,7 @@ Article one .. I'm Varun - +
From 122bcbafee06880044a3be219339e87802e85dc5 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:51:11 +0530 Subject: [PATCH 38/72] [imad-console] Updates ui/style.css --- ui/style.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/style.css b/ui/style.css index 6b1113166d5..2272bc063f5 100644 --- a/ui/style.css +++ b/ui/style.css @@ -21,3 +21,13 @@ body { height: 200px; } +.container { + max-width: 800px; + margin: 0 auto; + color: #0000ee; + font-family: Segoe Script; + padding-top: 55px; + padding-right: 20px; + padding-left: 20px; +} + From 8a1a183a6e9e202aa6acdce9d4e13f90c60d791f Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:51:17 +0530 Subject: [PATCH 39/72] [imad-console] Updates ui/article-2.html --- ui/article-2.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ui/article-2.html b/ui/article-2.html index 3f96d5c6331..f9f647262e9 100644 --- a/ui/article-2.html +++ b/ui/article-2.html @@ -4,17 +4,6 @@ Article two .. I'm Varun -
From 4cc0598089868b1c601aa20e8dd9f0ff8fc24ca7 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:51:21 +0530 Subject: [PATCH 40/72] [imad-console] Updates ui/article-3.html --- ui/article-3.html | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/ui/article-3.html b/ui/article-3.html index e01080de7de..5b93dc3e506 100644 --- a/ui/article-3.html +++ b/ui/article-3.html @@ -4,18 +4,8 @@ Article three .. I'm Varun - - + +
From 5f1f98f480050731735ef24245450a0407400753 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:53:13 +0530 Subject: [PATCH 41/72] [imad-console] Updates ui/article-2.html --- ui/article-2.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/article-2.html b/ui/article-2.html index f9f647262e9..4b5da267420 100644 --- a/ui/article-2.html +++ b/ui/article-2.html @@ -4,7 +4,10 @@ Article two .. I'm Varun + + +
From 498078c4b9a9fe49d76c6941cb45b90f151d8f69 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:53:32 +0530 Subject: [PATCH 42/72] [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 2272bc063f5..b60ca1f8fcb 100644 --- a/ui/style.css +++ b/ui/style.css @@ -24,7 +24,7 @@ body { .container { max-width: 800px; margin: 0 auto; - color: #0000ee; + color: #00065ee; font-family: Segoe Script; padding-top: 55px; padding-right: 20px; From 94ebab8f1c81429d3572544cbb18cb4fca1aa846 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:54:13 +0530 Subject: [PATCH 43/72] [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 b60ca1f8fcb..f7a4b261874 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: black; + background-color: lightgrey; color: white; margin-top: 75px; } From ab9e51b8c057db989f6eb0353950a2ffb67d6480 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:54:41 +0530 Subject: [PATCH 44/72] [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 f7a4b261874..874694d7e4d 100644 --- a/ui/style.css +++ b/ui/style.css @@ -24,7 +24,7 @@ body { .container { max-width: 800px; margin: 0 auto; - color: #00065ee; + color: #00000ee; font-family: Segoe Script; padding-top: 55px; padding-right: 20px; From 895365d58adb1c1c4bdbe5df04a3a6d9d8839816 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 21:55:14 +0530 Subject: [PATCH 45/72] [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 874694d7e4d..c4a0a9cc932 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: lightgrey; + background-color: green; color: white; margin-top: 75px; } From 5ed226cf05ad2f9135014ba08babf4ebd59b0c9d Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 22:19:05 +0530 Subject: [PATCH 46/72] [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 c4a0a9cc932..25fdccdf893 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,6 +1,6 @@ body { font-family: sans-serif; - background-color: green; + background-color: red; color: white; margin-top: 75px; } From cc6e07646354cbc031338d97f451939f3a38dc67 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 22:19:43 +0530 Subject: [PATCH 47/72] [imad-console] Updates ui/style.css --- ui/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/style.css b/ui/style.css index 25fdccdf893..22837c294b6 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,7 +1,7 @@ body { font-family: sans-serif; - background-color: red; - color: white; + background-color: lightgrey; + color: black; margin-top: 75px; } From bf72ec54207fedad37ee828c805387fa00585ee5 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 22:44:15 +0530 Subject: [PATCH 48/72] [imad-console] Updates server.js --- server.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index f5ac6ec4541..95a1b9ee69a 100644 --- a/server.js +++ b/server.js @@ -5,12 +5,64 @@ var path = require('path'); var app = express(); app.use(morgan('combined')); + +var ArticleOne = { + title: 'Article one .. Im Varun', + heading: 'Article One', + date: 'August 5,2017', + content: ` +

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

` +}; + +function createTemplate (data) { + var title = data.title; + var date = data.date; + var heading = data.heading; + var content = data.content; + var htmlTemplate = ` + + + + ${title} + + + + + +
+
+ Home +
+
+

+ ${heading} +

+
+ ${date} +
+
+ ${content} +
+
+ + + `; + return htmlTemplate; +} app.get('/', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'index.html')); }); app.get('/article-one', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'article-1.html')); + res.send(createTemplate(articleOne)); }); app.get('/article-two', function (req, res){ From 627afdd8b08a7d524715827d751c38462df042c8 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 22:45:16 +0530 Subject: [PATCH 49/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 95a1b9ee69a..75cb0e4faa8 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ var app = express(); app.use(morgan('combined')); -var ArticleOne = { +var articleOne = { title: 'Article one .. Im Varun', heading: 'Article One', date: 'August 5,2017', From 3a8e2e472873b04a1ce4214e89860aa4ab3a7c86 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 22:47:01 +0530 Subject: [PATCH 50/72] [imad-console] Updates ui/style.css --- ui/style.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ui/style.css b/ui/style.css index 22837c294b6..4e4e3684793 100644 --- a/ui/style.css +++ b/ui/style.css @@ -1,8 +1,6 @@ body { font-family: sans-serif; - background-color: lightgrey; - color: black; - margin-top: 75px; + margin-top: 60px; } .center { @@ -26,7 +24,6 @@ body { margin: 0 auto; color: #00000ee; font-family: Segoe Script; - padding-top: 55px; padding-right: 20px; padding-left: 20px; } From c1e3c23162378ec0b4b204476efbeafcb5d838f2 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 23:00:16 +0530 Subject: [PATCH 51/72] [imad-console] Updates server.js --- server.js | 66 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/server.js b/server.js index 75cb0e4faa8..8e7f3e08e4f 100644 --- a/server.js +++ b/server.js @@ -6,20 +6,42 @@ var app = express(); app.use(morgan('combined')); -var articleOne = { - title: 'Article one .. Im Varun', - heading: 'Article One', - date: 'August 5,2017', - content: ` -

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

` +var articles = { + 'article-one': { + title: 'Article one .. Im Varun', + heading: 'Article One', + date: 'August 5,2017', + content: ` +

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

+

+ This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. +

` + }, + 'article-two': { + title: 'Article Two .. Im Varun', + heading: 'Article Two', + date: 'August 10,2017', + content: ` +

+ This is the conent for my second article. +

` + + }, + 'article-three': { + title: 'Article Three .. Im Varun', + heading: 'Article Three', + date: 'August 23,2017', + content: ` +

+ This is the conent for my third article. +

` + + } }; function createTemplate (data) { @@ -56,23 +78,17 @@ function createTemplate (data) { `; return htmlTemplate; -} +} + app.get('/', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'index.html')); }); -app.get('/article-one', function (req, res){ - res.send(createTemplate(articleOne)); +app.get('/:articleName', function (req, res){ + res.send(createTemplate(articles[articleName])); }); -app.get('/article-two', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'article-2.html')); -}); - -app.get('/article-three', function (req, res){ - res.sendFile(path.join(__dirname, 'ui', 'article-3.html')); -}); - +var articleName = req.params.aricleName; app.get('/ui/style.css', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); From 5120cd37dfabdb58abc1fadec993a20c9d0fa9d6 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 23:07:46 +0530 Subject: [PATCH 52/72] Delete article-1.html --- ui/article-1.html | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 ui/article-1.html diff --git a/ui/article-1.html b/ui/article-1.html deleted file mode 100644 index 9e8de11043e..00000000000 --- a/ui/article-1.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - Article one .. I'm Varun - - - - - -
-
- Home -
-
-

- Article One -

-
- August 5,2017 -
-
-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-

- This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article.This is the conent for my first article. -

-
-
- - - - - - - From d4cf8baad0a09e57ffeffe6c0b5b4bb1dec21a33 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 23:07:58 +0530 Subject: [PATCH 53/72] Delete article-2.html --- ui/article-2.html | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 ui/article-2.html diff --git a/ui/article-2.html b/ui/article-2.html deleted file mode 100644 index 4b5da267420..00000000000 --- a/ui/article-2.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - Article two .. I'm Varun - - - - - - - -
-
- Home -
-
-

- Article two -

-
- August 15,2017 -
-
-

- This is the conent for my second article. -

-
-
- - - - - - - From b2bd09d76a03d366a91ca2104c2d8d7d08555f76 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Wed, 9 Aug 2017 23:08:06 +0530 Subject: [PATCH 54/72] Delete article-3.html --- ui/article-3.html | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 ui/article-3.html diff --git a/ui/article-3.html b/ui/article-3.html deleted file mode 100644 index 5b93dc3e506..00000000000 --- a/ui/article-3.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - Article three .. I'm Varun - - - - - -
-
- Home -
-
-

- Article three -

-
- August 23,2017 -
-
-

- This is the conent for my third article. -

-
-
- - - - - - - - From df91c50d6793eaf703f9fe388a2c53dfcde900f2 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 21:02:22 +0530 Subject: [PATCH 55/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 8e7f3e08e4f..d639e024af6 100644 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ app.get('/:articleName', function (req, res){ res.send(createTemplate(articles[articleName])); }); -var articleName = req.params.aricleName; +var articleName = req.params.arictleName; app.get('/ui/style.css', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); From cd1712818a8972160927502b3da9e1b4752a4465 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 21:14:02 +0530 Subject: [PATCH 56/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index d639e024af6..3e578194a16 100644 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ app.get('/:articleName', function (req, res){ res.send(createTemplate(articles[articleName])); }); -var articleName = req.params.arictleName; +var articleName = res.params.arictleName; app.get('/ui/style.css', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); From 66eff3d5c28e850bb99eae9c06f62bff1abe806d Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 21:14:41 +0530 Subject: [PATCH 57/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 3e578194a16..d639e024af6 100644 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ app.get('/:articleName', function (req, res){ res.send(createTemplate(articles[articleName])); }); -var articleName = res.params.arictleName; +var articleName = req.params.arictleName; app.get('/ui/style.css', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); From c724330da101fa2662c72ac4d58dc084de2789bc Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 21:54:52 +0530 Subject: [PATCH 58/72] [imad-console] Updates server.js --- server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index d639e024af6..848f28d6f68 100644 --- a/server.js +++ b/server.js @@ -88,8 +88,9 @@ app.get('/:articleName', function (req, res){ res.send(createTemplate(articles[articleName])); }); -var articleName = req.params.arictleName; + app.get('/ui/style.css', function (req, res) { + var articleName = req.params.arictleName; res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); From 79f30bb7748cefbbcdfe54ff7eb8382af2e0f5fd Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 21:57:32 +0530 Subject: [PATCH 59/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 848f28d6f68..1c0dc1f9c84 100644 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ app.get('/:articleName', function (req, res){ res.send(createTemplate(articles[articleName])); }); - +var articleName = req.params.arictleName; app.get('/ui/style.css', function (req, res) { var articleName = req.params.arictleName; res.sendFile(path.join(__dirname, 'ui', 'style.css')); From 3ef04ce078a544b88f5b6d5845fa4c99011574ad Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 22:00:38 +0530 Subject: [PATCH 60/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 1c0dc1f9c84..848f28d6f68 100644 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ app.get('/:articleName', function (req, res){ res.send(createTemplate(articles[articleName])); }); -var articleName = req.params.arictleName; + app.get('/ui/style.css', function (req, res) { var articleName = req.params.arictleName; res.sendFile(path.join(__dirname, 'ui', 'style.css')); From 8fddc17ade02fe00314bd77352c52a3c67026aa9 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 22:14:50 +0530 Subject: [PATCH 61/72] [imad-console] Updates server.js --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 848f28d6f68..6b0ab3f79d2 100644 --- a/server.js +++ b/server.js @@ -85,13 +85,13 @@ app.get('/', function (req, res) { }); app.get('/:articleName', function (req, res){ + var articleName = req.params.arictleName; res.send(createTemplate(articles[articleName])); }); app.get('/ui/style.css', function (req, res) { - var articleName = req.params.arictleName; - res.sendFile(path.join(__dirname, 'ui', 'style.css')); + res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); app.get('/ui/madi.png', function (req, res) { From c058da99ae0a5bd0ce6995cd5d456ca5fcc7ae8f Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 22:30:27 +0530 Subject: [PATCH 62/72] [imad-console] Updates ui/index.html --- ui/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/index.html b/ui/index.html index 782e322c8fa..0ec038e5068 100644 --- a/ui/index.html +++ b/ui/index.html @@ -13,6 +13,9 @@

A new heading

I've made some few local changes
+ From a721bb8b2f9f0d5fa6f9806bff4777e6f330eeca Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 22:34:48 +0530 Subject: [PATCH 63/72] [imad-console] Updates server.js --- server.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server.js b/server.js index 6b0ab3f79d2..a8e0f2d3b8b 100644 --- a/server.js +++ b/server.js @@ -94,6 +94,9 @@ app.get('/ui/style.css', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'style.css')); }); +app.get('/ui/main.js', function (req, res) { + res.sendFile(path.join(__dirname, 'ui', 'main.js')); +}); app.get('/ui/madi.png', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'madi.png')); }); From 38ffe737162f8dd11d12adfaf89d1ba4c1968706 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Fri, 11 Aug 2017 22:46:38 +0530 Subject: [PATCH 64/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index a8e0f2d3b8b..d5bdaec3890 100644 --- a/server.js +++ b/server.js @@ -85,7 +85,7 @@ app.get('/', function (req, res) { }); app.get('/:articleName', function (req, res){ - var articleName = req.params.arictleName; + var articleName = req.params.articleName; res.send(createTemplate(articles[articleName])); }); From c6712c2a2c1708d8a9b0198a71a9672eac848cf3 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Tue, 15 Aug 2017 22:27:46 +0530 Subject: [PATCH 65/72] [imad-console] Updates ui/index.html --- ui/index.html | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/ui/index.html b/ui/index.html index 0ec038e5068..66ff19c9d4e 100644 --- a/ui/index.html +++ b/ui/index.html @@ -4,19 +4,26 @@ -
- -
-
-
- Hi! I am Varun, and this is my first webapp. -

A new heading

- I've made some few local changes -
- - From e63efcd30cee80f2aafd5dc5c124b4f422f63f43 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Tue, 15 Aug 2017 22:29:06 +0530 Subject: [PATCH 66/72] [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 66ff19c9d4e..c68c0892733 100644 --- a/ui/index.html +++ b/ui/index.html @@ -8,7 +8,7 @@
-
+

Personal

From 55c3bdac645ef77e64f29d8c29eb3b6d0678bed2 Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Tue, 15 Aug 2017 22:33:54 +0530 Subject: [PATCH 67/72] [imad-console] Updates server.js --- server.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server.js b/server.js index d5bdaec3890..dfc89e28606 100644 --- a/server.js +++ b/server.js @@ -83,6 +83,11 @@ function createTemplate (data) { app.get('/', function (req, res) { res.sendFile(path.join(__dirname, 'ui', 'index.html')); }); +var counter=0; +app.get('/counter', function(req,res) { + counter = counter + 1; + req.send(counter.toString()); +}); app.get('/:articleName', function (req, res){ var articleName = req.params.articleName; From 89ea860bd8ff15cdd3314fcfc0fde7861778871a Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Tue, 15 Aug 2017 22:35:31 +0530 Subject: [PATCH 68/72] [imad-console] Updates server.js --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index dfc89e28606..c32a1938412 100644 --- a/server.js +++ b/server.js @@ -86,7 +86,7 @@ app.get('/', function (req, res) { var counter=0; app.get('/counter', function(req,res) { counter = counter + 1; - req.send(counter.toString()); + res.send(counter.toString()); }); app.get('/:articleName', function (req, res){ From e5f47e2bbbf5190fd3bbf3f066a231c44255acfd Mon Sep 17 00:00:00 2001 From: varunwitty <30322599+varunwitty@users.noreply.github.com> Date: Tue, 15 Aug 2017 22:43:23 +0530 Subject: [PATCH 69/72] [imad-console] Updates ui/index.html --- ui/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/index.html b/ui/index.html index c68c0892733..666bfaa65b3 100644 --- a/ui/index.html +++ b/ui/index.html @@ -21,6 +21,7 @@

Hobbies

+ This button has been clicked 0 times ..