diff --git a/Procfile b/Procfile
new file mode 100644
index 0000000..c3936b2
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: bundle exec rackup -p $PORT
diff --git a/README.md b/README.md
index a52f7f8..31aab33 100644
--- 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
-
+- Use ERB to include your `` and `` _partial_ in your _layout_.
diff --git a/my-site.rb b/my-site.rb
index c60406d..ba98b47 100644
--- a/my-site.rb
+++ b/my-site.rb
@@ -1,24 +1,52 @@
require "sinatra"
+require "time"
class MySite < Sinatra::Base
get "/" do
+ @page = "Home"
+ @sports = ["baseball", "basketball/men", "basketball/women", "crosscountry", "football", "golf/men", "golf/women", "gymnastics", "lacrosse", "soccer", "softball", "swimmingdiving/men", "swimmingdiving/women", "tennis/men", "tennis/women", "trackfield", "volleyball"]
erb :index
end
get "/index" do
+ @page = "Home"
+ @sports = ["baseball", "basketball/men", "basketball/women", "crosscountry", "football", "golf/men", "golf/women", "gymnastics", "lacrosse", "soccer", "softball", "swimmingdiving/men", "swimmingdiving/women", "tennis/men", "tennis/women", "trackfield", "volleyball"]
erb :index
end
get "/about" do
+ @page = "About"
+ @sports = ["baseball", "basketball/men", "basketball/women", "crosscountry", "football", "golf/men", "golf/women", "gymnastics", "lacrosse", "soccer", "softball", "swimmingdiving/men", "swimmingdiving/women", "tennis/men", "tennis/women", "trackfield", "volleyball"]
+ @stats = {
+ Name: "Jenna Nichols",
+ City: "Seattle, WA",
+ Age: "26",
+ Occupation: "Coder-in-training!"
+ }
+
+ @faves = ["French, especially Québec French", "Sociolinguistics", "Elephants", "College football (Go Gators!!)", "Arrested Development", "Board Games", "Karaoke", "My cats Bella and Luna"]
+
erb :about
end
get "/projects" do
+ @page = "Projects"
+ @sports = ["baseball", "basketball/men", "basketball/women", "crosscountry", "football", "golf/men", "golf/women", "gymnastics", "lacrosse", "soccer", "softball", "swimmingdiving/men", "swimmingdiving/women", "tennis/men", "tennis/women", "trackfield", "volleyball"]
erb :projects
end
get "/blog" do
+ @page = "Blog"
+ @sports = ["baseball", "basketball/men", "basketball/women", "crosscountry", "football", "golf/men", "golf/women", "gymnastics", "lacrosse", "soccer", "softball", "swimmingdiving/men", "swimmingdiving/women", "tennis/men", "tennis/women", "trackfield", "volleyball"]
erb :blog
end
+
+ # get "/test" do
+ # erb :test, {layout: false}
+ # end
+ #
+ # post "/blog" do
+ # @times = params[:message]
+ # end
end
diff --git a/public/.DS_Store b/public/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/public/.DS_Store differ
diff --git a/public/Jenna Nichols CV 2015.pdf b/public/Jenna Nichols CV 2015.pdf
deleted file mode 100644
index 6633e52..0000000
Binary files a/public/Jenna Nichols CV 2015.pdf and /dev/null differ
diff --git a/public/JennaNicholsCV2015.pdf b/public/JennaNicholsCV2015.pdf
new file mode 100644
index 0000000..bc7e6e9
Binary files /dev/null and b/public/JennaNicholsCV2015.pdf differ
diff --git a/public/albert.jpg b/public/albert.jpg
new file mode 100644
index 0000000..5212aa8
Binary files /dev/null and b/public/albert.jpg differ
diff --git a/public/albert2.png b/public/albert2.png
new file mode 100644
index 0000000..be81800
Binary files /dev/null and b/public/albert2.png differ
diff --git a/public/css/main.css b/public/css/main.css
new file mode 100644
index 0000000..4ea7846
--- /dev/null
+++ b/public/css/main.css
@@ -0,0 +1,179 @@
+/*
+ * This is a CSS file.
+ * Inside of CSS files comments are started with /* and ended with:
+ */
+
+/*
+ * Starting with Wave 2 of this project we will be using CSS to style our
+ * web pages. You should place all of your styles in this file and then
+ * reference it from each of your HTML files.
+ */
+
+/*
+ * This file is located at "public/main.css" in your project directory.
+ * Because it is in the "public" directory, Sinatra knows to make the file
+ * accessible to your HTML files when you use the src="path/to/file"
+ * attribute on the appropriate tags.
+ *
+ * For example, to include an image into your site, place the file in the
+ * public directory and use in your HTML
+ * file. The "public" part of the path should *not* be included.
+ */
+
+html {
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+body {
+ background-color: #C1CBE2;
+ margin-top: 0px;
+ padding-bottom: 60px;
+ }
+
+ #main {
+ margin-top: -20px;
+ padding-top: -10px;
+ }
+
+header {
+ margin: 0 auto;
+ border-radius: 25px;
+ width: 100%;
+ height: 100px;
+ background-color: #0F337A;
+}
+
+#logo {
+ display: inline-block;
+ margin: 10px 15px 0px 0px;
+ padding: 0px;
+ float: right;
+
+}
+
+h1 {
+ display: inline-block;
+ margin-top: 10px;
+ padding-top: 5px;
+ margin-left: 10px;
+ color: #ED4A2E;
+ font-family: 'Bangers', cursive;
+ font-size: 40px;
+ letter-spacing: 2px;
+}
+
+h2 {
+ display: block;
+ padding-top: 5px;
+ margin-left: 10px;
+ color: white;
+ font-family: 'Lato', sans-serif;
+ margin-top: -30px;
+}
+
+h3 {
+ padding-left: 10px;
+ color: black;
+ font-family: 'Lato', sans-serif;
+}
+
+h4 {
+ padding-left: 10px;
+ color: black;
+ font-family: 'Lato', sans-serif;
+}
+
+h5 {
+ padding-left: 10px;
+ color: black;
+ font-family: 'Lato', sans-serif;
+}
+
+#translation {
+ margin-top: -15px;
+}
+
+img {
+ padding-left: 10px;
+ padding-top: 50px;
+ display: block;
+}
+
+#stroop {
+ margin-top: 0px;
+ margin-left: 0px;
+ padding-top: 0px;
+ padding-left: 10px;
+}
+
+.main-images {
+ display: inline-block;
+ margin-top: -50px;
+}
+
+p {
+ padding-left: 10px;
+ color: black;
+ font-family: 'Lato', sans-serif;
+}
+
+a {
+ color: #0F337A;
+ font-family: 'Lato', sans-serif;
+}
+
+a:active {
+ color: #ED4A2E;
+}
+
+nav {
+ padding-top: 5px;
+ padding-left: 10px;
+ color: #ED4A2E;
+ font-family: 'Lato', sans-serif;
+}
+
+ul {
+ margin-top: -10px;
+ font-family: 'Lato', sans-serif;
+}
+
+
+footer {
+ position: relative;
+ border-radius: 25px;
+ margin: 0 auto;
+ bottom: 0;
+ width: 100%;
+ height: 60px;
+ background-color: #0F337A;
+}
+
+table {
+ font-family: 'Lato', sans-serif;
+}
+
+#table-section {
+ padding-top: 15px;
+}
+
+.footer-link {
+ color: white;
+}
+
+#copyright {
+ display: inline;
+ float: right;
+ color: white;
+ font-family: 'Lato', sans-serif;
+ padding-top: -20px;
+ margin-top: -25px;
+ margin-right: 15px;
+ padding-left: 10px;
+}
+
+.other-line {
+ margin-top: -16px;
+}
diff --git a/public/main.css b/public/main.css
deleted file mode 100644
index 0b72bfb..0000000
--- a/public/main.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This is a CSS file.
- * Inside of CSS files comments are started with /* and ended with:
- */
-
-/*
- * Starting with Wave 2 of this project we will be using CSS to style our
- * web pages. You should place all of your styles in this file and then
- * reference it from each of your HTML files.
- */
-
-/*
- * This file is located at "public/main.css" in your project directory.
- * Because it is in the "public" directory, Sinatra knows to make the file
- * accessible to your HTML files when you use the src="path/to/file"
- * attribute on the appropriate tags.
- *
- * For example, to include an image into your site, place the file in the
- * public directory and use in your HTML
- * file. The "public" part of the path should *not* be included.
- */
diff --git a/views/about.erb b/views/about.erb
index b33d595..c60d12a 100644
--- a/views/about.erb
+++ b/views/about.erb
@@ -1,17 +1,5 @@
-
-
-
- Jenna Nichols: About
-
-
-
-
- Jenna Nichols
- About
-
-
-
+
@@ -19,23 +7,12 @@
+ <% @stats.each do |key, value| %>
- Name:
- Jenna Nichols
-
-
- City:
- Seattle, WA
-
-
- Age:
- 26
+ <%= key %>:
+ <%= value %>
-
- Occupation:
- Coder-in-training!
-
-
+ <% end %>
@@ -50,39 +27,15 @@
This is my family! My husband is Eric, and our cats are Bella and Luna. Bella's the one sleeping on top of her face :3
-
-
+
+
Here are a few of my favorite things:
- French, especially Québec French
- Sociolinguistics
- Elephants
- College football (Go Gators!!)
- Arrested Development
- Board Games
- Karaoke
- My cats Bella and Luna
+ <% @faves.each do |fave| %>
+ <%= fave %>
+ <% end %>
-
-
-
-
-
diff --git a/views/blog.erb b/views/blog.erb
index de478a6..c8ea670 100644
--- a/views/blog.erb
+++ b/views/blog.erb
@@ -1,152 +1,21 @@
-
-
-
- Jenna Nichols: Blog
-
-
-
-
-
-
- Hello, World!
- October 26, 2015
-
+ Hello, World!
+ October 26, 2015
Blogging... I hate blogging... just going to post some song lyrics instead...
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
- Around the world, around the world
-
-
+
+ <% 18.times do %>
+ Around the world, around the world
+ Around the world, around the world
+ Around the world, around the world
+ Around the world, around the world
+ <% end %>
-
-
-
-
diff --git a/views/index.erb b/views/index.erb
index e021915..7d5a044 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -1,24 +1,11 @@
-
-
-
- Jenna Nichols: Home
-
-
-
-
-
-
-
-
+
+
Welcome to my personal web site!
- Bienvenue à mon site web personnel!
+ Bienvenue à mon site web personnel!
Perhaps you would like to look at some stuff?
@@ -30,22 +17,3 @@
-
-
-
-
-
diff --git a/views/layout.erb b/views/layout.erb
new file mode 100644
index 0000000..35e7a4b
--- /dev/null
+++ b/views/layout.erb
@@ -0,0 +1,38 @@
+
+
+
+ Jenna Nichols: <%= @page %>
+
+
+
+
+
+
+ Jenna Nichols
+
+ <%= @page %>
+
+
+<%= yield %>
+
+
+
+ Site links:
+ |
+ |
+ |
+
+
+
+ Find me on:
+ |
+ |
+
+
+
+ © <%= Time.now.year %>
+
+
+
+
+
diff --git a/views/projects.erb b/views/projects.erb
index 0579665..3374339 100644
--- a/views/projects.erb
+++ b/views/projects.erb
@@ -1,16 +1,3 @@
-
-
-
- Jenna Nichols: Projects
-
-
-
-
-
- Jenna Nichols
- Projects
-
-
Stroop Test in Ruby
@@ -28,12 +15,11 @@
- Download the playable Stroop test here !
+ Download the playable Stroop test here !
-
-
-
+
+
@@ -41,27 +27,6 @@
Before I decided to become a software developer, I was a PhD Candidate
in French Linguistics at the University of Texas at Austin. If you're curious
- about what I did there (teaching! research!), check out my CV here .
+ about what I did there (teaching! research!), check out my CV here .
-
-
-
-
-
-
-
diff --git a/views/test.erb b/views/test.erb
new file mode 100644
index 0000000..16ad808
--- /dev/null
+++ b/views/test.erb
@@ -0,0 +1,3 @@
+
+ Testing!
+