From 5c281a1a3ffb62d756c484062829afe72c902439 Mon Sep 17 00:00:00 2001
From: John Ma <jiama843@gmail.com>
Date: Wed, 3 Oct 2018 11:42:14 -0400
Subject: [PATCH] Fixes #278 (#282)

* <Fixed the main ui glitch>

* <Fixed issue>

* <Fixed code style>

* <Some more code style fixes>

* Update sessions_helper.rb
---
 app/assets/javascripts/settings.js  | 4 ++--
 app/controllers/users_controller.rb | 4 ++--
 app/views/users/edit.html.erb       | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/settings.js b/app/assets/javascripts/settings.js
index db4ee2b8..eb375729 100644
--- a/app/assets/javascripts/settings.js
+++ b/app/assets/javascripts/settings.js
@@ -20,12 +20,12 @@ $(document).on('turbolinks:load', function(){
   var action = $("body").data('action');
 
   // Only run on the settings page.
-  if (controller == "users" && action == "edit"){
+  if ((controller == "users" && action == "edit") || (controller == "users" && action == "update")){
     settingsButtons = $('.setting-btn');
     settingsViews = $('.setting-view');
 
     settingsButtons.each(function(i, btn) {
-      if(i != 0){ $(settingsViews[i]).hide(); }
+      if(!$(btn).hasClass("active")){ $(settingsViews[i]).hide(); }
       $(btn).click(function(){
         $(btn).addClass("active");
         settingsViews.each(function(i, view){
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d76b3aeb..968f6853 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -79,12 +79,12 @@ class UsersController < ApplicationController
       else
         # Append custom errors.
         errors.each { |k, v| @user.errors.add(k, v) }
-        render :edit
+        render :edit, params: { settings: params[:settings] }
       end
     elsif @user.update_attributes(user_params)
       redirect_to edit_user_path(@user), notice: I18n.t("info_update_success")
     else
-      render :edit
+      render :edit, params: { settings: params[:settings] }
     end
   end
 
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index b48f1add..7e559297 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -19,21 +19,22 @@
   <div class="row">
     <div class="col-lg-3 mb-4">
       <div class="list-group list-group-transparent mb-0">
-        <button id="account" class="list-group-item list-group-item-action setting-btn active">
+        
+        <button id="account" class="list-group-item list-group-item-action setting-btn <%= "active" if !params[:setting] || params[:setting] == "account"%>">
           <span class="icon mr-3"><i class="fas fa-user"></i></span><%= t("settings.account.title") %>
         </button>
 
         <% if @user.social_uid.nil? %>
-          <button id="password" class="list-group-item list-group-item-action setting-btn">
+          <button id="password" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "password"%>">
             <span class="icon mr-3"><i class="fas fa-lock"></i></span><%= t("settings.password.title") %>
           </button>
         <% end %>
 
-        <button id="design" class="list-group-item list-group-item-action setting-btn">
+        <button id="design" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "design"%>">
           <span class="icon mr-3"><i class="fas fa-edit"></i></span><%= t("settings.design.title") %>
         </button>
 
-        <button id="delete" class="list-group-item list-group-item-action setting-btn">
+        <button id="delete" class="list-group-item list-group-item-action setting-btn <%= "active" if params[:setting] == "delete"%>">
           <span class="icon mr-3"><i class="fas fa-trash-alt"></i></span><%= t("settings.delete.title") %>
         </button>
       </div>