Skip to content

Completed Tasks #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Completed Tasks #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7280a4
Completed all tasks
shriya-tiwari Jun 20, 2022
4aee371
Merge branch 'COPS-CSOC-2022:main' into main
shriya-tiwari Jun 20, 2022
65cdfd9
Completed tasks
shriya-tiwari Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 22 additions & 53 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/izitoast/1.4.0/css/iziToast.min.css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" type="text/css"
rel="stylesheet">
<link rel="stylesheet" href="/style.css">
<link rel="stylesheet" href="/style.css" type="text/css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/izitoast/1.4.0/js/iziToast.min.js"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<meta charset=utf-8>
<meta http-equiv=X-UA-Compatible content="IE=edge">
<meta name=viewport content="width=device-width,initial-scale=1">
Expand Down Expand Up @@ -37,6 +38,22 @@
<span class="sr-only">(current)</span>
</a>
</li>
<li class="nav-item active">
<a class="nav-link" ><span id="searchtag" onclick="searchtask()"> Search </span>
<span class="sr-only">(current)</span>
<input id="input-button" type="text" class="form-control todo-edit-task-input hideme flexgrp" placeholder="Search task">
<div id="done-button" class="input-group-append hideme flexgrp">
<button class="btn btn-outline-secondary todo-update-task" type="button" id="searchBtn" onclick="searchButton()">
<script src="https://cdn.lordicon.com/xdjxvujz.js"></script>
<lord-icon
src="https://cdn.lordicon.com/pvbutfdk.json"
trigger="hover"
colors="primary:#ffffff"
style="width:20px;height:20px">
</lord-icon></button>
</div>
</a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<ul class="navbar-nav mr-auto">
Expand All @@ -45,7 +62,7 @@
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>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#" onclick="logout()">Logout</a>
<a class="dropdown-item" id="logoutButton" href="#" onclick="logout()">Logout</a>
</div>
</li>
</ul>
Expand All @@ -54,63 +71,15 @@
</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" id="taskAdded" placeholder="Enter Task">
<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="addtask" onclick="addTask()">Add Task</button>
</div>
</div>
<ul class="list-group todo-available-tasks">
<ul class="list-group todo-available-tasks" id="taskList">
<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>


</ul>
</center>
<script type="module" src="./src/init.js"></script>
Expand Down
7 changes: 4 additions & 3 deletions login/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/izitoast/1.4.0/js/iziToast.min.js"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<meta charset=utf-8>
<meta http-equiv=X-UA-Compatible content="IE=edge">
<meta name=viewport content="width=device-width,initial-scale=1">
Expand All @@ -28,10 +29,10 @@
<div class="collapse navbar-collapse" id="navbarTogglerDemo03">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item">
<a class="nav-link" href="/register/">Register<span class="sr-only">(current)</span></a>
<a class="nav-link" href="../register/">Register<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/login/">Login</a>
<a class="nav-link" href="../login/">Login</a>
</li>
</ul>
</div>
Expand All @@ -50,7 +51,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" onclick="login()" type="submit">Log In</button>
</div>
</body>

Expand Down
7 changes: 4 additions & 3 deletions register/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/izitoast/1.4.0/js/iziToast.min.js"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<meta charset=utf-8>
<meta http-equiv=X-UA-Compatible content="IE=edge">
<meta name=viewport content="width=device-width,initial-scale=1">
Expand All @@ -28,10 +29,10 @@
<div class="collapse navbar-collapse" id="navbarTogglerDemo03">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item active">
<a class="nav-link" href="/register/">Register<span class="sr-only">(current)</span></a>
<a class="nav-link" href="../register/">Register<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="/login/">Login</a>
<a class="nav-link" href="../login/">Login</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -64,7 +65,7 @@
<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" onclick="register()" type="submit">Register</button>
</div>
</body>

Expand Down
9 changes: 6 additions & 3 deletions src/auth_required.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/***
* @todo Redirect the user to login page if token is not present.
*/
const auth = function() {
if(!localStorage.getItem('token'))
window.location.href = '/login/';
}

auth();
52 changes: 48 additions & 4 deletions src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,52 @@
import axios from 'axios';
// import axios from 'axios';
const API_BASE_URL = 'https://todo-app-csoc.herokuapp.com/';

function getTasks() {
/***
* @todo Fetch the tasks created by the user and display them in the dom.
*/

axios({
headers: {
Authorization: 'Token ' + localStorage.getItem('token'),
},
url: API_BASE_URL + 'todo/',
method: 'get'
}).then((data,status) => {
const todos = data.data;
var tasklist = document.getElementById("taskList");
tasklist.innerHTML = `
<span class="badge badge-primary badge-pill todo-available-tasks-text">
Available Tasks
</span>`;
console.log(todos);
todos.map((todo) => {
var title = todo.title;
var index = todo.id;
console.log(title);
var content = `
<li class="list-group-item d-flex justify-content-between align-items-center">
<input id="input-button-${index}" type="text" class="form-control todo-edit-task-input hideme" placeholder="Edit The Task">
<div id="done-button-${index}" class="input-group-append hideme">
<button class="btn btn-outline-secondary todo-update-task" type="button" onclick="updateTask(${index})">Done</button>
</div>
<div id="task-${index}" class="todo-task">
${title}
</div>

<span id="task-actions-${index}">
<button id="editButton-${index}" style="margin-right:5px;" type="button" onclick="editTask(${index})"
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(${index})">
<img src="https://res.cloudinary.com/nishantwrp/image/upload/v1587486661/CSOC/delete.svg"
width="18px" height="22px">
</button>
</span>
</li>`
tasklist.innerHTML += content;

})
})
}

axios({
Expand All @@ -18,3 +60,5 @@ axios({
document.getElementById('profile-name').innerHTML = data.name;
getTasks();
})

window.getTasks = function() { getTasks()};
Loading