Merge pull request rubyforgood#4674 from rubyforgood/new_theme

New theme

.gitignore

@@ -19,7 +19,6 @@
 /storage/*
 !/storage/.keep
 
-/public/assets
 .byebug_history
 
 # Ignore master key for decrypting credentials and more.

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.1.3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1.2-alpine AS builder
+FROM ruby:3.1.3-alpine AS builder
 
 LABEL maintainer="[email protected]"
 
@@ -25,7 +25,7 @@ RUN yarn build && yarn build:css
 
 ### BUILD STEP DONE ###
 
-FROM ruby:3.1.2-alpine
+FROM ruby:3.1.3-alpine
 
 ARG RAILS_ROOT=/usr/src/app/
 

Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-ruby "3.1.2"
+ruby "3.1.3"
 gem "rails", "~> 7.0.4"
 
 gem "after_party" # post-deployment tasks

Gemfile.lock

@@ -508,6 +508,7 @@ PLATFORMS
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -581,7 +582,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.1.3p185
 
 BUNDLED WITH
    2.3.4

app/assets/config/manifest.js

@@ -2,3 +2,4 @@
 //= link_directory ../builds .js
 //= link_tree ../images
 //= link_tree ../fonts
+//= link shared/noscript.css

app/assets/stylesheets/application.scss

@@ -8,6 +8,7 @@
 @use "@fortawesome/fontawesome-free/scss/fontawesome";
 @use "@fortawesome/fontawesome-free/scss/solid";
 @use "select2/dist/css/select2";
+@use "select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme";
 
 // custom css for the app
 @use "base/breakpoints";

app/assets/stylesheets/pages/password.scss

@@ -1,7 +1,7 @@
 @use "../base/variables.scss" as globals;
 
 .password-box {
-  width: 450px;
+  width: 80%;
   margin: 10% auto;
   text-align: center;
   border-radius: 25px;

app/assets/stylesheets/shared/footer.scss

@@ -1,95 +1,95 @@
-@use "../base/variables" as globals;
-@use "../base/breakpoints.scss" as screen-sizes;
-
-footer {
-  padding: 2rem 0;
-  text-align: center;
-  background-color: globals.$primary;
-  color: #fff;
-
-  .default-footer {
-    a.rfglink {
-      color: #fff;
-    }
-
-    .rfglogo {
-      max-height: 3em;
-    }
-  }
-  .terms-conditions-link {
-    color:#fff;
-  }
-
-  .footer-logos {
-    .rfglink {
-      .rfglogo {
-        max-height: 6em;
-      }
-    }
-  }
-
-  ul {
-    list-style: none;
-    padding-left: 0;
-    margin-top: 2rem;
-  }
-
-  li {
-    display: inline-block;
-
-    a, a:hover {
-      color: white;
-    }
-  }
-
-  li:not(:first-child):before {
-    content: " | ";
-  }
-
-  .address {
-    margin-bottom: 2rem;
-  }
-
-  .copyright {
-    font-size: 18px;
-    font-weight: 700;
-  }
-}
-
-.footer.container-fluid {
-  min-height: calc(100vh - 45px);
-}
-
-footer.logged-in {
-  position: relative;
-  height: 40px;
-  left: 0px;
-  bottom: 0px;
-  background: #F8F8F8;
-  box-shadow: 0px -2px 12px rgba(0, 0, 0, 0.25);
-  padding: 2rem;
-  padding-top: 1rem;
-  padding-left: 2%;
-  margin-left: 320px;
-  width: calc(100% - 320px);
-
-  span {
-    font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 400;
-    font-size: 14px;
-    line-height: 140%;
-    color: #2E2E2E;
-  }
-
-  a {
-    white-space: nowrap;
-  }
-
-  @media only screen and (max-width: screen-sizes.$mobile) {
-    width: 100%;
-    margin-left: 0;
-    padding-bottom: 1rem;
-    height: 100px;
-  }
-}
+//@use "../base/variables" as globals;
+//@use "../base/breakpoints.scss" as screen-sizes;
+//
+//footer {
+//  padding: 2rem 0;
+//  text-align: center;
+//  background-color: globals.$primary;
+//  color: #fff;
+//
+//  .default-footer {
+//    a.rfglink {
+//      color: #fff;
+//    }
+//
+//    .rfglogo {
+//      max-height: 3em;
+//    }
+//  }
+//  .terms-conditions-link {
+//    color:#fff;
+//  }
+//
+//  .footer-logos {
+//    .rfglink {
+//      .rfglogo {
+//        max-height: 6em;
+//      }
+//    }
+//  }
+//
+//  ul {
+//    list-style: none;
+//    padding-left: 0;
+//    margin-top: 2rem;
+//  }
+//
+//  li {
+//    display: inline-block;
+//
+//    a, a:hover {
+//      color: white;
+//    }
+//  }
+//
+//  li:not(:first-child):before {
+//    content: " | ";
+//  }
+//
+//  .address {
+//    margin-bottom: 2rem;
+//  }
+//
+//  .copyright {
+//    font-size: 18px;
+//    font-weight: 700;
+//  }
+//}
+//
+//.footer.container-fluid {
+//  min-height: calc(100vh - 45px);
+//}
+//
+//footer.logged-in {
+//  position: relative;
+//  height: 40px;
+//  left: 0px;
+//  bottom: 0px;
+//  background: #F8F8F8;
+//  box-shadow: 0px -2px 12px rgba(0, 0, 0, 0.25);
+//  padding: 2rem;
+//  padding-top: 1rem;
+//  padding-left: 2%;
+//  margin-left: 320px;
+//  width: calc(100% - 320px);
+//
+//  span {
+//    font-family: 'Montserrat';
+//    font-style: normal;
+//    font-weight: 400;
+//    font-size: 14px;
+//    line-height: 140%;
+//    color: #2E2E2E;
+//  }
+//
+//  a {
+//    white-space: nowrap;
+//  }
+//
+//  @media only screen and (max-width: screen-sizes.$mobile) {
+//    width: 100%;
+//    margin-left: 0;
+//    padding-bottom: 1rem;
+//    height: 100px;
+//  }
+//}

app/assets/stylesheets/shared/noscript.css

@@ -1,9 +1,8 @@
-noscript div {
-  color: #b71c1c;
+.noscript {
   position: fixed;
   left: 50%;
+  top: 25%;
   transform: translateX(-50%);
-  background: #eee;
-  padding: 0 1em;
+  padding: 5vw;
   z-index: 99;
 }

app/assets/webfonts/fa-solid-900.ttf

@@ -0,0 +1 @@
+../../../node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf

app/assets/webfonts/fa-solid-900.woff2

@@ -0,0 +1 @@
+../../../node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2

app/controllers/case_contacts_controller.rb

@@ -81,9 +81,9 @@ def create
       @casa_cases = [@case_contact.casa_case]
       render :new
     elsif @selected_cases.count > 1
-      redirect_to case_contacts_path(success: true)
+      redirect_to case_contacts_path(success: true), notice: "Case contacts successfully created"
     else
-      redirect_to casa_case_path(CaseContact.last.casa_case, success: true)
+      redirect_to casa_case_path(CaseContact.last.casa_case, success: true), notice: "Case contact successfully created"
     end
   end
 

app/controllers/static_controller.rb

@@ -0,0 +1,23 @@
+# Provides a means to present static pages that still use the site layout
+class StaticController < ApplicationController
+  skip_before_action :authenticate_user!
+  skip_before_action :set_current_user
+  skip_before_action :set_current_organization
+
+  layout false
+
+  def index
+    redirect_to dashboard_path_from_current_role if current_user
+  end
+
+  def register
+  end
+
+  def page
+    # This allows for a flexible addition of static content
+    # Anything under the url /pages/:name will render the file /app/views/static/[name].html.erb
+    # Example: /pages/contact renders /app/views/static/contact.html.erb
+    # Example2: /pages/index renders /app/views/static/index.html.erb, even when logged in
+    render template: "static/#{params[:name]}"
+  end
+end

app/decorators/case_contact_decorator.rb

@@ -71,17 +71,17 @@ def report_contact_types
   def medium_icon_classes
     case object.medium_type
     when CaseContact::IN_PERSON
-      "fas fa-users"
+      "lni lni-users"
     when CaseContact::TEXT_EMAIL
-      "fas fa-envelope"
+      "lni lni-envelope"
     when CaseContact::VIDEO
-      "fas fa-video"
+      "lni lni-camera"
     when CaseContact::VOICE_ONLY
-      "fas fa-phone-square-alt"
+      "lni lni-phone"
     when CaseContact::LETTER
-      "fas fa-file-alt"
+      "lni lni-empty-file"
     else
-      "fas fa-question"
+      "lni lni-question-circle"
     end
   end
 

app/helpers/sidebar_helper.rb

@@ -11,7 +11,7 @@ def inbox_label
     "Inbox <span class='badge badge-danger'>#{unread_count}</span>".html_safe
   end
 
-  def menu_item(label:, path:, visible: true)
+  def menu_item(label:, path:, visible: false)
     link_to label, path, class: "list-group-item #{active_class(path)}" if visible
   end
 

app/javascript/application.js

@@ -1,8 +1,8 @@
 /* global window */
 
+import './jQueryGlobalizer.js'
 import 'bootstrap'
 import 'bootstrap-select'
-import './jQueryGlobalizer.js'
 import './sweet-alert-confirm.js'
 
 require('datatables.net-dt')(null, window.jQuery) // First parameter is the global object. Defaults to window if null
@@ -22,12 +22,13 @@ require('./src/casa_case')
 require('./src/new_casa_case')
 require('./src/dashboard')
 require('./src/emancipations')
-require('./src/require_communication_preference')
 require('./src/import')
 require('./src/password_confirmation')
+require('./src/plainadmin')
 require('./src/read_more')
+require('./src/reimbursements')
 require('./src/reports')
+require('./src/require_communication_preference')
 require('./src/select')
 require('./src/sidebar')
 require('./src/tooltip')
-require('./src/reimbursements')