Skip to content
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

Completed week 2 #50

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Completed week 2 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 12 additions & 47 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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" href="#" id="logoutButton">Logout</a>
</div>
</li>
</ul>
Expand All @@ -54,63 +54,28 @@
</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="inputTask" 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="addTaskButton">Add Task</button>

</div>
</div>
<div class="input-group mb-3 todo-search-task">
<input type="text" class="form-control" placeholder="Search 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>
<div id="taskList">


<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>
</ul>
</center>
<script type="module" src="./src/init.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion login/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="loginBtn" type="submit">Log In</button>
</div>
</body>

Expand Down
181 changes: 180 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion register/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,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="registerBtn" type="submit">Register</button>
</div>
</body>

Expand Down
3 changes: 3 additions & 0 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.
*/
if (localStorage.token === undefined) {
window.location.href = 'login/';
}
48 changes: 47 additions & 1 deletion src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
import axios from 'axios';
import { updateTask, deleteTask, editTask } from './main';
const API_BASE_URL = 'https://todo-app-csoc.herokuapp.com/';
window.deleteTask = deleteTask;
window.updateTask = updateTask;
window.editTask = editTask;
const taskList = document.getElementById("taskList");

function getTasks() {

export function getTasks() {
/***
* @todo Fetch the tasks created by the user and display them in the dom.
*/
const headersForApiRequest = {
Authorization: 'Token ' + localStorage.getItem('token')
}
axios({
headers: headersForApiRequest,
url: API_BASE_URL + 'todo/',
method: 'GET',
}).then(function ({ data, status }) {
console.log(data);
taskList.innerHTML = "";
for (var index = 0; index < data.length; index++) displayTask(data[index].id, data[index].title);
})
}

axios({

headers: {
Authorization: 'Token ' + localStorage.getItem('token'),
},
Expand All @@ -18,3 +37,30 @@ axios({
document.getElementById('profile-name').innerHTML = data.name;
getTasks();
})

export function displayTask(id, title) {

var template = `
<li class="list-group-item d-flex justify-content-between align-items-center" class="taskElement" id="taskElement-REPLACE_ID">
<input id="input-button-REPLACE_ID" type="text" class="form-control todo-edit-task-input hideme" placeholder="Edit The Task">
<div id="done-button-REPLACE_ID" class="input-group-append hideme">
<button class="btn btn-outline-secondary todo-update-task" type="button" id="updateTaskButtonREPLACE_ID" onclick="updateTask(REPLACE_ID)">Done</button>
</div>
<div id="task-REPLACE_ID" class="todo-task">
REPLACE_TASK_TITLE
</div>
<span id="task-actions-REPLACE_ID">
<button style="margin-right:5px;" type="button" id="editTaskButtonREPLACE_ID" class="btn btn-outline-warning" onclick="editTask(REPLACE_ID)">
<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" id="deleteTaskButtonREPLACE_ID" onclick="deleteTask(REPLACE_ID)">
<img src="https://res.cloudinary.com/nishantwrp/image/upload/v1587486661/CSOC/delete.svg" width="18px" height="22px">
</button>
</span>
</li>
`
var result1 = template.replace(/REPLACE_ID/g, id);
var result2 = result1.replace("REPLACE_TASK_TITLE", title);

taskList.innerHTML += result2;
}
Loading