COPS-CSOC-2022 · Anikaaasingh · Jun 19, 2022 · Jun 19, 2022 · Jun 20, 2022 · Jun 20, 2022
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -2,10 +2,10 @@
 
 I have completed the following tasks
 
-- [ ] Login
-- [ ] `auth_required.js` and `no_auth_required.js`
-- [ ] Add Task
-- [ ] Get Tasks
-- [ ] Edit Task
-- [ ] Delete Task
-- [ ] Bonus Task
+- [X] Login
+- [X] `auth_required.js` and `no_auth_required.js`
+- [X] Add Task
+- [X] Get Tasks
+- [X] Edit Task
+- [X] Delete Task
+- [X] Bonus Task
diff --git a/index.html b/index.html
@@ -43,9 +43,10 @@
                     <li class="nav-item dropdown active">
                         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                             data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="#" class="rounded-circle" id="avatar-image"><span class="todo-profile-name" id="profile-name">Loading ...</span></a>
+                            <img src="#" class="rounded-circle" id="avatar-image"><span class="todo-profile-name"
+                                id="profile-name">Loading ...</span></a>
                         <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                            <a class="dropdown-item" href="#" onclick="logout()">Logout</a>
+                            <a class="dropdown-item" id="logoutButton" href="#">Logout</a>
                         </div>
                     </li>
                 </ul>
@@ -54,63 +55,27 @@
     </nav>
     <center>
         <div class="input-group mb-3 todo-add-task">
-            <input type="text" class="form-control" placeholder="Enter Task">
+            <input type="text" class="form-control" placeholder="Enter Task" id="inputTask">
             <div class="input-group-append">
-                <button type="button" class="btn btn-outline-success" onclick="addTask()">Add Task</button>
+                <button type="button" class="btn btn-outline-success" id="addTaskButton">Add Task</button>
             </div>
         </div>
+
+        <div class="input-group mb-3 todo-search-task">
+            <input type="text" class="form-control" placeholder="Seach for a Task" id="searchTask">
+            <div class="input-group-append">
+                <button type="button" class="btn btn-outline-warning" id="searchTaskButton">Search</button>
+            </div>
+        </div>
+
         <ul class="list-group todo-available-tasks">
             <span class="badge badge-primary badge-pill todo-available-tasks-text">
                 Available Tasks
             </span>
 
-
-            <li class="list-group-item d-flex justify-content-between align-items-center">
-                    <input id="input-button-1" type="text" class="form-control todo-edit-task-input hideme" placeholder="Edit The Task">
-                    <div id="done-button-1"  class="input-group-append hideme">
-                        <button class="btn btn-outline-secondary todo-update-task" type="button" onclick="updateTask(1)">Done</button>
-                    </div>
-                    <div id="task-1" class="todo-task">
-                        Sample Task 1
-                    </div>
-
-                    <span id="task-actions-1">
-                        <button style="margin-right:5px;" type="button" onclick="editTask(1)"
-                            class="btn btn-outline-warning">
-                            <img src="https://res.cloudinary.com/nishantwrp/image/upload/v1587486663/CSOC/edit.png"
-                                width="18px" height="20px">
-                        </button>
-                        <button type="button" class="btn btn-outline-danger" onclick="deleteTask(1)">
-                            <img src="https://res.cloudinary.com/nishantwrp/image/upload/v1587486661/CSOC/delete.svg"
-                                width="18px" height="22px">
-                        </button>
-                    </span>
-            </li>
-
-
-            <li class="list-group-item d-flex justify-content-between align-items-center">
-                    <input id="input-button-2" type="text" class="form-control todo-edit-task-input hideme" placeholder="Edit The Task">
-                    <div id="done-button-2" class="input-group-append hideme">
-                        <button class="btn btn-outline-secondary todo-update-task" type="button" onclick="updateTask(2)">Done</button>
-                    </div>
-
-                    <div id="task-2" class="todo-task">
-                        Sample Task 2
-                    </div>
-                    <span id="task-actions-2">
-                        <button style="margin-right:5px;" type="button" onclick="editTask(2)"
-                            class="btn btn-outline-warning">
-                            <img src="https://res.cloudinary.com/nishantwrp/image/upload/v1587486663/CSOC/edit.png"
-                                width="18px" height="20px">
-                        </button>
-                        <button type="button" class="btn btn-outline-danger" onclick="deleteTask(2)">
-                            <img src="https://res.cloudinary.com/nishantwrp/image/upload/v1587486661/CSOC/delete.svg"
-                                width="18px" height="22px">
-                        </button>
-                    </span>
-            </li>
-
-
+            <div id="taskList">
+
+            </div>
         </ul>
     </center>
     <script type="module" src="./src/init.js"></script>

diff --git a/login/index.html b/login/index.html
@@ -50,7 +50,7 @@
       <label>Password</label>
       <input type="Password" class="form-control" id="inputPassword">
     </div>
-    <button class="btn btn-outline-success my-2 my-sm-0" onclick="login()" type="submit">Log In</button>
+    <button class="btn btn-outline-success my-2 my-sm-0" id="loginButton" type="submit">Log In</button>
   </div>
 </body>
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/COPS-CSOC-2022/csoc-task-2-web#readme",
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "vite": "^2.3.7"
   }
 }
diff --git a/register/index.html b/register/index.html
@@ -64,8 +64,8 @@
       <label for="inputAddress2">Password</label>
       <input type="Password" class="form-control" id="inputPassword">
     </div>
-    <button class="btn btn-outline-success my-2 my-sm-0" onclick="register()" type="submit">Register</button>
+    <button class="btn btn-outline-success my-2 my-sm-0" id="registerButton" type="submit">Register</button>
   </div>
 </body>
 
-</html>
+</html>
diff --git a/src/auth_required.js b/src/auth_required.js
@@ -1,3 +1,6 @@
 /***
  * @todo Redirect the user to login page if token is not present.
  */
+if (localStorage.token === undefined) {
+    window.location.href = 'login/';
+}