Merge pull request #560 from better-together-org/fix/trix-uploads

Fix/trix attachment uploads

Author: rsmithlal

Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    better_together (0.4.0)
+    better_together (0.4.1)
       activerecord-import
       activerecord-postgis-adapter
       bootstrap (~> 5.3.2)

app/controllers/better_together/application_controller.rb

@@ -3,6 +3,7 @@
 module BetterTogether
   # Base application controller for engine
   class ApplicationController < ActionController::Base
+    include ActiveStorage::SetCurrent
     include Pundit::Authorization
 
     protect_from_forgery with: :exception

app/javascript/better_together/controllers/trix_controller.js

@@ -0,0 +1,19 @@
+// app/javascripts/better_together/controllers/trix_controller.js
+
+import { Controller } from "@hotwired/stimulus";
+
+export default class TrixController extends Controller {
+
+  connect() {
+
+    // wait for the trix editor is attached to the DOM to do stuff
+    addEventListener("trix-initialize", function (event) {
+      console.log("im inititalized!");
+      // ...
+      // add underline code
+      // remove buttons code
+      // add custom icons code here
+      // ...
+    }, true);
+  }
+}

app/views/better_together/pages/_form.html.erb

@@ -39,7 +39,11 @@
 
     <div class="row mb-3">
       <%= form.label :content %>
-      <%= form.rich_text_area :content, class: "form-control#{' is-invalid' if page.errors[:content].any?}" %>
+      <%=
+        form.rich_text_area :content,
+                            class: "form-control#{' is-invalid' if page.errors[:content].any?}",
+                            data: { controller: 'trix' }
+      %>
       <% if page.errors[:content].any? %>
         <div class="invalid-feedback">
           <%= page.errors[:content].join(", ") %>

lib/better_together/engine.rb

@@ -40,11 +40,19 @@ class Engine < ::Rails::Engine
       require_dependency 'rack/cors'
     end
 
-    config.action_mailer.default_url_options = {
+    default_url_options = {
       host: ENV.fetch('APP_HOST', 'localhost:3000'),
-      locale: I18n.locale
+      protocol: ENV.fetch('APP_PROTOCOL', 'http'),
+      locale: ENV.fetch('APP_LOCALE', I18n.locale)
     }
 
+    routes.default_url_options =
+      config.action_mailer.default_url_options =
+        config.default_url_options =
+          default_url_options
+
+    config.time_zone = ENV.fetch('APP_TIME_ZONE', 'Newfoundland')
+
     initializer 'better_together.importmap', before: 'importmap' do |app|
       app.config.importmap.paths << Engine.root.join('config/importmap.rb')
 

lib/better_together/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterTogether
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end