Ada-C4 · lacuchilla · Oct 27, 2015 · Oct 27, 2015 · Oct 27, 2015 · Oct 27, 2015
diff --git a/.DS_Store b/.DS_Store
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: bundle exec rackup -p $PORT
diff --git a/README.md b/README.md
@@ -18,8 +18,8 @@ The requirements for this wave are:
     - Feel free to use some of the static HTML pages made for the previous exercise
   - At least **one** of the static pages must include at least **two** images
 
-<!--
-## Wave 2: Use CSS to apply style and struture to our website
+
+## Wave 2: Use CSS to apply style and structure to our website
 
 The requirements for this wave are:
 - Add `class` and/or `id` attributes to your html tags where appropriate
@@ -32,6 +32,7 @@ The requirements for this wave are:
   - Style your headings (`<h1>`, `<h2>`, etc.) so they are visually distinct.
   - don't use `<br>` tags to separate content; apply `margin` and `padding` where appropriate to space out content.
 
+<!--
 ## Wave 3: DRY up your markup by utilizing layouts and ERB
 
 The requirements for this wave are:

diff --git a/my-site.rb b/my-site.rb
@@ -2,23 +2,35 @@
 
 class MySite < Sinatra::Base
 
+  get "/" do
+    @title = "Amy Hunter"
+    erb :index
+  end
+
   get "/index" do
+    @title = "Amy Hunter"
     erb :index
   end
 
-  get "/projectsummary" do
-    erb :projectsummary
+  get "/project_summary" do
+    @title = "Projects I've Done"
+    erb :project_summary
   end
 
-  get "/aboutme" do
-    erb :aboutme
+  get "/about_me" do
+    @title = "About Me"
+    erb :about_me
   end
 
-  get "/blogpost" do
-    erb :blogpost
+  get "/blog_post" do
+    @title = "My Blog"
+    @things_i_like = ["Mariners Baseball", "Carving Pumpkins", "Black Cats", "NES Gaming", "Swing Dancing"]
+    erb :blog_post
   end
 
-  get "/frenchpoetry" do
-    erb :frenchpoetry
+  get "/french_poetry" do
+    @title = "French Poetry"
+    @french_word_definitions = ["houx = holly", "voiles = sails", "blanchit = whitens, lightens", "demeurer = remain"]
+    erb :french_poetry
   end
 end
diff --git a/public/css/master_stylesheet.css b/public/css/master_stylesheet.css
@@ -0,0 +1,59 @@
+body {
+  width: 960px;
+  margin: auto;
+  background-color: #FFB3B3;
+}
+
+p {
+  font-family: Arial;
+}
+
+table {
+  font-family: "Fredoka One", serif;
+}
+
+article {
+  color: #3333CC;
+}
+
+.fav_thing {
+  color: #660066;
+}
+
+h1 {
+  font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+  font-weight: 120%;
+  margin: auto 50px;
+}
+
+h2 {
+  font-family: "Lobster", serif;
+}
+
+li {
+  font-family: "Poiret One", sans-serif;
+  font-weight: bold;
+  color: #33CC33;
+  display: inline;
+  list-style-type: none;
+  margin: 2em;
+}
+
+.arty {
+  font-size: 200%;
+  border: 3px dotted #003366;
+
+}
+
+.awesome {
+  border-width: thick;
+}
+
+header, footer {
+  background-color: #E4E4E4;
+}
+
+img#spock {
+  display: block;
+  margin: auto;
+}
diff --git a/views/about_me.erb b/views/about_me.erb
@@ -0,0 +1,27 @@
+<html>
+  <head>
+    <title>About Me</title>
+    <link href="css/about_me_stylesheet.css" rel="stylesheet">
+    <meta charset="utf-8">
+  </head>
+
+  <header>
+    <h2>Amy Hunter</h2>
+
+  </header>
+  <body class="awesome">
+    <section>
+      <article class="arty">I have been learning about programming on my own for the past two years, but never learned enough to make things. I mostly looked at tutorials, attempted a couple of MOOCs, and went to dozens of tech events. Now, I'm in Ada. I write a bunch of code and I am writing programs I couldn't write six weeks ago. </article>
+    </section>
+
+    <section>
+      <p>I am an active member of Seattle Pyladies. Click on the logo to go to our meetup page. Come visit us at a hacknight or event!</p>
+      <p><a href="http://www.meetup.com/Seattle-PyLadies"><img src="pyladiespic.jpg"></a></p>
+    </section>
+
+    <section>
+      <p>I also like video games, especially platform and puzzle games. I was raised on the NES. Kirby is adorable. Click on Kirby to visit his website!</p>
+      <p><a href="http://kirby.nintendo.com/"><img src="Kirby.png" height="150" width="150"></a></p>
+      </section>
+    </body>
+</html>
diff --git a/views/aboutme.erb b/views/aboutme.erb
diff --git a/views/blogpost.erb → views/blog_post.erb b/views/blogpost.erb → views/blog_post.erb
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>My Blog</title>
-    <meta charset = "utf-8">
+    <meta charset="utf-8">
   </head>
 
   <header>My Blog, My Thoughts</header>
