Merge branch 'dev' into feature/github-integration

Signed-off-by: Robert Smith <[email protected]>

Author: rsmithlal

.rubocop.yml

@@ -2,9 +2,9 @@ AllCops:
   Exclude:
     - 'bin/*'
     - 'node_modules/**/*'
-    - 'spec/dummy/db/schema.rb'
+    # - 'spec/dummy/db/schema.rb'
     - 'vendor/**/*'
   NewCops: enable
-Style/StringLiterals:
-  Exclude:
-    - 'db/migrate/*'
+# Style/StringLiterals:
+#   Exclude:
+#     - 'db/migrate/*'

Gemfile.lock

@@ -24,6 +24,7 @@ PATH
       active_storage_validations
       activerecord-import
       activerecord-postgis-adapter
+      acts_as_tenant
       bootstrap (~> 5.3.2)
       dartsass-sprockets (~> 3.1)
       devise
@@ -117,7 +118,7 @@ GEM
       rails-html-sanitizer (~> 1.6)
     active_storage_svg_sanitizer (0.1.0)
       rails (>= 5.2)
-    active_storage_validations (1.4.0)
+    active_storage_validations (2.0.2)
       activejob (>= 6.1.4)
       activemodel (>= 6.1.4)
       activestorage (>= 6.1.4)
@@ -156,6 +157,8 @@ GEM
       mutex_m
       securerandom (>= 0.3)
       tzinfo (~> 2.0)
+    acts_as_tenant (1.0.1)
+      rails (>= 6.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     asset_sync (2.19.2)
@@ -424,7 +427,7 @@ GEM
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2025.0107)
-    mini_magick (5.1.2)
+    mini_magick (5.2.0)
       benchmark
       logger
     mini_mime (1.1.5)
@@ -450,7 +453,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
     nokogiri (1.18.3-x86_64-linux-gnu)
@@ -511,7 +514,7 @@ GEM
     pundit (2.4.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (3.1.10)
+    rack (3.1.11)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-mini-profiler (3.3.1)
@@ -661,11 +664,11 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (2.4.1)
-    sass-embedded (1.83.4-x86_64-linux-gnu)
+    sass-embedded (1.85.1-x86_64-linux-gnu)
       google-protobuf (~> 4.29)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sassc-embedded (1.80.1)
+    sassc-embedded (1.80.4)
       sass-embedded (~> 1.80)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
@@ -716,7 +719,7 @@ GEM
     stackprof (0.2.27)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.2)
+    stringio (3.1.5)
     sync (0.5.0)
     term-ansicolor (1.11.2)
       tins (~> 1.0)
@@ -733,17 +736,17 @@ GEM
     trailblazer-option (0.1.2)
     translate_enum (0.2.0)
       activesupport
-    turbo-rails (2.0.11)
-      actionpack (>= 6.0.0)
-      railties (>= 6.0.0)
+    turbo-rails (2.0.13)
+      actionpack (>= 7.1.0)
+      railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
     unf (0.2.0)
     unicode-display_width (2.6.0)
-    uri (1.0.2)
+    uri (1.0.3)
     version_gem (1.1.4)
     virtus (2.0.0)
       axiom-types (~> 0.1)
@@ -768,7 +771,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.2)
 
 PLATFORMS
   x86_64-linux

app/assets/stylesheets/better_together/theme.scss

@@ -1,3 +1,24 @@
+// New to NL colour palette
+$blue-1: #004BA8;
+$blue-2: #3E78B2;
+$beige:  #EAF0CE;
+$teal:  #5a8f9b;
+$beige-light: lighten($beige, 10%);
+$green-2: #70A288;
+$green-1: #42b983; // variant
+
+// Override the color variables in the host application
+$primary: $green-1; /* Change to a different blue */
+$secondary: $green-2; /* Change to a different green */
+$success: $green-2;
+$info: $green-1;
+$warning: #C9B947;
+$danger: #BF4A47;
+$text-opposite-theme-color: #222; /* Darker text */
+$background-opposite-theme-color: #f0f0f0; /* Lighter background */
+$light-background-text-color: #222;
+$dark-background-text-color: #f0f0f0;
+
 @import "bootstrap/functions";
 @import "bootstrap/variables";
 

app/controllers/better_together/pages_controller.rb

@@ -5,6 +5,8 @@ module BetterTogether
   class PagesController < FriendlyResourceController # rubocop:todo Metrics/ClassLength
     before_action :set_page, only: %i[show edit update destroy]
 
