a1-mareksgarbaczonek

README.md

@@ -1,100 +1,24 @@
 Assignment 1 - Hello World: Basic Deployment w/ Git, GitHub, Glitch
 ===
 
-*DUE: Thursday, August 31st by 11:59 AM (before the start of class!)*  
+Marek Garbaczonek
+https://a1-mareksgarbaczonek.glitch.me
 
-First assignment! You will 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, as well as experiment some with HTML/CSS/JS. If you already know these, great! 
-However, if you're new to them, spend several hours practicing, experimenting, and reading documentation. Don't just get your website up and done, as
-you'll need skills with these tools throughout the rest of the course.
-
-Assignment details
----
-
-This assignment requires that your website is both contained in a GitHub repository and hosted in Glitch. There are two ways to do this:
-
-1. Fork this repo and clone it to your computer, make changes locally on your computer, push the repo onto GitHub, and then import your GitHub repo into Glitch.
-2. Fork this repo and then import it directly to Glitch, use the Glitch editor to make changes, and then export your repo from Glitch back to GitHub.
-3. Same as #1, but instead of importing from Github to Glitch you just upload the files (or copy/paste) them directly to Glitch.
-
-## Option 1 - Clone to computer, push to Github, import to Glitch (recommended)
-
-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
-4. Complete some technical and/or design achievements (see below).
-5. 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.
-
-6. Modify the README file according to the specification below.
-7. Commit and push all your changes to GitHub. 
-8. Deploy your project to Glitch. You can do this by [importing the repo from GitHub](https://medium.com/glitch/import-code-from-anywhere-83fb60ea4875)
-9. Ensure that your project has the proper naming scheme (guide follows) so we can find it.
-9. Create and submit a Pull Request to the original repo.
-
-## Option 2 - Fork repo and import to Glitch, edit on Glitch, and then export back to GitHub
-Most of these steps are the same as option 1, except that you being by creating a new project Glitch using this repo as a staring point (just choose New Project > Import from GitHub for this and then paste in the link to your repo). At the end, you can export your Glitch project to GitHub by [following these instructions](https://www.youtube.com/watch?time_continue=77&v=aWJFbtrgW4E&feature=emb_logo). *Note that the location of the projecct export feature in Glitch has moved from what they show in this video.* It's now located in Tools > Import and Export (tools is located in the bottom left of the Glitch editor).
-
-## Option 3 - Clone to computer, edit locally, push to GitHub, upload to Glitch
-This is the same as option 1, except that for step 6 (Deploy to Glitch) you simply upload each file to your Glitch repository (using New File > Upload a File).
-
-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.
-
-Achievements
----
-Below are some suggested technical and design achievements. You can use these to help boost your grade up to an A and customize the assignment to your personal interests. These are recommended acheivements, but feel free to create/implement your own... just make sure you thoroughly describe what you did in your README and why it was challenging. ALL ACHIEVEMENTS MUST BE DESCRIBED IN YOUR README IN ORDER TO GET CREDIT FOR THEM.
-
-Note that if you want to load resources besides your index.html file (images, an CSS file, a JS file) you'll need to modify server.js to point to these. For now it's easiest to just hardcode paths to the resources, but we'll look at ways to optimize this shortly.
-
-*Technical*
-1. (max 5 points) Style your page using CSS. Each style rule you apply will get you 1 extra point for a maximum of 5 points. Be sure to describe your style rules in your README.
-2. (5 points) Add a simple JavaScript animation to the page.
-3. (max 5 points) Experiment with other *semantic* HTML tags (links, images, tables, header, footer, etc.) Each extra tag you use will get you 1 extra point for a maximum of 5 points. Be sure to describe the tags you use in your README.
-
-*Design*
-1. (10 points) Create a color palette using [color.adobe.com](https://color.adobe.com). Use all the colors in the palette in your webpage by implementing the appropriate CSS. Add a small screenshot of the color wheel for your color palette to your repo.
-2. (5 points) Use a font from [Google Fonts](https://fonts.google.com) in your website.
-
-Resources
----
-
-If you need a JavaScript/HTML/CSS refresher, see [HTML & CSS](https://wpi.primo.exlibrisgroup.com/discovery/fulldisplay?docid=alma9936730811904746&context=L&vid=01WPI_INST:Default&lang=en&search_scope=MyInst_and_CI&adaptor=Local%20Search%20Engine&tab=Everything&query=any,contains,Jon%20Duckett&offset=0) 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 text below with your links and descriptions)
----
-
-Charlie Roberts
-http://a1-charlieroberts.glitch.me
-
-This project shows ...
+This project showcases a bit of who I am, my experience with several technologies, and the past computer science courses I have taken. 
 
 ## Technical Achievements
-- **Styled page with CSS**: Added rules for the p, li, and a selectors...
+- Styled page with CSS:
+   - Added rules for h1 and h2 to have padding
+   - Set the website background color and text color in the body rule
+   - I have created a .color-text rule to use inside of the HTML to color specific bits of text differently. I would insert a span around the text I want to color inside HTML and then add the color-text class to apply the styling.
+   - I have created DIVs to create boxes around my text and created .container and .container-boxy rules to apply color, align the text to the center for the regular container box for the header of the website, added margins, box-shadow, and added a dynamic width to the containers so that they take up 90% of the width of the screen until the width reaches 900px then it stops expanding.
+   - Then I also added padding for p, p2, and ul rules to make that text also fit nicely in the containers.
 
 ### Design Achievements
-- **Used the Roboto Font from Google Fonts**: I used Roboto as the font for the primary copy text in my site.
+- Used Nunito Sans Font From Google Fonts: I used the Nunito Sans Font for all of the text on my website.
+- I have created a color palette using color.adobe.com, "ColorWheel.png" in my repo, and used all of the colors in the palette:
+   - Color A: I have used this color as the main background-color for my website
+   - Color B: I have used this color as the background-color for all of the containers containing text information on the website.
+   - Color C: I have used this color as the box-shadow for all of the containers mentioned above on the site.
+   - Color D: I have used this color as the text color on all of the text on the website
+   - Color E: I have used this color as a highlight text color to separate out information like the Class of 2024 text from the title, course numbers from course names, and technology from experience.

index.html

@@ -3,26 +3,55 @@
   <head>
     <title>CS4241 Assignment 1</title>
     <meta charset="utf-8">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:opsz,[email protected],200;6..12,300;6..12,400;6..12,500;6..12,600;6..12,700;6..12,800;6..12,900;6..12,1000&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="style.css">
   </head>
   <body>
-    <h1>Information about [Your name here]</h1>
-    <p>
-      [Self introduction]
-    </p>
-    <p>
-      [Major and other information]
-    </p>
-    <p>
-      [Other things]
-    </p>
-
-    <h2>Experience</h2>
-    <p>
-      Working experience
-    </p>
-    <ul>
-      <li>IBM/Rational</li>
-      <li>WPI</li>
-    </ul>
+    <div class="container">
+      <h1>Information About Marek Garbaczonek, <span class="color-text">Class of 2024</span></h1>
+      <p>
+        I am a Computer Science BS, IMGD BS, and in the process of becoming a Computer Science MS student.</br>
+        Over the last few years I have been a freelance video game developer, 3d environment artist, and designer.</br>
+        In my free time, I enjoy running marathons, singing, dancing, hiking, and spending quality time with my friends and family.
+      </p>
+    </div>
+    <div class="container-body">
+      <h2>Courses</h2>
+      <p2>
+        I have previously taken the following computer science courses:
+      </p2>
+      <ul>
+        <li><span class="color-text">CS 1102:</span> &nbsp Accelerated Introduction To Program Design</li>
+        <li><span class="color-text">CS 2103:</span> &nbsp Accelerated Object-Oriented Design Concepts</li>
+        <li><span class="color-text">CS 3133:</span> &nbsp Foundations Of Computer Science</li>
+        <li><span class="color-text">CS 2303:</span> &nbsp Systems Programming Concepts</li>
+        <li><span class="color-text">CS 2022:</span> &nbsp Discrete Mathematics</li>
+        <li><span class="color-text">CS 2223:</span> &nbsp Algorithms</li>
+        <li><span class="color-text">CS 3431:</span> &nbsp Database Systems I</li>
+        <li><span class="color-text">CS 3733:</span> &nbsp Software Engineering</li>
+        <li><span class="color-text">CS 3041:</span> &nbsp Human-Computer Interaction</li>
+        <li><span class="color-text">CS 4341:</span> &nbsp Introduction To Artificial Intelligence</li>
+        <li><span class="color-text">CS 543:</span> &nbsp &nbsp Computer Graphics</li>
+        <li><span class="color-text">CS 539:</span> &nbsp &nbsp Machine Learning</li>
+        <li><span class="color-text">CS 546:</span> &nbsp &nbsp Human-Computer Interaction</li>
+      </ul>
+    </div>
+    <div class="container-body">
+      <h2>Experience</h2>
+      <p2>
+        Below is my experience with the following technologies and methods:
+      </p2>
+      <ul>
+        <li><span class="color-text">HTML:</span> &nbsp Moderate</li>
+        <li><span class="color-text">CSS:</span> Moderate</li>
+        <li><span class="color-text">Java:</span> A Lot</li>
+        <li><span class="color-text">JavaScript:</span> Substantial</li>
+        <li><span class="color-text">Ruby:</span> None</li>
+        <li><span class="color-text">Python:</span> Substantial</li>
+        <li><span class="color-text">Unit Testing:</span> Substantial</li>
+      </ul>
+    </div>
   </body>
 </html>

server.js

@@ -1,6 +1,6 @@
 const http = require('http'),
-      fs   = require('fs'),
-      port = 3000
+    fs   = require('fs'),
+    port = 3000
 
 const server = http.createServer( function( request,response ) {
   switch( request.url ) {
@@ -10,6 +10,9 @@ const server = http.createServer( function( request,response ) {
     case '/index.html':
       sendFile( response, 'index.html' )
       break
+    case '/style.css':
+      sendFile( response, 'style.css' )
+      break
     default:
       response.end( '404 Error: File Not Found' )
   }
@@ -18,7 +21,7 @@ const server = http.createServer( function( request,response ) {
 server.listen( process.env.PORT || port )
 
 const sendFile = function( response, filename ) {
-   fs.readFile( filename, function( err, content ) {
-     response.end( content, 'utf-8' )
-   })
-}
+  fs.readFile( filename, function( err, content ) {
+    response.end( content, 'utf-8' )
+  })
+}

style.css

@@ -0,0 +1,47 @@
+body {
+    font-family: 'Nunito Sans', sans-serif;;
+    background-color: #16515C;
+    color: #555D5E;
+}
+
+h1 {
+    padding: 25px 25px 0px;
+}
+
+h2 {
+    padding: 25px 25px 0px;
+}
+
+.color-text{
+    color: #2895A8;
+}
+
+.container {
+    background-color: #9EE8F5;
+    text-align: center;
+    margin: 0px auto;
+    width: 90%;
+    max-width: 900px;
+    box-shadow: 0 0 10px #35C2DB;
+}
+
+.container-body {
+    background-color: #9EE8F5;
+    margin: 0px auto;
+    width: 90%;
+    max-width: 900px;
+    box-shadow: 0 0 10px #35C2DB;
+}
+
+p {
+    padding: 0px 25px 25px;
+}
+
+p2 {
+    padding: 0px 25px;
+}
+
+ul {
+    padding: 0px 25px 25px 50px;
+}
+