Merge pull request #720 from rdunlop/fix_wysiwyg

update tinymce editor, and allow creation of new tenants from the non…

Gemfile.lock

@@ -303,7 +303,7 @@ GEM
     net-ssh (7.0.1)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     numerizer (0.1.1)
@@ -320,7 +320,7 @@ GEM
     public_suffix (4.0.7)
     pundit (2.2.0)
       activesupport (>= 3.0.0)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -473,7 +473,7 @@ GEM
     tilt (2.0.11)
     timeout (0.3.0)
     timers (4.3.5)
-    tinymce-rails (4.9.3)
+    tinymce-rails (6.3.1)
       railties (>= 3.1.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
@@ -495,7 +495,7 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

README.rdoc

@@ -39,8 +39,7 @@ To do this:
 1. install `docker `and `docker-compose`.
 1. run `docker-compose up`
 1. Create the database schema with `docker-compose exec app bundle exec rake db:create db:schema:load`
-1. Add an entry to your /etc/hosts file `sudo vi /etc/hosts`: `127.0.0.1 www.local.com`
-1. open http://www.local.com:3000/new
+1. open http://www.lvh.me:3000/new
 1. Create a new database `docker-compose run app bundle exec rake db:create db:schema:load`
 
 Setup the database

app/controllers/application_controller.rb

@@ -39,7 +39,13 @@ def load_config
     @config = Rulebook.current_rulebook
 
     # if there is no subdomain specified, redirect to the 'choose-subdomain' page
-    redirect_to welcome_index_all_path, flash: { alert: "Invalid subdomain" } if @config.nil? && !(controller_name == "welcome" && (action_name == "index_all" || action_name == "new_location"))
+    if @config.nil? &&
+       !(
+         (controller_name == "welcome" && (action_name == "index_all" || action_name == "new_location")) ||
+         (controller_name == "rulebooks")
+       )
+      redirect_to welcome_index_all_path, flash: { alert: "Invalid subdomain" }
+    end
   end
 
   def set_base_breadcrumb

config/environments/development.rb

@@ -67,4 +67,6 @@
 
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
+
+  config.hosts << "www.lvh.me"
 end