Skip to content

Add global footer #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spencekeith wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add global footer #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec91596
quick fix
Jun 20, 2017
9ad7538
Logo, typo, city
Jun 20, 2017
4d4f5a2
Merge pull request #1 from Spencekeith/minor_changes
jnmothafer Jun 20, 2017
11222c4
spencer_schedule
Spencekeith Jun 20, 2017
6fec730
Merge pull request #4 from Spencekeith/spencer_schedule_commit
Spencekeith Jun 20, 2017
ccbe75f
homepage_footer
Spencekeith Jun 20, 2017
798055d
Update home.erb
Spencekeith Jun 20, 2017
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
View file
Open in desktop
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.15.1
10 changes: 9 additions & 1 deletion app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ class App < Sinatra::Base
['6:30pm', 'Meetup Presentation'],
]

# TODO: add a third day's schedule (@day_after)
@day_after = [
['7:00am', 'Wake up'],
['8:00am', 'Work Out'],
['9:00am', 'Inbox Zero'],
['11:00am', 'B-ball'],
['1:00pm', 'Lunch'],
['3:00pm', 'DC Time'],
['6:30pm', 'Meetup Presentation'],
]

erb :schedule
end
Expand Down
Binary file added public/images/learnco.ico
View file
Open in desktop
Binary file not shown.
13 changes: 11 additions & 2 deletions views/home.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<head>
<link rel="shortcut icon" href="images/learnco.ico" type="image/x-icon">
</head>
<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 +13,11 @@
<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" required>
<input type="Submit">
</form>
<footer>
<p>Copyright VFA Fellows 2017</p>
<p>Credit: Electric Abs</>
</footer>
8 changes: 8 additions & 0 deletions views/schedule.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,12 @@
<% end %>
</ol>
</div>
<div class="column">
<h3>Day 3</h3>
<ol>
<% @day_after.each do |item| %>
<li><%= item.first %>: <%= item.last %></li>
<% end %>
</ol>
</div>
</div>