WIP: User flow redesign

app/controllers/application_controller.rb

@@ -16,8 +16,16 @@ 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?
+    redirect_path = stored_location_for(resource)
+    if redirect_path
+      redirect_path
+    elsif current_user.home_city.nil?
       cities_path
     else
       city_path(current_user.home_city)

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,16 @@ 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 cities path if no redirect location exists
+        unless redirect_url
+          redirect_url = cities_path
+        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

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 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].to_i.to_s)
+    end
+
     super
   end
 end

app/controllers/static_controller.rb

@@ -29,6 +29,14 @@ def about
   def jfdi_signup
     @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].to_i.to_s)
+    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]
+  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? }

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/_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) 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,50 @@
+<% 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, sign up and 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>
+      <button>Email me in <%= next_month_name %></button>
+    </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>

config/routes.rb

@@ -30,6 +30,9 @@
   end
 
   resources :tea_times do
+    collection do
+      get 'list' => 'tea_times#list'
+    end
     member do
       post '/attendance'                => 'attendance#create', as: :attendance
       patch '/attendance/all'           => 'attendance#mark',             as: :mark

spec/controllers/tea_times_controller_spec.rb

@@ -9,27 +9,39 @@
   end
 
   describe '#index' do
+    it 'should be viewable by all viewers' do
+      get :index
+      assert_response :success
+
+      sign_in @user
+      referer '/'
+      get :index
+      assert_response :success
+    end
+  end
+
+  describe '#list' do
     context 'viewed by a host or admin' do
       it 'should show *all* the tea times to hosts' do
         sign_in @host
-        get :index
+        get :list
         expect(assigns(:tea_times)).to eq(TeaTime.all)
       end
 
       it 'should show *all* the tea times to admins' do
         sign_in @admin
-        get :index
+        get :list
         expect(assigns(:tea_times)).to eq(TeaTime.all)
       end
     end
 
     it 'should redirect normal and anonymous users to sign in' do
-      get :index
+      get :list
       assert_response :redirect
 
       sign_in @user
       referer '/'
-      get :index
+      get :list
       assert_response 302
     end
   end

spec/features/user_behaviours_spec.rb

@@ -10,6 +10,16 @@
     expect(page).to have_content 'Dashboard'
   end
 
+  scenario 'can sign up with a valid email and password and a redirect_to_tt path' do
+    tt = create(:tea_time)
+    visit sign_up_path(redirect_to_tt: tt.id)
+    fill_in('user_name', with: 'Darth Helmet')
+    fill_in('user_email', with: '[email protected]')
+    fill_in('user_password', with: SecureRandom.hex)
+    click_button("Let's Get Tea")
+    expect(page.current_path).to eq tea_time_path(tt.id)
+  end
+
   scenario 'with blank name' do
     sign_up_with('', '[email protected]')
     #User should be redirected to the sign up page
@@ -23,6 +33,14 @@
     expect(page).to have_content user.home_city.name
   end
 
+  scenario 'can sign in with a redirect_to_tt path and be redirected correctly' do
+    tt = create(:tea_time)
+    user = create(:user)
+    visit new_user_session_path(redirect_to_tt: tt.id)
+    sign_in user
+    expect(page.current_path).to eq tea_time_path(tt.id)
+  end
+
   scenario 'with an already created user account from a registration form' do
     user = create(:user)
     sign_up_with(user.nickname, user.email)
@@ -102,6 +120,30 @@
   end
 end
 
+feature 'Registered User without home city' do
+  before(:each) do
+    @host = create(:user, :host)
+    @user = create(:user, home_city: nil)
+    @tt = create(:tea_time, host: @host, city: @host.home_city)
+    sign_in @user
+  end
+
+  feature 'Tea Time Attendance' do
+    scenario 'signing up to a tea time sets user home city to tea time city' do
+      visit city_path(@host.home_city)
+      expect(page.status_code).to eq(200)
+      click_link('Count Me In')
+      expect(current_path).to eq tea_time_path(@tt)
+
+      find('input.confirm').click
+
+      # Reload the user model and check the user's home city is set
+      @user.reload
+      expect(@user.home_city).to eq @tt.city
+    end
+  end
+end
+
 private
   def sign_up_with(name, email, opts = nil)
     visit sign_up_path