diff --git a/README.md b/README.md index 304a16f1..81f585bc 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 -=== +## Update 1:50 PM 9/9 +The professor asked me to add a message to the top of my README, as I had difficulties with this assignment. -Due: September 9th, by 11:59 AM. +I attempted to go deeper than I should have with this project, and it caused me to waste far too much time writing things that didn't work just to delete them. Currently, the project lacks functionality for displaying the submitted forms in the table. Unfortunately, I was unable to find what was going wrong (as were others who I asked) and threw in the towel at about 5 am due to people breaking things in my house and myself having to be the person to fix them on multiple days this weekend. Hopefully, I was just missing something small as opposed to being completely off the mark. Any feedback after grading would be appreciated. -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. +## House Job Tracker +This project is designed to assist in tracking house jobs for the house that I live in. +The user is able to add, edit or clear house jobs for both days of the week on which they are done. +The app seeks to keep house job assignmetn organized to reduce the possibility of people forgetting or not being able to find out they're own house job +Further development is needed for the app to be useful for more than a personal record of house jobs, as it does not have persistent storage. -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 +http://a2-samtalpey.glitch.me ## Technical Achievements -- **Tech Achievement 1**: Using a combination of... -- **Tech Achievement 2**: ... +- **NPM express**: Utilized the npm "express" module +- **Tabluar Data**: Data is stored on the server in an array, and displayed through a table +- **XMLHttpRequests**: Utilized XMLHttpRequests to send data from client to server +- **HTML forms**: Learned how to send data from an HTML form to a server ### 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... +- **CSS Styling**: Table for displaying job listings +- **Consultation**: CSS layout was designed using feedback from potential future users diff --git a/package.json b/package.json index 988f135f..0f8e2b9a 100755 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { - "name": "", - "version": "", - "description": "", - "author": "", + "name": "job_tracker", + "version": "0.1.0", + "description": "A tracker created for AXP house jobs", + "author": "Sam Talpey", "scripts": { "start": "node server.improved.js" }, "dependencies": { "mime": "^2.4.4" + "express": "^4.17.1" } } diff --git a/public/css/style.css b/public/css/style.css index d5f842ab..49a08c0e 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1 +1,44 @@ -/*Style your own assignment! This is fun! */ \ No newline at end of file +table { + margin: 5px; +} +table, th, tr { + border: 2px solid black; +} +td { + border: 1px solid black; +} + +body { + justify-content: center; +} +.readout { + display: flex; + justify-content: center; +} + +h1, h2 { + text-align: center; +} + +h1 { + margin-bottom: 25px; +} +h2 { + margin: 10px; +} +h3 { + margin-bottom: 10px; +} +h5 { + margin-top: 5px; + margin-bottom: 5px; +} + +#jobForm { + display: block; + text-align: center; +} + +input, select, button { + margin: 5px; +} \ No newline at end of file diff --git a/public/index.html b/public/index.html index c56d620e..8257de0b 100755 --- a/public/index.html +++ b/public/index.html @@ -1,41 +1,158 @@ - CS4241 Assignment 2 + House Job Tracker + + -
- - -
+

House Job Tracker

+
+

House Jobs This Week

+
+
+

Tuesday

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
JobName
Knobs + Rags
1st Floor Bathroom
2nd Floor Br, Toilet/Vanity
2nd Floor Br, Showers/Floors
3rd Floor Bathroom
Foyer + Library Floor
Library
Stairs
TV Room
2/3 Floor Halls
Basement
Laundry Room
+
+
+

Thursday

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
JobName
Knobs + Rags
1st Floor Bathroom
2nd Floor Br, Toilet/Vanity
2nd Floor Br, Showers/Floors
3rd Floor Bathroom
Foyer + Library Floor
Library
Stairs
TV Room
2/3 Floor Halls
Basement
Laundry Room
+
+
+
+
+

Add or reassign a house job

+
To remove a job, submit a blank form
+
+ Name:
+ Job:
+ Day: + + +
+
- diff --git a/public/js/scripts.js b/public/js/scripts.js index de052eae..5d7ace4e 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -1,3 +1,20 @@ -// Add some Javascript code here, to run on the front end. +const submit = function() { + // Getting form info + form = document.getElementById("form") + name = form.elements[0].value + job = form.elements[1].value + day = form.elements[2].value -console.log("Welcome to assignment 2!") \ No newline at end of file + // Sending XMLHttp request with data + data = {"name": name, "job": job, "day": day} + var req = new XMLHttpRequest() + req.open("POST", "/", true) + req.send(data) +} + +const reset = function() { + data = {"name": "reset", "job": "none", "day": form.elements[2].value} + var req = new XMLHttpRequest() + req.open("POST", "/", true) + req.send(data) +} diff --git a/server.improved.js b/server.improved.js index 26673fc0..3c66519e 100644 --- a/server.improved.js +++ b/server.improved.js @@ -1,72 +1,54 @@ -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/', +const express = require('express'), + dir = '/public/', + server = express(), port = 3000 -const appdata = [ - { 'model': 'toyota', 'year': 1999, 'mpg': 23 }, - { 'model': 'honda', 'year': 2004, 'mpg': 30 }, - { 'model': 'ford', 'year': 1987, 'mpg': 14} +let jobs = [ + { 'name': 'One', 'job': 'Foo', 'day': 'Tuesday', 'done': false, 'late': false }, ] -const server = http.createServer( function( request,response ) { - if( request.method === 'GET' ) { - handleGet( request, response ) - }else if( request.method === 'POST' ){ - handlePost( request, response ) - } +server.get('/', function(req, res) { + res.sendFile(__dirname + dir + 'index.html') }) -const handleGet = function( request, response ) { - const filename = dir + request.url.slice( 1 ) - - if( request.url === '/' ) { - sendFile( response, 'public/index.html' ) - }else{ - sendFile( response, filename ) - } -} - -const handlePost = function( request, response ) { +server.post('/', function(req, res) { let dataString = '' - - request.on( 'data', function( data ) { - dataString += data + request.on('data', function(data) { + dataString += data }) request.on( 'end', function() { - console.log( JSON.parse( dataString ) ) - - // ... do something with the data here!!! - - response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + dataObj = JSON.parse(dataString) + jobs.concat(dataObj) + + table = null + jobs.forEach(function(job) { + + if(job["name"] === "reset") { + for(i=1, row; row=table.rows[i]; i++) { + row.cells[1].innerHTML = "" + } + } + + if(job["day"] === "Tuesday") { + table = document.getElementById("tuesTable") + } + else table = document.getElementById("thurTable") + + for(i = 1, row; row = table.rows[i]; i++) { + if(row.cells[0].innerHTML === job["job"]) { + row.cells[1].innerHTML = job["name"] + } + } + }) + + response.writeHead( 200, 'OK', {'Content-Type': 'text/plain' }) response.end() }) -} - -const sendFile = function( response, filename ) { - const type = mime.getType( filename ) - - fs.readFile( filename, function( err, content ) { - - // 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 ) - - }else{ - - // file not found, error code 404 - response.writeHeader( 404 ) - response.end( '404 Error: File Not Found' ) - - } - }) -} +}) -server.listen( process.env.PORT || port ) +server.use(express.static('public')) +server.set('port', process.env.PORT || port) +server.listen(port, function() { + console.log("Job Tracker running on port 3000") +})