@@ -12,12 +12,10 @@
     <article>We are now in the sixth week of classes, and I'm amazed at all of the things I have accomplished. I am writing programs in Ruby, making web pages using HTML, testing using Rspec and navigating the terminal like a champ. I'm really grateful for all of the support I have received from my fellow students and the Ada staff. Being a part of this program is an opportunity for me to grow personally as well as professionally, and it's been an intense and wonderful experience.</article>
   </section>
 
-  <footer>
-    <uo>
-      <li><a href = "aboutme">About Me</a></li>
-      <li><a href = "frenchpoetry">French Poetry</a></li>
-      <li><a href = "index">Homepage</a></li>
-      <li><a href = "projectsummary">My Projects </a></li>
-    </uo>
-  </footer>
+  <section>
+    <p>This is a list of things I like:</p>
+      <% @things_i_like.each do |thing| %>
+        <li class = "fav_thing"><%= thing %></li>
+      <% end %>
+  </section>
 </html>
diff --git a/views/frenchpoetry.erb → views/french_poetry.erb b/views/frenchpoetry.erb → views/french_poetry.erb
@@ -8,8 +8,8 @@
   </header>
 
   <section>
-  <blockquote>
-  <pre>
+    <blockquote>
+      <pre>
   Demain, dès l’aube, à l’heure où blanchit la campagne,
   Je partirai. Vois-tu, je sais que tu m’attends.
   J’irai par la forêt, j’irai par la montagne.
@@ -24,13 +24,13 @@
   Ni les voiles au loin descendant vers Harfleur,
   Et quand j’arriverai, je mettrai sur ta tombe
   Un bouquet de houx vert et de bruyère en fleur.
-  </pre>
-  </blockquote>
+      </pre>
+    </blockquote>
   </section>
-<h2>English Translation, with edits by me</h2>
+  <h2>English Translation, with edits by me</h2>
   <section>
-  <blockquote>
-  <pre>
+    <blockquote>
+      <pre>
   Tomorrow, at dawn, at the hour when the countryside grows white,
   I will leave. You see, I know you are waiting for me.
   I will travel through the forest, I will travel past the mountain.
@@ -45,15 +45,11 @@
   Nor the faraway sails which descend toward Harfleur.
   When I arrive, I will place on your tomb
   A bouquet of green holly and flowering heather.
-  </pre>
+    </pre>
   </blockquote>
   </section>
