LeekSwan · kristikaz · Dec 12, 2019 · Dec 12, 2019 · Dec 12, 2019 · Dec 12, 2019
diff --git a/backend/.gitattributes → Backend/.gitattributes b/backend/.gitattributes → Backend/.gitattributes
diff --git a/backend/.gitignore → Backend/.gitignore b/backend/.gitignore → Backend/.gitignore
diff --git a/backend/README.md → Backend/README.md b/backend/README.md → Backend/README.md
diff --git a/backend/app.js → Backend/app.js b/backend/app.js → Backend/app.js
diff --git a/backend/bin/server.js → Backend/bin/server.js b/backend/bin/server.js → Backend/bin/server.js
diff --git a/backend/data/DataStore.js → Backend/data/DataStore.js b/backend/data/DataStore.js → Backend/data/DataStore.js
diff --git a/Backend/data/account.json b/Backend/data/account.json
@@ -0,0 +1,11 @@
+{
+  "users": {
+    "kristi": {
+      "passwordHash": "$2a$10$xoqFyN3Yc4CWgT2qWRGbGuY41unh62XhLlyXPGiSD9E/v3YwbuP3O",
+      "data": {
+        "last": "kaz",
+        "email": "k@gmail.com"
+      }
+    }
+  }
+}
diff --git a/Backend/data/private.json b/Backend/data/private.json
@@ -0,0 +1,16 @@
+{
+  "scores": {
+    "kristi": [
+      {
+        "name": "kristi",
+        "score": 0
+      },
+      {
+        "score": 360
+      },
+      {
+        "score": 360
+      }
+    ]
+  }
+}
diff --git a/backend/data/public.json → Backend/data/public.json b/backend/data/public.json → Backend/data/public.json
diff --git a/Backend/data/user.json b/Backend/data/user.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/backend/filters/user.js → Backend/filters/user.js b/backend/filters/user.js → Backend/filters/user.js
diff --git a/backend/middlewares/auth.js → Backend/middlewares/auth.js b/backend/middlewares/auth.js → Backend/middlewares/auth.js
diff --git a/backend/middlewares/modify_user_path.js → Backend/middlewares/modify_user_path.js b/backend/middlewares/modify_user_path.js → Backend/middlewares/modify_user_path.js
diff --git a/backend/middlewares/parse_delete.js → Backend/middlewares/parse_delete.js b/backend/middlewares/parse_delete.js → Backend/middlewares/parse_delete.js
diff --git a/backend/middlewares/parse_get.js → Backend/middlewares/parse_get.js b/backend/middlewares/parse_get.js → Backend/middlewares/parse_get.js
diff --git a/backend/middlewares/parse_post.js → Backend/middlewares/parse_post.js b/backend/middlewares/parse_post.js → Backend/middlewares/parse_post.js
diff --git a/backend/middlewares/parse_utils.js → Backend/middlewares/parse_utils.js b/backend/middlewares/parse_utils.js → Backend/middlewares/parse_utils.js
diff --git a/backend/package-lock.json → Backend/package-lock.json b/backend/package-lock.json → Backend/package-lock.json
diff --git a/backend/package.json → Backend/package.json b/backend/package.json → Backend/package.json
diff --git a/backend/routes/account.js → Backend/routes/account.js b/backend/routes/account.js → Backend/routes/account.js
diff --git a/backend/routes/index.js → Backend/routes/index.js b/backend/routes/index.js → Backend/routes/index.js
diff --git a/backend/routes/private.js → Backend/routes/private.js b/backend/routes/private.js → Backend/routes/private.js
diff --git a/backend/routes/public.js → Backend/routes/public.js b/backend/routes/public.js → Backend/routes/public.js
diff --git a/backend/routes/user.js → Backend/routes/user.js b/backend/routes/user.js → Backend/routes/user.js
diff --git a/backend/data/account.json b/backend/data/account.json
@@ -1,31 +1,10 @@
 {
   "users": {
-    "hi": {
-      "passwordHash": "$2a$10$lYNpVSUSOBQZhm8.jY7LXOgcgq4cvyi210WWBSt.lXcYSKuD9w382",
+    "kristi": {
+      "passwordHash": "$2a$10$xoqFyN3Yc4CWgT2qWRGbGuY41unh62XhLlyXPGiSD9E/v3YwbuP3O",
       "data": {
-        "last": "hi",
-        "email": "hi@gmail.com"
-      }
-    },
-    "oo": {
-      "passwordHash": "$2a$10$clNbEu2jA1JvGM.FSjPKy.t1ZWYHVs35LwPPDzOuscKusgzhHxxWW",
-      "data": {
-        "last": "oo",
-        "email": "oo@gmail.com"
-      }
-    },
-    "omgamazing": {
-      "passwordHash": "$2a$10$ldY0ThglPgz/4ZyQKcjXbO95BwY9EpCWhRARWSlmDm1IbRmcHi4NK",
-      "data": {
-        "last": "oo",
-        "email": "oooo@gmail.com"
-      }
-    },
-    "omg": {
-      "passwordHash": "$2a$10$Ebj6IGQo1S4OkQUttpvFk.Y.eBYkNyJtB5kV52HMvWPLMTQTBPBUG",
-      "data": {
-        "last": "omg",
-        "email": "omg@gmail.com"
+        "last": "kaz",
+        "email": "k@gmail.com"
       }
     }
   }

diff --git a/backend/data/private.json b/backend/data/private.json
diff --git a/backend/data/user.json b/backend/data/user.json
@@ -1,177 +1,2 @@
 {
-  "hi": {
-    "TODO": {
-      "1": [
-        {
-          "task": "k",
-          "key": 1
-        },
-        {
-          "task": "d",
-          "key": 1
-        }
-      ],
-      "4": {
-        "data": "qqqqqqqqqqqqqqqqqqqqqqqqq",
-        "key": 4
-      }
-    }
-  },
-  "oo": {
-    "TODO": {
-      "1": [
-        {
-          "task": "hello",
-          "key": 1
-        },
-        {
-          "task": "hi",
-          "key": 1
-        },
-        {
-          "task": "d",
-          "key": 1
-        }
-      ],
-      "2": [
-        {
-          "task": "hi",
-          "key": 2
-        },
-        {
-          "task": "how are you",
-          "key": 2
-        },
-        {
-          "task": "f",
-          "key": 2
-        }
-      ],
-      "3": [
-        {
-          "task": "a",
-          "key": 3
-        },
-        {
-          "task": "j",
-          "key": 3
-        }
-      ],
-      "4": [
-        {
-          "task": "b",
-          "key": 4
-        },
-        {
-          "task": "j",
-          "key": 4
-        }
-      ],
-      "5": [
-        {
-          "task": "hi",
-          "key": 5
-        }
-      ],
-      "6": [
-        {
-          "task": "hi",
-          "key": 6
-        }
-      ],
-      "7": [
-        {
-          "task": "hi",
-          "key": 7
-        }
-      ],
-      "8": [
-        {
-          "task": "hello",
-          "key": 8
-        }
-      ],
-      "9": [
-        {
-          "task": "hello",
-          "key": 9
-        }
-      ],
-      "10": [
-        {
-          "task": "hello",
-          "key": 10
-        }
-      ],
-      "11": [
-        {
-          "task": "hi",
-          "key": 11
-        }
-      ],
-      "undefined": {}
-    }
-  },
-  "omgamazing": {
-    "TODO": {
-      "1": [
-        {
-          "task": "hello",
-          "key": 1
-        }
-      ],
-      "2": [
-        {
-          "task": "this",
-          "key": 2
-        }
-      ],
-      "3": [
-        {
-          "task": "is",
-          "key": 3
-        }
-      ],
-      "4": [
-        {
-          "task": "my",
-          "key": 4
-        }
-      ],
-      "5": [
-        {
-          "task": "todo",
-          "key": 5
-        }
-      ],
-      "6": [
-        {
-          "task": "list",
-          "key": 6
-        }
-      ]
-    }
-  },
-  "omg": {
-    "TODO": {
-      "1": [
-        {
-          "task": "hi",
-          "key": 1
-        }
-      ],
-      "2": [
-        {
-          "task": "hello",
-          "key": 2
-        }
-      ],
-      "3": [
-        {
-          "task": "hiiiii",
-          "key": 3
-        }
-      ]
-    }
-  }
-}
+}
diff --git a/frontend/index.html b/frontend/index.html
@@ -3,40 +3,43 @@
 <head>
     <meta charset="UFT-8">
     <meta name="viewport" content="witdth=device-width, initial-scale=1">
+
+    <title>Final Project: Study Hall </title>
+
+
     <link rel="stylesheet" href="login_style.css"/>
-    <link href="https://fonts.googleapis.com/css?family=Shrikhand&display=swap" rel="stylesheet">
-
-    <!--<link rel="stylesheet" href="node_modules/bulma/css/bulma.css" />-->
-    <title>Final Project: Wedding Planner</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Shrikhand&display=swap" >
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.0/css/bulma.min.css">   
+    <link rel="stylesheet" href="node_modules/bulma/css/bulma.css" />
 
 </head>
 
 
-<style>
-    body {
-      background-image: url("http://getwallpapers.com/wallpaper/full/0/f/1/891619-cool-wallpaper-of-study-1920x1080.jpg");
-            background-repeat:no-repeat;
-           background-size:cover;
-    } 
-    </style>
-
 
 <body>
-
   <!-- Header -->
 <section class="section"></section>
     <div class="container">
 
-        </div>
     </div>
 </section>
 
 <!-- Login Form-->
 
 <section>
   <div class="form">
-    <div class= "title" style="color:red"> 
-        <h1>Hi </h1>
+    <div class= "title"> 
+        <h1>Study Hall</h1>
+        <h2 class="subtitle">Your Premier Studying Portal </h2>
+        <p>
+          Welcome to Study Hall! A great website for motivating students like you 
+          to do one of the most laborious tasks school entails: studying.
+        <br/>
+        <br/>
+          With Study Hall, you can keep track of important to-dos, time your 
+          study sessions, and gain points the more you study! Follow the easy sign 
+          up process below to get started or if you have already made an account, log in!
+        </p>
     </div>
     <ul class="tab-group">
       <li class="tab active"><a href="#signup">Sign Up</a></li>
@@ -111,7 +114,7 @@ <h1>Hi </h1>
       </div>
   </div>
 </section>
-
+</body>
 
 <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script><script  src="login.js"></script>
 <script src="https://unpkg.com/axios/dist/axios.min.js"></script>

diff --git a/frontend/login_style.css b/frontend/login_style.css
@@ -2,9 +2,13 @@
     box-sizing: border-box;
   }
 
-
-  .title h1{
-    color: red;
+  body {
+    background-image: url("http://getwallpapers.com/wallpaper/full/0/f/1/891619-cool-wallpaper-of-study-1920x1080.jpg");
+    background-repeat:no-repeat;
+    background-size:auto;
+  } 
+  title {
+    color: white;
   }
   html {
     overflow-y: scroll;
@@ -75,6 +79,12 @@
     font-weight: 300;
     margin: 0 0 40px;
   }
+
+  .subtitle {
+    text-align: center;
+    color: #ffffff;
+    font-weight: 300; 
+  }
 
   label {
     position: absolute;