From 8624e08226357b2d38fdfdcc68cecbc7f34f562a Mon Sep 17 00:00:00 2001 From: Ryan Cleary Date: Tue, 20 Jun 2017 15:40:16 +0000 Subject: [PATCH 1/6] Startup HP typo fixed --- Gemfile.lock | 5 +---- views/home.erb | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3b1fad1..679ee72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,8 +70,5 @@ DEPENDENCIES sinatra thin -RUBY VERSION - ruby 2.2.0p0 - BUNDLED WITH - 1.12.5 + 1.14.6 diff --git a/views/home.erb b/views/home.erb index 19d8743..e57027d 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,7 +1,7 @@

Startup Sprint!

-

Subscribe to the Stertup Sprint newsletter

+

Subscribe to the Startup Sprint newsletter

<% if @error == 'email' %>

Please enter a valid email

<% end %> From d2e20b29a0047b306d8644b6ac021941ada14642 Mon Sep 17 00:00:00 2001 From: Ryan Cleary Date: Tue, 20 Jun 2017 15:56:14 +0000 Subject: [PATCH 2/6] picture changed --- views/home.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.erb b/views/home.erb index e57027d..87f9415 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,5 +1,5 @@

Startup Sprint!

- +learnco

Subscribe to the Startup Sprint newsletter

<% if @error == 'email' %> From dfd98a73a1ab2905107746e2efbdb2cefe953c1d Mon Sep 17 00:00:00 2001 From: Diane Ryu Date: Tue, 20 Jun 2017 16:14:28 +0000 Subject: [PATCH 3/6] pushing favicon change --- views/layout.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/layout.erb b/views/layout.erb index 17df63b..b5a4d0c 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,7 +5,7 @@ Startup Sprint - + From e40bfb884d10a66a8aa2dd7a0a85b0396fe59324 Mon Sep 17 00:00:00 2001 From: Diane Ryu Date: Tue, 20 Jun 2017 18:41:00 +0000 Subject: [PATCH 4/6] TeamMember_1 --- views/team.erb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 views/team.erb diff --git a/views/team.erb b/views/team.erb new file mode 100644 index 0000000..cb2678c --- /dev/null +++ b/views/team.erb @@ -0,0 +1,23 @@ +/* add a page with each team member and their name.*/ + +

Grayson Berger +

+ + +
+ +

Ryan Cleary +

+ + +
+ +

Grettie Mason +

+ + +
+ +

Diane Ryu +

+ From 6d42e5a46ccc47a0838567aeb944eda2cc6d1d25 Mon Sep 17 00:00:00 2001 From: Diane Ryu Date: Tue, 20 Jun 2017 18:47:26 +0000 Subject: [PATCH 5/6] TeamMember_2 --- app.rb | 4 ++++ views/layout.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app.rb b/app.rb index 68e111c..b372f8c 100644 --- a/app.rb +++ b/app.rb @@ -6,6 +6,10 @@ class App < Sinatra::Base erb :home end + get '/team' do + erb :team + end + post '/subscribe' do @full_name = params[:full_name] @email = params[:email] diff --git a/views/layout.erb b/views/layout.erb index b5a4d0c..17df63b 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,7 +5,7 @@ Startup Sprint - + From 1676e83342972b095817525cc0c02bcfccf1de05 Mon Sep 17 00:00:00 2001 From: Diane Ryu Date: Tue, 20 Jun 2017 18:54:35 +0000 Subject: [PATCH 6/6] added title --- views/team.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/team.erb b/views/team.erb index cb2678c..704c24c 100644 --- a/views/team.erb +++ b/views/team.erb @@ -1,4 +1,5 @@ -/* add a page with each team member and their name.*/ +

The Dream Team +

Grayson Berger