spencerarogers-archive · DarrenDouglas22 · Jun 21, 2016 · Jun 21, 2016 · Jun 21, 2016 · Jun 21, 2016
diff --git a/.DS_Store b/.DS_Store
diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,10 @@ gem 'thin'
 gem 'shotgun'
 gem 'pry'
 gem 'require_all'
+# Below could cause and issue
+gem 'bootstrap-sass', '~> 3.1.1.0'
+gem 'youtube_it', '~> 2.4.0'
+# Above is what Leigh did that could cause an issue
 
 group :test do
   gem 'rspec'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    bootstrap-sass (3.1.1.1)
+      sass (~> 3.2)
+    builder (3.2.2)
     coderay (1.1.0)
     daemons (1.2.3)
     diff-lcs (1.2.5)
     domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     eventmachine (1.2.0.1)
+    excon (0.49.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    json (1.8.3)
+    jwt (1.5.4)
     method_source (0.8.2)
     mime-types (2.99.2)
+    mini_portile2 (2.1.0)
+    multi_json (1.12.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     netrc (0.11.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    oauth (0.4.7)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pkg-config (1.1.7)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -40,8 +63,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
+    sass (3.4.22)
     shotgun (0.9)
       rack (>= 1.0)
+    simple_oauth (0.3.1)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -55,11 +80,21 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    youtube_it (2.4.2)
+      builder
+      excon
+      faraday (>= 0.8, < 0.10)
+      json (~> 1.8)
+      nokogiri (~> 1.6.0)
+      oauth (~> 0.4.4)
+      oauth2 (~> 1.0.0)
+      simple_oauth (>= 0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass (~> 3.1.1.0)
   pry
   rack-test
   rake
@@ -69,9 +104,7 @@ DEPENDENCIES
   shotgun
   sinatra
   thin
-
-RUBY VERSION
-   ruby 2.2.0p0
+  youtube_it (~> 2.4.0)
 
 BUNDLED WITH
    1.12.5
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
diff --git a/Rakefile b/Rakefile
diff --git a/app.rb b/app.rb
@@ -1,14 +1,16 @@
 require_relative 'config/environment'
 
 class App < Sinatra::Base
-  get '/' do
+
+  get '/home' do
     @error = params['error']
     erb :home
   end
 
   post '/subscribe' do
     @full_name = params[:full_name]
     @email = params[:email]
+    @city = params[:city]
 
     if [email protected](/.+@.+/)
       redirect to('/?error=email')
@@ -17,9 +19,19 @@ class App < Sinatra::Base
     erb :subscribe
   end
 
+  get '/youtube' do
+    erb :youtube
+  end
+
+  get '/rainbow' do
+    erb :rainbow
+
+  end
+
   get '/reddit' do
     # TODO: we can probably get the listings with something like:
     # JSON.parse(RestClient.get('http://reddit.com/.json'))
+    # http://www.reddit.com/r/subreddit/new.json?sort=new
 
     @listings = []
 
@@ -53,9 +65,7 @@ class App < Sinatra::Base
 
 class App < Sinatra::Base
   get '/fib/:n' do
-    # TODO: implement an algorithm to calculate the fibonacci sequence at
-    # the nth position and display
-    # (4) points
+    fib(4)
   end
 
   get '/team-randomizer' do
@@ -65,6 +75,12 @@ class App < Sinatra::Base
   end
 
   def fib(n)
-    # TODO: calculate fib
+    if n == 0
+      if n == 1
+        n
+      else
+        fib(n-1) + fib(n-2)
+      end
+    end
   end
 end
diff --git a/config.ru b/config.ru
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/models/.keep b/models/.keep
diff --git a/models/sample_model.rb b/models/sample_model.rb
diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/images/.keep b/public/images/.keep
diff --git a/public/images/Danielle.jpg b/public/images/Danielle.jpg
diff --git a/public/images/Darren.jpg b/public/images/Darren.jpg
diff --git a/public/images/Edward.jpg b/public/images/Edward.jpg
diff --git a/public/images/Hayden.jpg b/public/images/Hayden.jpg
diff --git a/public/images/Leigh.jpg b/public/images/Leigh.jpg
diff --git a/public/images/learnco.png b/public/images/learnco.png
diff --git a/public/javascripts/.keep b/public/javascripts/.keep
diff --git a/public/stylesheets/.keep b/public/stylesheets/.keep
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
@@ -88,7 +88,9 @@ textarea {
    Author's custom styles
    ========================================================================== */
 
-
+.img-circle {
+    border-radius: 50%;
+}
 
 
 

diff --git a/rainbow.erb b/rainbow.erb
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#p01 {
+color: red;
+}
+#p02 {
+color: orange;
+}
+#p03 {
+color: yellow;
+}
+#p04 {
+color: green;
+}
+#p05 {
+color: blue;
+}
+#p06 {
+color: indigo;
+}
+#p07 {
+color: violet;
+}
+</style>
+</head>
+<body>
+
+<p id="p01">rainbow</p>
+<p id="p02">rainbow</p>
+<p id="p03">rainbow</p>
+<p id="p04">rainbow</p>
+<p id="p05">rainbow</p>
+<p id="p06">rainbow</p>
+<p id="p07">rainbow</p>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/views/.keep b/views/.keep
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/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>
 <% 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="cityVar" required>
   <input type="Submit">
 </form>
