Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

export to excel files #706

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
5 changes: 4 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -105,6 +107,7 @@ gem 'googleauth'
gem 'scout_apm'

# crypto
gem 'rbnacl'
gem 'rbnacl-libsodium'

# factories
Expand Down Expand Up @@ -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'
Expand Down
33 changes: 19 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -544,6 +547,7 @@ DEPENDENCIES
awesome_print
axlsx_rails
bootstrap (~> 4.0.0.alpha5)
bootstrap-sass
browserify-rails
byebug
cancancan
Expand Down Expand Up @@ -574,7 +578,7 @@ DEPENDENCIES
koala
launchy
memory_profiler
mini_racer
mini_racer (~> 0.2.3)
minitest (~> 5.10.3)
minitest-focus
minitest-matchers
Expand All @@ -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
Expand All @@ -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
3 changes: 3 additions & 0 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
{
"url": "https://github.com/affinityworks/blackbox-buildpack.git"
},
{
"url": "https://github.com/rabble/heroku-buildpack-libsodium.git"
},
{
"url": "heroku/nodejs"
},
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ $primaryblue: rgba(2, 117, 216, 1);
@extend button;
}

.btn-add-event {
height: 38px;
}

.modal-actions {
display: flex;
flex-direction: row;
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/action_network_request_person_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions client/app/bundles/Events/components/Events.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class Events extends Component {
</div>
<UserAuth allowed={['organizer']}>
<button
className='btn btn-primary mr-2'
className='btn btn-primary mr-2 btn-add-event'
onClick={this.displayEventCreate}
>
Add Event
Expand All @@ -151,7 +151,7 @@ class Events extends Component {
<UserAuth allowed={['organizer']}>
<div className='col-3 text-right'>
<a href={`/admin/auth/facebook?group_id=${id}`} className='btn btn-facebook'>
Import Event From Facebook
Import Facebook Event
</a>
</div>
</UserAuth>
Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.1",
"private": true,
"engines": {
"node": "6.9.0",
"node": "6.14.4",
"npm": "4.1.1"
},
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions keyrings/live/blackbox-admins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
4BDE1254 # @Matt-Holland
97B47404 # @aguestuser
E36DE477 # heroku deploy agent
[email protected]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.1",
"private": true,
"engines": {
"node": "6.9.0",
"node": "6.14.4",
"npm": "4.1.1"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"files":{"pdf-ab356bb6fc15ab7cb58d2617610293c5131d9f8759c119d9664413351c798d17.css":{"logical_path":"pdf.css","mtime":"2018-10-18T21:31:43-07:00","size":341370,"digest":"ab356bb6fc15ab7cb58d2617610293c5131d9f8759c119d9664413351c798d17","integrity":"sha256-qzVrtvwVq3y1jSYXYQKTxRMdn4dZwRnZZkQTNRx5jRc="},"active_admin-2cecfbbc5796efba31a98ee97b31653ecff5a2bcd774fba6162dd65ac62deb2f.css":{"logical_path":"active_admin.css","mtime":"2018-10-18T21:31:43-07:00","size":465453,"digest":"2cecfbbc5796efba31a98ee97b31653ecff5a2bcd774fba6162dd65ac62deb2f","integrity":"sha256-LOz7vFeW77oxqY7pezFlPs/1orzXdPumFi3WWsYt6y8="},"active_admin/print-093dace10ac358806a1bb15ab95f6af02afdaf69b571e4cc956aa27836270509.css":{"logical_path":"active_admin/print.css","mtime":"2018-10-18T21:31:33-07:00","size":18961,"digest":"093dace10ac358806a1bb15ab95f6af02afdaf69b571e4cc956aa27836270509","integrity":"sha256-CT2s4QrDWIBqG7FauV9q8Cr9r2m1ceTMlWqieDYnBQk="},"active_admin-fdb0f5d0a66ca35632f87c12ae5833526f65b882582a68d98897ed10e7f902c3.js":{"logical_path":"active_admin.js","mtime":"2018-10-19T20:41:00-07:00","size":621785,"digest":"fdb0f5d0a66ca35632f87c12ae5833526f65b882582a68d98897ed10e7f902c3","integrity":"sha256-/bD10KZso1Yy+HwSrlgzUm9luIJYKmjZiJftEOf5AsM="},"application-1491467884d14b282b0aa4bd0eeb2ef15a45092fdd680cbfeb0fd2c292512583.js":{"logical_path":"application.js","mtime":"2018-10-19T20:41:00-07:00","size":13855141,"digest":"1491467884d14b282b0aa4bd0eeb2ef15a45092fdd680cbfeb0fd2c292512583","integrity":"sha256-FJFGeITRSygrCqS9Dusu8VpFCS/daAy/6w/SwpJRJYM="},"application-fbea513acd48c3fd7d3a4de5ee121da34ef960d24a381746a69ab8f47b4a4cc4.css":{"logical_path":"application.css","mtime":"2018-10-19T20:51:26-07:00","size":485627,"digest":"fbea513acd48c3fd7d3a4de5ee121da34ef960d24a381746a69ab8f47b4a4cc4","integrity":"sha256-++pROs1Iw/19Ok3l7hIdo075YNJKOBdGppq49HtKTMQ="},"bootstrap_and_overrides.css-2c51f6c4414f1197930ccc543899fb9c18dc2d0543ed70ad1da76ec68b3b6bd7.less":{"logical_path":"bootstrap_and_overrides.css.less","mtime":"2018-10-12T16:25:43-07:00","size":1352,"digest":"2c51f6c4414f1197930ccc543899fb9c18dc2d0543ed70ad1da76ec68b3b6bd7","integrity":"sha256-LFH2xEFPEZeTDMxUOJn7nBjcLQVD7XCtHaduxos7a9c="},"doorkeeper/admin/application-1379fe084f940f83a7ba3446f129d7decae5952e2b313e7aa492a8bc5dd46781.css":{"logical_path":"doorkeeper/admin/application.css","mtime":"2018-10-18T21:31:56-07:00","size":123512,"digest":"1379fe084f940f83a7ba3446f129d7decae5952e2b313e7aa492a8bc5dd46781","integrity":"sha256-E3n+CE+UD4OnujRG8SnX3srllS4rMT56pJKovF3UZ4E="},"doorkeeper/application-9978641b752837f38727bc4d43bcc418cd96a63cfd1575e2809acbfe25910fea.css":{"logical_path":"doorkeeper/application.css","mtime":"2018-10-18T21:31:56-07:00","size":124301,"digest":"9978641b752837f38727bc4d43bcc418cd96a63cfd1575e2809acbfe25910fea","integrity":"sha256-mXhkG3UoN/OHJ7xNQ7zEGM2Wpjz9FXXigJrL/iWRD+o="}},"assets":{"pdf.css":"pdf-ab356bb6fc15ab7cb58d2617610293c5131d9f8759c119d9664413351c798d17.css","active_admin.css":"active_admin-2cecfbbc5796efba31a98ee97b31653ecff5a2bcd774fba6162dd65ac62deb2f.css","active_admin/print.css":"active_admin/print-093dace10ac358806a1bb15ab95f6af02afdaf69b571e4cc956aa27836270509.css","active_admin.js":"active_admin-fdb0f5d0a66ca35632f87c12ae5833526f65b882582a68d98897ed10e7f902c3.js","application.js":"application-1491467884d14b282b0aa4bd0eeb2ef15a45092fdd680cbfeb0fd2c292512583.js","application.css":"application-fbea513acd48c3fd7d3a4de5ee121da34ef960d24a381746a69ab8f47b4a4cc4.css","bootstrap_and_overrides.css.less":"bootstrap_and_overrides.css-2c51f6c4414f1197930ccc543899fb9c18dc2d0543ed70ad1da76ec68b3b6bd7.less","doorkeeper/admin/application.css":"doorkeeper/admin/application-1379fe084f940f83a7ba3446f129d7decae5952e2b313e7aa492a8bc5dd46781.css","doorkeeper/application.css":"doorkeeper/application-9978641b752837f38727bc4d43bcc418cd96a63cfd1575e2809acbfe25910fea.css"}}
Loading