Syv followup constituency first baob only

.haml-lint.yml

@@ -29,9 +29,8 @@ linters:
   EmptyScript:
     enabled: true
 
-  # Seems to default to true anyway, but uncommenting it interferes with the TODO file
-  # HtmlAttributes:
-  #   enabled: true
+  HtmlAttributes:
+    enabled: false
 
   ImplicitDiv:
     enabled: true

.haml-lint_todo.yml

@@ -19,14 +19,6 @@ linters:
       - "app/views/user/vote/show.html.haml"
       - "app/views/users/_info_summary.html.haml"
 
-  # Offense count: 42
-  HtmlAttributes:
-    exclude:
-      - "app/views/home/_swap_form.html.haml"
-      - "app/views/static_pages/contact.html.haml"
-      - "app/views/static_pages/faq.html.haml"
-      - "app/views/static_pages/privacy.html.haml"
-
   # Offense count: 27
   InstanceVariables:
     exclude:

Gemfile

@@ -70,7 +70,7 @@ gem "invisible_captcha", "~> 2.3"
 
 # These need to be outside the development group for Rakefile to
 # be happy in Heroku.
-gem "rubocop", "~> 1.22.1"
+gem "rubocop", "1.22.1"
 gem "rubocop-rails"
 gem "rubocop-rspec"
 

Gemfile.lock

@@ -285,7 +285,7 @@ GEM
       rack
     orm_adapter (0.5.0)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
@@ -353,8 +353,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -379,7 +378,7 @@ GEM
       awesome_print (> 1.0.0)
       rspec (> 3.0.0)
     rspec-support (3.9.4)
-    rubocop (1.22.3)
+    rubocop (1.22.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -388,7 +387,7 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
     rubocop-rails (2.15.2)
       activesupport (>= 4.2.0)
@@ -436,7 +435,6 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
-    strscan (3.1.0)
     sysexits (1.2.0)
     temple (0.10.3)
     terminal-notifier-guard (1.7.0)
@@ -447,7 +445,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
     uri (0.13.0)
     version_gem (1.1.4)
@@ -521,7 +519,7 @@ DEPENDENCIES
   random_data
   rspec-rails (~> 4.0)
   rspec-snapshot
-  rubocop (~> 1.22.1)
+  rubocop (= 1.22.1)
   rubocop-rails
   rubocop-rspec
   sassc-rails

app/assets/stylesheets/home.scss

@@ -36,6 +36,14 @@ p {
     &.choose-party {
         font-size: 34px;
     }
+
+    &.choose-constituency {
+        font-size: 34px;
+    }
+
+    &.hidden-field {
+        display: none;
+    }
 }
 
 h1,

app/controllers/home_controller.rb

@@ -1,11 +1,19 @@
 class HomeController < ApplicationController
+  include HomeHelper
+
   before_action :whats_the_magic_word
 
   def index
-    if params.key?(:clear) && prepops
+    if params.key?(:clear)
       session.delete("pre_populate")
+      session.delete("pre_login_flow")
     end
 
+    @user = User.new
+
+    logger.warn "params.inspect: #{params.inspect}"
+    logger.warn "session['pre_login_flow'].inspect: #{session["pre_login_flow"].inspect}"
+
     # Don't change this without also updating the related comment in
     # the view!
     if logged_in? && swapping_open?
@@ -14,8 +22,41 @@ def index
     end
 
     @parties = Party.all
+    @constituencies = OnsConstituency.all.order(:name)
+    @default_constituency_ons_id = default_ons_constituency&.ons_id
+  end
+
+  # rubocop:disable Metrics/MethodLength
+  def pre_login
+    logger.warn "params.inspect: #{params.inspect}"
+    logger.warn "session['pre_login_flow'].inspect: #{session["pre_login_flow"].inspect}"
+
+    @constituency_ons_id = params["user"] && params["user"]["constituency_ons_id"]
+
+    if @constituency_ons_id && !@constituency_ons_id.empty?
+      mark_pre_login_constituency_complete
+    end
+
+    if params["user"]
+      if params["user"]["willing_party_id"] &&
+        !params["user"]["willing_party_id"].empty?
+        params["user"]["preferred_party_id"] &&
+        !params["user"]["preferred_party_id"].empty?
+        mark_pre_login_parties_complete
+      end
+    end
+
+    if !pre_login_candidates_form_complete || !pre_login_candidates_form_complete
+      # the view will figure out which form to render
+      @parties = Party.all
+      @constituencies = OnsConstituency.all.order(:name)
+
+      prepopulate_fields_from_session
+
+      render action: "index" and return
+    end
 
-    prepopulate_fields_from_session
+    render action: "new", controller: "../users/sessions"
   end
 
   private

app/controllers/users/registrations_controller.rb

@@ -52,7 +52,8 @@ def create
   # If you have extra params to permit, append them to the sanitizer.
   def configure_sign_up_params
     devise_parameter_sanitizer.permit(:sign_up, keys: [
-      :name, :preferred_party_id, :willing_party_id, :consent_news_email, :consent_to_data_processing
+      :name, :preferred_party_id, :willing_party_id, :consent_news_email,
+      :consent_to_data_processing, :constituency_ons_id
     ])
   end
 

app/controllers/users_controller.rb

@@ -10,6 +10,11 @@ def new
 
   def show
     @mobile_number = @user.mobile_number
+
+    logger.warn "@user.email.blank?: #{@user.email.blank?}"
+    logger.warn "[email protected]: #{[email protected]}"
+    logger.warn "@user: #{@user.inspect}"
+
     if [email protected] || @user.email.blank?
       redirect_to edit_user_constituency_path
       return

app/helpers/home_helper.rb

@@ -1,2 +1,23 @@
 module HomeHelper
+  def pre_login_flow
+    return session["pre_login_flow"] || {}
+  end
+
+  def pre_login_constituency_form_complete
+    params["user"] && params["user"]["constituency_ons_id"] && !params["user"]["constituency_ons_id"].empty?
+  end
+
+  def pre_login_candidates_form_complete
+    !!pre_login_flow["candidates_form_complete"]
+  end
+
+  def mark_pre_login_constituency_complete
+    session["pre_login_flow"] ||= {}
+    session["pre_login_flow"]["constituency_form_complete"] = true
+  end
+
+  def mark_pre_login_parties_complete
+    session["pre_login_flow"] ||= {}
+    session["pre_login_flow"]["parties_form_complete"] = true
+  end
 end

app/javascript/packs/postcodesHelper.js

@@ -84,6 +84,6 @@ $(document).ready(() => {
   };
 
   $("#txt-postcode").keyup(postcodeEnter);
-  
+
   clearPostcodeError();
 });

