GRN2-180: First stages of refactoring code for v2.4 (#748)

* Email rescues and authenticator concern

* Application controller and helper clean up

* Moved controller code out of helpers

* More helper and email clean up

* Cleaned up remaining helpers and create omniauth_options

* Controller code clean up

* restructured views structure

* Restructured role code

* Restructured profile and code clean up

* Master merge

* Added bbb server concern to deal with bbb calls

* Bug fixes and changes after changes

* rspec

* More rubocop fixes

app/views/account_activations/show.html.erb

@@ -21,7 +21,9 @@
       </div>
       <div class="card-body">
         <p><%= t("verify.not_verified") %></p>
-        <%= render "/shared/components/resend_button" %>
+        <div class="btn-list text-right pt-8">
+          <%= button_to t("verify.resend"), resend_email_path, params: { email: params['email'], email_verified: false }, class: "btn btn-primary btn-space" %>
+        </div>
       </div>
     </div>
   </div>

app/views/admins/components/_settings.html.erb

@@ -22,7 +22,7 @@
         <div class="input-group">
           <input id="branding-url" type="text" class="form-control" value="<%= logo_image %>">
           <span class="input-group-append">
-            <button id="branding-image" onclick="changeBrandingImage('<%= admin_branding_path %>')" class="btn btn-primary" type="button"><%= t("administrator.site_settings.branding.change") %></button>
+            <button id="branding-image" onclick="changeBrandingImage('<%= admin_update_settings_path(setting: 'Branding Image') %>')" class="btn btn-primary" type="button"><%= t("administrator.site_settings.branding.change") %></button>
           </span>
         </div>
       </div>
@@ -34,9 +34,9 @@
         <label class="form-label"><%= t("administrator.site_settings.color.title") %></label>
         <label class="form-label text-muted"><%= t("administrator.site_settings.color.info") %></label>
           <div class="color-inputs">
-            <input id="coloring-path-regular" type="hidden" value="<%= admin_coloring_path%>">
-            <input id="coloring-path-lighten" type="hidden" value="<%= admin_coloring_lighten_path%>">
-            <input id="coloring-path-darken" type="hidden" value="<%= admin_coloring_darken_path%>">
+            <input id="coloring-path-regular" type="hidden" value="<%= admin_coloring_path %>">
+            <input id="coloring-path-lighten" type="hidden" value="<%= admin_update_settings_path(setting: "Primary Color Lighten") %>">
+            <input id="coloring-path-darken" type="hidden" value="<%= admin_update_settings_path(setting: "Primary Color Darken") %>">
 
             <div id="colorinput-regular" class="btn primary-regular mr-3">
               <%= t("administrator.site_settings.color.regular") %>
@@ -64,13 +64,13 @@
             <%= registration_method_string %>
           </button>
           <div class="dropdown-menu" aria-labelledby="registrationMethods">
-            <%= button_to admin_change_registration_path("open"), class: "dropdown-item" do %>
+            <%= button_to admin_change_registration_path(value: "open"), class: "dropdown-item" do %>
               <%= t("administrator.site_settings.registration.methods.open") %>
             <% end %>
-            <%= button_to admin_change_registration_path("invite"), class: "dropdown-item" do %>
+            <%= button_to admin_change_registration_path(value: "invite"), class: "dropdown-item" do %>
               <%= t("administrator.site_settings.registration.methods.invite") %>
             <% end %>
-            <%= button_to admin_change_registration_path("approval"), class: "dropdown-item" do %>
+            <%= button_to admin_change_registration_path(value: "approval"), class: "dropdown-item" do %>
               <%= t("administrator.site_settings.registration.methods.approval") %>
             <% end %>
           </div>
@@ -88,10 +88,10 @@
             <%= room_authentication_string %>
           </button>
           <div class="dropdown-menu" aria-labelledby="room-auth">
-            <%= button_to admin_room_authentication_path(value: "true"), class: "dropdown-item" do %>
+            <%= button_to admin_update_settings_path(setting: "Room Authentication", value: "true"), class: "dropdown-item" do %>
               <%= t("administrator.site_settings.authentication.enabled") %>
             <% end %>
-            <%= button_to admin_room_authentication_path(value: "false"), class: "dropdown-item" do %>
+            <%= button_to admin_update_settings_path(setting: "Room Authentication", value: "false"), class: "dropdown-item" do %>
               <%= t("administrator.site_settings.authentication.disabled") %>
             <% end %>
           </div>
@@ -109,10 +109,10 @@
             <%= recording_default_visibility_string %>
           </button>
           <div class="dropdown-menu" aria-labelledby="room-auth">
-            <%= button_to admin_recording_visibility_path(visibility: "public"), class: "dropdown-item" do %>
+            <%= button_to admin_update_settings_path(setting: "Default Recording Visibility", value: "public"), class: "dropdown-item" do %>
               <%= t("recording.visibility.public") %>
             <% end %>
-            <%= button_to admin_recording_visibility_path(visibility: "private"), class: "dropdown-item" do %>
+            <%= button_to admin_update_settings_path(setting: "Default Recording Visibility", value: "private"), class: "dropdown-item" do %>
               <%= t("recording.visibility.unlisted") %>
             <% end %>
           </div>
@@ -128,25 +128,25 @@
         <div class="row gutters-xs">
           <div class="col-auto">
             <label class="colorinput">
-              <%= button_to admin_room_limit_path(limit: 1), class: "colorinput-input" do %><% end %>
+              <%= button_to admin_update_settings_path(setting: "Room Limit", value: 1), class: "colorinput-input" do %><% end %>
               <span class="colorinput-color <%= room_limit_number == 1 ? "btn-primary" : "btn-outline-primary" %>">1</span>
             </label>
           </div>
           <div class="col-auto">
             <label class="colorinput">
-              <%= button_to admin_room_limit_path(limit: 5), class: "colorinput-input" do %><% end %>
+              <%= button_to admin_update_settings_path(setting: "Room Limit", value: 5), class: "colorinput-input" do %><% end %>
               <span class="colorinput-color <%= room_limit_number == 5 ? "btn-primary" : "btn-outline-primary" %>">5</span>
             </label>
           </div>
           <div class="col-auto">
             <label class="colorinput">
-              <%= button_to admin_room_limit_path(limit: 10), class: "colorinput-input" do %><% end %>
+              <%= button_to admin_update_settings_path(setting: "Room Limit", value: 10), class: "colorinput-input" do %><% end %>
               <span class="colorinput-color <%= room_limit_number == 10 ? "btn-primary" : "btn-outline-primary" %>">10</span>
             </label>
           </div>
           <div class="col-auto">
             <label class="colorinput">
-              <%= button_to admin_room_limit_path(limit: 15), class: "colorinput-input" do %><% end %>
+              <%= button_to admin_update_settings_path(setting: "Room Limit", value: 15), class: "colorinput-input" do %><% end %>
               <span class="colorinput-color <%= room_limit_number == 15 ? "btn-primary" : "btn-outline-primary" %>">15+</span>
             </label>
           </div>

app/views/admins/components/_users.html.erb

@@ -29,7 +29,7 @@
 %>
 
 <% unless @role.nil? %>
-  <%= render "shared/components/admins_tags" %>
+  <%= render "admins/components/admins_tags" %>
 <% end %>
 
 <div class="form-group">
@@ -88,7 +88,7 @@
                     <td><%= user.provider %></td>
                     <td class="text-center">
                       <% roles = user.roles().pluck(:name) %>
-                      <%= render "shared/components/admins_role", role: user.highest_priority_role %>
+                      <%= render "admins/components/admins_role", role: user.highest_priority_role %>
                     </td>
                     <td>
                       <% if roles.include?("pending") %>

app/views/admins/edit_user.html.erb

@@ -21,7 +21,7 @@
       <%= render "admins/components/menu_buttons" %>
     </div>
     <div id="edit_user" class="col-lg-9">
-      <%= render "shared/settings/setting_view", setting_id: "account", setting_title: t("settings.account.subtitle") %>
+      <%= render "users/components/setting_view", setting_id: "account", setting_title: t("settings.account.subtitle") %>
     </div>
   </div>
 </div>

app/views/main/index.html.erb

@@ -28,4 +28,4 @@
   </div>
 </div>
 
-<%= render "shared/features" %>
+<%= render "main/components/features" %>

app/views/rooms/join.html.erb

@@ -14,7 +14,7 @@
 %>
 
 <% valid_access_code = @room.access_code.nil? || @room.access_code.empty? || @room.access_code == session[:access_code] %>
-<%= render 'shared/room_event', render_recordings: valid_access_code do %>
+<%= render 'rooms/components/room_event', render_recordings: valid_access_code do %>
   <% if room_authentication_required %>
     <h2><%= t("administrator.site_settings.authentication.user-info") %></h2>
   <% elsif !valid_access_code %>
@@ -43,7 +43,7 @@
             readonly: !current_user.nil?, 
             autofocus: true
             %>
-        <%= f.submit (!@is_running && @anyone_can_start)? t("room.start") : t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
+        <%= f.submit (!@room_running && @anyone_can_start)? t("room.start") : t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
       </div>
     <% end %>
   <% end %>

app/views/rooms/show.html.erb

@@ -66,7 +66,7 @@
         <% end %>
       </div>
       <div class="offset-lg-1 col-lg-3 col-sm-12 force-bottom mt-5 pr-0">
-        <% if @is_running %>
+        <% if @room_running %>
           <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %>
         <% else %>
           <% unless exceeds_limit %>
@@ -80,20 +80,20 @@
       <% if current_user.rooms.length > 1 %>
         <div class="col-lg-4 col-md-6 col-sm-12">
           <%= link_to current_user.main_room do %>
-            <%= render "shared/components/room_block", room: current_user.main_room %>
+            <%= render "rooms/components/room_block", room: current_user.main_room %>
           <% end %>
         </div>
         <% current_user.secondary_rooms.each do |room| %>
           <div class="col-lg-4 col-md-6 col-sm-12">
             <%= link_to room do %>
-              <%= render "shared/components/room_block", room: room %>
+              <%= render "rooms/components/room_block", room: room %>
             <% end %>
           </div>
-          <%= render "shared/modals/delete_room_modal", recording_count: room.recording_count, room: room %>
+          <%= render "shared/modals/delete_room_modal", room: room %>
         <% end %>
       <% end %>
       <% unless room_limit_exceeded %>
-        <%= render "shared/components/create_room_block"%>
+        <%= render "rooms/components/create_room_block"%>
       <% end %>
     </div>
   </div>

app/views/rooms/wait.html.erb

@@ -13,7 +13,7 @@
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
 
-<%= render 'shared/room_event', render_recordings: true do %>
+<%= render 'rooms/components/room_event', render_recordings: true do %>
   <div class="row">
     <div class="col-9">
       <h3><%= t("room.wait.message") %></h3>

app/views/shared/components/_resend_button.html.erb

@@ -1,18 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-%>
-
-<div class="btn-list text-right pt-8">
-    <%= button_to t("verify.resend"), resend_email_path, params: { email: params['email'], email_verified: false }, class: "btn btn-primary btn-space" %>
-</div>

app/views/shared/components/_subtitle.html.erb

@@ -14,12 +14,13 @@
 %>
 
 <div class="row mt-2">
-  <div class="col-4">
-    <p class="subtitle"><%= subtitle %></p>
-  </div>
   <% if search %>
+    <div class="col-4">
+      <p class="subtitle"><%= subtitle %></p>
+    </div>
+
     <div class="col-8">
-      <% if display_invite %>
+      <% if invite_registration %>
         <div id="invite-user" class="d-inline-block float-right ml-3">
           <%= link_to "#inviteModal", :class => "btn btn-primary", "data-toggle": "modal" do %>
             <%= t("administrator.users.invite") %> <i class="fas fa-paper-plane ml-1"></i>
@@ -43,6 +44,10 @@
         </div>
       </div>
     </div>
+  <% else %>
+    <div class="col-12">
+      <p class="subtitle"><%= subtitle %></p>
+    </div>
   <% end %>
 </div>
 

app/views/shared/components/_terms_button.html.erb

@@ -1,18 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-%>
-
-<div class="btn-list text-right pt-8">
-    <%= button_to t("terms.accept_existing"), terms_path, params: { accept: true }, class: "btn btn-primary btn-space" %>
-</div>

app/views/shared/modals/_delete_room_modal.html.erb

@@ -34,8 +34,8 @@
         <div class="card-footer">
           <p>
             <%= t("modal.delete_room.warning").html_safe %>
-            <% if recording_count > 0 %>
-              <%= t("modal.delete_room.recording_warning", recordings_num: recording_count).html_safe %>
+            <% if @recordings.length > 0 %>
+              <%= t("modal.delete_room.recording_warning", recordings_num: @recordings.length).html_safe %>
             <% end %>
           </p>
         </div>

app/views/users/change_password.html.erb

@@ -12,7 +12,15 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
+<div class="container pt-6">
+  <%= render "shared/components/subtitle", subtitle: t("settings.title"), search: false %>
 
-<div class="btn-list text-right pt-8">
-    <%= button_to t("verify.accept"), confirm_path, params: { user_uid: params[:user_uid], email_verified: true }, class: "btn btn-primary btn-space" %>
+  <div class="row">
+    <div class="col-lg-3 mb-4">
+      <%= render "users/components/menu_buttons" %>
+    </div>
+    <div class="col-lg-9">
+      <%= render "users/components/setting_view", setting_id: "password", setting_title: t("settings.password.subtitle") %>
+    </div>
+  </div>
 </div>

app/views/users/components/_menu_buttons.html.erb

@@ -0,0 +1,26 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+%>
+
+<div class="list-group list-group-transparent mb-0">
+  <%= link_to edit_user_path, class: "list-group-item list-group-item-action dropdown-item #{"active" if active_page == "edit"}" do %>
+    <span class="icon mr-3"><i class="fas fa-user"></i></span><%= t("settings.account.title") %>
+  <% end %>
+  <%= link_to change_password_path, class: "list-group-item list-group-item-action dropdown-item #{"active" if active_page == "change_password"}" do %>
+    <span class="icon mr-3"><i class="fas fa-key"></i></span><%= t("settings.password.title") %>
+  <% end %>
+  <%= link_to delete_account_path, class: "list-group-item list-group-item-action dropdown-item #{"active" if active_page == "delete_account"}" do %>
+    <span class="icon mr-3"><i class="fas fa-trash-alt"></i></span><%= t("settings.delete.title") %>
+  <% end %>
+</div>

app/views/users/components/_setting_view.html.erb

@@ -17,10 +17,10 @@
   <div class="card-body p-6">
     <div class="card-title text-primary">
       <div class="form-group">
-        <%= render "shared/components/subtitle", subtitle: setting_title, search: setting_id == "users" %>
+        <%= render "shared/components/subtitle", subtitle: setting_title, search: false %>
       </div>
     </div>
 
-    <%= render "shared/settings/#{setting_id}" %>
+    <%= render "users/components/#{setting_id}" %>
   </div>
 <% end %>

app/views/users/delete_account.html.erb

@@ -12,11 +12,15 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
+<div class="container pt-6">
+  <%= render "shared/components/subtitle", subtitle: t("settings.title"), search: false %>
 
-<div class="form-group">
   <div class="row">
-    <div class="col-12">
-      <center><%= t("settings.design.not_supported") %></center>
+    <div class="col-lg-3 mb-4">
+      <%= render "users/components/menu_buttons" %>
+    </div>
+    <div class="col-lg-9">
+      <%= render "users/components/setting_view", setting_id: "delete", setting_title: t("settings.delete.subtitle") %>
     </div>
   </div>
 </div>

app/views/users/edit.html.erb

@@ -12,48 +12,15 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
-
 <div class="container pt-6">
   <%= render "shared/components/subtitle", subtitle: t("settings.title"), search: false %>
 
   <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 dropdown-item 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 dropdown-item 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="delete" class="list-group-item list-group-item-action dropdown-item 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>
-
-      <% if @user.errors.any? %>
-        <h5 class="mt-8"><%= t("errors.title") %>:</h5>
-        <ul>
-        <% @user.errors.full_messages.each do |err| %>
-          <li class="text-danger"><%= err %>.</li>
-        <% end %>
-        </ul>
-      <% end %>
+      <%= render "users/components/menu_buttons" %>
     </div>
-
-
     <div class="col-lg-9">
-      <%= render "shared/settings/setting_view", setting_id: "account", setting_title: t("settings.account.subtitle") %>
-
-      <% if @user.social_uid.nil? %>
-        <%= render "shared/settings/setting_view", setting_id: "password", setting_title: t("settings.password.subtitle") %>
-      <% end %>
-
-      <%= render "shared/settings/setting_view", setting_id: "delete", setting_title: t("settings.delete.subtitle") %>
+      <%= render "users/components/setting_view", setting_id: "account", setting_title: t("settings.account.subtitle") %>
     </div>
   </div>
 </div>

app/views/users/terms.html.erb

@@ -24,7 +24,9 @@
             <%= markdown(Rails.configuration.terms) %>
           </div>
           <% if Rails.configuration.terms && current_user && !current_user.accepted_terms %>
-            <%= render "/shared/components/terms_button" %>
+            <div class="btn-list text-right pt-8">
+              <%= button_to t("terms.accept_existing"), terms_path, params: { accept: true }, class: "btn btn-primary btn-space" %>
+            </div>
           <% end %>
         </form>
       </div>