diff --git a/README.md b/README.md index 304a16f1..67a02b53 100755 --- a/README.md +++ b/README.md @@ -1,89 +1,9 @@ -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. 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 +## User Management +Made a small way to keep track of users and their data, along with admin privledges and remembering users +By using localstorage I can keep track of users throughout user sessions +While this tries to solve the problem of keeping track of users, it is very bare bones in terms of features, and because of the lack of any server, if the server goes down for any reason all user data is lost. +I hope that in the future I can add a sql server to this in order to keep track of users better, as well as a better way to keep track of users, as currently a user could modify their localstorage in order to pretend to be someone else. +https://a2-edkazcarlson.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... +Using localstorage, I am able to keep track of user nicknames through different browser sessions, and keep individual sessions independant. \ No newline at end of file diff --git a/package.json b/package.json index 988f135f..7ff0a9f6 100755 --- a/package.json +++ b/package.json @@ -7,6 +7,6 @@ "start": "node server.improved.js" }, "dependencies": { - "mime": "^2.4.4" + "mime": "^2.4.6" } } diff --git a/public/css/style.css b/public/css/style.css index d5f842ab..d9483490 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 +/*Style your own assignment! This is fun! */ +.hidden{ + color:red; +} + +table{ + border-collapse: collapse; +} + +tr, td, th{ + border:solid; + border-width: 2px; + border-color: black; +} + +body, button, ::placeholder{ + font-size: 28px; + font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; + display:flex; + justify-content: center; + align-items: center; + flex-direction:column; + margin: 0px; +} + +table { + display: flex; + justify-content: space-around; +} + +input[type = text]{ + width: 500px; + height: 30px; + font-size: 28px; + font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; +} + +input[type = checkbox]{ + width: 30px; + height: 30px; +} +#Title{ + text-align: center; +} + +#header{ + background-color: gray; + display: flex; + justify-content: space-around; + font-size: 36px; + width: 100%; + padding-top: 5px; + padding-bottom: 5px; +} + + + +a { + color: black; +} + +.glow{ + text-shadow: 2px 2px 8px rgb(109, 0, 0); + color: red; +} \ No newline at end of file diff --git a/public/header.html b/public/header.html new file mode 100644 index 00000000..fcf0223f --- /dev/null +++ b/public/header.html @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/public/index.html b/public/index.html index c56d620e..344f34de 100755 --- a/public/index.html +++ b/public/index.html @@ -1,41 +1,77 @@ - CS4241 Assignment 2 + User Entry + + -
- - + +

User Entry

+ + + +
+ +
+ +
+ + +
+
+ - diff --git a/public/js/scripts.js b/public/js/scripts.js index de052eae..cc1c9d3d 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!") \ No newline at end of file +window.onload = setGreeting; +function setGreeting(){ + let greeting = document.getElementById('headerGreeting'); + let name = localStorage.getItem('nick') + if (name !== null){ + greeting.innerText = `Hello ${name}`; + } +} \ No newline at end of file diff --git a/public/results.html b/public/results.html new file mode 100644 index 00000000..61f0219f --- /dev/null +++ b/public/results.html @@ -0,0 +1,88 @@ + + + + + + + + Users Page + + + +

Users Table

+ + + + + + + + + + +
NicknameUsernamePasswordSSNAdmin StatusDate addedDelete
+ + + + + diff --git a/server.improved.js b/server.improved.js index 26673fc0..e671c87f 100644 --- a/server.improved.js +++ b/server.improved.js @@ -6,11 +6,23 @@ 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} -] +let appdata = [ + {id: 0, username: "Test", password: "password" , ssn : "123456789", admin: false, dateAdded: '1991-8-21', nick: 'T'}, + {id: 1, username: "n0Passw0rdMan123", password: "password123" , ssn : "987654321", admin: false, dateAdded: '2000-2-24', nick: 'PM'} +]; + +let wasLastAnAdmin = false; + +let resultsPage = null; +fs.readFile('public/results.html', function(err, content){ + resultsPage = content; +}); + +let headerFile; +fs.readFile('public/header.html', function(err, content){ + headerFile = content; +}); + const server = http.createServer( function( request,response ) { if( request.method === 'GET' ) { @@ -20,36 +32,103 @@ const server = http.createServer( function( request,response ) { } }) + + const handleGet = function( request, response ) { const filename = dir + request.url.slice( 1 ) - if( request.url === '/' ) { - sendFile( response, 'public/index.html' ) + sendFile( response, 'public/index.html' ); + }else if (request.url === '/users'){ + sendFile( response, 'public/results.html' ); + }else if (request.url === '/style.css') { + sendFile( response, 'public/css/style.css'); }else{ sendFile( response, filename ) } } const handlePost = function( request, response ) { - let dataString = '' - - request.on( 'data', function( data ) { - dataString += data - }) - - request.on( 'end', function() { - console.log( JSON.parse( dataString ) ) - - // ... do something with the data here!!! + if( request.url === '/delete' ) { + let toDelete = ''; + + request.on('data', function( data ) { + toDelete += data; + toDelete = JSON.parse(toDelete).id; + }); + + request.on('end', function(){ + appdata = appdata.filter(function(val){ + return val.id !== toDelete; + }) + }); + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }); + response.end(); + } else if (request.url === '/userList'){ + let redactedData = []; + if (wasLastAnAdmin){ + appdata.forEach(function(element){ + redactedData.push({id: element.id, + username: element.username, + password: element.password , + ssn : -1, + admin: element.admin, + dateAdded: element.dateAdded, + nick: element.nick}) + }); + } else { + appdata.forEach(function(element){ + redactedData.push({id: element.id, + username: element.username, + password: -1 , + ssn : -1, + admin: element.admin, + dateAdded: element.dateAdded, + nick: element.nick}) + }); + } + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }); + response.end(JSON.stringify(redactedData)); + } else { + let dataString = ''; + let nick = ''; + request.on( 'data', function( data ) { + dataString += data; + data = JSON.parse(dataString); + wasLastAnAdmin = data.admin; + let dateAdded = new Date(); + dateAdded = `${dateAdded.getFullYear()}-${dateAdded.getMonth()}-${dateAdded.getDate()} ${dateAdded.getHours()}:${dateAdded.getMinutes()}`; + data.dateAdded = dateAdded; + let upperCase = ''; + for (let i = 0; i < data.username.length; i++){ + if (data.username.charAt(i) === data.username.charAt(i).toUpperCase()){ + upperCase += data.username.charAt(i); + } + } + if (upperCase.length > 0){ + data.nick = upperCase; + } else{ + if (data.username.length === 0){ + data.nick = 'Blank'; + } else { + data.nick = data.username.charAt(0); + } + } + response.end(data.nick); + if (appdata.length === 0){ + data.id = 0 + } else { + data.id = parseInt(appdata[appdata.length - 1].id) + 1; + } + appdata.push(data); + }) + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }); + + } - 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