app/views/home/_candidates_form.html.haml

@@ -0,0 +1,22 @@
+= form_with url: sign_in_path, id: "login-form", local: true do
+  %p.choose-party
+    Which party would you most like to vote for?
+    = select :user, :preferred_party_id, nil, {}, {form: 'login-form'} do
+      %option(disabled=true selected=true) ...
+      = options_for_select(parties.map {|p| [ p.name, p.id ]}, selected: preferred_party_id)
+  %p.choose-party
+    When we find someone to vote for your party in #{election_constituency_other},
+    which party could you vote for in exchange?
+    = select :user, :willing_party_id, nil, {}, {form: 'login-form'} do
+      %option(disabled=true selected=true) ...
+      = options_for_select(parties.map {|p| [ p.name, p.id ]}, selected: willing_party_id)
+  %p.hidden-field
+    = hidden_field_tag 'user[constituency_ons_id]', constituency_ons_id
+
+  %p
+    %button{ formmethod: :post, onclick: "return checkForm()", class: "btn btn-lg btn-primary" }
+      Swap Your Vote!
+  %p.small.subdued
+    We will match you with someone who will
+    cast your preferred vote in a different area where it could count for more.
+    In return, you will cast their preferred vote in your area.

app/views/home/_candidates_form_js.html.haml

@@ -0,0 +1,32 @@
+:javascript
+  function checkForm() {
+    preferred_party_id = $("select[name='user[preferred_party_id]']").val();
+    willing_party_id = $("select[name='user[willing_party_id]']").val();
+    if (preferred_party_id == null || willing_party_id == null) {
+      $(".js-blank-error-modal").modal();
+      return false;
+    } else if (preferred_party_id == willing_party_id) {
+      $(".js-equal-party-error-modal").modal();
+      return false;
+    }
+
+    return true;
+  }
+
+.modal.js-blank-error-modal{ tabindex: "-1", role: "dialog" }
+  .modal-dialog
+    .modal-content
+      .modal-body
+        Please choose both your preferred party and your willing party.
+      .modal-footer
+        %button.btn.btn-primary{ data: { dismiss: "modal" }, aria: { label: "Close" } }
+          Close
+
+.modal.js-equal-party-error-modal{ tabindex: "-1", role: "dialog" }
+  .modal-dialog
+    .modal-content
+      .modal-body
+        Your preferred party and your willing party cannot be the same.
+      .modal-footer
+        %button.btn.btn-primary{ data: { dismiss: "modal" }, aria: { label: "Close" } }
+          Close

app/views/home/_closed_wind_down.html.haml

@@ -8,15 +8,21 @@
 
       %p
 
-        We closed swaps shortly before the polls closed, and are now
-        looking forward to see the results.
+        Thank you for using Swap My Vote in the United Kingdom General Election, 2024.
+
+      %p
+        UPDATE: For the US Presidential Election, 2024, please visit our cousin site stateside.
+      %p
+        Swap Your Vote to defeat Trump in swing states and cast protest votes in safe states:
+        %br
+        = link_to "Visit SwapYourVote.org", "https://swapyourvote.org", class: "button"
 
       -# Review this line depending on when we closed for swaps!
                   We closed swaps shortly before the polls opened,
                   and are now looking forward to see the results.
 
       %p
-        We will run Swap My Vote again for the next elections,
+        We will run Swap My Vote again for the next UK elections,
         whenever that turns out to be.
 
       %p

app/views/home/_constituency_form.html.haml

@@ -0,0 +1,15 @@
+= form_for @user, url: pre_login_path, id: "login-form", local: true do |f|
+
+  .d-flex.flex-column.align-items-center
+
+    %p.choose-constituency
+      My constituency is
+      = f.collection_select :constituency_ons_id, constituencies,
+                            :ons_id, :name,
+                            selected: default_constituency_ons_id,
+                            prompt: true
+
+    = render partial: "users/postcode_field"
+
+    %p.text-center
+      = submit_tag("Next: Choose Parties", class: "btn btn-primary")

app/views/home/_open_and_voting.html.haml

@@ -1,3 +1,5 @@
+= javascript_pack_tag "postcodesHelper"
+
 .background-pattern.border-bottom
   .container.text-center
     %h1

app/views/home/_open_pre_elections.html.haml

@@ -1,3 +1,5 @@
+= javascript_pack_tag "postcodesHelper"
+
 .background-pattern.border-bottom
   .container.text-center
     %h1