cs4241-18a · cormaclc · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018
diff --git a/.idea/a1-gettingstarted.iml b/.idea/a1-gettingstarted.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -1,77 +1,15 @@
-Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Heroku  
-===
+Cormac Lynch-Collier
+http://a1-cormaccollier.herokuapp.com
 
-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/). 
-
-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 a basic understanding of git, heroku, and html. There was additional css and javascript knowledge
+demonstrated, indicating a slightly higher understanding of the two. I was able to apply css knowledge that I already had,
+as well as learning some new javascript by using jquery. In terms of content it has some information about me.
 
 ## 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...
-
+- server.js: modified the server.js file to allow the use of css and javascript files
+- jquery: I have little experience with jquery so I wanted apply it in a basic way to this project. I did this
+through '.hover()' on the technology experience section as well as with 'show more', and 'show less' in the classes section.
 
+## Design Achievments
+- color: I used green, red and yellow to indicate my levels of understanding for the technologies. These colors represent
+levels to humans, green: go etc. and can be applied to the tech section.
diff --git a/index.html b/index.html
@@ -1,27 +1,82 @@
 <html lang="en">
+
   <head>
     <title>CS4241 Assignment 1</title>
+    <link href="./styles.css" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
     <meta charset="utf-8">
   </head>
-  <body>
-    <h1>Information about [Your name here]</h1>
-    <p>
-      [Self introduction]
-    </p>
+
+  <p>
+    <h1>Information about Cormac Lynch-Collier</h1>
     <p>
-      [Major and other information]
+      I'm a junior at WPI (class of 2020) and currently pursuing my bachelors in
+      Computer Science and a minor in History.
     </p>
+
     <p>
-      [Other things]
+      In my spare time I like to play and watch soccer. I also like to spend time in the outdoors hiking or taking
+      pictures.
     </p>
 
     <h2>Experience</h2>
-    <p>
+    <h3>
+      WPI CS Courses
+    </h3>
+      <ul class="class-col">
+        <li class="first"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_1101" target="_blank">CS 1101</a></li>
+        <li class="first"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_2102" target="_blank">CS 2102</a></li>
+        <li class="first"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_2303" target="_blank">CS 2303</a></li>
+        <li class="first"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_2011" target="_blank">CS 2011</a></li>
+        <li class="second"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_2022" target="_blank">CS 2022</a></li>
+        <li class="second"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_2233" target="_blank">CS 2233</a></li>
+        <li class="second"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_3733" target="_blank">CS 3733</a></li>
+        <li class="second"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_3133" target="_blank">CS 3133</a></li>
+        <li class="second"><a href="https://www.wpi.edu/academics/calendar-courses/course-descriptions/computer-science#cs_3041" target="_blank">CS 3041</a></li>
+      </ul>
+
+    <li id="more">Show More</li>
+    <li id="less">Show Less</li>
+    <h3>
+      Technologies/Methods
+    </h3>
+    <div id="technologies">
+      <div class="tech-yellow"><h2 class="tech-title">HTML</h2>
+        <p class="tech-experience">I have some experience with HTML from building websites on my own.</p>
+      </div>
+      <div class="tech-green"><h2 class="tech-title">CSS</h2>
+        <p class="tech-experience">I have a lot of experience with CSS from building websites for a summer internship.</p>
+      </div>
+      <div class="tech-green"><h2 class="tech-title">Java</h2>
+        <p class="tech-experience">I have a lot of experience with Java, mostly from taking software engineering and
+          previous classes.</p>
+      </div>
+      <div class="tech-yellow"><h2 class="tech-title">JavaScript</h2>
+        <p class="tech-experience">I have some experience with JavaScript, mostly with ReactJS building websites.</p>
+      </div>
+      <div class="tech-red"><h2 class="tech-title">Ruby</h2>
+        <p class="tech-experience">I have no experience with Ruby.</p>
+      </div>
+      <div class="tech-green"><h2 class="tech-title">Python</h2>
+        <p class="tech-experience">I have a lot of experience with Python, working on personal projects and using Django
+        for back end development.</p>
+      </div>
+      <div class="tech-yellow"><h2 class="tech-title">Unit Testing</h2>
+        <p class="tech-experience">I have some experience with Unit Testing through projects I have worked on.</p>
+      </div>
+    </div>
+    <h3>
       Working experience
-    </p>
+    </h3>
     <ul>
-      <li>IBM/Rational</li>
-      <li>WPI</li>
+      <li>
+        Cogo Labs -- I created two websites while working for Cogo. The first was the corporate website for an incubating
+        company, Minerva Analytics. The second, a directory of accelerators with scalable database and profile page model.
+        <a href="https://www.cogolabs.com/" target="_blank">More info on Cogo Labs.</a>
+      </li>
     </ul>
+
+    <script src="https://code.jquery.com/jquery-1.10.2.js"></script>
+    <script type="text/javascript" src="./scripts.js"></script>
   </body>
 </html>