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
4 changes: 4 additions & 0 deletions app.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ class App < Sinatra::Base
erb :home
end

get '/facepage' do
erb :facepage
end

post '/subscribe' do
@full_name = params[:full_name]
@email = params[:email]
Expand Down
Binary file added public/images/Andrew.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Jeannie.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Micah.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/Rachel.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/stylesheets/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
/*
* TODO: add custom styling
*/
.nav3 {

float: left;
padding-left: 20px;
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
color: #333333;
padding-top: 20px;
padding-right: 20px;
}

.icons{
display:inline-block;
width: 64px;
height: 64px;
}


}

.column {

Expand Down
39 changes: 39 additions & 0 deletions views/facepage.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<h1>Our Crashing Flatiron Team</h1>
<style>
div.container {
display:inline-block;
}

p {
text-align:center;
}
</style>

<body>
<div class="container">
<img src="images/Jeannie.jpg" />
<p>Jeannie Blackwood</p>
</div>
<div class="container">
<img class="middle-img" src="images/Micah.jpg" />
<p>Micah Jaffe</p>
</div>
</div>
<div class="container">
<img src="images/Rachel.jpg" />
<p>Rachel Smedley</p>
</div>
<div class="container">
<img class="middle-img" src="images/Andrew.jpg" />
<p>Andrew Hausman</p>
</div>
</div>

</body>



<h3>Thanks for checking out our facepage!</h3>


<a href="/">Home</a>
4 changes: 3 additions & 1 deletion views/home.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h1>Startup Sprint!</h1>
<img src="images/learnco.jpg">
<img src="images/learnco.png">

<h3>Subscribe to the Stertup Sprint newsletter</h3>
<% if @error == 'email' %>
Expand All @@ -12,3 +12,5 @@
<input type="text" id="email" name="email" required>
<input type="Submit">
</form>

<a href="/facepage">Meet Our Team</a>