diff --git a/Color Palette.png b/Color Palette.png new file mode 100644 index 0000000..07a0e19 Binary files /dev/null and b/Color Palette.png differ diff --git a/README.md b/README.md index c333a9b..fd23f9e 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,16 @@ -Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Glitch -=== - -*DUE: Thursday, August 29th by 11:59 AM (before the start of class!)* - -This assignment is a "warm-up" exercise. -You will simply deploy the starting Web site that you will use this term to [Glitch](http://www.glitch.com/). - -Treat this assignment as a chance to get up to speed on Git, GitHub, and Glitch. -If you already know these, great. -However, if you're new to them, spend several hours practicing, experimenting, and reading documentation. -In other words, don't just get your website up and done. You will need skills with these tools throughout the rest of the course. - -Assignment details ---- - -Do the following to complete this assignment: - -1. Fork the starting project code in GitHub. This repo contains: - * the server code, `server.js` - * A starting `index.html` file that you will edit as described below - * A package.json file that helps configure Glitch - * This README -2. Edit `index.html` to show the following information about you: - * your name and class at WPI (e.g. class of 2020) Note: Do not put any contact or personal information that you do not potentially want other people outside of this class to see. - * your major(s) and minor(s) - * previous computer science courses that you have taken at WPI - * your experience with the following technologies and methods (none, some, a lot) - * HTML - * CSS - * Java - * JavaScript - * Ruby - * Python - * unit testing -3. Test your project to make sure that when someone goes to your main page, it displays correctly. You can do this locally by simply running `node server.js` from within the assignment directory. - -4. Modify the README file according to the specification below. -5. Commit and push all your changes to GitHub. -6. Deploy your project to Glitch. You can do this by [importing the repo from GitHub](https://medium.com/glitch/import-code-from-anywhere-83fb60ea4875) -7. Ensure that your project has the proper naming scheme (guide follows) so we can find it. -8. Create and submit a Pull Request to the original repo. - -Naming and URL Scheme ---- - -You must use a consistent naming scheme for all projects in this course. -If we can't find it, we can't grade it. - -By default Glitch often assigns your application a random name. To change it, click on the project dropdown menu in the upper left corner of Glitch. You will then see an additional text field displaying the project name in the resulting menu; click here to edit the name. - -The name scheme should be `a1-yourGitHubUsername`. -The `a1` will need to be updated to `a2`, `a3`, and so on in future projects. - -Resources ---- - -If you need a JavaScript/HTML/CSS refresher, see [Technology Fundamentals by Scott Murray](http://chimera.labs.oreilly.com/books/1230000000345/ch03.html#_html) and/or [JavaScript Codeacademy](https://www.codecademy.com/en/tracks/javascript). - -If you need a Git/GitHub refreseher, see [GitHub Bootcamp](https://help.github.com/categories/bootcamp/), the [GitHub Guides](https://guides.github.com/) (especially the ones on Hello World, and Understanding the GitHub Flow, and Forking Projects), and [CodeSchool's Try Git Course](https://www.codeschool.com/courses/try-git). - -Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions) ---- - -Charlie Roberts -http://a1-charlieroberts.glitch.me - -This project shows ... - -## Technical Achievements -- **Proved P=NP**: Using a combination of... -- **Solved AI**: ... - -### Design Achievements -- **Re-vamped Apple's Design Philosophy**: Shown in `style.css`, the code... - - +Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Glitch +=== + +Malek ElShakhs https://glitch.com/~a1-mlshax + +I originally submitted my pull request to the 2019 repository, and only realized this once Professor Roberts sent out a message regarding that problem + +### Technical Achievements + +- **Styled Page with CSS:** Added rules for the body, h1, h2, p, li, table, th, and td as well as the job tag, the rules I used changed the font-family, padding, background-color, margin, display, font-weight, border, border-collapse, and text-align +- **Used Other HTML Tags:** Used the link, table, tr, th, td, a, and b tags as well as adding a custom tag job, one link is for adding the stylesheet, and the other is to make the Lato font available in the stylesheet + +### Design Achievements + +- **Used the Lato Font from Google Fonts:** Added the link to the index.html to allow the use of the Lato font-family in the stylesheet +- **Used a color palette from color.adobe.com:** Used the color palette on color.adobe.com which can be seen in the Color Palette.png file in the repository diff --git a/index.html b/index.html index 37ac8c3..00b63fa 100755 --- a/index.html +++ b/index.html @@ -1,28 +1,98 @@ - - - - CS4241 Assignment 1 - - - -

Information about [Your name here]

-

- [Self introduction] -

-

- [Major and other information] -

-

- [Other things] -

- -

Experience

-

- Working experience -

- - - + + + + + + + CS4241 Assignment 1 + + + +

Information about Malek ElShakhs

+

+ WPI Class of 2021 +

+

+ Computer Science Major +

+

+ Big thanks to + W3Schools + for helping make this website so great +

+ +

Experience

+

+ Working experience +

+ + + diff --git a/package.json b/package.json index 1699a50..8ae22bb 100755 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ -{ - "name": "cr-4241-simple-glitch", - "version": "0.1.0", - "description": "WPI CS 4241 first assignment", - "author": "Charlie Roberts", - "scripts": { - "start": "node server.js" - } -} +{ + "name": "cr-4241-simple-glitch", + "version": "0.1.0", + "description": "WPI CS 4241 first assignment", + "author": "Charlie Roberts", + "scripts": { + "start": "node server.js" + } +} diff --git a/server.js b/server.js index 9490f71..13a95fa 100644 --- a/server.js +++ b/server.js @@ -1,25 +1,29 @@ -const http = require('http'), - fs = require('fs'), - port = 3000 - -const server = http.createServer( function( request,response ) { - switch( request.url ) { - case '/': - sendFile( response, 'index.html' ) - break - case '/index.html': - sendFile( response, 'index.html' ) - break - default: - response.end( '404 Error: File Not Found' ) - } -}) - -server.listen( process.env.PORT || port ) - -const sendFile = function( response, filename ) { - fs.readFile( filename, function( err, content ) { - file = content - response.end( content, 'utf-8' ) - }) -} +const http = require('http'), + fs = require('fs'), + port = 3000 + +const server = http.createServer( function( request,response ) { + switch( request.url ) { + case '/': + sendFile( response, 'index.html' ) + break + case '/index.html': + sendFile( response, 'index.html' ) + break + case '/style.css': + sendFile( response, 'style.css' ) + break + default: + response.end( '404 Error: File Not Found' ) + } +}) + +server.listen( process.env.PORT || port ) + +const sendFile = function( response, filename ) { + fs.readFile( filename, function( err, content ) { + file = content + response.end( content, 'utf-8' ) + }) +} + diff --git a/style.css b/style.css new file mode 100644 index 0000000..5c0cc14 --- /dev/null +++ b/style.css @@ -0,0 +1,38 @@ +body{ + font-family: 'Lato', sans-serif; +} +h1{ + padding: 8px; + background-color: #AEB7FD; +} +h2{ + padding: 5px; + background-color: #9DB7E3; +} +p{ + padding: 4px; + background-color: #B8E2FA; +} +li{ + margin: 1px; + padding: 2px; + background-color: #AEFDEF; +} +job{ + display: block; + margin: 6px; + padding: 2px; + font-weight: bold; + background-color: #9DDCE3; +} +table, th, td { + border: 1px solid black; + border-collapse: collapse; +} +th, td { + padding: 5px; + text-align: center; +} +th{ + background-color: #9DDCE3; +} \ No newline at end of file