diff --git a/views/layout.erb b/views/layout.erb
@@ -7,6 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="icon" href="favicon.ico" type="image/x-icon"/>
         <link rel="stylesheet" href="stylesheets/main.css">
+        <%= favicon_link_tag %>
     </head>
     <body>
         <!--[if lt IE 8]>

diff --git a/views/rainbow.erb b/views/rainbow.erb
@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+  <p>
+  <svg>
+    <rect id="red" height="100" width="1000" fill="red" />
+  </svg>
+  </p>
+  <p>
+  <svg>
+    <rect id="orange" height="100" width="1000" fill="orange" />
+  </svg>
+  </p>
+  <p>
+  <svg>
+    <rect id="yellow" height="100" width="1000" fill="yellow" />
+  </svg>
+  </p>
+  <p>
+  <svg>
+    <rect id="green" height="100" width="1000" fill="green" />
+  </svg>
+  </p>
+  <p>
+  <svg>
+    <rect id="blue" height="100" width="1000" fill="blue" />
+  </svg>
+</p>
+<p>
+  <svg>
+    <rect id="indigo" height="100" width="1000" fill="indigo" />
+  </svg>
+</p>
+<p>
+  <svg>
+    <rect id="violet" height="100" width="1000" fill="violet"/>
+  </svg>
+</p>
+</html>
diff --git a/views/reddit.erb b/views/reddit.erb
diff --git a/views/schedule.erb b/views/schedule.erb
@@ -1,18 +1,30 @@
-<div>
-  <div class="column">
-    <h3>Today</h3>
-    <ol>
-      <% @today.each do |item| %>
-        <li><%= item.first %>: <%= item.last %></li>
-      <% end %>
-    </ol>
-  </div>
-  <div class="column">
-    <h3>Tomorrow</h3>
-    <ol>
-      <% @tomorrow.each do |item| %>
-        <li><%= item.first %>: <%= item.last %></li>
-      <% end %>
-    </ol>
-  </div>
-</div>
+<html>
+<head>
+<style>
+.schedule {
+-webkit-column-count: 2; / Chrome, Safari, Opera /
+-moz-column-count: 2; / Firefox /
+column-count: 2;
+}
+</style>
+</head>
+<body>
+
+<div class="schedule">
+
+<h3>Today</h3>
+<ol>
+<% @today.each do |item| %>
+<li><%= item.first %>: <%= item.last %></li>
+<% end %>
+</ol>
+
+<h3>Tomorrow</h3>
+<ol>
+<% @tomorrow.each do |item| %>
+<li><%= item.first %>: <%= item.last %></li>
+<% end %>
+</ol>
+
+</body>
+</html>
diff --git a/views/splash.erb b/views/splash.erb
diff --git a/views/subscribe.erb b/views/subscribe.erb
@@ -1,3 +1,5 @@
-<p>Thanks for subscribing <%= @full_name %></p>
+<p>Thanks for subscribing <%= @full_name %> from <%= @cityVar %>
+</p>
+
 
 <a href="/">Home</a>
diff --git a/views/team.erb b/views/team.erb
@@ -0,0 +1,26 @@
+<div>
+  <div class="column">
+    <img class="img-circle" src="/Users/darrendouglas/startup-sprint/public/images/Darren.jpg" width="300" height="300"/>
+    <h3>Darren Douglas</h3>
+ </div>
+   <div class="column">
+    <img src="/Users/darrendouglas/startup-sprint/public/images/Danielle.jpg" width="300" height="300">
+    <h3>Danielle Harris</h3>
+ </div>
+
+  <div class="column">
+    <img src="/Users/darrendouglas/startup-sprint/public/images/Edward.jpg" width="300" height="300">
+    <h3>Edward Gordon</h3>
+ </div>
+
+  <div class="column">
+    <img src="/Users/darrendouglas/startup-sprint/public/images/Leigh.jpg" width="300" height="300">
+    <h3>Leigh Stauffer</h3>
+ </div>
+
+   <div class="column">
+    <img src="/Users/darrendouglas/startup-sprint/public/images/Hayden.jpg" width="300" height="300"> 
+    <h3>Hayden Gridley</h3>
+ </div>
+
+</div>
diff --git a/views/youtube.erb b/views/youtube.erb
@@ -0,0 +1,4 @@
+This is dope
+<div class="embed-container">
+  <iframe width="420" height="315" src="https://www.youtube.com/embed/FtX8nswnUKU" frameborder="0" allowfullscreen></iframe>
+</div>