Menu

app.rb

@@ -3,15 +3,22 @@
 class App < Sinatra::Base
   get '/' do
     @error = params['error']
+    @full_name = params['full_name']
+    @city = params['city']
     erb :home
   end
 
+  get '/home' do
+    redirect to('/')
+  end
+
   post '/subscribe' do
     @full_name = params[:full_name]
     @email = params[:email]
+    @city = params[:city]
 
     if [email protected](/.+@.+/)
-      redirect to('/?error=email')
+      redirect to('/?error=email&full_name='+@full_name+'&city='+@city)
     end
 
     erb :subscribe
@@ -49,8 +56,12 @@ class App < Sinatra::Base
 
     erb :schedule
   end
-end
 
+  get '/rainbow' do
+    erb :rainbow
+  end
+
+end
 class App < Sinatra::Base
   get '/fib/:n' do
     # TODO: implement an algorithm to calculate the fibonacci sequence at
@@ -63,8 +74,29 @@ class App < Sinatra::Base
     # separated names. Randomize this list of names and display it as an
     # ordered list (<ol>). 5 points
   end
-
   def fib(n)
     # TODO: calculate fib
   end
 end
+
+# in app.rb
+class App
+  get '/youtube' do
+    "Hello World"
+    erb :youtube
+  end
+end
+
+class App
+  get '/training' do
+    "Hello World"
+      erb :training
+  end
+end
+
+class App
+  get '/reddit' do
+    "hello world"
+    erb :reddit
+  end
+end

public/stylesheets/main.css

@@ -1,3 +1,20 @@
+/*
+ * From csslayout
+*/
+
+#container1 {
+    float:left;
+    width:100%;
+}
+#col1 {
+    float:left;
+    width:50%;
+}
+#col2 {
+    float:left;
+    width:50%;
+}
+
 /*
  * What follows is the result of much research on cross-browser styling.
  * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,

views/home.erb

@@ -1,14 +1,33 @@
 <h1>Startup Sprint!</h1>
-<img src="images/learnco.jpg">
+<img src="images/learnco.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>
+  <p style="color: red;"><%= @full_name %>, please enter a valid email</p>
+ <form method=POST action="/subscribe">
+    <label for="full-name">Full Name</label>
+    <input type="text" id="full-name" name="full_name" value=<%= @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" value=<%= @city %> >
+    <input type="Submit">
+  </form>
+<%else%>
+  <form method=POST action="/subscribe">
+    <label for="full-name">Full Name</label>
+    <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>
 <% end %>
-<form method=POST action="/subscribe">
-  <label for="full-name">Full Name</label>
-  <input type="text" id="full-name" name="full_name" required>
-  <label for="email">Email</label>
-  <input type="text" id="email" name="email" required>
-  <input type="Submit">
-</form>
+<ul>
+    <li><a href="https://salty-chamber-67169.herokuapp.com/schedule">Schedule</a></li>
+    <li><a href="https://salty-chamber-67169.herokuapp.com/rainbow">Rainbow</a></li>
+    <li><a href="https://salty-chamber-67169.herokuapp.com/reddit">Reddit</a></li>
+    <li><a href="https://salty-chamber-67169.herokuapp.com/training">Training</a></li>
+    <li><a href="https://salty-chamber-67169.herokuapp.com/youtube">Youtube</a></li>
+<ul>

views/rainbow.erb

@@ -0,0 +1,7 @@
+<hr style= "border: 50px solid #ff0000"/>​
+<hr style= "border: 50px solid #FF5733"/>
+<hr style= "border: 50px solid #FEEF38"/>
+<hr style= "border: 50px solid #1ECD39"/>
+<hr style= "border: 50px solid #1E88CD"/>
+<hr style= "border: 50px solid #5224E3"/>
+<hr style= "border: 50px solid #7658D5"/>

views/reddit.erb

@@ -0,0 +1 @@
+<script src="https://www.reddit.com/hot/.embed?limit=20&t=all" type="text/javascript"></script>

views/redditfeed.erb

@@ -0,0 +1 @@
+<script src="https://www.reddit.com/hot/.embed?limit=20&t=all" type="text/javascript"></script>

views/schedule.erb

@@ -1,18 +1,21 @@
 <div>
-  <div class="column">
-    <h3>Today</h3>
-    <ol>
-      <% @today.each do |item| %>
-        <li><%= item.first %>: <%= item.last %></li>
-      <% end %>
-    </ol>
-  </div>
-  <div class="column">
+  <div class="main">
+    <div id="container1">
+
+      <div id="col1">
+        <h3>Today</h3>
+        <% @today.each do |item| %>
+        <p><%= item.first %>: <%= item.last %></p>
+        <% end %>
+      </div>
+
+   <div id="col2">
     <h3>Tomorrow</h3>
-    <ol>
       <% @tomorrow.each do |item| %>
-        <li><%= item.first %>: <%= item.last %></li>
+        <p><%= item.first %>: <%= item.last %></p>
       <% end %>
-    </ol>
   </div>
 </div>
+
+</div>
+</div>

views/subscribe.erb

@@ -1,3 +1,3 @@
 <p>Thanks for subscribing <%= @full_name %></p>
-
+<p>Your city is <%=@city%></p>
 <a href="/">Home</a>

views/training.erb

@@ -0,0 +1,2 @@
+<h1> "Flatiron School + Venture for America" </h1>
+<img src="https://i.ytimg.com/vi/Q6ctb-Pb3lc/hqdefault.jpg" alt="Spongebob" style="width:304px;height:228px;">

views/youtube.erb

@@ -0,0 +1,3 @@
+<object width="420" height="315"
+data="http://www.youtube.com/embed/XGSy3_Czz8k">
+</object>