+    skip_before_action :check_platform_setup, unless: -> { ::BetterTogether::Platform.where(host: true).any? }
+
     before_action only: %i[new edit], if: -> { Rails.env.development? } do
       # Make sure that all BLock subclasses are loaded in dev to generate new block buttons
       BetterTogether::Content::Block.load_all_subclasses

app/controllers/better_together/seeds_controller.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # CRUD for Seed records
+  class SeedsController < ApplicationController
+    before_action :set_seed, only: %i[show edit update destroy]
+
+    # GET /seeds
+    def index
+      @seeds = Seed.all
+    end
+
+    # GET /seeds/1
+    def show; end
+
+    # GET /seeds/new
+    def new
+      @seed = Seed.new
+    end
+
+    # GET /seeds/1/edit
+    def edit; end
+
+    # POST /seeds
+    def create
+      @seed = Seed.new(seed_params)
+
+      if @seed.save
+        redirect_to @seed, notice: 'Seed was successfully created.'
+      else
+        render :new, status: :unprocessable_entity
+      end
+    end
+
+    # PATCH/PUT /seeds/1
+    def update
+      if @seed.update(seed_params)
+        redirect_to @seed, notice: 'Seed was successfully updated.', status: :see_other
+      else
+        render :edit, status: :unprocessable_entity
+      end
+    end
+
+    # DELETE /seeds/1
+    def destroy
+      @seed.destroy!
+      redirect_to seeds_url, notice: 'Seed was successfully destroyed.', status: :see_other
+    end
+
+    private
+
+    # Use callbacks to share common setup or constraints between actions.
+    def set_seed
+      @seed = Seed.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def seed_params
+      params.fetch(:seed, {})
+    end
+  end
+end

app/controllers/concerns/better_together/wizard_methods.rb

@@ -16,6 +16,7 @@ def determine_wizard_outcome # rubocop:todo Metrics/AbcSize
 
       if wizard.completed?
         flash[:notice] = wizard.success_message
+        # TODO: This needs to be adjusted for private platforms. Flash message is not retained after wizard completion
         redirect_to wizard.success_path
       else
         next_step_path, flash_key, message = wizard_next_step_info

app/helpers/better_together/form_helper.rb

@@ -23,7 +23,7 @@ def language_select_field(form: nil, field_name: :locale, selected_locale: I18n.
 
     def locale_options_for_select(selected_locale = I18n.locale)
       options_for_select(
-        I18n.available_locales.map { |locale| [I18n.t("locales.#{locale}", locale:), locale] },
+        I18n.available_locales.map { |locale| [I18n.t("better_together.languages.#{locale}", locale:), locale] },
         selected_locale
       )
     end

app/helpers/better_together/seeds_helper.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  module SeedsHelper # rubocop:todo Style/Documentation
+  end
+end

app/helpers/better_together/translatable_fields_helper.rb

@@ -40,7 +40,7 @@ def tab_button(locale, unique_locale_attribute, translation_present) # rubocop:t
                   type: 'button',
                   aria: { controls: "#{unique_locale_attribute}-field",
                           selected: locale.to_s == I18n.locale.to_s }) do
-        (t("locales.#{locale}") + translation_indicator(translation_present)).html_safe
+        (t("better_together.languages.#{locale}") + translation_indicator(translation_present)).html_safe
       end
     end
 
@@ -73,7 +73,7 @@ def dropdown_menu(_attribute, locale, unique_locale_attribute, base_url) # ruboc
       content_tag(:ul, class: 'dropdown-menu') do
         I18n.available_locales.reject { |available_locale| available_locale == locale }.map do |available_locale|
           content_tag(:li) do
-            link_to "AI Translate from #{I18n.t("locales.#{available_locale}")}", '#ai-translate',
+            link_to "AI Translate from #{I18n.t("better_together.languages.#{available_locale}")}", '#ai-translate',
                     class: 'dropdown-item',
                     data: {
                       'better_together--translation-target' => 'aiTranslate',

app/javascript/controllers/better_together/time_zone_controller.js

@@ -0,0 +1,20 @@
+import { Controller } from "stimulus"
+
+export default class extends Controller {
+  static targets = [ "select" ]
+
+  connect() {
+    // Called when the controller is initialized and the element is in the DOM
+    const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+    if (this.hasSelectTarget) {
+      const options = this.selectTarget.options;
+      for (let i = 0; i < options.length; i++) {
+        if (options[i].value === userTimeZone) {
+          this.selectTarget.selectedIndex = i;
+          break;
+        }
+      }
+    }
+  }
+}