Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,5 @@ DEPENDENCIES
sinatra
thin

RUBY VERSION
ruby 2.2.0p0

BUNDLED WITH
1.12.5
1.14.6
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Fork and clone this lab. You'll probably want to add your teammates as collabora

You'll need to run `bundle install` to install all the necessary Ruby gems.

Start the server with the `rackup` command, you can then view it at "http://localhost:9292".
Start the server with the `rackup` command, you can then view it at "git ".

## Recommended Workflow

Expand Down
12 changes: 12 additions & 0 deletions app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ class App < Sinatra::Base
erb :home
end

get '/home' do
redirect to('/')
end

get '/rainbow' do
erb :rainbow
end

get '/youtube' do
erb :youtube
end

post '/subscribe' do
@full_name = params[:full_name]
@email = params[:email]
Expand Down
38 changes: 38 additions & 0 deletions public/stylesheets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,43 @@
*/

.column {
-webkit-column-count: 3; /* Chrome, Safari, Opera */
-moz-column-count: 3; /* Firefox */
column-count: 3;
}

rainbow-container{
height: 1050px;
}

.rainbow-row {
height:150px;
}

#one {
background-color: red;
}

#two {
background-color: orange;
}

#three {
background-color: yellow;
}

#four {
background-color: green;
}

#five {
background-color: blue;
}

#six {
background-color: indigo;
}

#seven {
background-color: violet;
}
6 changes: 4 additions & 2 deletions views/home.erb
Original file line number Diff line number Diff line change
@@ -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 %>
Expand All @@ -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" name="email" required>
<input type="Submit">
</form>
2 changes: 1 addition & 1 deletion views/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Startup Sprint</title>
<link rel="icon" href="favicon.ico" type="image/x-icon"/>
<link rel="icon" href="images/learnco.png" type="image/x-icon"/>
<link rel="stylesheet" href="stylesheets/normalize.css">
<link rel="stylesheet" href="stylesheets/main.css">
</head>
Expand Down
9 changes: 9 additions & 0 deletions views/rainbow.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="rainbow-container">
<div class="rainbow-row" id="one"></div>
<div class="rainbow-row" id="two"></div>
<div class="rainbow-row" id="three"></div>
<div class="rainbow-row" id="four"></div>
<div class="rainbow-row" id="five"></div>
<div class="rainbow-row" id="six"></div>
<div class="rainbow-row" id="seven"></div>
</div>
8 changes: 8 additions & 0 deletions views/schedule.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,12 @@
<% end %>
</ol>
</div>
<div class="column">
<h3>Day After Tomorrow</h3>
<ol>
<% @day_after.each do |item| %>
<li><%= item/first %>: <%= item.last %></li>
<% end %>
</ol>
</div>
</div>
1 change: 1 addition & 0 deletions views/subscribe.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<p>Thanks for subscribing <%= @full_name %></p>
<p><%= @city-name %></p>

<a href="/">Home</a>
1 change: 1 addition & 0 deletions views/youtube.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<iframe width="560" height="315" src="https://www.youtube.com/embed/AnVv0RkiG4U" frameborder="0" allowfullscreen></iframe>