GRN2-xx: General bug fixes and performance upgrades (#734)

* General bug fixes and performance upgrades

* Removed unused lines

Gemfile

@@ -60,6 +60,7 @@ gem 'bigbluebutton-api-ruby'
 gem 'bootstrap', '~> 4.3.1'
 gem 'tabler-rubygem', git: 'https://github.com/vbalazs/tabler-rubygem.git', branch: 'fix-sass'
 gem 'pagy'
+gem 'font-awesome-sass', '~> 5.9.0'
 
 # For detecting the users preferred language.
 gem 'http_accept_language'

Gemfile.lock

@@ -132,6 +132,8 @@ GEM
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
+    font-awesome-sass (5.9.0)
+      sassc (>= 1.11)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (0.4.0)
@@ -359,6 +361,7 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   faker
+  font-awesome-sass (~> 5.9.0)
   health_check
   http_accept_language
   i18n-language-mapping (~> 0.1.0)
@@ -395,5 +398,4 @@ DEPENDENCIES
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
-  webmock
-
+  webmock

app/assets/javascripts/application.js

@@ -33,4 +33,5 @@
 //= require jquery_ujs
 //= require jquery-ui/widget
 //= require jquery-ui/widgets/sortable
+//= require pickr.min.js
 //= require_tree .

app/assets/stylesheets/application.scss

@@ -34,14 +34,18 @@
 @import "bootstrap";
 @import "jquery-ui/sortable";
 @import "tabler-custom";
+@import "font-awesome-sprockets";
+@import "font-awesome";
 
 @import "utilities/variables";
 @import "admins";
 @import "main";
 @import "rooms";
 @import "sessions";
+@import "monolith.min.css";
 
 @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,500,500i,600,600i,700,700i&subset=latin-ext);
+@import url(https://fonts.googleapis.com/css?family=Roboto:400,500);
 
 * {
   outline: none !important;

app/controllers/sessions_controller.rb

@@ -36,7 +36,7 @@ class SessionsController < ApplicationController
       user = admin
     else
       user = User.find_by(email: session_params[:email], provider: @user_domain)
-      redirect_to(signin_path, alert: I18n.t("invalid_user")) && return unless user
+      redirect_to(signin_path, alert: I18n.t("invalid_credentials")) && return unless user
       redirect_to(root_path, alert: I18n.t("invalid_login_method")) && return unless user.greenlight_account?
       redirect_to(account_activation_path(email: user.email)) && return unless user.activated?
     end

app/views/application/migration_error.html.erb

@@ -18,10 +18,10 @@
   <h1 class="h3 mb-2"><%= t("errors.migration_error.notice").html_safe %></h1>
   <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.migration_error.contact_admin") %></p>
   <h1 class="h3 mb-3"><%= t("errors.migration_error.version") %></h1>
-  <a class="btn btn-success mt-3 mx-3" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10" target="_blank">
+  <a class="btn btn-success mt-3 mx-3" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10" target="_blank" rel="noopener">
     <i class="far fa-star mr-2"></i><%= t("errors.migration_error.upgrade") %>
   </a>
-  <a class="btn btn-info mt-3 mx-3 w-20" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#remaining-on-greenlight-10" target="_blank">
+  <a class="btn btn-info mt-3 mx-3 w-20" href="http://docs.bigbluebutton.org/install/greenlight-v2.html#remaining-on-greenlight-10" target="_blank" rel="noopener">
     <i class="far fa-hand-paper mr-2"></i><%= t("errors.migration_error.continue") %>
   </a>
 </div>

app/views/layouts/application.html.erb

@@ -19,8 +19,6 @@
     <title><%= t("bigbluebutton") %></title>
     <%= csrf_meta_tags %>
 
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
-
     <!-- Global javascript variables and helpers. -->
     <script type="text/javascript">
       window.GreenLight = {};
@@ -28,16 +26,9 @@
       window.GreenLight.RELATIVE_ROOT = "<%= relative_root %>"
     </script>
 
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,500" rel="stylesheet">
-
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
 
-
-    <!-- Because of turbolinks, this will only load once -->
-    <%= stylesheet_link_tag    "https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/monolith.min.css" %>
-    <%= javascript_include_tag "https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.min.js" %>
-
     <!-- Primary color styling -->
     <%= stylesheet_link_tag themes_primary_path %>
 
@@ -71,7 +62,7 @@
           <div class="flash alert d-inline">
             <i class="fas fa-exclamation-triangle"></i>
             <p class="d-inline"><%= t("test_install",
-              href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank")
+              href: link_to(t("docs").downcase, "http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight", target: "_blank", rel: "noopener")
             ).html_safe %>
           </div>
         </div>

app/views/main/index.html.erb

@@ -18,7 +18,7 @@
     <div class="row">
       <div class="col-md-12 col-sm-12 text-center">
         <h1 id="main-text" class="display-4 mb-4"> <%= t("landing.welcome").html_safe %></h1>
-        <p class="lead offset-lg-2 col-lg-8 col-sm-12 "><%= t("landing.about", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank")).html_safe %></p>
+        <p class="lead offset-lg-2 col-lg-8 col-sm-12 "><%= t("landing.about", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %></p>
         <%= link_to "https://youtu.be/Hso8yLzkqj8", target: "_blank" do %>
           <h4><%= t("landing.video") %> <i class="far fa-play-circle ml-1"></i></h4>
         <% end %>

app/views/shared/_footer.html.erb

@@ -14,7 +14,7 @@
 %>
 
 <footer class="footer pt-3">
-  <p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank")).html_safe %> <%= Greenlight::Application::VERSION %></p>
+  <p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %> <%= Greenlight::Application::VERSION %></p>
 </footer>
 
 <%= render "shared/components/cookie_warning" %>

app/views/shared/_header.html.erb

@@ -73,7 +73,7 @@
                 <% end %>
               <% end %>
               <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="http://docs.bigbluebutton.org/install/greenlight-v2.html" target="_blank">
+              <a class="dropdown-item" href="http://docs.bigbluebutton.org/install/greenlight-v2.html" target="_blank" rel="noopener">
                 <i class="dropdown-icon far fa-question-circle"></i> <%= t("header.dropdown.help") %>
               </a>
               <%= link_to logout_path, class: "dropdown-item" do %>

config/locales/en.yml

@@ -210,8 +210,7 @@ en:
       signout: Sign out
   home_room: Home Room
   info_update_success: Information successfully updated.
-  invalid_user: Login failed due to user not found. Are you sure the email account is correct?
-  invalid_credentials: Login failed due to invalid credentials. Are you sure you entered them correctly?
+  invalid_credentials: The email and password you entered did not match our records. Try again or click Forgot Password to reset your password.
   invalid_login_method: Login failed due to account mismatch. You need to log in with omniauth.
   invite_message: "To invite someone to the meeting, send them this link:"
   javascript: