WIP: User flow redesign

app/assets/javascripts/modals.js

@@ -42,3 +42,4 @@ function modalActivation() {
 
 $(document).ready(modalActivation)
 $(document).on('page:load', modalActivation)
+$(document).on('turbolinks:load', modalActivation)

app/controllers/application_controller.rb

@@ -16,11 +16,17 @@ def use_new_styles
     go_back(exception)
   end
 
+  # Override Devise's after_sign_in_path_for to check whether
+  # the user (here, `resource` would be User) has a stored
+  # redirect location, and use that as the path. Otherwise,
+  # go to a city page.
+  # See https://github.com/plataformatec/devise/wiki/How-To:-Redirect-back-to-current-page-after-sign-in,-sign-out,-sign-up,-update
   def after_sign_in_path_for(resource)
-    if current_user.home_city.nil?
-      cities_path
+    redirect_path = stored_location_for(resource)
+    if redirect_path
+      redirect_path
     else
-      city_path(current_user.home_city)
+      tea_times_path
     end
   end
 

app/controllers/attendance_controller.rb

@@ -39,6 +39,11 @@ def create
       current_user.update_attributes(phone_number: params[:attendance][:phone_number])
     end
 
+    # Save home city if they don't have one yet
+    if current_user.home_city.nil?
+      current_user.update_attributes(home_city: @tea_time.city)
+    end
+
     if @attendance.save
       # Send various emails (Should all be run async)
       @attendance.send_confirmation_mail  if @attendance.pending?

app/controllers/registrations_controller.rb

@@ -7,7 +7,21 @@ def create
       user_info = GetOrCreateNonWaitlistedUser.call(user_params)
       if user_info[:new_user?] && user_info[:user].valid?
         sign_in user_info[:user]
-        redirect_to cities_path
+
+        # Retrieve redirect location from Devise if exists
+        redirect_url = stored_location_for(User)
+
+        # Fall back to tea times path if no redirect location exists
+        unless redirect_url
+          redirect_url = tea_times_path
+        end
+
+        # If the ?remind_next_month GET param exists, show banner
+        if params.has_key?(:remind_next_month)
+          flash[:success] = "We'll let you know about tea times next month!"
+        end
+
+        redirect_to redirect_url
       elsif !user_info[:new_user?] && user_info[:user].valid?
         redirect_to new_user_session_path, alert: 'You\'ve made an account already. Log in using the same email. Click \'Forgot Password\' if you\'re confused.'
       else
@@ -52,7 +66,7 @@ def after_update_path_for(resource)
     end
 
     def user_params
-      a = params.require(:user).permit(:nickname, :email, :password, :phone_number)
+      a = params.require(:user).permit(:nickname, :email, :password, :phone_number, :home_city_id)
       a[:given_name] = a[:nickname] if !a[:given_name]
       a
     end

app/controllers/sessions_controller.rb

@@ -2,6 +2,14 @@ class SessionsController < Devise::SessionsController
   def new
     @use_new_styles = true
     return redirect_to profile_path if current_user
+
+    # If the redirect_to_tt parameter exists, store the URL
+    # to redirect to after login
+    # See https://github.com/plataformatec/devise/wiki/How-To:-Redirect-back-to-current-page-after-sign-in,-sign-out,-sign-up,-update
+    if params[:redirect_to_tt] && TeaTime.find(params[:redirect_to_tt])
+      store_location_for(:user, '/tea_times/' + params[:redirect_to_tt])
+    end
+
     super
   end
 end

app/controllers/static_controller.rb

@@ -27,8 +27,51 @@ def about
   end
 
   def jfdi_signup
+    # Querystring params (all optional):
+    # - redirect_to_tt: integer - Set the tea time to redirect to after signup
+    # - city_id: integer - Set the default selected city in home city dropdown
+    # - remind_next_month: (any) - Pass a querystring param to the registration
+    #   action handler to display the banner that we'll remind them next month
+
     @full_form = !request.xhr?
     return redirect_to profile_path if current_user
+
+    # If the redirect_to_tt parameter exists, store the URL
+    # to redirect to after signup
+    # See https://github.com/plataformatec/devise/wiki/How-To:-Redirect-back-to-current-page-after-sign-in,-sign-out,-sign-up,-update
+    if params[:redirect_to_tt] && TeaTime.find(params[:redirect_to_tt])
+      store_location_for(:user, '/tea_times/' + params[:redirect_to_tt])
+    end
+
+    # Set parameters for after registration completes
+    # We want to show a banner after registration that we'll remind them next month
+    # This passes through the querystring param ?remind_next_month to the registration handler
+    @form_action_params = {}
+    if params.has_key?(:remind_next_month)
+      @form_action_params['remind_next_month'] = ''
+    end
+
+    # Generate cities list, prepend a placeholder element
+    # @active_cities = City.fully_brewed.order(users_count: :desc)
+    # @upcoming_cities = City.where(
+    #     brew_status: [City.brew_statuses[:cold_water], City.brew_statuses[:warming_up]]
+    # ).order(users_count: :desc)
+    # @cities = @active_cities + @upcoming_cities
+    @cities = City.where(
+        brew_status: [City.brew_statuses[:fully_brewed], City.brew_statuses[:cold_water], City.brew_statuses[:warming_up]]
+    ).order(name: :asc)
+    @cities_set = @cities.collect { |city| [city.name, city.id] }
+
+    # Add the placeholder and Other option
+    @cities_set_with_blank = @cities_set.prepend(['Home city', nil]).append(['Other', 'other'])
+
+    # Set selected city in dropdown
+    @selected_city = ''
+    if params[:city_id] && City.find(params[:city_id])
+      # If a default city is selected, set the selected city in the dropdown
+      @selected_city = City.find(params[:city_id]).id
+    end
+
     if @full_form
       render 'registrations/sign_up'
     else

app/controllers/tea_times_controller.rb

@@ -1,13 +1,38 @@
 class TeaTimesController < ApplicationController
   helper TeaTimesHelper
-  before_action :set_tea_time, except: [:index, :new, :create]
-  before_action :authenticate_user!
-  before_action :authorized?, only: [:new, :edit, :create, :update, :cancel, :destroy, :index]
+  before_action :set_tea_time, except: [:index, :list, :new, :create]
+  before_action :authenticate_user!, except: [:index, :show]
+  before_action :authorized?, only: [:new, :edit, :create, :update, :cancel, :destroy, :list]
   before_action :use_new_styles, except: [:create, :update, :cancel, :destroy]
 
   # GET /tea_times
   # GET /tea_times.json
   def index
+    @tea_times = TeaTime.this_month.order(start_time: :asc).includes(:city).all
+
+    # Array of cities holding tea times this month
+    # Extract all names of cities from tea times and deduplicate
+    @cities = @tea_times.map { |tt| tt.city.name }.uniq
+
+    # For each available city, create a hash entry and an empty list
+    # of tea times
+    @tea_times_by_city = Hash.new
+    @cities.each { |city| @tea_times_by_city[city] = [] }
+
+    # Iterate through tea times and segment into cities
+    @tea_times.each do |tt|
+      @tea_times_by_city[tt.city.name].push(tt)
+    end
+
+    respond_to do |format|
+      format.html { render layout: !request.xhr? }
+      format.json { render json: @tea_times }
+    end
+  end
+
+  # GET /tea_times/list
+  # GET /tea_times/list.json
+  def list
     @tea_times = TeaTime.all
     respond_to do |format|
       format.html { render layout: !request.xhr? }
@@ -18,9 +43,11 @@ def index
   # GET /tea_times/1
   # GET /tea_times/1.json
   def show
-    @new_attendance = @tea_time.attendances.new(user_id: current_user.id, provide_phone_number: true)
+    if user_signed_in?
+      @new_attendance = @tea_time.attendances.new(user_id: current_user.id, provide_phone_number: true)
+    end
     respond_to do |format|
-      format.html { render layout: !request.xhr? }
+      format.html { render layout: !request.xhr?, locals: { full_form: !request.xhr? } }
       format.json { render json: @tea_time }
     end
   end

app/helpers/static_helper.rb

@@ -2,10 +2,8 @@ module StaticHelper
   def next_step_path
     if current_user.nil?
       sign_up_path
-    elsif current_user.home_city.nil?
-      cities_path
     else
-      city_path(current_user.home_city)
+      tea_times_path
     end
   end
 end

app/models/tea_time.rb

@@ -32,6 +32,7 @@ class TeaTime < ActiveRecord::Base
   scope :past, -> { before(Time.now.utc) }
   scope :future, -> { after(Time.now.utc) }
   scope :future_until, ->(until_time) { future.before(until_time) }
+  scope :this_month, -> { after(Date.today.at_beginning_of_month).before(Date.today.at_end_of_month) }
 
   def date
     start_time.strftime("%A, %D")

app/views/shared/_header.html.erb

@@ -13,22 +13,9 @@
           </li>
         <% end %>
 
-        <% if !current_user %>
-          <li class="nav-link-item">
-            <%= link_to "Cities", cities_path %>
-          </li>
-        <% elsif current_user && current_user.home_city.nil? %>
-          <li class="nav-link-item">
-            <%= link_to "Set Home City", cities_path, class: 'nav-emphasis' %>
-          </li>
-        <% else %>
-          <li class="nav-link-item">
-            <%= link_to current_user.home_city.name, city_path(current_user.home_city) %>
-          </li>
-          <li class="nav-link-item">
-            <%= link_to "Cities", cities_path %>
-          </li>
-        <% end %>
+        <li class="nav-link-item">
+          <%= link_to "Tea Times", tea_times_path %>
+        </li>
 
         <% if !current_user || (current_user && !current_user.host?) %>
           <li class="nav-link-item">

app/views/shared/_new_footer.html.erb

@@ -5,7 +5,7 @@
 				<div class="link-container">
 					<%= link_to 'About', about_path %>
 					<%= link_to "Hosting", hosting_path %>
-					<%= link_to "Cities", cities_path %>
+					<%= link_to "Tea Times", tea_times_path %>
 					<a target="_blank" href="https://facebook.com/teawithstrangers" alt="Tea With Strangers Facebook Page">Facebook</a>
 					<a target="_blank" href="https://twitter.com/teawstrangers" alt="Tea With Strangers Twitter Page">Twitter</a>
 				</div>

app/views/shared/_new_sign_up.html.erb

@@ -1,6 +1,7 @@
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: ['sign-up'] }) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name, @form_action_params), html: { class: ['sign-up'] }) do |f| %>
   <%= f.text_field :nickname, placeholder: 'First name (or nickname)', id: 'user_name', class: 'name', autofocus: true %>
   <%= f.email_field :email, placeholder: 'Email address', id: 'user_email', class: 'email' %>
   <%= f.password_field :password, placeholder: 'Password (at least 8 characters you won\'t forget!)', id: 'user_password', class: 'password' %>
