cs4241-18a · Feng729 · Aug 28, 2018 · Aug 31, 2018
diff --git a/BlueBackground.jpg b/BlueBackground.jpg
diff --git 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
diff --git a/code.png b/code.png
diff --git a/computer.png b/computer.png
diff --git a/ie.jpg b/ie.jpg
diff --git a/index.html b/index.html
@@ -1,27 +1,84 @@
-<html lang="en">
+<html lang="en" style = "position:relative; width:100%; height:80px; background-color:#A7D7A2;">
   <head>
     <title>CS4241 Assignment 1</title>
     <meta charset="utf-8">
   </head>
+
   <body>
-    <h1>Information about [Your name here]</h1>
+
+    <center><div id = "title" style = "position:relative; width:70%; height:1280px; background-color:#FFFFFF; border-radius: 5px; 
+    border-style: solid; border-color :#23404F; ">
+      <h1 style = "color: #23404F;">Information about </h1>
+      <h1 style = "color: #23404F;">Yaofeng Wang, WPI 2019' </h1> 
+
     <p>
-      [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.
     </p>
-    <p>
-      [Major and other information]
+    <div id = "Majors">
+    <img style = "position:absolute; left:70px; top:50px;" src = "wpi.png" height="100" width="130" ／>
+    <h4 style = "color: #23404F; font-style: italic; font-size: 25px"> Majors: </h4>
+    <p style = "font-weight: bold; font-size: 18px">
+      Computer Science (CS) / Industrial Engineering (IE)
     </p>
+    </div>
+    <h4 style = "color: #23404F; font-style: italic; font-size: 25px"> Previous Computer Science courses taken at WPI:</h4>
+    <img style = "position:absolute; left:70px; top:240px;" src = "computer.png" height="100" width="130" ／>
+    <img style = "position:absolute; right:70px; top:230px;" src = "ie.jpg" height="100" width="140" ／>
+
+    <img style = "position:absolute; left:50px; top:400px;" src = "code.png" height="150" width="180" ／>
+    <img style = "position:absolute; right:50px; top:390px;" src = "class.png" height="150" width="180" ／>
     <p>
-      [Other things]
+      CS1101 Introduction To Program Design <br />
+      CS2022 Discrete Mathematics <br />
+      CS2102 Object-oriented Design Concepts <br />
+      CS2223 Algorithms <br />
+      CS2303 Systems Programming Concepts <br />
+      CS3013 Operating Systems <br />
+      CS3043 Social Implications Of Information Processing <br />
+      CS3133 Foundations Of Computer Science <br />
+      CS3431 Database Systems I <br />
+      CS3733 Software Engineering <br />
+      CS4120 Analysis Of Algorithms <br />
+      CS4341 Introduction To Artificial Intelligence <br />
+      CS4801 Introduction To Cryptography And Communication Security <br />
     </p>
-
-    <h2>Experience</h2>
+    <h4 style = "color: #23404F;">* Experience with the following technologies and methods</h4>
+    <p> 
+      HTML: some <br />
+      CSS: none <br />
+      Java: a lot <br />
+      JavaScript: none <br />
+      Ruby: none <br />
+      Python: a lot <br />
+      Unit testing: none <br />
+    </p>
+    <h2 style = "color: #23404F;">Experience</h2>
     <p>
       Working experience
     </p>
     <ul>
-      <li>IBM/Rational</li>
-      <li>WPI</li>
+      <li>
+        Senior Assistant for CS4241, WPI <br />
+        August 2018 - now 
+      </li>
+      <li>
+        Information Architect Intern, The Hanover Insurance Group, Worcester, MA <br />
+        June 2018 - August 2018 <br />
+      </li>
+
+      <li>
+        Software Development Intern, Siasun Robot and Automation CO., LTD, Shenyang, China <br />
+        June 2017 - August 2017 <br />
+        Implemented a C# Quartz job scheduler in a tea collecting and producing line using Visual Studio window form application. Connected Quartz with the production line organizing website using C# and JavaScript.
+      </li>
+      <li>
+        Web Developer Intern, Chinese Academy of Sciences, Shenyang, China <br />
+        May 2016 - August 2016 <br />
+        Edited the company website in Java, JavaScript, and HTML allowing employee communication. Built a database of the employees information using Oracle SQL. Enhanced the website with pictures, dropdown lists, checkboxes, and keywords searches.
+      </li>
     </ul>
+
+  </div>
+</center>
   </body>
 </html>
diff --git 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
@@ -0,0 +1,12 @@
+html{
+  padding:5%;
+  background-color:blue;
+
+}
+body{
+  font: 75% georgia, sans-serif;
+  /*color: #555753;*/
+
+  background-color:white;
+
+}
diff --git a/wpi.png b/wpi.png