diff --git a/BlueBackground.jpg b/BlueBackground.jpg new file mode 100644 index 00000000..63d76ab4 Binary files /dev/null and b/BlueBackground.jpg differ diff --git a/README.md b/README.md index b7146505..e51c09e8 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,17 @@ Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Heroku -=== -This assignment is a "warm-up" exercise. -You will simply deploy the starting Web site that you will use this term to the [Heroku Web platform](http://www.heroku.com/). +Yaofeng Wang +http://a1-feng729.herokuapp.com -Refer to [Getting started with node.js on Heroku](https://devcenter.heroku.com/articles/getting-started-with-nodejs#introduction). - -(Thanks to past instructors of the course, here is a short [getting started with Heroku movie](http://web.cs.wpi.edu/~gpollice/Movies/HerokuGettingStarted/) that may also help.) - -Treat this assignment as a chance to get up to speed on Git, GitHub, and Heroku. -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 skill with these tools throughout the rest of the course. - -Assignment details ---- - -Do the following to complete this assignment: - -1. Fork the starting project code. This repo contains: - * the server code, `server.js` - * the `Procfile` that you need for Heroku deployment - * A starting `index.html` file that you will edit as described below -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. -4. Deploy your project to Heroku. -5. Ensure that your project has the proper naming scheme (guide follows) so we can find it. -6. Modify the Readme to the specification below. -7. 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 Heroku assigns your application a random name. -To change it, follow [this guide](https://devcenter.heroku.com/articles/renaming-apps). - -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) ---- - -Lane Harrison -http://codementum-a1.herokuapp.com - -This project shows ... +This project shows my academic background and work experience. ## Technical Achievements -- **Proved P=NP**: Using a combination of... -- **Solved AI**: ... +- Added CSS code +- Added image switches to load in images and show on the page -### Design Achievements -- **Re-vamped Apple's Design Philosophy**: Shown in `style.css`, the code... +### Design Achievements +- Added borders +- Added images +- Centered and changed font-size, font-style, and font-weight diff --git a/class.png b/class.png new file mode 100644 index 00000000..bc3167c8 Binary files /dev/null and b/class.png differ diff --git a/code.png b/code.png new file mode 100644 index 00000000..d0a8cece Binary files /dev/null and b/code.png differ diff --git a/computer.png b/computer.png new file mode 100644 index 00000000..133c3423 Binary files /dev/null and b/computer.png differ diff --git a/ie.jpg b/ie.jpg new file mode 100644 index 00000000..4a963591 Binary files /dev/null and b/ie.jpg differ diff --git a/index.html b/index.html index 8c012087..8d61eeff 100755 --- a/index.html +++ b/index.html @@ -1,27 +1,84 @@ - + CS4241 Assignment 1 + -

Information about [Your name here]

+ +
+

Information about

+

Yaofeng Wang, WPI 2019'

+

- [Self introduction] + Hi everyone, welcome to my page! My name is Yaofeng Wang, originally from Shenyang, China, living in Worcester, MA, USA. I am a senior at Worcester Polytechnic Institute double majoring in Computer Science and Industrial Engineering. I enjoy singing and watching movies. One of my life goals is to travel around the world and visit all continents.

-

- [Major and other information] +

+ +

Majors:

+

+ Computer Science (CS) / Industrial Engineering (IE)

+
+

Previous Computer Science courses taken at WPI:

+ + + + +

- [Other things] + CS1101 Introduction To Program Design
+ CS2022 Discrete Mathematics
+ CS2102 Object-oriented Design Concepts
+ CS2223 Algorithms
+ CS2303 Systems Programming Concepts
+ CS3013 Operating Systems
+ CS3043 Social Implications Of Information Processing
+ CS3133 Foundations Of Computer Science
+ CS3431 Database Systems I
+ CS3733 Software Engineering
+ CS4120 Analysis Of Algorithms
+ CS4341 Introduction To Artificial Intelligence
+ CS4801 Introduction To Cryptography And Communication Security

- -

Experience

+

* Experience with the following technologies and methods

+

+ HTML: some
+ CSS: none
+ Java: a lot
+ JavaScript: none
+ Ruby: none
+ Python: a lot
+ Unit testing: none
+

+

Experience

Working experience

+ +
+
diff --git a/server.js b/server.js index bca03e89..a03e37e2 100644 --- a/server.js +++ b/server.js @@ -13,6 +13,21 @@ var server = http.createServer (function (req, res) { case '/index.html': sendFile(res, 'index.html') break + case '/wpi.png': + sendFile(res, 'wpi.png') + break + case '/computer.png': + sendFile(res, 'computer.png') + break + case '/ie.jpg': + sendFile(res, 'ie.jpg') + break + case '/code.png': + sendFile(res, 'code.png') + break + case '/class.png': + sendFile(res, 'class.png') + break default: res.end('404 not found') } diff --git a/style.css b/style.css new file mode 100644 index 00000000..869fdc90 --- /dev/null +++ b/style.css @@ -0,0 +1,12 @@ +html{ + padding:5%; + background-color:blue; + +} +body{ + font: 75% georgia, sans-serif; + /*color: #555753;*/ + + background-color:white; + +} \ No newline at end of file diff --git a/wpi.png b/wpi.png new file mode 100644 index 00000000..d1af177e Binary files /dev/null and b/wpi.png differ