+  <%= f.select :home_city_id, @cities_set_with_blank, {disabled: '', selected: @selected_city}, id: 'user_home_city', class: 'home_city' %>
   <%= f.submit "Let's Get Tea", id: 'user_signup_submit', class: 'orange' %>
 <% end %>

app/views/shared/_tea_time_row.html.erb

@@ -70,8 +70,20 @@
             </button>
           <% end %>
         <% end %>
+      <% elsif (no_signin_button ||= false) # No signin button; don't show signin CTA text %>
+        <%= link_to sign_up_path(redirect_to_tt: tea_time.id, city_id: tea_time.city.id) do %>
+          <% if tea_time.spots_remaining? %>
+            <button class="spots<%= tea_time.spots_remaining %>">
+              Count Me In
+            </button>
+          <% else %>
+            <button class="yellow button">
+              Join Waitlist
+            </button>
+          <% end %>
+        <% end %>
       <% else %>
-        <%= link_to new_user_session_path do %>
+        <%= link_to new_user_session_path(redirect_to_tt: tea_time.id) do %>
           <button class="yellow button">
             Sign in to schedule
           </button>

app/views/static/index.html.erb

@@ -8,7 +8,7 @@
       <span class='cover-photo-subtext'>
         But you don’t discover that when you’re staring at a screen.
       </span>
