From 4d28d390c3c5e9ebb65b524c45f5a03c74c66a7c Mon Sep 17 00:00:00 2001
From: Jacob van Steyn <jacobvs2@gmail.com>
Date: Thu, 8 Sep 2022 09:54:47 -0400
Subject: [PATCH 1/3] log received data

---
 public/index.html  |  9 +++++++--
 server.improved.js | 17 +++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/public/index.html b/public/index.html
index c56d620..fdd01bf 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,6 +9,11 @@
       <input type='text' id='yourname' value="your name here">
       <button>submit</button>
     </form>
+  <table>
+    <thead>
+      Name
+    </thead>
+  </table>
   </body>
   <script>
 
@@ -25,8 +30,8 @@
       body 
     })
     .then( function( response ) {
-      // do something with the reponse 
-      console.log( response )
+      var data = response.json()
+      console.log( data )
     })
 
     return false
diff --git a/server.improved.js b/server.improved.js
index 26673fc..8fe4ba6 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -6,11 +6,7 @@ const http = require( 'http' ),
       dir  = 'public/',
       port = 3000
 
-const appdata = [
-  { 'model': 'toyota', 'year': 1999, 'mpg': 23 },
-  { 'model': 'honda', 'year': 2004, 'mpg': 30 },
-  { 'model': 'ford', 'year': 1987, 'mpg': 14} 
-]
+const appdata = []
 
 const server = http.createServer( function( request,response ) {
   if( request.method === 'GET' ) {
@@ -38,11 +34,12 @@ const handlePost = function( request, response ) {
   })
 
   request.on( 'end', function() {
-    console.log( JSON.parse( dataString ) )
-
-    // ... do something with the data here!!!
-
-    response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
+    var data = JSON.parse( dataString );
+    console.log("Received Data: " + data);
+    appdata.push(data)
+    
+    response.writeHead(200, "OK", {'Content-Type': 'text/plain' })
+    response.json(appdata)
     response.end()
   })
 }

From 6c39f596038d280f914ec1a5f2cddbaa90a1b8a6 Mon Sep 17 00:00:00 2001
From: Jacob van Steyn <jacobvs2@gmail.com>
Date: Thu, 8 Sep 2022 11:48:53 -0400
Subject: [PATCH 2/3] Add files

---
 README.md            |  98 ++-------------------------------
 public/css/style.css |  80 ++++++++++++++++++++++++++-
 public/index.html    | 128 +++++++++++++++++++++++++++++++++----------
 server.improved.js   |  98 +++++++++++++++++++++------------
 4 files changed, 245 insertions(+), 159 deletions(-)

diff --git a/README.md b/README.md
index 9434c98..b389adc 100644
--- a/README.md
+++ b/README.md
@@ -1,98 +1,12 @@
 Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js  
 ===
-
-Due: September 8th, by 11:59 AM.
-
-This assignment aims to introduce you to creating a prototype two-tiered web application. 
-Your application will include the use of HTML, CSS, JavaScript, and Node.js functionality, with active communication between the client and the server over the life of a user session.
-
-Baseline Requirements
----
-
-There is a large range of application areas and possibilities that meet these baseline requirements. 
-Try to make your application do something useful! A todo list, storing / retrieving high scores for a very simple game... have a little fun with it.
-
-Your application is required to implement the following functionalities:
-
-- a `Server` which not only serves files, but also maintains a tabular dataset with 3 or more fields related to your application
-- a `Results` functionality which shows the entire dataset residing in the server's memory
-- a `Form/Entry` functionality which allows a user to add, modify, or delete data items residing in the server's memory
-- a `Server Logic` which, upon receiving new or modified "incoming" data, includes and uses a function that adds at least one additional derived field to this incoming data before integrating it with the existing dataset
-- the `Derived field` for a new row of data must be computed based on fields already existing in the row. 
-For example, a `todo` dataset with `task`, `priority`, and `creation_date` may generate a new field `deadline` by looking at `creation_date` and `priority`
-
-Your application is required to demonstrate the use of the following concepts:
-
-HTML:
-- One or more [HTML Forms](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms), with any combination of form tags appropriate for the user input portion of the application
-- A results page displaying all data currently available on the server. You will most likely use a `<table>` tag for this, but `<ul>` or `<ol>` could also work and might be simpler to work with. Alternatively, you can create a single-page app (see Technical Acheivements) but this is not a requirement.
-- All pages should [validate](https://validator.w3.org)
-- If your app contains multple pages, they should all be accessible from the homepage (index.html)
-
-CSS:
-- CSS styling of the primary visual elements in the application
-- Various CSS Selector functionality must be demonstrated:
-    - Element selectors
-    - ID selectors
-    - Class selectors
-- CSS positioning and styling of the primary visual elements in the application:
-    - Use of either a CSS grid or flexbox for layout
-    - Rules defining fonts for all text used; no default fonts! Be sure to use a web safe font or a font from a web service like [Google Fonts](http://fonts.google.com/)
-
-- CSS defined in a maintainable, readable form, in external stylesheets 
-
-JavaScript:
-- At minimum, a small amount of front-end JavaScript to get / fetch data from the server; a sample is provided in this repository.
-
-Node.js:
-- An HTTP Server that delivers all necessary files and data for the application, and also creates the required `Derived Fields` in your data. 
-A starting point is provided in this repository.
-
-Deliverables
----
-
-Do the following to complete this assignment and acheive a base grade of 85%:
-
-1. Fork the starting project code (make sure to fork the 2022 repo!). This repo contains some starter code that may be used or discarded as needed.
-2. Implement your project with the above requirements.
-3. Test your project to make sure that when someone goes to your main page, it displays correctly.
-4. Deploy your project to Glitch, and fill in the appropriate fields in your package.json file.
-5. Ensure that your project has the proper naming scheme `a2-yourGithubUsername` so we can find it.
-6. Modify the README to the specifications below, and delete all of the instructions originally found in this README.
-7. Create and submit a Pull Request to the original repo. Label the pull request as follows: a2-gitusername-firstname-lastname
-
-Acheivements
----
-
-Below are suggested technical and design achievements. You can use these to help boost your grade up to an A and customize the assignment to your personal interests. These are recommended acheivements, but feel free to create/implement your own... just make sure you thoroughly describe what you did in your README and why it was challenging. ALL ACHIEVEMENTS MUST BE DESCRIBED IN YOUR README IN ORDER TO GET CREDIT FOR THEM.
-
-*Technical*
-- (10 points) Create a single-page app that both provides a form for users to submit data and always shows the current state of the server-side data. To put it another way, when the user submits data, the server should respond sending back the updated data (including the derived field calculated on the server) and the client should then update its data display.
-
-*Design/UX*
-- (5 points per person, with a max of 10 points) Test your user interface with other students in the class. Define a specific task for them to complete (ideally something short that takes <10 minutes), and then use the [think-aloud protocol](https://en.wikipedia.org/wiki/Think_aloud_protocol) to obtain feedback on your design (talk-aloud is also find). Important considerations when designing your study:
-
-1. Make sure you start the study by clearly stating the task that you expect your user to accomplish.
-2. You shouldn't provide any verbal instructions on how to use your interface / accomplish the task you give them. Make sure that your interface is clear enough that users can figure it out without any instruction, or provide text instructions from within the interface itself. 
-3. If users get stuck to the point where they give up, you can then provde instruction so that the study can continue, but make sure to discuss this in your README. You won't lose any points for this... all feedback is good feedback!
-
-You'll need to use sometype of collaborative software that will enable you both to see the test subject's screen and listen to their voice as they describe their thoughts. After completing each study, briefly (one to two sentences for each question) address the following in your README:
-
-1. Provide the last name of each student you conduct the evaluation with.
-2. What problems did the user have with your design?
-3. What comments did they make that surprised you?
-4. What would you change about the interface based on their feedback?
-
-*You do not need to actually make changes based on their feedback*. This acheivement is designed to help gain experience testing user interfaces. If you run two user studies, you should answer two sets of questions. 
-
-Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions)
----
-
-## Your Web Application Title
-Include a very brief summary of your project here. Be sure to include the CSS positioning technique you used, and any required instructions to use your application.
+## Todo List App
+https://a2-jacobvs.glitch.me/
 
 ## Technical Achievements
-- **Tech Achievement 1**: Using a combination of...
+- **Tech Achievement 1**: Single Page App, allows users to submit tasks
+- Added a derived due date
+- Added delete functionality
 
 ### Design/Evaluation Achievements
-- **Design Achievement 1**: 
+- **Design Achievement 1**: Styled page using box sizing border box
diff --git a/public/css/style.css b/public/css/style.css
index d5f842a..302f6f4 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1 +1,79 @@
-/*Style your own assignment! This is fun! */
\ No newline at end of file
+/*Style your own assignment! This is fun! */
+html {
+    box-sizing: border-box;
+}
+
+*, *::before, *::after {
+    box-sizing: inherit;
+    margin: 0;
+    padding: 0;
+}
+
+.container {
+    width: 100%;
+    max-width: 500px;
+    margin: 0 auto;
+    padding-left: 10px;
+    padding-right: 10px;
+    color: #333;
+    height: 90vh;
+    margin-top: 5vh;
+    margin-bottom: 5vh;
+    overflow-y: auto;
+}
+
+
+:root {
+    --color-text-main: #000000;
+    --color-primary: #FFFF00;
+    --wrapper-height: 87vh;
+    --image-max-width: 300px;
+    --image-margin: 3rem;
+    --font-family: "Raleway";
+}
+
+body {
+    font-family: Raleway, serif;
+    background-color: var(--color-bg);
+}
+
+
+.title {
+    text-align: center;
+    margin-bottom: 20px;
+    font-size: 80px;
+    opacity: 0.5;
+}
+
+
+input[type=text], select, input[type=range] {
+    width: 100%;
+    padding: 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    box-sizing: border-box;
+    margin-top: 6px;
+    margin-bottom: 16px;
+    resize: vertical;
+}
+
+input[type=submit] {
+    background-color: #04AA6D;
+    color: white;
+    padding: 12px 20px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+input[type=submit]:hover {
+    background-color: #45a049;
+}
+
+
+.todolist {
+    width:100%;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index fdd01bf..dd67611 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,46 +1,114 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <title>CS4241 Assignment 2</title>
-    <meta charset="utf-8">
-  </head>
-  <body>
-    <form action="">
-      <input type='text' id='yourname' value="your name here">
-      <button>submit</button>
-    </form>
-  <table>
-    <thead>
-      Name
-    </thead>
-  </table>
-  </body>
-  <script>
-
-  const submit = function( e ) {
+<link rel="stylesheet" href="./css/style.css">
+<link rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Raleway">
+<head>
+  <title>CS4241 Assignment 2</title>
+  <meta charset="utf-8">
+</head>
+<body>
+<h1 class="title">
+  todo list
+</h1>
+<div class="container">
+  <form action="" class="todoform">
+    <label for="taskinput">Task:</label>
+    <input autofocus type="text" id="taskinput" name="task" placeholder="What do you want to do?">
+    <label for="priorityinput">Priority:</label>
+    <select id="priorityinput" name="priority">
+      <option value="Highest">Highest</option>
+      <option value="High">High</option>
+      <option value="Medium">Medium</option>
+      <option value="Low">Low</option>
+      <option value="Lowest">Lowest</option>
+    </select>
+    <label for="daysinput">Days to Complete:</label>
+    <output>1</output>
+    <input type="range" min="1" max="10" value="1" id="daysinput" name="days" oninput="this.previousElementSibling.value = this.value">
+
+    <button type="submit">Submit</button>
+  </form>
+</div>
+<table id="table">
+  <thead>
+  <tr>
+    <th>Task</th>
+    <th>Days to Complete</th>
+    <th>Due Date</th>
+    <th>Priority</th>
+    <th>Done?</th>
+  </tr>
+  </thead>
+  <tbody></tbody>
+</table>
+
+</body>
+<script>
+
+  const handleSubmit = function( e ) {
     // prevent default form action from being carried out
     e.preventDefault()
 
-    const input = document.querySelector( '#yourname' ),
-          json = { yourname: input.value },
-          body = JSON.stringify( json )
+    const form = e.target
+    var data = {};
+    for (var i = 0, ii = form.length; i < ii; ++i) {
+      var input = form[i];
+      if (input.name) {
+        data[input.name] = input.value;
+      }
+    }
 
-    fetch( '/submit', {
+    var date = new Date();
+    date.setDate(date.getDate() + data.days)
+    data.duedate = date.toLocaleString()
+
+    const body = JSON.stringify(data)
+    console.log(body)
+
+    fetch( '/submit/', {
       method:'POST',
-      body 
-    })
-    .then( function( response ) {
-      var data = response.json()
-      console.log( data )
+      body
     })
+            .then(async function( response ) {
+              var data = await response.json()
+              console.log( data )
+              console.log("response ^")
+              form.reset()
+              updateTable(data)
+            })
 
     return false
   }
+  const deleteData = (id) => {
+    var form = document.createElement('form');
+    form.setAttribute('method', 'post');
+    form.setAttribute('action', `/delete&id=${id}`);
+    form.style.display = 'hidden';
+    document.body.appendChild(form)
+    form.submit();
+  }
+
+  const updateTable = (dataJ) => {
+    const table = document.querySelector('tbody')
+    dataJ.map((value, index) => {
+      const row = document.createElement("tr");
+      row.innerHTML = ` <td>${value.task}</td>
+                        <td>${value.days}</td>
+                        <td>${value.duedate}</td>
+                        <td>${value.priority}</td>
+                        <td><button type="button" onclick="deleteData(${index});">DONE!</button></td>`;
+      row.dataset.ind = index;
+      table.appendChild(row);
+    });
+  }
 
   window.onload = function() {
-    const button = document.querySelector( 'button' )
-    button.onclick = submit
+    const form = document.querySelector('form');
+    form.addEventListener('submit', handleSubmit);
+
+
   }
 
-  </script>
+</script>
 </html>
diff --git a/server.improved.js b/server.improved.js
index 8fe4ba6..84ab7d9 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -1,69 +1,95 @@
 const http = require( 'http' ),
-      fs   = require( 'fs' ),
-      // IMPORTANT: you must run `npm install` in the directory for this assignment
-      // to install the mime library used in the following line of code
-      mime = require( 'mime' ),
-      dir  = 'public/',
-      port = 3000
+    fs   = require( 'fs' ),
+    // IMPORTANT: you must run `npm install` in the directory for this assignment
+    // to install the mime library used in the following line of code
+    mime = require( 'mime' ),
+    dir  = 'public/',
+    port = 3000
 
 const appdata = []
 
 const server = http.createServer( function( request,response ) {
   if( request.method === 'GET' ) {
-    handleGet( request, response )    
+    handleGet( request, response )
   }else if( request.method === 'POST' ){
-    handlePost( request, response ) 
+    handlePost( request, response )
   }
 })
 
 const handleGet = function( request, response ) {
-  const filename = dir + request.url.slice( 1 ) 
+  const filename = dir + request.url.slice( 1 )
 
   if( request.url === '/' ) {
     sendFile( response, 'public/index.html' )
-  }else{
+  } else if (request.url === '/getdata'){
+    response.writeHead(200, "OK", { "Content-Type": "text/plain" });
+    response.write(JSON.stringify(appdata));
+    response.end();
+  }
+  else {
     sendFile( response, filename )
   }
 }
 
 const handlePost = function( request, response ) {
-  let dataString = ''
+  console.log(request.url)
+  if (request.url === '/submit/'){
+    let dataString = ''
 
-  request.on( 'data', function( data ) {
-      dataString += data 
-  })
+    request.on( 'data', function( data ) {
+      dataString += data
+    })
+
+    request.on( 'end', function() {
+      var data = JSON.parse( dataString );
+      console.log(data);
+      appdata.push(data)
+
+      response.writeHead(200, "OK", {'Content-Type': 'text/plain' })
+      response.write(JSON.stringify(appdata))
+      response.end()
+    })
+  }
+  else if (request.url === '/delete/'){
+    let dataString = ''
+
+    request.on( 'data', function( data ) {
+      dataString += data
+    })
+
+    request.on( 'end', function() {
+      var data = JSON.parse( dataString );
+      console.log(data);
+      delete appdata[data.id]
+
+      response.writeHead(200, "OK", {'Content-Type': 'text/plain' })
+      response.write(JSON.stringify(appdata))
+      response.end()
+    })
+  }
 
-  request.on( 'end', function() {
-    var data = JSON.parse( dataString );
-    console.log("Received Data: " + data);
-    appdata.push(data)
-    
-    response.writeHead(200, "OK", {'Content-Type': 'text/plain' })
-    response.json(appdata)
-    response.end()
-  })
 }
 
 const sendFile = function( response, filename ) {
-   const type = mime.getType( filename ) 
+  const type = mime.getType( filename )
 
-   fs.readFile( filename, function( err, content ) {
+  fs.readFile( filename, function( err, content ) {
 
-     // if the error = null, then we've loaded the file successfully
-     if( err === null ) {
+    // if the error = null, then we've loaded the file successfully
+    if( err === null ) {
 
-       // status code: https://httpstatuses.com
-       response.writeHeader( 200, { 'Content-Type': type })
-       response.end( content )
+      // status code: https://httpstatuses.com
+      response.writeHeader( 200, { 'Content-Type': type })
+      response.end( content )
 
-     }else{
+    }else{
 
-       // file not found, error code 404
-       response.writeHeader( 404 )
-       response.end( '404 Error: File Not Found' )
+      // file not found, error code 404
+      response.writeHeader( 404 )
+      response.end( '404 Error: File Not Found' )
 
-     }
-   })
+    }
+  })
 }
 
 server.listen( process.env.PORT || port )

From 57b0ef962891bc8b753067c7da318767a4a95710 Mon Sep 17 00:00:00 2001
From: Jacob van Steyn <jacobvs2@gmail.com>
Date: Fri, 9 Sep 2022 16:55:55 -0400
Subject: [PATCH 3/3] fix

---
 public/css/style.css |  1 -
 public/index.html    | 98 ++++++++------------------------------------
 public/js/scripts.js | 78 ++++++++++++++++++++++++++++++++++-
 server.improved.js   | 16 ++++----
 4 files changed, 104 insertions(+), 89 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 302f6f4..18e8d08 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -16,7 +16,6 @@ html {
     padding-left: 10px;
     padding-right: 10px;
     color: #333;
-    height: 90vh;
     margin-top: 5vh;
     margin-bottom: 5vh;
     overflow-y: auto;
diff --git a/public/index.html b/public/index.html
index dd67611..6808ddc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,6 +3,8 @@
 <link rel="stylesheet" href="./css/style.css">
 <link rel="stylesheet"
       href="https://fonts.googleapis.com/css2?family=Raleway">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/purecss@2.1.0/build/pure-min.css" integrity="sha384-yHIFVG6ClnONEA5yB5DJXfW2/KC173DIQrYoZMEtBvGzmf0PKiGyNEqe9N6BNDBH" crossorigin="anonymous">
+<script src="./js/scripts.js"></script>
 <head>
   <title>CS4241 Assignment 2</title>
   <meta charset="utf-8">
@@ -14,7 +16,7 @@ <h1 class="title">
 <div class="container">
   <form action="" class="todoform">
     <label for="taskinput">Task:</label>
-    <input autofocus type="text" id="taskinput" name="task" placeholder="What do you want to do?">
+    <input autofocus type="text" id="taskinput" name="task" placeholder="What do you want to do?" required>
     <label for="priorityinput">Priority:</label>
     <select id="priorityinput" name="priority">
       <option value="Highest">Highest</option>
@@ -30,85 +32,21 @@ <h1 class="title">
     <button type="submit">Submit</button>
   </form>
 </div>
-<table id="table">
-  <thead>
-  <tr>
-    <th>Task</th>
-    <th>Days to Complete</th>
-    <th>Due Date</th>
-    <th>Priority</th>
-    <th>Done?</th>
-  </tr>
-  </thead>
-  <tbody></tbody>
-</table>
-
-</body>
-<script>
-
-  const handleSubmit = function( e ) {
-    // prevent default form action from being carried out
-    e.preventDefault()
-
-    const form = e.target
-    var data = {};
-    for (var i = 0, ii = form.length; i < ii; ++i) {
-      var input = form[i];
-      if (input.name) {
-        data[input.name] = input.value;
-      }
-    }
-
-    var date = new Date();
-    date.setDate(date.getDate() + data.days)
-    data.duedate = date.toLocaleString()
-
-    const body = JSON.stringify(data)
-    console.log(body)
-
-    fetch( '/submit/', {
-      method:'POST',
-      body
-    })
-            .then(async function( response ) {
-              var data = await response.json()
-              console.log( data )
-              console.log("response ^")
-              form.reset()
-              updateTable(data)
-            })
-
-    return false
-  }
-  const deleteData = (id) => {
-    var form = document.createElement('form');
-    form.setAttribute('method', 'post');
-    form.setAttribute('action', `/delete&id=${id}`);
-    form.style.display = 'hidden';
-    document.body.appendChild(form)
-    form.submit();
-  }
-
-  const updateTable = (dataJ) => {
-    const table = document.querySelector('tbody')
-    dataJ.map((value, index) => {
-      const row = document.createElement("tr");
-      row.innerHTML = ` <td>${value.task}</td>
-                        <td>${value.days}</td>
-                        <td>${value.duedate}</td>
-                        <td>${value.priority}</td>
-                        <td><button type="button" onclick="deleteData(${index});">DONE!</button></td>`;
-      row.dataset.ind = index;
-      table.appendChild(row);
-    });
-  }
-
-  window.onload = function() {
-    const form = document.querySelector('form');
-    form.addEventListener('submit', handleSubmit);
-
+<div class="container">
+  <table id="table" class="pure-table">
+    <thead>
+    <tr>
+      <th>Task</th>
+      <th>Days to Complete</th>
+      <th>Due Date</th>
+      <th>Priority</th>
+      <th>Done?</th>
+    </tr>
+    </thead>
+    <tbody></tbody>
+  </table>
+</div>
 
-  }
 
-</script>
+</body>
 </html>
diff --git a/public/js/scripts.js b/public/js/scripts.js
index de052ea..9d1ebc3 100644
--- a/public/js/scripts.js
+++ b/public/js/scripts.js
@@ -1,3 +1,79 @@
 // Add some Javascript code here, to run on the front end.
+const handleSubmit = function( e ) {
+    // prevent default form action from being carried out
+    e.preventDefault()
 
-console.log("Welcome to assignment 2!")
\ No newline at end of file
+    const form = e.target
+    var data = {};
+    for (var i = 0, ii = form.length; i < ii; ++i) {
+        var input = form[i];
+        if (input.name) {
+            data[input.name] = input.value;
+        }
+    }
+
+    var date = new Date();
+    date.setDate(date.getDate() + data.days)
+    data.duedate = date.toLocaleString()
+
+    const body = JSON.stringify(data)
+    console.log(body)
+
+    fetch( '/submit/', {
+        method:'POST',
+        body
+    })
+        .then(async function( response ) {
+            var data = await response.json()
+            console.log( data )
+            console.log("response ^")
+            form.reset()
+            updateTable(data)
+        })
+
+    return false
+}
+const deleteData = (id) => {
+
+    // var form = document.createElement('form');
+    // form.setAttribute('method', 'post');
+    // form.setAttribute('action', `/delete&id=${id}`);
+    // form.style.display = 'hidden';
+    // document.body.appendChild(form)
+    // form.submit()
+    fetch(`/delete?id=${id}`, {method: "POST"})
+        .then(async function( response ) {
+            var data = await response.json()
+            console.log( data )
+            console.log("response ^")
+            updateTable(data)
+        });
+}
+
+const priorities = {"Highest": 1, "High": 0.75, "Medium": 0.5,"Low": 0.25,"Lowest":0}
+
+const updateTable = (dataJ) => {
+    const table = document.querySelector('tbody')
+    table.innerHTML = ""
+
+    dataJ.sort(function (a, b) {
+        return (priorities[b.priority]-(b.days*.01))-(priorities[a.priority]-(a.days*.01))
+    })
+    dataJ.map((value, index) => {
+        const row = document.createElement("tr");
+        row.innerHTML = ` <td>${value.task}</td>
+                        <td>${value.days}</td>
+                        <td>${value.duedate}</td>
+                        <td>${value.priority}</td>
+                        <td><button type="button" onclick="deleteData(${index});">DONE!</button></td>`;
+        row.dataset.ind = index;
+        table.appendChild(row);
+    });
+}
+
+window.onload = function() {
+    const form = document.querySelector('form');
+    form.addEventListener('submit', handleSubmit);
+
+
+}
\ No newline at end of file
diff --git a/server.improved.js b/server.improved.js
index 84ab7d9..e1953d6 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -6,7 +6,7 @@ const http = require( 'http' ),
     dir  = 'public/',
     port = 3000
 
-const appdata = []
+let appdata = []
 
 const server = http.createServer( function( request,response ) {
   if( request.method === 'GET' ) {
@@ -50,17 +50,19 @@ const handlePost = function( request, response ) {
       response.end()
     })
   }
-  else if (request.url === '/delete/'){
-    let dataString = ''
+  else if (request.url.includes('delete')){
+    let dataString = new URL(request.headers.origin + request.url).searchParams.get('id')
+    console.log("Data: " + dataString)
 
     request.on( 'data', function( data ) {
-      dataString += data
     })
 
     request.on( 'end', function() {
-      var data = JSON.parse( dataString );
-      console.log(data);
-      delete appdata[data.id]
+      console.log(appdata)
+      var index = parseInt(dataString)
+      console.log(index)
+      if (index === 0 && appdata.length == 1) appdata = []
+      else appdata.splice(index, index)
 
       response.writeHead(200, "OK", {'Content-Type': 'text/plain' })
       response.write(JSON.stringify(appdata))