From 1920dcde2ade0d31d02c8765927e369f597af5b6 Mon Sep 17 00:00:00 2001
From: amalik3099 <46609090+amalik3099@users.noreply.github.com>
Date: Sun, 11 Oct 2020 16:56:42 +0400
Subject: [PATCH 07/12] display width adjustments
---
public/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/index.html b/public/index.html
index 9ae3e63c..13c12e1c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,7 +15,7 @@
-
+
-
+
-
+
@@ -24,47 +24,18 @@
this.state = {
username: null,
tasks: [],
- usernameInput: "",
- passwordInput: "",
- taskInput: "",
- priorityInput: "",
+ userIDEntry: "",
+ pwdEntry: "",
+ todoEntry: "",
+ priorityValEntry: "",
};
- this.processLogin = this.processLogin.bind(this);
- this.processData = this.processData.bind(this);
this.login = this.login.bind(this);
this.logout = this.logout.bind(this);
- this.submit = this.submit.bind(this);
- this.delete = this.delete.bind(this);
- this.save = this.save.bind(this);
- }
-
- processData(json) {
- this.setState({ tasks: json, taskInput: "", priorityInput: "" });
- }
-
- processLogin(json) {
- console.log("user data", json);
- if (!json._id) return;
- this.setState({
- username: json.username,
- usernameInput: "",
- passwordInput: "",
- });
- fetch("/api/getData")
- .then((response) => response.json())
- .then((json) => this.processData(json));
- }
-
- logout() {
- fetch("/logout").then(() => {
- this.setState({ username: null });
- });
- }
-
- componentDidMount() {
- fetch("/api/getUser")
- .then((response) => response.json())
- .then((json) => this.processLogin(json));
+ this.deliver = this.deliver.bind(this);
+ this.setLogin = this.setLogin.bind(this);
+ this.processData = this.processData.bind(this);
+ this.removeEntries = this.removeEntries.bind(this);
+ this.saveEntries = this.saveEntries.bind(this);
}
login() {
@@ -74,36 +45,39 @@
"Content-Type": "application/json",
},
body: JSON.stringify({
- username: this.state.usernameInput,
- password: this.state.passwordInput,
+ username: this.state.userIDEntry,
+ password: this.state.pwdEntry,
}),
})
.then((response) => {
if (!response.ok) {
- throw "Invalid Username/Passwword";
+ throw "Invalid Username/Passwword combination";
}
return response.json();
})
- .then((json) => this.processLogin(json))
+ .then((json) => this.setLogin(json))
.catch((err) => {
console.error(err);
alert(err);
});
}
- delete(id) {
- const json = {
- delete: true,
- id,
- },
- body = JSON.stringify(json);
+ logout() {
+ fetch("/logout").then(() => {
+ this.setState({ username: null });
+ });
+ }
+ deliver() {
fetch("/submit", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
- body,
+ body: JSON.stringify({
+ task: this.state.todoEntry,
+ priority: this.state.priorityValEntry,
+ }),
})
.then((response) => response.json())
.then((json) => {
@@ -111,16 +85,42 @@
});
}
- submit() {
+ setLogin(json) {
+ console.log("user data", json);
+ if (!json._id) return;
+ this.setState({
+ username: json.username,
+ userIDEntry: "",
+ pwdEntry: "",
+ });
+ fetch("/api/getData")
+ .then((response) => response.json())
+ .then((json) => this.processData(json));
+ }
+
+ processData(json) {
+ this.setState({ tasks: json, todoEntry: "", priorityValEntry: "" });
+ }
+
+ componentDidMount() {
+ fetch("/api/getUser")
+ .then((response) => response.json())
+ .then((json) => this.setLogin(json));
+ }
+
+ removeEntries(id) {
+ const json = {
+ delete: true,
+ id,
+ },
+ body = JSON.stringify(json);
+
fetch("/submit", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
- body: JSON.stringify({
- task: this.state.taskInput,
- priority: this.state.priorityInput,
- }),
+ body,
})
.then((response) => response.json())
.then((json) => {
@@ -128,11 +128,11 @@
});
}
- save(id) {
- const ticket = this.state.tasks.find((t) => t._id == id);
+ saveEntries(id) {
+ const todo = this.state.tasks.find((t) => t._id == id);
const json = {
- task: ticket.task,
- priority: ticket.priority,
+ task: todo.task,
+ priority: todo.priority,
id,
},
body = JSON.stringify(json);
@@ -145,7 +145,7 @@
})
.then((response) => response.json())
.then((json) => {
- alert("Success!");
+ alert("Changes have been saved!");
this.processData(json);
});
}
@@ -165,9 +165,9 @@
id="username"
placeholder="Username"
// .
- value={this.state.usernameInput}
+ value={this.state.userIDEntry}
onChange={(e) =>
- this.setState({ usernameInput: e.target.value })
+ this.setState({ userIDEntry: e.target.value })
}
/>
- this.setState({ passwordInput: e.target.value })
+ this.setState({ pwdEntry: e.target.value })
}
/>