-      <%= link_to next_step_path, class: 'sign-up' do %>
+      <%= link_to tea_times_path, class: 'sign-up' do %>
         <button class='orange cover-photo-cta'>
           Let's Get Tea
         </button>
@@ -70,7 +70,7 @@
       <h1 class="small dark mid-page-cta">
         Actually talk to people.
       </h1>
-      <%= link_to next_step_path, class: 'sign-up' do %>
+      <%= link_to tea_times_path, class: 'sign-up' do %>
         <button class='orange cover-photo-cta'>
           Let's get tea
         </button>
@@ -118,7 +118,7 @@
       <h1 class="small dark mid-page-cta">
         Do we get to high five yet?
       </h1>
-      <%= link_to next_step_path, class: 'sign-up' do %>
+      <%= link_to tea_times_path, class: 'sign-up' do %>
         <button class='orange cover-photo-cta'>
           Yes
         </button>

app/views/tea_times/index.html.erb

@@ -0,0 +1,59 @@
+<%= content_for :title do %>Tea Times | Tea With Strangers<% end %>
+
+<% next_month_name = Date.today.next_month.strftime("%B") %>
+
+<div class="cover-photo" style="background-image: linear-gradient(to bottom, rgba(247, 191, 77, 0.87), rgba(247, 191, 77, 0.87)), url('<%= image_path("missing-city-image.jpg") %>'); margin-bottom: 50px;">
+  <%= render partial: 'shared/header' %>
+  <div class="content">
+    <div class="content-box">
+      <h1 class="cover-photo-lede">Tea times this month</h1>
+      <span class='cover-photo-subtext'>
+        We announce tea times at the beginning of each month.
+        If nothing this month fits you,
+        <% if !user_signed_in? %>sign up and <% end %>
+        we'll email you in <%= next_month_name %> about tea
+        times then.
+      </span>
+    </div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="light-background">
+    <div>
+      <% if @tea_times_by_city.empty? %>
+        <p>
+          No tea times scheduled for this month! Check back later.
+        </p>
+      <% else %>
+        <p>
+          This month, there are tea times happening in <%= @cities.to_sentence %>.
+        </p>
+        <p>
+          If you don't live in any of these places or the tea times below don't
+          work for your schedule, we can try to make something work for you in
+          <%= next_month_name %>.
+        </p>
+      <% end %>
+    </div>
+    <div>
+      <% if user_signed_in? %>
+        TODOCOPY None of these times work for you? We'll send out a newsletter in <%= next_month_name %> with the next month's tea times.</div>
+      <% else %>
+        <%= link_to sign_up_path(remind_next_month: 'yes') do %>
+          <button>Email me in <%= next_month_name %></button>
+        <% end %>
+      <% end %>
+    </div>
+    <% @tea_times_by_city.each do |city, tts| %>
+      <div class="tt-set-container">
+        <div class="tt-container tt-city-name" style="border: 5px solid #EF6236; color: #EF6236; font-weight: bold; height: 200px; padding: 20px; font-size: 30px; text-transform: uppercase; text-align: center;">
+          <%= city %>
+        </div>
+        <% tts.each do |tt| %>
+          <%= render partial: 'shared/tea_time_row', locals: {tea_time: tt, no_signin_button: true} %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>