Merge pull request #354 from mehulkar/hosting-redirect

Remove redirect on /hosting page

app/assets/stylesheets/application.css.scss

@@ -21,3 +21,8 @@
 .jfdi_signup, .forbes_index, .forbes_show {
   @extend .light-background;
 }
+
+// put this in the right place later
+button.orange.full-width-button {
+  @include span-columns(8 of 8);
+}

app/assets/stylesheets/cities/_index.scss

@@ -244,4 +244,4 @@ h3.cities-list-header {
     background-color: $tws-green;
     background-image: linear-gradient(to bottom, $tws-green, $tws-green);
   }
-}
+}

app/assets/stylesheets/static/_about.scss

@@ -0,0 +1,27 @@
+.static-container {
+  margin-bottom: $base-font-size*3;
+
+  @include media($desktop) {
+    @include span-columns(10 of 12);
+    @include shift(1);  
+  }
+
+  @include media($desktop) {
+    @include span-columns(8 of 12);
+    @include shift(2);  
+  }
+
+  ol {
+    li {
+      padding-left: $base-font-size;
+    }
+  }
+
+  h2 {
+    margin-bottom: $base-font-size;
+  }
+
+  h3.static-subheader {
+    margin-bottom: $base-font-size;
+  }
+}

app/controllers/static_controller.rb

@@ -1,5 +1,5 @@
 class StaticController < ApplicationController
-  before_filter :away_ye_waitlisted, except: [:index, :jfdi_signup]
+  before_filter :away_ye_waitlisted, except: [:index, :jfdi_signup, :hosting]
 
   def index
     use_new_styles
@@ -28,6 +28,7 @@ def questions
   end
 
   def hosting
+    use_new_styles
   end
 
   def jfdi_signup

app/views/cities/forbes_show.html.erb

@@ -17,6 +17,7 @@
 <div class="light-background">
 <%= render partial: 'shared/header' %>
 <%= render partial: 'cities/show/city_banner' %>
+
 <div class="container city">
   <div class="city-info">
     <%= render partial: 'cities/show/fallback' %>

app/views/cities/show/_fallback.html.erb

@@ -1,19 +1,36 @@
 <div class="city-container">
-	<h2>You're awesome for being into this.</h2>
+	<h2>Thanks for joining Tea With Strangers in <%= @city.name %>!</h2>
 	<p>
-		This is such a weird thing to be interested in, and that 
-		you're here must mean you're at least curious. So thank you for, 
-		well, being you!
+		We’re thrilled to welcome you to the Tea With Strangers community and can’t wait to see you at a teatime soon.
 	</p>
-	<p> 
+	<p>
 		Unfortunately, there are approximately <%=
-		number_with_delimiter(User.all.count * (rand(100) + 1))%> people 
-		who are also excited about tea time, and we're having trouble 
+		number_with_delimiter(User.all.count * (rand(100) + 1))%> people
+		who are also excited about tea time, and we're having trouble
 		stopping our website from melting.
 	</p>
-	<p>
+	<p >
 	  We're very sorry for the inconvenience, and we'll shoot you an email when things
 	  have calmed down.
 	</p>
+	<h2>You're awesome for being into this.</h2>
+	<p>
+		There's something to be said about the type of person that goes to
+		have a conversation with complete strangers for no reason at all.
+	</p>
+	<blockquote class="wide">
+		Hey, I don't know you guys. I don't have any context to talk to you. I don't know what I can get from you. But for the next two hours, I'm going to sit around, ask some questions, share some stories, and just be with you anyway because why not?
+	</blockquote>
+	<p>
+		Sounds weird, but to do something like that requires a leap of
+		faith on the people around you. Actually taking that leap is so cool
+		because you'll always be surprised by what you find. And it'll
+		(hopefully) leave ya wondering, "Wait, what if I found a way to
+		take this leap on everyone I ever crossed paths with?"
+	</p>
+	<p>
+		Imagine that!
+	</p>
+
 	<%= render partial: 'cities/show/set_city' %>
 </div>

app/views/static/hosting.html.erb

@@ -0,0 +1,80 @@
+<%= content_for :title do %>
+  Become a Host with Tea With Strangers!
+<% end %>
+
+<%= content_for :description do %>
+  Tea With Strangers is a community of people that bring strangers together for great conversations. We're all about making cities feel more like neighborhoods. Come join!
+<% end %>
+
+<%= content_for :head do %>
+  <meta property ="og:type" content="website"/>
+  <meta property ="og:title" content='<%= "Become a Host with Tea With Strangers!"%>'/>
+  <meta property ="og:image" content='http://f.cl.ly/items/0L0u3E213R2X0l3n3f0d/facebook-img.jpg'/>
+  <meta property ="og:description" content ="Tea With Strangers is a community of people that bring strangers together for great conversations. We're all about making cities feel more like neighborhoods. You should join. Yes, you."/>
+<% end %>
+
+<div class="light-background">
+  <%= render partial: 'shared/header' %>
+<div class="city-banner intro-to-tws cover-photo">
+  <div class="content">
+    <div class="content-box">
+      <h1 class="cover-photo-lede city-title">Travel in your own home</h1>
+    </div>
+  </div>
+</div>
+
+<div class="container static">
+  <div class="static-container">
+    <h2>Full disclosure: We're hosts. Not mind readers.</h2>
+    <p>
+      But if you're on this page, you might be wondering at least a couple of things.
+    </p>
+    <ol>
+      <li>
+        What / who is a host?
+      </li>
+      <li>
+        Why do hosts love hosting?
+      </li>
+      <li>
+        Am I host material?
+      </li>
+      <li>
+        How can I get involved?
+      </li>
+    </ol>
+    <p>So we asked our hosts some of these questions. Here's what they had to say.</p>
+    <h3 class="static-subheader">A host sometimes asks questions, often smiles, listens wholeheartedly and loves to bring amazing people together.</h3>
+    <p>
+      Each host is different, uniquely amazing and full of stories, smiles, hugs and wonder. But I guess you could say that we do share something — a common core. We love the people around us before they've given us reason to. And we know that real conversations make our communities feel a little more like home.
+    </p>
+    <h3 class="static-subheader">Hosting is an amazing experience.</h3>
+    <p>
+      Hosting Tea With Strangers can make your life feel more fulfilling, more magical, and it might even make you a better person. Every time you host tea time, you're practicing being inclusive, attentive, and curious without inhibition. That's an awesome challenge, and in it is huge opportunity to grow as a person.
+    </p>
+    <p>
+      In addition, the host community is an incredibly supportive, dynamic and exciting group of people that likes to hang together, share love across the globe and support each other on our journeys through our neighborhoods. Imagine joining a new family of awesome people that’s both local and global and is as loving and caring as you are. That’s the host fam.
+    </p>
+    <h3 class="static-subheader">You know yourself better than anyone else.</h3>
+    <p>
+      If stories, amazing people, tea, smiles, real conversation and our description of hosting all sound awesome to you then you may already have an inner host within you. So what are you waiting for? Let us know that you want in on our eclectic and extraordinary family.
+    </p>
+    <h3 class="static-subheader">Join us!</h3>
+
+    <% if user_signed_in? %>
+      <a href="#" data-user-interest='hosting'>
+        <button class='orange full-width-button'>
+          I'm interested
+        </button>
+      </a>
+    <% else %>
+        <%= link_to sign_up_path do %>
+          <button class='orange full-width-button'>
+            I'm interested
+          </button>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+
+<%= render partial: 'shared/new_footer' %>