Merge branch 'hotfix-1.1.3' into master

sean0x42 · Oct 27, 2018 · 596c100 · 596c100
2 parents 0d41202 + 985c463
commit 596c100
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/app/assets/stylesheets/components/_flash-messages.scss b/app/assets/stylesheets/components/_flash-messages.scss
@@ -49,6 +49,8 @@
 
   h3 {
     font-size: $font-size;
+    font-weight: 500;
+    letter-spacing: 0;
     line-height: $body-line-height;
     margin: 0.5rem 0 -0.25rem;
   }

diff --git a/app/controllers/players/passwords_controller.rb b/app/controllers/players/passwords_controller.rb
@@ -2,6 +2,8 @@
 
 # Players password controller
 class Players::PasswordsController < Devise::PasswordsController
+  respond_to :html, :js
+
   # GET /resource/password/new
   # def new
   #   super
@@ -29,7 +31,7 @@ class Players::PasswordsController < Devise::PasswordsController
   # end
 
   # The path used after sending reset password instructions
-  # def after_sending_reset_password_instructions_path_for(resource_name)
-  #   super(resource_name)
-  # end
+  def after_sending_reset_password_instructions_path_for(*)
+    root_path
+  end
 end
diff --git a/app/javascript/packs/components/modals/modal_controller.js b/app/javascript/packs/components/modals/modal_controller.js
@@ -5,8 +5,8 @@ let state = State.NONE;
 const queue = [];
 
 /**
- * Checks if there is a new modal in the queue to display. If there is, the state is updated appropriately and the new
- * modal is displayed.
+ * Checks if there is a new modal in the queue to display. If there is, the
+ * state is updated appropriately and the new modal is displayed.
  */
 const updateModalQueue = () => {
   if (state === State.DISPLAYING_MODAL || queue.length === 0) return;
@@ -94,6 +94,13 @@ window.constructModal = (title, subheading, html) => {
   checkForSelects();
 };
 
+/**
+ * Closes any currently open modal window.
+ */
+window.closeModal = () => {
+  closeCurrentModal();
+};
+
 // Listen to ajax before event
 addEventListener("ajax:before", (event) => {
   const { target } = event;

diff --git a/app/views/landing/release_notes.html.erb b/app/views/landing/release_notes.html.erb
@@ -7,13 +7,24 @@
   <h1><%= t('landing.release_notes.title') %></h1>
 
   <div class="release-notes">
+    <!-- 1.1.3 -->
+    <div class="release">
+      <h2><span class="version">1.1.3</span>October 27th, 2018</h2>
+      <ul>
+        <li>
+          <div class="change change-fixed">fixed</div>
+          <p>Fixed an issue preventing players from resetting their passwords <a href="https://github.com/sean0x42/riverrats.com.au/issues/105" class="anchor">#105</a>.</p>
+        </li>
+      </ul>
+    </div>
+
     <!-- 1.1.2 -->
     <div class="release">
       <h2><span class="version">1.1.2</span>October 26th, 2018</h2>
       <ul>
         <li>
           <div class="change change-fixed">fixed</div>
-          <p>Fixed a mail misconfiguration</p>
+          <p>Fixed a mail misconfiguration.</p>
         </li>
       </ul>
     </div>

diff --git a/app/views/players/passwords/_new_form.html.erb b/app/views/players/passwords/_new_form.html.erb
@@ -1,8 +1,7 @@
 <%= form_with model: resource, url: player_password_path, class: 'modal-form' do |form| %>
-  <%= devise_error_messages! %>
-
   <div class="field">
     <%= form.label :email %><br/>
+    <%= field_errors resource, :email %>
     <%= form.email_field :email, autofocus: true, placeholder: '[email protected]' %>
   </div>
 
@@ -12,4 +11,4 @@
     <p><%= link_to 'Sign in', new_player_session_path, class: 'anchor', remote: true, data: { expects_modal: true, disable: true } %>
       or <%= link_to 'sign up!', new_player_registration_path, class: 'anchor', remote: true, data: { expects_modal: true, disable: true } %></p>
   </div>
-<% end -%>
+<% end -%>
diff --git a/app/views/players/passwords/create.js.erb b/app/views/players/passwords/create.js.erb
@@ -0,0 +1,2 @@
+createFlash("Password reset sent.", "Please check your email.");
+closeModal();
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -14,7 +14,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'no-reply@riverrats.com.au'
+  config.mailer_sender = 'riverratspl@gmail.com'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -6,7 +6,7 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
-  version: "version 1.1.2"
+  version: "version 1.1.3"
   achievement:
     wins:
       title: "Winner Winner Chicken Dinner %{level}"