diff --git a/README.md b/README.md index 2c6e21e2..3eb3b4e7 100755 --- a/README.md +++ b/README.md @@ -1,89 +1,13 @@ -Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js -=== - -Due: September 9th, by 11:59 AM. - -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 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. Only one member needs to submit a pull request. - -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 - -## Technical Achievements -- **Tech Achievement 1**: Using a combination of... -- **Tech Achievement 2**: ... - -### 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... +https://jamevor-a2-shortstack.glitch.me/ +Doughboyz Catering Ordering Application +This application is for Doughboyz catering! This is a food ordering app for a local breakfast place. Users will put the order specifications into the form and their order will populate the table. A messege to the user will appear. javascript was used to produce all the basic funcality of the ordering/modify proccess. + +-This project pertains to food ordering -This application will let stuents order food when no other dining option is avalible on campus -By utlizing the HTML forms and Javascript the application was able to be developed -The project will let users place orders which can be completed addressing the problem of being hungry. -There are several areas where the projectt can be improved. The forms to order need to be made more secure to not leak information, The "About the Founder" page could be made into its own page found from the homepage. Lastly how to modify a page could be updated but it was the only way I knew how to do it. + +Technical Achievements +Tech Achievement 1: Radio Buttons were used to make it easier for the user to change a specific part of their order +Tech Achievement 2: Server Logic Takes information of Users name and order and produces a messege to the user on their ordr completion. +Tech Achievement 3: Jquerry and Datatables was used as an API to display the data neatly to the user +Design/Evaluation Achievements +Design Achievement 1: The Order ID was added to make modifying and deleting an order easier for the user. A user may only need to put in the order ID they would like to affect +Design Achievement 2: The background color changes to white in the "About the Author" section to help the user realize they are now using a diffrent part of the site rom the ordering section. diff --git a/package.json b/package.json index 988f135f..ab8c1332 100755 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "start": "node server.improved.js" }, "dependencies": { + "datatables.net-buttons-dt": "^1.5.6", + "datatables.net-dt": "^1.10.19", + "jquery": "^3.4.1", "mime": "^2.4.4" } } diff --git a/public/css/style.css b/public/css/style.css index d5f842ab..11963fad 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1 +1,65 @@ -/*Style your own assignment! This is fun! */ \ No newline at end of file + +.main{ + + background-color: orange; +} +h1 { + font-size: 50px; + text-align: center; +} +.logo{ + margin-right: 780px; + width: 300px; + padding: 10px; + +} +#slogan { + font-size: 30px; + text-align: center; + font-style: italic; +} +#barack { + text-align: center; + font-style: italic; + font-size: 20px; +} +.me{ + width:55%; + margin-right:-10%; + float: right; + +} +.me iframe{ + width:100%; +} +#my_info { + width:25%; + height:280px; + border-style: solid; + border-width: 5px; + margin-left: 500px; + font-size: 30px; + +} +.clearfix{ + clear:both +} +.ordering{ + text-align: center; + font-size: 20px; + text-align: left; + margin-left: 780px; + margin-right: 780px; + border-style: solid; + border-width: 5px; +} +h2 { + font-size: 50px; + margin-left: 530px; + margin-bottom: 0px; +} +.modify{ + border-style: dotted; + border-width: 5px; + margin-right: 780px; +} diff --git a/public/index.html b/public/index.html index c56d620e..19194da6 100755 --- a/public/index.html +++ b/public/index.html @@ -3,39 +3,187 @@ CS4241 Assignment 2 + + + + + + +
+

Doughboyz Catering

+ +

Flapjacks and Good Snacks.

