Merge branch 'master' into monika_animation

3 files changed, 101 insertions, 3 deletions

diff --git a/views/login.pug b/views/login.pug
index 9bc40a495..98816e9c8 100644
--- a/views/login.pug
+++ b/views/login.pug
@@ -9,16 +9,14 @@ block content
         .overlay(id='overlay_login')
             a(href="/signup")
                 img(id='new_user', src="https://bit.ly/2EuqPb4", alt="")
-            a(href="/forgot")
+            a(href="/forgotPassword")
                 img(id='forgot', src="https://bit.ly/2XjHpSo", alt="")
             .inner.login
                 h3.auth_header Log In
                 .form-group
-                    //- label.col-sm-3.control-label(for='email', id='email_label') Email
                     .col-sm-7
                     input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus, required)
                 .form-group
-                    //- label.col-sm-3.control-label(for='password') Password
                     .col-sm-7
                     input.form-control(type='password', name='password', id='password', placeholder='Password', required)
                 .form-group
diff --git a/views/stylesheets/authentication.css b/views/stylesheets/authentication.css
index 36bb880af..ff1f4aace 100644
--- a/views/stylesheets/authentication.css
+++ b/views/stylesheets/authentication.css
@@ -139,4 +139,85 @@ body {
     padding-right: 10px;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 16px;
+}
+
+.outermost, .online-container {
+    display: flex;
+    flex-direction: row;
+    height: 98vh;
+    justify-content: center;
+}
+
+.online-container {
+    background: white;
+    display: flex;
+    flex-direction: row;
+    height: 80%;
+    width: 80%;
+    align-self: center;
+    justify-content: center;
+    border-radius: 8px;
+    box-shadow: 10px 10px 10px #00000099;
+}
+
+.partition {
+    width: 50%;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid black;
+}
+
+.inner-activity {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    height: 100%;
+    border-top: 2px solid black;
+    background: white;
+    padding: 20px;
+    overflow: scroll;
+}
+
+ol {
+    align-self: center;
+}
+
+li {
+    font-family: Arial, Helvetica, sans-serif;
+    border: 1px solid black;
+    padding: 10px;
+    border-radius: 5px;
+    margin-bottom: 5px;
+}
+
+.duration {
+    font-style: italic;
+}
+
+span.user-type {
+    align-self: center;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: bold;
+    font-size: 20px;
+    margin: 50px;
+}
+
+#active-partition {
+    background: green;
+    border-top-left-radius: 8px;
+    border-bottom-left-radius: 8px;
+}
+
+#active-inner {
+    border-bottom-left-radius: 8px;
+}
+
+#inactive-partition {
+    background: red;
+    border-top-right-radius: 8px;
+    border-bottom-right-radius: 8px;
+}
+
+#inactive-inner {
+    border-bottom-right-radius: 8px;
 }
\ No newline at end of file
diff --git a/views/user_activity.pug b/views/user_activity.pug
new file mode 100644
index 000000000..68e42140d
--- /dev/null
+++ b/views/user_activity.pug
@@ -0,0 +1,19 @@
+extends ./layout
+
+block content
+    style
+        include ./stylesheets/authentication.css
+    .outermost
+        .online-container
+            .partition(id="active-partition")
+                span.user-type Active Users
+                .inner-activity(id="active-inner")
+                    ol
+                        each val in active
+                            li= val
+            .partition(id="inactive-partition")
+                span.user-type Inactive Users
+                .inner-activity(id="inactive-inner")
+                    ol
+                        each val in inactive
+                            li= val
\ No newline at end of file