diff --git a/README.md b/README.md index 304a16f1..0b3728ae 100755 --- a/README.md +++ b/README.md @@ -1,89 +1,22 @@ Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js === -Due: September 9th, by 11:59 AM. +## To-Do List +This application is a basic online to-do list where users can add tasks with given due dates and time estimations and see how long they have until the due date. -This assignment aims to introduce you to the concepts and practice involved in creating a prototype (i.e. not deployment ready) two-tiered web application. +- The project aims to be a to-do list. +- The main challenge the application addresses is forgetting what you have to do for a class or other task. +- The key innovation that make it possible to address the problem is the ability to see how long until the day the assignment is due. +- The application really does address the problem. +- Areas of future work could include sorting the list based on due date, or color coding items that have certain esitmations of time. -The baseline aims of this assignment involve creating an application that demonstrates the use of several specific pieces of HTML, CSS, JavaScript, and Node.js functionality. -Another aim of this assignment is to establish creative boundaries in which you and your partner can explore designing, implementing, and evaluating usable, useful, novel, and technically efficient web applications. - -Baseline Requirements ---- - -Note that there is a very large range of application areas and possibilities that meet these baseline requirements. -Games, internet of things, organizational tools, commerce, media - all are possibilities with a two-tiered form-focused web application. - -Do not limit yourselves to any of the examples given below. -Examples like the upcoming `efficiency_ratio` idea for the `cars` dataset are meant to be illustrative and easy to understand. -They are not intended to be sensible or useful ideas. - -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 `cars` dataset with `year`, `horsepower`, and `fuel_efficiency` may create a new field `efficiency_ratio` by dividing `fuel_efficiency` by `horsepower` - -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 - - Clarification: the results page can be implemented in any way. `
`s, `table`s, and `list`s are common choices - -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 sizing of the primary visual elements in the application: - - CSS to cause at least one element to be horizontally centered on the page - - CSS to cause at least one pair of elements to appear side-by-side - - 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. A starting point is provided in this repository. - -Deliverables ---- - -Do the following to complete this assignment: - -1. Fork the starting project code. 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-yourname` so we can find it. -6. Modify the Readme to the specifications below. -7. Create and submit a Pull Request to the original repo. Label the pull request as follows: a2-gitusername-firstname-lastname - -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. -Images are encouraged, along with concise, high-level text. - -Here is a sample formula for summarizing your activities, talk about: -- the domain area the project pertains to -- the main challenges or problems the application addresses -- the key innovations that make it possible to address the problem -- the main results of the implementation, does it really address the problem? -- any additional implications of the resulting application, or possibly areas for future work that have been discovered as part of the design and implementation activities - -(Note that when I use the above formula, I aim to have only one sentence per thought in order to remain concise.) - -http://a2-charlieroberts.glitch.me +https://a2-mariocastro.glitch.me/ ## Technical Achievements -- **Tech Achievement 1**: Using a combination of... -- **Tech Achievement 2**: ... +- **Tech Achievement 1**: The application provides a form for users to submit data and responds to the user submitting data by returning and displaying the server data alongwith the derived attribute. +- **Tech Achievement 2**: Implemented a time remaining derived attribute that has the server calculate the time until the given due date and sends it back to the client. ### Design/Evaluation Achievements -- **Design Achievement 1**: Shown in `style.css`, the code... -- **Design Achievement 2**: We tested the application with n=X users, finding that... +- **Design Achievement 1**: Shown in `style.css`, the webpage contains gradient color backgrounds, and "mouse over" UI changes. +- **Design Achievement 2**: We tested the application with n=1 users (Last name: Moran), finding that they had no problems with the design. They tried inputting dates in the past and negative estimated time so that would be something to prevent the user from entering in the future. +- **Design Achievement 2**: The application will not let the user submit an empty task and will display a message and provides visual feedback to invalid data. diff --git a/package.json b/package.json index 988f135f..2f242f1b 100755 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "Mario Castro Assignment 2", + "version": "1", + "description": "My assignment 2 for WebWare CS4241", + "author": "Mario Castro", "scripts": { "start": "node server.improved.js" }, "dependencies": { - "mime": "^2.4.4" + "mime": "^2.4.6", + "mine": "^0.1.0" } } diff --git a/public/css/style.css b/public/css/style.css index d5f842ab..e28912f2 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1 +1,118 @@ -/*Style your own assignment! This is fun! */ \ No newline at end of file +/*Style your own assignment! This is fun! */ +form{ + display: flex; + justify-content: center; + + +} +input{ + margin: 10px; + border-top-style: none; + border-left-style: none; + border-right-style: none; + border-bottom-style: 1px; + background-color: #92FFF6; + padding: 10px; + width: 200px; +} + + + +#title{ + text-align: center; + padding: 0%; + margin-right: 30%; + margin-left: 30%; + + +} + + + +body{ + + background: rgb(133,253,124); + background: linear-gradient(0deg, rgba(133,253,124,1) 0%, rgba(223,250,134,1) 100%); + text-align: center; + + background-repeat: no-repeat; + background-attachment: fixed; + margin:10px; + padding:5px; + +} + +#backgroundPane{ + padding-top: 10px; + padding-left: 10px; + padding-right: 10px; + margin-left: 25%; + margin-right: 25%; + background: #92FFF6; + border-radius: 15px; + min-height: 600px; + height: auto; + height: 100%; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2); +} + +input:focus{ + outline: none; + background-color: #B8FFF6; + border-radius: 5px; +} + +input:hover{ + outline: none; + background-color: #B8FFF6; + border-radius: 5px; +} + +.buttons:hover{ + background-color: #00FFFF; +} + +.buttons{ + text-align: center; + margin-top: 10px; + margin-bottom: 10px; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2); + background-color: #008FFF; + border-radius: 5px; + outline: none; + border: none; + padding: 10px; +} + +h2{ + text-align: center; +} + +*{ + font-family: 'Roboto', sans-serif; +} + +table{ + table-layout: auto; + background-color: #B8FFF6; +} + + +table, th, td{ + + margin-left: auto; + margin-right: auto; + border: 1px solid black; + border-collapse: collapse; +} + +tr{ + width: 30px; +} +td,th{ + padding: 5px; +} + +hr{ + width:50%; +} diff --git a/public/index.html b/public/index.html index c56d620e..efac62a9 100755 --- a/public/index.html +++ b/public/index.html @@ -3,39 +3,47 @@ CS4241 Assignment 2 + + + -
- - -
- - +
+ + diff --git a/public/js/scripts.js b/public/js/scripts.js index de052eae..648dfd85 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -1,3 +1,100 @@ // Add some Javascript code here, to run on the front end. -console.log("Welcome to assignment 2!") \ No newline at end of file +console.log("Welcome to assignment 2!") + + +const submit = function( e ) { + // prevent default form action from being carried out + e.preventDefault() + + + + + const assignmentNameInput = document.querySelector( '#assignmentname' ), + dueDateInput = document.querySelector( '#duedate' ), + esttime = document.querySelector( '#esttime' ), + json={assignmentname: assignmentNameInput.value, dueDate:dueDateInput.value, esttime:esttime.value}, + body=JSON.stringify(json); + + if(assignmentNameInput.value==='' || dueDateInput.value==='' || esttime.value===''){ + assignmentNameInput.style.backgroundColor="#F59487"; + dueDateInput.style.backgroundColor="#F59487"; + esttime.style.backgroundColor="#F59487"; + var invalidLable = document.querySelector('#invalidInput'); + invalidLable.innerHTML = "Input invalid, try again" + return false; + } + + assignmentNameInput.style.backgroundColor="#white"; + dueDateInput.style.backgroundColor="#white"; + esttime.style.backgroundColor="#white"; + + + + //Clears input from fields + assignmentNameInput.value = ''; + dueDateInput.value = ''; + esttime.value =''; + + fetch( '/submit', { + method:'POST', + body + }) + .then( function( response ) { + var responseValue = response.text() + return responseValue; + + + }).then( function(responseValue){ + console.log("This is the response" + responseValue); + var table = document.getElementById("todotable"); + buildTableOfEntries(table,responseValue); + + }) + + return false + } + +window.onload = function() { + const button = document.querySelector( 'button' ) + button.onclick = submit + + + fetch("/data") + .then(function(response){ + var responseValue = response.text() + return responseValue; + }).then(function(responseValue) { + var table = document.getElementById('todotable'); + buildTableOfEntries(table,responseValue); + }) + + } + +function buildTableOfEntries(table, entries){ + table.innerHTML=""; + + var headerRow = document.createElement("tr"); + headerRow.appendChild(newCell("Assignment","th")); + headerRow.appendChild(newCell("Due Date","th")); + headerRow.appendChild(newCell("Time Remaining","th")); + headerRow.appendChild(newCell("Estimated Hours of Work","th")); + table.appendChild(headerRow); + + JSON.parse(entries).forEach(element => { + var rowNode = document.createElement("tr"); + rowNode.appendChild(newCell(element.assignmentname.toString(),"td")); + rowNode.appendChild(newCell(element.dueDate.toString(),"td")); + rowNode.appendChild(newCell(element.timeLeft.toString(),"td")) + rowNode.appendChild(newCell(element.esttime.toString() + " Hours","td")); + table.appendChild(rowNode); + }); +} + +function newCell(text, type){ + var textNode = document.createTextNode(text); + var cellNode = document.createElement(type); + cellNode.appendChild(textNode); + return cellNode; +} + diff --git a/server.improved.js b/server.improved.js index 26673fc0..780c1361 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} -] +var appdata = [] const server = http.createServer( function( request,response ) { if( request.method === 'GET' ) { @@ -25,8 +21,11 @@ const handleGet = function( request, response ) { if( request.url === '/' ) { sendFile( response, 'public/index.html' ) + }else if(request.url === '/data'){ + response.writeHeader(200, {'Content-Type': 'application/json'}) + response.end(JSON.stringify(appdata)) }else{ - sendFile( response, filename ) + sendFile(response,filename) } } @@ -40,13 +39,24 @@ const handlePost = function( request, response ) { request.on( 'end', function() { console.log( JSON.parse( dataString ) ) - // ... do something with the data here!!! + console.log("this is the data string: " + dataString ); - response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) - response.end() + var nonStringData = JSON.parse(dataString) + nonStringData.timeLeft = stringTimeRemainingUntil(nonStringData.dueDate); + console.log(nonStringData); + + appdata.push(nonStringData); + console.log("This is the current server data: " + JSON.stringify(appdata)) + response.writeHeader( 200, {'Content-Type': 'application/json' }) + response.end(JSON.stringify(appdata)) }) } + + + + + const sendFile = function( response, filename ) { const type = mime.getType( filename ) @@ -70,3 +80,33 @@ const sendFile = function( response, filename ) { } server.listen( process.env.PORT || port ) + + +function stringTimeRemainingUntil(date){ + var currentDate = new Date(); + var dueDate = getDate(date); + return convertMS(Math.abs(dueDate-currentDate)) + + function getDate(date_string) { + var date_components = date_string.split("-"); + var year = date_components[0]; + var month = date_components[1]; + var day = date_components[2]; + return new Date(year, month - 1, day); + } + + function convertMS( milliseconds ) { + var day, hour, minute, seconds; + seconds = Math.floor(milliseconds / 1000); + minute = Math.floor(seconds / 60); + seconds = seconds % 60; + hour = Math.floor(minute / 60); + minute = minute % 60; + day = Math.floor(hour / 24); + hour = hour % 24; + return day +" days, " + hour + " hours, " + minute + " minutes."; + } +} + + +