From 4758357bc8adafe06108c8e965780563a515e63c Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Sat, 4 Apr 2020 20:27:22 -0500
Subject: [PATCH] simplified signup

---
 web/app/assets/stylesheets/web/main.scss |  14 +--
 web/app/controllers/users_controller.rb  |   4 +
 web/app/views/users/new.html.erb         | 104 +++--------------------
 3 files changed, 25 insertions(+), 97 deletions(-)

diff --git a/web/app/assets/stylesheets/web/main.scss b/web/app/assets/stylesheets/web/main.scss
index cfdae525c..7cc20672b 100644
--- a/web/app/assets/stylesheets/web/main.scss
+++ b/web/app/assets/stylesheets/web/main.scss
@@ -330,8 +330,12 @@ body.web {
   // all custom CSS for the register page goes here
   .register-page {
 
+    display:inline-block;
+
     .register-container {
       padding:0 10px 10px;
+      margin-left: 45px;
+      margin-top: 20px;
     }
 
     input.register-musician {
@@ -364,6 +368,7 @@ body.web {
 
     div.register-as {
       margin-left:45px;
+      display:none;
     }
 
     input.register-fan {
@@ -401,18 +406,15 @@ body.web {
     }
 
 
-    .register-left {
-
       select {
         width:104%;
       }
 
       div.field {
-        margin-top:31px;
-        width:43%;
-        float:left;
+        margin-top: 18px;
+        width: 100%;
       }
-    }
+
 
     .register-right {
 
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index c9b48d6af..e439281da 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -452,6 +452,10 @@ JS
         end
       end
     end
+    if instruments.length == 0
+      # default to guitar when non-specified
+      instruments << {:instrument_id => "acoustic guitar", :proficiency_level => 3, :priority => 1}
+    end
 
     return instruments
   end
diff --git a/web/app/views/users/new.html.erb b/web/app/views/users/new.html.erb
index 8c2f46163..16a52d554 100644
--- a/web/app/views/users/new.html.erb
+++ b/web/app/views/users/new.html.erb
@@ -7,7 +7,6 @@
 
   <%= form_for(@user, :url => @signup_postback, :method => :post) do |f| %>
 
-      <div class="register-left left w45">
         <div class="register-container">
           <div class="register-as">
           Register as a:
@@ -23,99 +22,28 @@
             <%= f.text_field :first_name %>
           </div>
 
-          <div class="field last_name right-side">
+          <div class="field last_name ]>
             <%= f.label :last_name, "Last Name:" %>
             <%= f.text_field :last_name %>
           </div>
 
-          <br clear="all"/>
 
           <div class="field email">
             <%= f.label :email, "Email Address:" %>
             <%= f.text_field :email %>
           </div>
 
-          <div class="field country right-side">
-            <%= f.label :country, "Country:" %>
-            <select id="country_select" name="jam_ruby_user[country]" autocomplete="off" class="easydropdown">
-              <option class="label" value="" <%= (@location.nil? || @location[:country].nil? || @location[:country].blank?) ? "selected" : "" %>>Select Country</option>
-              <% @countriesx.each do |country| %>
-                  <% unless country[:countrycode].blank? %>
-                      <option value="<%= country[:countrycode] %>" <%= @location[:country] == country[:countrycode] ? "selected" : "" %>><%= country[:countryname] %></option>
-                  <% end %>
-              <% end %>
-            </select>
-          </div>
-
-          <br clear="all"/>
-
-          <div class="field state">
-            <%= f.label :state, "State/Province:" %>
-            <select id="region_select" name="jam_ruby_user[state]" autocomplete="off" class="easydropdown">
-              <option value="" <%= @location[:state].blank? ? "selected" : "" %>>State/Province</option>
-              <% @regions.each do |region| %>
-                  <% unless region.blank? %>
-                      <option value="<%= region[:region] %>" <%= @location[:state] == region[:region] ? "selected" : "" %>><%= region[:name] %></option>
-                  <% end %>
-              <% end %>
-
-            </select>
-          </div>
-
-          <div class="field city right-side">
-            <%= f.label :state, "City:" %>
-            <select id="city_select" name="jam_ruby_user[city]" autocomplete="off" class="easydropdown">
-              <option value=""  <%= @location[:city].blank? ? "selected" : "" %>>Select City</option>
-              <% @cities.each do |city| %>
-                  <% unless city.blank? %>
-                      <option value="<%= city %>" <%= @location[:city] == city ? "selected" : "" %>><%= city %></option>
-                  <% end %>
-              <% end %>
-
-            </select>
-          </div>
-
-          <br clear="all"/>
 
           <div class="field password">
             <%= f.label :password, "Choose a Password:" %>
             <%= f.password_field :password %>
           </div>
 
-          <div class="field password_confirmation right-side">
+          <div class="field password_confirmation">
             <%= f.label :password_confirmation, "Verify Password:" %>
             <%= f.password_field :password_confirmation %>
           </div>
 
-          <br clear="all"/>
-        </div>
-        <!-- end left column -->
-      </div>
-
-      <!-- sign in right column -->
-      <div class="register-right right w45"><br/>
-
-        <div class="ftue-instrumentlist-wrapper">
-          <label class="instruments">What instruments can you play?</label>
-
-          <div class="ftue-instrumentlist">
-            <table id="instrument_selector" class="instrument_selector" width="100%" cellpadding="0" cellspacing="6">
-              <% Instrument.standard_list.each do |instrument| %>
-                  <tr>
-                    <td>
-                      <input id="<%= instrument.id.gsub(" ", "") %>_checkbox" name="jam_ruby_user[instruments][<%= instrument.id %>][selected]" type="checkbox"/><%= instrument.description %>
-                    </td>
-                    <td align="right" width="50%">
-                      <select id="<%= instrument.id.gsub(" ", "") %>_proficiency" name="jam_ruby_user[instruments][<%= instrument.id %>][proficiency]" class='proficiency_selector easydropdown'>
-                        <option value="1">Beginner</option>
-                        <option value="2">Intermediate</option>
-                        <option value="3">Expert</option>
-                      </select></td>
-                  </tr>
-              <% end %>
-            </table>
-          </div>
-        </div>
 
           <div class="field terms_of_service">
             <small>
@@ -125,28 +53,22 @@
             </small>
           </div>
 
-        <div class="field recaptcha">
-          <% if Rails.application.config.recaptcha_enable %>
-            <div id="recaptcha_select" name="recaptcha_response_field" class="g-recaptcha" data-sitekey="<%=Rails.application.config.recaptcha_public_key%>" data-callback="recaptcha_success" data-expired-callback="recaptcha_expired">
-            </div>
-          <% end %>
-        </div>
+          <div class="field recaptcha">
+            <% if Rails.application.config.recaptcha_enable %>
+              <div id="recaptcha_select" name="recaptcha_response_field" class="g-recaptcha" data-sitekey="<%=Rails.application.config.recaptcha_public_key%>" data-callback="recaptcha_success" data-expired-callback="recaptcha_expired">
+              </div>
+            <% end %>
+          </div>
 
-        <!--
-      <img src="images/content/captcha.png" width="152" height="50" align="left" class="mr10" /><small>Enter the characters from the box to the left:<br />
-          <input type="text" /> <br clear="all" /><br />
-          -->
+          <div class="actions">
+            <%= f.submit "CREATE ACCOUNT", class: "button-orange disabled", id:"create-account-submit"%>
+            <%= link_to "CANCEL", root_path, :class=>'button-grey' %>
+          </div>
 
-        <div class="actions">
-          <%= f.submit "CREATE ACCOUNT", class: "button-orange disabled", id:"create-account-submit"%>
-          <%= link_to "CANCEL", root_path, :class=>'button-grey' %>
+          <br clear="all"/>
         </div>
-        <br style="clear:both;"/><br/>
-        <!--<a href="/auth/facebook" class="right"><img src="/fb-signup-button.png"></a> -->
 
       </div>
-      <br clear="all" />
-      <!-- end right column -->
 
   <% end %>