Merge pull request #712 from rubyforgood/709-organization-email-text

Default Organization Email Text

Author: seanmarcia

.babelrc

@@ -0,0 +1,18 @@
+{
+  "presets": [
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": "> 1%",
+        "uglify": true
+      },
+      "useBuiltIns": true
+    }]
+  ],
+
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-object-rest-spread",
+    ["transform-class-properties", { "spec": true }]
+  ]
+}

.gitignore

@@ -49,3 +49,8 @@ pdx_db_test
 # Ignore Docker stuff (see issues #503, #603)
 Dockerfile
 docker-compose.yml
+/public/packs
+/public/packs-test
+/node_modules
+yarn-debug.log*
+.yarn-integrity

.postcssrc.yml

@@ -0,0 +1,3 @@
+plugins:
+  postcss-import: {}
+  postcss-cssnext: {}

.rubocop.yml

@@ -18,6 +18,7 @@ AllCops:
     - "Vagrantfile"
     - "Rakefile"
     - "tmp/*"
+    - "node_modules/**/*"
   UseCache: false
 Bundler/OrderedGems:
   Enabled: false

.travis.yml

@@ -3,9 +3,20 @@ sudo: required
 addons:
   chrome: stable
   postgresql: "9.6"
+cache:
+  bundler: true
+  yarn: true
+  directories:
+    - node_modules
 before_install:
 - gem update --system
 - gem install bundler
+install:
+- bundle install
+- nvm install node
+- node -v
+- npm i -g yarn
+- yarn install
 script:
 - export RAILS_ENV=test
 - bundle exec rake db:create db:migrate

Gemfile

@@ -44,6 +44,9 @@ gem "therubyracer", "~> 0.12", platforms: :ruby
 gem "yajl-ruby"
 gem "toastr-rails"
 gem "sucker_punch", "~> 2.0"
+gem "actiontext", github: "kobaltz/actiontext", branch: "archive", require: "action_text"
+gem "image_processing"
+gem "webpacker", "~> 3.5"
 
 group :development, :test do
   gem "awesome_print"

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/kobaltz/actiontext.git
+  revision: ef59c4ba99d1b7614dd47f5a294eef553224db88
+  branch: archive
+  specs:
+    actiontext (0.1.0)
+      nokogiri
+      rails (>= 5.2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -194,6 +203,9 @@ GEM
     hashdiff (0.3.7)
     i18n (1.3.0)
       concurrent-ruby (~> 1.0)
+    image_processing (1.7.1)
+      mini_magick (~> 4.0)
+      ruby-vips (>= 2.0.13, < 3)
     io-like (0.3.0)
     jaro_winkler (1.5.1)
     jbuilder (2.8.0)
@@ -225,6 +237,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mimemagic (0.3.2)
+    mini_magick (4.9.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
@@ -274,6 +287,8 @@ GEM
     rack (2.0.6)
     rack-protection (2.0.4)
       rack
+    rack-proxy (0.6.5)
+      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.2)
@@ -356,6 +371,8 @@ GEM
       unicode-display_width (~> 1.4.0)
     ruby-graphviz (1.2.3)
     ruby-progressbar (1.10.0)
+    ruby-vips (2.0.13)
+      ffi (~> 1.9)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
@@ -433,6 +450,10 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    webpacker (3.5.5)
+      activesupport (>= 4.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 4.2)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -444,6 +465,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actiontext!
   annotate
   api-auth (~> 2.3)
   awesome_print
@@ -477,6 +499,7 @@ DEPENDENCIES
   geocoder
   groupdate (~> 4.1)
   guard-rspec
+  image_processing
   jbuilder
   jquery-rails
   jquery-ui-rails
@@ -512,6 +535,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console
   webmock (~> 3.5)
+  webpacker (~> 3.5)
   yajl-ruby
 
 RUBY VERSION

app/assets/stylesheets/actiontext.scss

@@ -0,0 +1,36 @@
+//
+// Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+// the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+// inclusion directly in any other asset bundle and remove this file.
+//
+//= require trix/dist/trix
+
+// We need to override trix.css’s image gallery styles to accommodate the
+// <action-text-attachment> element we wrap around attachments. Otherwise,
+// images in galleries will be squished by the max-width: 33%; rule.
+.trix-content {
+  .attachment-gallery {
+    > action-text-attachment,
+    > .attachment {
+      flex: 1 0 33%;
+      padding: 0 0.5em;
+      max-width: 33%;
+    }
+
+    &.attachment-gallery--2,
+    &.attachment-gallery--4 {
+      > action-text-attachment,
+      > .attachment {
+        flex-basis: 50%;
+        max-width: 50%;
+      }
+    }
+  }
+
+  action-text-attachment {
+    .attachment {
+      padding: 0 !important;
+      max-width: 100% !important;
+    }
+  }
+}

app/assets/stylesheets/application.scss

@@ -15,6 +15,7 @@
  *= require ionicons
  *= require bootstrap.min
  *= require fullcalendar
+ *= require actiontext
  */
 
  //Use @import in order to process SCSS variables

app/controllers/admin/organizations_controller.rb

@@ -51,7 +51,7 @@ def destroy
 
   def organization_params
     params.require(:organization)
-          .permit(:name, :short_name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location,
+          .permit(:name, :short_name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text,
                   users_attributes: %i(name email password password_confirmation organization_admin))
   end
 end