ktravers · pdejoy58 · Jun 20, 2017 · Jun 20, 2017 · Jun 20, 2017 · Jun 20, 2017
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -70,8 +70,5 @@ DEPENDENCIES
   sinatra
   thin
 
-RUBY VERSION
-   ruby 2.2.0p0
-
 BUNDLED WITH
-   1.12.5
+   1.14.6
diff --git a/app.rb b/app.rb
@@ -1,6 +1,9 @@
 require_relative 'config/environment'
 
 class App < Sinatra::Base
+  get '/home' do
+    redirect to('/')
+  end
   get '/' do
     @error = params['error']
     erb :home

diff --git a/public/images/10385_aidanf(1).JPG b/public/images/10385_aidanf(1).JPG
diff --git a/public/images/729.vfa_logo_color.png b/public/images/729.vfa_logo_color.png
diff --git a/public/images/VFA.jpeg b/public/images/VFA.jpeg
diff --git a/public/stylesheets/favicon-160x160.ico b/public/stylesheets/favicon-160x160.ico
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
@@ -5,3 +5,23 @@
 .column {
 
 }
+
+.navbar {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    background-color: #333;
+}
+
+.nav-item {
+    float: left;
+}
+
+.nav-item a {
+    display: block;
+    color: white;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none;
+}
diff --git a/views/home.erb b/views/home.erb
@@ -1,7 +1,7 @@
 <h1>Startup Sprint!</h1>
-<img src="images/learnco.jpg">
+<img src="images/729.vfa_logo_color.png">
 
-<h3>Subscribe to the Stertup Sprint newsletter</h3>
+<h3>Subscribe to the Startup Sprint newsletter</h3>
 <% if @error == 'email' %>
   <p style="color: red;">Please enter a valid email</p>
 <% end %>
@@ -10,5 +10,7 @@
   <input type="text" id="full-name" name="full_name" required>
   <label for="email">Email</label>
   <input type="text" id="email" name="email" required>
+  <label for="city">City</label>
+  <input type="text" id="city" name="city">
   <input type="Submit">
 </form>
diff --git a/views/layout.erb b/views/layout.erb
@@ -7,8 +7,15 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon"/>
     <link rel="stylesheet" href="stylesheets/normalize.css">
     <link rel="stylesheet" href="stylesheets/main.css">
+    <link ""
   </head>
   <body>
+    <ul class="navbar">
+      <li class="nav-item"><a href="home.erb">Home</a></li>
+      <li class="nav-item"><a href="reddit.erb">Reddit</a></li>
+      <li class="nav-item"><a href="schedule.erb">Schedule</a></li>
+      <li class="nav-item"><a href="subscribe.erb">Subscribe</a></li>
+    </ul>
     <!--[if lt IE 8]>
       <p>You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->

diff --git a/views/rainbow.erb b/views/rainbow.erb
diff --git a/views/schedule.erb b/views/schedule.erb
@@ -15,4 +15,12 @@
       <% end %>
     </ol>
   </div>
+  <div class="column">
+    <h3>Day After</h3>
+    <ol>
+      <% @day_after.each do |item| %>
+        <li><%= item.first %>: <%= item.last %></li>
+      <% end %>
+    </ol>
+  </div>
 </div>
diff --git a/views/subscribe.erb b/views/subscribe.erb
@@ -1,3 +1,3 @@
-<p>Thanks for subscribing <%= @full_name %></p>
-
+<p>Thanks for subscribing! <%= @full_name %></p>
+<p>Thanks for telling us where you're from! <%=@city%></p>
 <a href="/">Home</a>
diff --git a/views/team.erb b/views/team.erb
@@ -0,0 +1,45 @@
+<DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>OUR TEAM</title>
+
+<body>
+  <div class="background" style="background-image:"
+  <h1>Our Team</h1>
+
+  <h2>Aidan McConnell</h2>
+  <img src="10385_aidanf(1).jpg" alt="Aidan">
+  <li>
+    <ul>University of Pennsylvania Graduate</ul>
+    <ul>From Charlotte, North Carolina</ul>
+    <ul>VFA Employer: Blispay</ul>
+  <li>
+
+  <h2>Peter DeJoy</h2>
+  <li>
+    <ul>Technical Genius University Graduate</ul>
+    <ul>From Coolville, USA</ul>
+    <ul>VFA Employer: </ul>
+  </li>
+
+<h2>Sasseen Najjar</h2>
+<li>
+  <ul>University of Pennsylvania Graduate</ul>
+  <ul>From Awesome Junction, USA</ul>
+  <ul>VFA Employer:</ul>
+</li>
+
+<h2>Brian Kane</h2>
+<li>
+  <ul>University of Ballerville Graduate</ul>
+  <ul>From Incredible City, USA</ul>
+  <ul>VFA Employer: Blispay</ul>
+</li>
+
+<h2>Jonathan Schwartz</h2>
+<li>
+  <ul>College of Excellence and Mastery</ul>
+  <ul>From Stupendous Village, USA</ul>
+  <ul>VFA Employer:</ul>
+</li>