-    <footer>
-      <uo>
-        <li><a href = "aboutme">About Me</a></li>
-        <li><a href = "index">Homepage</a></li>
-        <li><a href = "blogpost">My Blog</a></li>
-        <li><a href = "projectsummary">My Projects </a></li>
-      </uo>
-    </footer>
+  <section>
+    <h2>Vocab Word Generator</h2>
+    <p><%= @french_word_definitions.sample %></p>
+  </section>
 </html>
diff --git a/views/index.erb b/views/index.erb
@@ -1,22 +1,16 @@
 <html>
   <head>
       <title>Amy Hunter, the Pragmatic Programmer</title>
-      <meta charset = "utf-8">
+      <meta charset="utf-8">
     </head>
     <header>
-      <h2>Amy Hunter is a programmer!</h2>
+      <h2>I'm a programmer!</h2>
     </header>
 
     <h4>Welcome to my website!</h4>
     <p>Thank you so much for taking the time to stop by. This site will give you some information about my journey with programming.</p>
 
-    <img src="tumblr-static-spock-cat.jpg"/>
+    <img id="spock" src="tumblr-static-spock-cat.jpg"/>
     <footer>
-      <uo>
-        <li><a href = "aboutme">About Me</a></li>
-        <li><a href = "frenchpoetry">French Poetry</a></li>
-        <li><a href = "blogpost">My Blog</a></li>        
-        <li><a href = "projectsummary">My Projects </a></li>
-      </uo>
-    </footer>
+
 </html>
diff --git a/views/layout.erb b/views/layout.erb
@@ -0,0 +1,30 @@
+<html>
+  <head>
+    <link href="css/master_stylesheet.css" rel="stylesheet">
+    <meta charset="utf-8">
+    <link href='https://fonts.googleapis.com/css?family=Poiret+One' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Fredoka+One' rel='stylesheet' type='text/css'>
+    <title>
+      <%= @title %>
+    </title>
+  </head>
+  <body>
+    <header>
+      <h1>Amy Hunter</h1>
+      <nav>
+        <ul>
+          <li><a href="about_me">About Me</a></li>
+          <li><a href="french_poetry">French Poetry</a></li>
+          <li><a href="index">Homepage</a></li>
+          <li><a href="blog_post">My Blog</a></li>
+          <li><a href="project_summary">My Projects</a></li>
+        </ul>
+      </nav>
+    </header>
+      <%= yield %>
+  </body>
+  <footer>
+    <p>&copy; <%= Time.now.year %> Amy Hunter </p>
+  </footer>
+</html>
diff --git a/views/project_summary.erb b/views/project_summary.erb
@@ -0,0 +1,60 @@
+<html>
+  <head>
+      <title>Projects I've Done</title>
+      <meta charset="utf-8">
+  </head>
+  <header>
+    <h3>Projects</h3>
+  </header>
+
+  <section>
+    <table border="1">
+      <thead>
+        <tr>
+          <th colspan="3">Projects I've Completed in Ada Developers Academy</th>
+        </tr>
+        <tr>
+          <th>Project Name</th>
+          <th>Solo</th>
+          <th>Partner</th>
+        </tr>
+      </thead>
+        <tr>
+          <td style="text-align: center">Calculator</td>
+          <td style="text-align: center">X</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td style="text-align: center">Solar System</td>
+          <td style="text-align: center">X</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td style="text-align: center">Word Guess</td>
+          <td></td>
+          <td style="text-align: center">X</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">Bank Accounts</td>
+          <td style="text-align: center">X</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td style="text-align: center">Scrabble</td>
+          <td></td>
+          <td style="text-align: center">X</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">FarMar</td>
+          <td style="text-align: center">X</td>
+          <td></td>
+        </tr>
+      </table>
+    </section>
+
+    <section>
+      <article>
+        <p>The lastest project, FarMar, is the one that I am the most proud of. It was my biggest project to date, and incorporated a lot of new concepts. Also, there was a more complex file structure and multiple classes to contend with. I spent a whole week on it, and I'm proud that I finished it.</p>
+      </article>
+    </section>
+</html>