From cb71818b75381157fc1b2eb27825ea55b24e8e52 Mon Sep 17 00:00:00 2001 From: kandonie Date: Wed, 28 Aug 2019 21:46:18 -0400 Subject: [PATCH 1/2] edited index.html, but still need to add some stuff --- README.md | 64 ------------------------------------------------------ index.html | 14 ++++-------- 2 files changed, 4 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index c333a9b..7b5cba8 100644 --- a/README.md +++ b/README.md @@ -1,67 +1,3 @@ -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 diff --git a/index.html b/index.html index 37ac8c3..cf9ca19 100755 --- a/index.html +++ b/index.html @@ -5,23 +5,17 @@ -

Information about [Your name here]

+

Kristen Andonie

- [Self introduction] -

-

- [Major and other information] -

-

- [Other things] + Hi! I'm a WPI student double majoring in Robotics Engineering and Computer Science.

Experience

- Working experience + ~I can do things wee~

From 8844aa87b06ede8c0be380961a2d19e39a3efea7 Mon Sep 17 00:00:00 2001 From: kandonie Date: Thu, 29 Aug 2019 11:45:13 -0400 Subject: [PATCH 2/2] Finished editing page --- README.md | 12 ++++++------ index.html | 27 +++++++++++++++++++++++---- server.js | 5 ++++- styles.css | 11 +++++++++++ 4 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 styles.css diff --git a/README.md b/README.md index 7b5cba8..8198833 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -Charlie Roberts -http://a1-charlieroberts.glitch.me +Kristen Andonie +https://glitch.com/~a1-kandonie -This project shows ... +This project shows the following achievements: ## Technical Achievements -- **Proved P=NP**: Using a combination of... -- **Solved AI**: ... +- **Linked CSS Stylesheet**: By adding a case in the server to link the file ### Design Achievements -- **Re-vamped Apple's Design Philosophy**: Shown in `style.css`, the code... +- **Font Design**: Shown in `styles.css`, I used different colors for the background and text + diff --git a/index.html b/index.html index cf9ca19..31ee78f 100755 --- a/index.html +++ b/index.html @@ -3,20 +3,39 @@ CS4241 Assignment 1 +

Kristen Andonie

- Hi! I'm a WPI student double majoring in Robotics Engineering and Computer Science. + Hi! I'm a WPI student double majoring in Robotics Engineering + and Computer Science.

Experience

- ~I can do things wee~ + Courses I have taken:

+ +

+ Languages: +

+ diff --git a/server.js b/server.js index 9490f71..c422f9d 100644 --- a/server.js +++ b/server.js @@ -7,9 +7,12 @@ const server = http.createServer( function( request,response ) { case '/': sendFile( response, 'index.html' ) break - case '/index.html': + case 'index.html': sendFile( response, 'index.html' ) break + case '/styles.css': + sendFile( response, 'styles.css' ) + break default: response.end( '404 Error: File Not Found' ) } diff --git a/styles.css b/styles.css new file mode 100644 index 0000000..fcf150f --- /dev/null +++ b/styles.css @@ -0,0 +1,11 @@ +h1, h2, li { + color: orange; +} + +p { + color: olive; +} + +body { + background-color: maroon; +}