+
- - + Name:
+ Address:
+ Order:
+ Condiment:
+ Aditional Information:
+
+ + +
- - + window.onload = function() { + const button = document.querySelector( '#buttonDelete' ) + button.onclick = delID + + const button2 = document.querySelector( '#buttonSubmit' ) + button2.onclick = submit + + const button3 = document.querySelector( '#buttonModify' ) + button3.onclick = modID + } + + + diff --git a/public/js/scripts.js b/public/js/scripts.js index de052eae..e0275744 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -1,3 +1,8 @@ -// Add some Javascript code here, to run on the front end. +console.log("Welcome to assignment 2!") + +$(document).ready(function() { + $('#example').DataTable( { + "ajax": 'fullOrders.json' + } ); +} ); -console.log("Welcome to assignment 2!") \ No newline at end of file diff --git a/server.improved.js b/server.improved.js index 26673fc0..13d6e6b5 100644 --- a/server.improved.js +++ b/server.improved.js @@ -1,11 +1,11 @@ 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 + const appdata = [ { 'model': 'toyota', 'year': 1999, 'mpg': 23 }, { 'model': 'honda', 'year': 2004, 'mpg': 30 }, @@ -20,12 +20,43 @@ const server = http.createServer( function( request,response ) { } }) +let data = { + "data": [ + [ + "1", + "Tiger Nixon", + "Ball St", + "Pancakes", + "Syrup", + "Make it quick", + "Hello Tiger Nixon, your order of pancakes will be ready in exactly 30 seconds." + ], + [ + "2", + "Garrett Winters", + "100 Insitute Rd", + "Waffles", + "Butter", + "Speed", + "Hello Garrett Winters, your order of Waffles will be ready in exactly 30 seconds." + ] + ] +}; + +let idCounter = 3; + const handleGet = function( request, response ) { const filename = dir + request.url.slice( 1 ) - + if( request.url === '/' ) { sendFile( response, 'public/index.html' ) - }else{ + } + else if(request.url.includes('fullOrders.json')){ + response.writeHead(200, {"Content-Type": "application/json"}); + response.write(JSON.stringify(data)); + response.end(); + } + else{ sendFile( response, filename ) } } @@ -39,11 +70,87 @@ 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' }) - response.end() + + // add row into the table + if(request.url.includes("submit")){ + let clientData = Object.values(JSON.parse(dataString)); + + // server side processing + let message = "Hello "+ clientData[0] + ", your order of " + clientData[2] + " will be ready in exactly 30 seconds." + clientData[5] = message + clientData.unshift(idCounter.toString()) + idCounter += 1; + + data['data'].push(clientData); + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + response.end() + } + else if(request.url.includes("delete")){ + let clientData = Object.values(JSON.parse(dataString)); + + let newData = []; + for(var i = 0; i < data['data'].length; i++) { + var serverName = data['data'][i][0]; + if (!(clientData[0] === serverName)){ + newData.push(data['data'][i]) + } + } + data['data'] = newData; + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + response.end() + } + else if(request.url.includes("modify")){ + let clientData = Object.values(JSON.parse(dataString)); + + let newData = []; + for(var i = 0; i < data['data'].length; i++) { + var serverName = data['data'][i][0]; + if (!(clientData[0] === serverName)){ + newData.push(data['data'][i]) + } + else{ + try { + let newEntry = data['data'][i] + switch(clientData[1]) { + case "nam": + newEntry[1] = clientData[2] + newData.push(newEntry) + break; + case "add": + newEntry[2] = clientData[2] + newData.push(newEntry) + break; + case "ord": + newEntry[3] = clientData[2] + newData.push(newEntry) + break; + case "con": + newEntry[4] = clientData[2] + newData.push(newEntry) + break; + case "inf": + newEntry[5] = clientData[2] + newData.push(newEntry) + break; + case "mes": + newEntry[6] = clientData[2] + newData.push(newEntry) + break; + } + } + catch (e){ + newData.push(data['data'][i]) + } + } + } + data['data'] = newData; + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + response.end() + } + else { + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + response.end() + } }) } @@ -70,3 +177,5 @@ const sendFile = function( response, filename ) { } server.listen( process.env.PORT || port ) + +server.listen( process.env.PORT || port )