diff --git a/Gemfile b/Gemfile index 1839ba24..252b51bc 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ gem 'omniauth-facebook' gem 'omniauth-twitter' gem 'omniauth-google-oauth2' gem 'bootstrap', '~> 4.0.0.alpha5' +gem 'bootstrap-sass' source 'https://rails-assets.org' do gem 'rails-assets-tether', '>= 1.3.3' end @@ -67,6 +68,7 @@ gem 'jbuilder', '~> 2.5' gem 'roar' gem 'react_on_rails', '~> 6.8.0' + # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 3.0' # Use ActiveModel has_secure_password @@ -105,6 +107,7 @@ gem 'googleauth' gem 'scout_apm' # crypto +gem 'rbnacl' gem 'rbnacl-libsodium' # factories @@ -179,7 +182,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] ruby ">=2.3.3" -gem 'mini_racer', platforms: :ruby +gem 'mini_racer', '~> 0.2.3', platforms: :ruby source 'https://rails-assets.org' do gem 'rails-assets-tether', '>= 1.3.3' diff --git a/Gemfile.lock b/Gemfile.lock index ac0eb31b..b960daaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/activeadmin/inherited_resources.git - revision: 3524e3171ae935469f06e8ee32835c1a8b4de2c1 + revision: f4794094f8e4bdce5f30df4349097216f21eb89b specs: inherited_resources (1.9.0) actionpack (>= 4.2, < 5.3) @@ -86,7 +86,7 @@ GEM arel (7.1.4) arel-helpers (2.8.0) activerecord (>= 3.1.0, < 6) - autoprefixer-rails (9.1.4) + autoprefixer-rails (9.3.1) execjs awesome_print (1.8.0) axlsx (1.3.6) @@ -103,6 +103,9 @@ GEM autoprefixer-rails (>= 6.0.3) popper_js (>= 1.12.9, < 2) sass (>= 3.5.2) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) bourbon (5.1.0) sass (~> 3.4) thor (~> 0.19) @@ -124,7 +127,7 @@ GEM activesupport childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) - cocoon (1.2.11) + cocoon (1.2.12) coderay (1.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -157,7 +160,7 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.3) - doorkeeper (5.0.1) + doorkeeper (5.0.2) railties (>= 4.2) dotenv (2.5.0) dotenv-rails (2.5.0) @@ -191,7 +194,7 @@ GEM geokit-rails (2.3.1) geokit (~> 1.5) rails (>= 3.0) - get_process_mem (0.2.2) + get_process_mem (0.2.3) globalid (0.4.1) activesupport (>= 4.2.0) google-api-client (0.10.3) @@ -203,10 +206,10 @@ GEM mime-types (>= 1.6) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.6.6) + googleauth (0.6.7) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) @@ -236,7 +239,7 @@ GEM multi_xml (>= 0.5.2) httpclient (2.8.3) hurley (0.2) - i18n (1.1.0) + i18n (1.1.1) concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -277,7 +280,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.13) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) memoist (0.16.0) memory_profiler (0.9.12) @@ -469,7 +472,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - scout_apm (2.4.19) + scout_apm (2.4.20) selenium-webdriver (3.14.1) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -527,7 +530,7 @@ GEM wicked_pdf (1.1.0) wkhtmltopdf-binary-edge (0.12.4.0) wkhtmltopdf-heroku (2.12.4.0) - xpath (3.1.0) + xpath (3.2.0) nokogiri (~> 1.8) zip-zip (0.3) rubyzip (>= 1.0.0) @@ -544,6 +547,7 @@ DEPENDENCIES awesome_print axlsx_rails bootstrap (~> 4.0.0.alpha5) + bootstrap-sass browserify-rails byebug cancancan @@ -574,7 +578,7 @@ DEPENDENCIES koala launchy memory_profiler - mini_racer + mini_racer (~> 0.2.3) minitest (~> 5.10.3) minitest-focus minitest-matchers @@ -596,6 +600,7 @@ DEPENDENCIES rails-controller-testing rake (= 12.1.0) rb-fsevent (~> 0.10.2) + rbnacl rbnacl-libsodium react_on_rails (~> 6.8.0) redis @@ -622,7 +627,7 @@ DEPENDENCIES zip-zip RUBY VERSION - ruby 2.3.3p222 + ruby 2.3.7p456 BUNDLED WITH - 1.16.6 + 1.16.2 diff --git a/app.json b/app.json index 3f8b5cba..9278e646 100644 --- a/app.json +++ b/app.json @@ -100,6 +100,9 @@ { "url": "https://github.com/affinityworks/blackbox-buildpack.git" }, + { + "url": "https://github.com/rabble/heroku-buildpack-libsodium.git" + }, { "url": "heroku/nodejs" }, diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss index 50ce8a45..0fcd8f5d 100644 --- a/app/assets/stylesheets/buttons.scss +++ b/app/assets/stylesheets/buttons.scss @@ -135,6 +135,10 @@ $primaryblue: rgba(2, 117, 216, 1); @extend button; } +.btn-add-event { + height: 38px; +} + .modal-actions { display: flex; flex-direction: row; diff --git a/app/jobs/action_network_request_person_job.rb b/app/jobs/action_network_request_person_job.rb index 13af1583..e8c19b9b 100644 --- a/app/jobs/action_network_request_person_job.rb +++ b/app/jobs/action_network_request_person_job.rb @@ -3,7 +3,7 @@ class ActionNetworkRequestPersonJob < ApplicationJob queue_as :default def perform(next_uri,group) - logger.debug "in perform #{next_uri}" + logger.debug "in ActionNetworkRequestPersonJob perform #{next_uri}" logs = [] people, next_uri = Api::ActionNetwork::People.request_resources_from_action_network(next_uri, group) people.each(&:sanitize_email_addresses) diff --git a/client/app/bundles/Events/components/Events.jsx b/client/app/bundles/Events/components/Events.jsx index 431be6b8..8c4deb13 100644 --- a/client/app/bundles/Events/components/Events.jsx +++ b/client/app/bundles/Events/components/Events.jsx @@ -141,7 +141,7 @@ class Events extends Component {