diff --git a/.gitignore b/.gitignore index 0041b8a6dc..1e694af50c 100644 --- a/.gitignore +++ b/.gitignore @@ -99,8 +99,8 @@ node_modules spec/examples.txt .babelrc -.eslintignore -.eslintrc.json +#.eslintignore +#.eslintrc.json .postcssrc.yml /public/packs /public/packs-test diff --git a/Gemfile b/Gemfile index bacbbdf3cc..7a8444e8eb 100644 --- a/Gemfile +++ b/Gemfile @@ -132,9 +132,6 @@ gem 'mini_racer' # Provides binaries for WKHTMLTOPDF project in an easily accessible package. gem 'wkhtmltopdf-binary' -# Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications (http://puma.io) -gem 'puma' - # PDF generator (from HTML) gem for Ruby on Rails (https://github.com/mileszs/wicked_pdf) gem 'wicked_pdf' diff --git a/Gemfile.lock b/Gemfile.lock index cd09e2b503..b91eb83035 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM io-like (~> 0.3.0) arel (6.0.4) ast (2.4.0) - autoprefixer-rails (9.1.4) + autoprefixer-rails (9.3.1) execjs bcrypt (3.1.12) better_errors (2.5.0) @@ -66,23 +66,24 @@ GEM sass (>= 3.3.4) brakeman (4.3.1) builder (3.2.3) - bullet (5.7.6) + bullet (5.8.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.11.0) + uniform_notifier (~> 1.11) bundle-audit (0.1.0) bundler-audit bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) byebug (10.0.2) - capybara (3.9.0) + capybara (3.10.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - xpath (~> 3.1) - capybara-screenshot (1.0.21) + regexp_parser (~> 1.2) + xpath (~> 3.2) + capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy childprocess (0.9.0) @@ -91,7 +92,7 @@ GEM archive-zip (~> 0.10) nokogiri (~> 1.8) coderay (1.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.0) contact_us (1.2.0) rails (>= 4.2.0) crack (0.4.3) @@ -106,7 +107,7 @@ GEM railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) - devise_invitable (1.7.4) + devise_invitable (1.7.5) actionmailer (>= 4.1.0) devise (>= 4.0.0) diff-lcs (1.3) @@ -130,7 +131,7 @@ GEM railties (>= 3.0.0) faker (1.9.1) i18n (>= 0.7) - faraday (0.12.2) + faraday (0.15.3) multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) @@ -189,7 +190,7 @@ GEM activesupport (>= 3.0.0) multi_json (>= 1.2) json (2.1.0) - jwt (1.5.6) + jwt (2.1.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -212,11 +213,11 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) locale (2.1.2) - loofah (2.2.2) + loofah (2.2.3) 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) metaclass (0.0.4) method_source (0.9.0) @@ -237,9 +238,9 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -257,7 +258,7 @@ GEM options (2.3.2) orm_adapter (0.5.0) parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) pg (0.19.0) po_to_json (1.0.1) @@ -316,9 +317,12 @@ GEM ffi (>= 0.5.0, < 2) recaptcha (4.12.0) json + regexp_parser (1.2.0) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) + rollbar (2.18.0) + multi_json rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -327,13 +331,13 @@ GEM rspec-expectations (>= 2.99.0.beta1) rspec-core (3.8.0) rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-rails (3.8.0) + rspec-rails (3.8.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -342,19 +346,19 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.59.2) + rubocop (0.60.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (~> 1.4.0) rubocop-dmp_roadmap (1.1.0) rubocop (>= 0.58.2) rubocop-rails_config (>= 0.2.2) rubocop-rspec (>= 1.27.0) - rubocop-rails_config (0.2.5) + rubocop-rails_config (0.2.6) railties (>= 3.0) rubocop (~> 0.56) rubocop-rspec (1.30.0) @@ -375,14 +379,13 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (1.12.1) + sassc (2.0.0) ffi (~> 1.9.6) - sass (>= 3.3.0) - sassc-rails (1.3.0) + rake + sassc-rails (2.0.0) railties (>= 4.0.0) - sass - sassc (~> 1.9) - sprockets (> 2.11) + sassc (>= 2.0) + sprockets (> 3.0) sprockets-rails tilt sax-machine (1.3.2) @@ -424,7 +427,7 @@ GEM tzinfo (1.2.5) thread_safe (~> 0.1) unicode-display_width (1.4.0) - uniform_notifier (1.11.0) + uniform_notifier (1.12.1) warden (1.2.7) rack (>= 1.0) web-console (3.3.0) @@ -441,7 +444,7 @@ GEM railties (>= 4.2) wicked_pdf (1.1.0) wkhtmltopdf-binary (0.12.4) - xpath (3.1.0) + xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.16) yard-tomdoc (0.7.1) diff --git a/README.md b/README.md index 39e55b5e98..25fac48ad5 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ The tool has four main functions: 3. To export attractive and useful plans in a variety of formats; 4. To allow collaborative work when creating Data Management Plans. -#### Current Release -[v1.1.3](https://github.com/DMPRoadmap/roadmap/releases/tag/v1.1.3) +Download the latest release [here](https://github.com/DMPRoadmap/roadmap/releases) [![Build Status](https://travis-ci.org/DMPRoadmap/roadmap.svg)](https://travis-ci.org/DMPRoadmap/roadmap) #### Pre-requisites diff --git a/app/assets/javascripts/.eslintignore b/app/assets/javascripts/.eslintignore new file mode 100644 index 0000000000..44f765e007 --- /dev/null +++ b/app/assets/javascripts/.eslintignore @@ -0,0 +1 @@ +javascripts/locale \ No newline at end of file diff --git a/app/assets/javascripts/.eslintrc.json b/app/assets/javascripts/.eslintrc.json new file mode 100644 index 0000000000..efb0265235 --- /dev/null +++ b/app/assets/javascripts/.eslintrc.json @@ -0,0 +1,12 @@ +{ + "extends": "airbnb-base", + "env": { + "jasmine": true, + "jquery": true + }, + "globals": { + "timeago": true, + "fixture": true, + "spyOnEvent": true + } +} diff --git a/app/javascript/README.md b/app/assets/javascripts/README.md similarity index 100% rename from app/javascript/README.md rename to app/assets/javascripts/README.md diff --git a/app/javascript/constants.js b/app/assets/javascripts/constants.js similarity index 100% rename from app/javascript/constants.js rename to app/assets/javascripts/constants.js diff --git a/app/javascript/locale/de/app.js b/app/assets/javascripts/locale/de/app.js similarity index 100% rename from app/javascript/locale/de/app.js rename to app/assets/javascripts/locale/de/app.js diff --git a/app/javascript/locale/en_GB/app.js b/app/assets/javascripts/locale/en_GB/app.js similarity index 100% rename from app/javascript/locale/en_GB/app.js rename to app/assets/javascripts/locale/en_GB/app.js diff --git a/app/javascript/locale/en_GB/timeago.js b/app/assets/javascripts/locale/en_GB/timeago.js similarity index 100% rename from app/javascript/locale/en_GB/timeago.js rename to app/assets/javascripts/locale/en_GB/timeago.js diff --git a/app/javascript/locale/en_US/app.js b/app/assets/javascripts/locale/en_US/app.js similarity index 100% rename from app/javascript/locale/en_US/app.js rename to app/assets/javascripts/locale/en_US/app.js diff --git a/app/javascript/locale/es/app.js b/app/assets/javascripts/locale/es/app.js similarity index 100% rename from app/javascript/locale/es/app.js rename to app/assets/javascripts/locale/es/app.js diff --git a/app/javascript/locale/fr/app.js b/app/assets/javascripts/locale/fr/app.js similarity index 100% rename from app/javascript/locale/fr/app.js rename to app/assets/javascripts/locale/fr/app.js diff --git a/app/javascript/packs/application.js b/app/assets/javascripts/packs/application.js similarity index 100% rename from app/javascript/packs/application.js rename to app/assets/javascripts/packs/application.js diff --git a/app/javascript/spec/autoCompleteSpec.js b/app/assets/javascripts/spec/autoCompleteSpec.js similarity index 100% rename from app/javascript/spec/autoCompleteSpec.js rename to app/assets/javascripts/spec/autoCompleteSpec.js diff --git a/app/javascript/spec/debounceSpec.js b/app/assets/javascripts/spec/debounceSpec.js similarity index 100% rename from app/javascript/spec/debounceSpec.js rename to app/assets/javascripts/spec/debounceSpec.js diff --git a/app/javascript/spec/expandCollapseAllSpec.js b/app/assets/javascripts/spec/expandCollapseAllSpec.js similarity index 100% rename from app/javascript/spec/expandCollapseAllSpec.js rename to app/assets/javascripts/spec/expandCollapseAllSpec.js diff --git a/app/javascript/spec/fixtures/accordion.html b/app/assets/javascripts/spec/fixtures/accordion.html similarity index 100% rename from app/javascript/spec/fixtures/accordion.html rename to app/assets/javascripts/spec/fixtures/accordion.html diff --git a/app/javascript/spec/fixtures/autoComplete.html b/app/assets/javascripts/spec/fixtures/autoComplete.html similarity index 100% rename from app/javascript/spec/fixtures/autoComplete.html rename to app/assets/javascripts/spec/fixtures/autoComplete.html diff --git a/app/javascript/spec/fixtures/form.html b/app/assets/javascripts/spec/fixtures/form.html similarity index 100% rename from app/javascript/spec/fixtures/form.html rename to app/assets/javascripts/spec/fixtures/form.html diff --git a/app/javascript/spec/isTypeSpec.js b/app/assets/javascripts/spec/isTypeSpec.js similarity index 100% rename from app/javascript/spec/isTypeSpec.js rename to app/assets/javascripts/spec/isTypeSpec.js diff --git a/app/javascript/spec/isValidInputTypeSpec.js b/app/assets/javascripts/spec/isValidInputTypeSpec.js similarity index 100% rename from app/javascript/spec/isValidInputTypeSpec.js rename to app/assets/javascripts/spec/isValidInputTypeSpec.js diff --git a/app/javascript/spec/tinymceSpec.js b/app/assets/javascripts/spec/tinymceSpec.js similarity index 100% rename from app/javascript/spec/tinymceSpec.js rename to app/assets/javascripts/spec/tinymceSpec.js diff --git a/app/javascript/utils/array.js b/app/assets/javascripts/utils/array.js similarity index 100% rename from app/javascript/utils/array.js rename to app/assets/javascripts/utils/array.js diff --git a/app/javascript/utils/autoComplete.js b/app/assets/javascripts/utils/autoComplete.js similarity index 100% rename from app/javascript/utils/autoComplete.js rename to app/assets/javascripts/utils/autoComplete.js diff --git a/app/javascript/utils/debounce.js b/app/assets/javascripts/utils/debounce.js similarity index 100% rename from app/javascript/utils/debounce.js rename to app/assets/javascripts/utils/debounce.js diff --git a/app/javascript/utils/expandCollapseAll.js b/app/assets/javascripts/utils/expandCollapseAll.js similarity index 100% rename from app/javascript/utils/expandCollapseAll.js rename to app/assets/javascripts/utils/expandCollapseAll.js diff --git a/app/javascript/utils/externalLink.js b/app/assets/javascripts/utils/externalLink.js similarity index 100% rename from app/javascript/utils/externalLink.js rename to app/assets/javascripts/utils/externalLink.js diff --git a/app/javascript/utils/isType.js b/app/assets/javascripts/utils/isType.js similarity index 100% rename from app/javascript/utils/isType.js rename to app/assets/javascripts/utils/isType.js diff --git a/app/javascript/utils/isValidInputType.js b/app/assets/javascripts/utils/isValidInputType.js similarity index 100% rename from app/javascript/utils/isValidInputType.js rename to app/assets/javascripts/utils/isValidInputType.js diff --git a/app/javascript/utils/links.js b/app/assets/javascripts/utils/links.js similarity index 100% rename from app/javascript/utils/links.js rename to app/assets/javascripts/utils/links.js diff --git a/app/javascript/utils/notificationHelper.js b/app/assets/javascripts/utils/notificationHelper.js similarity index 100% rename from app/javascript/utils/notificationHelper.js rename to app/assets/javascripts/utils/notificationHelper.js diff --git a/app/javascript/utils/paginable.js b/app/assets/javascripts/utils/paginable.js similarity index 100% rename from app/javascript/utils/paginable.js rename to app/assets/javascripts/utils/paginable.js diff --git a/app/javascript/utils/panelHeading.js b/app/assets/javascripts/utils/panelHeading.js similarity index 100% rename from app/javascript/utils/panelHeading.js rename to app/assets/javascripts/utils/panelHeading.js diff --git a/app/javascript/utils/passwordHelper.js b/app/assets/javascripts/utils/passwordHelper.js similarity index 100% rename from app/javascript/utils/passwordHelper.js rename to app/assets/javascripts/utils/passwordHelper.js diff --git a/app/javascript/utils/popoverHelper.js b/app/assets/javascripts/utils/popoverHelper.js similarity index 100% rename from app/javascript/utils/popoverHelper.js rename to app/assets/javascripts/utils/popoverHelper.js diff --git a/app/javascript/utils/requiredField.js b/app/assets/javascripts/utils/requiredField.js similarity index 100% rename from app/javascript/utils/requiredField.js rename to app/assets/javascripts/utils/requiredField.js diff --git a/app/javascript/utils/scrollTo.js b/app/assets/javascripts/utils/scrollTo.js similarity index 100% rename from app/javascript/utils/scrollTo.js rename to app/assets/javascripts/utils/scrollTo.js diff --git a/app/javascript/utils/tabHelper.js b/app/assets/javascripts/utils/tabHelper.js similarity index 100% rename from app/javascript/utils/tabHelper.js rename to app/assets/javascripts/utils/tabHelper.js diff --git a/app/javascript/utils/timeagoFactory.js b/app/assets/javascripts/utils/timeagoFactory.js similarity index 100% rename from app/javascript/utils/timeagoFactory.js rename to app/assets/javascripts/utils/timeagoFactory.js diff --git a/app/javascript/utils/tinymce.js b/app/assets/javascripts/utils/tinymce.js similarity index 100% rename from app/javascript/utils/tinymce.js rename to app/assets/javascripts/utils/tinymce.js diff --git a/app/javascript/utils/tooltipHelper.js b/app/assets/javascripts/utils/tooltipHelper.js similarity index 100% rename from app/javascript/utils/tooltipHelper.js rename to app/assets/javascripts/utils/tooltipHelper.js diff --git a/app/javascript/views/answers/edit.js b/app/assets/javascripts/views/answers/edit.js similarity index 100% rename from app/javascript/views/answers/edit.js rename to app/assets/javascripts/views/answers/edit.js diff --git a/app/javascript/views/answers/rda_metadata.js b/app/assets/javascripts/views/answers/rda_metadata.js similarity index 100% rename from app/javascript/views/answers/rda_metadata.js rename to app/assets/javascripts/views/answers/rda_metadata.js diff --git a/app/javascript/views/devise/passwords/edit.js b/app/assets/javascripts/views/devise/passwords/edit.js similarity index 100% rename from app/javascript/views/devise/passwords/edit.js rename to app/assets/javascripts/views/devise/passwords/edit.js diff --git a/app/javascript/views/devise/registrations/edit.js b/app/assets/javascripts/views/devise/registrations/edit.js similarity index 100% rename from app/javascript/views/devise/registrations/edit.js rename to app/assets/javascripts/views/devise/registrations/edit.js diff --git a/app/javascript/views/guidances/new_edit.js b/app/assets/javascripts/views/guidances/new_edit.js similarity index 100% rename from app/javascript/views/guidances/new_edit.js rename to app/assets/javascripts/views/guidances/new_edit.js diff --git a/app/javascript/views/notes/index.js b/app/assets/javascripts/views/notes/index.js similarity index 100% rename from app/javascript/views/notes/index.js rename to app/assets/javascripts/views/notes/index.js diff --git a/app/javascript/views/org_admin/phases/new_edit.js b/app/assets/javascripts/views/org_admin/phases/new_edit.js similarity index 100% rename from app/javascript/views/org_admin/phases/new_edit.js rename to app/assets/javascripts/views/org_admin/phases/new_edit.js diff --git a/app/javascript/views/org_admin/phases/preview.js b/app/assets/javascripts/views/org_admin/phases/preview.js similarity index 100% rename from app/javascript/views/org_admin/phases/preview.js rename to app/assets/javascripts/views/org_admin/phases/preview.js diff --git a/app/javascript/views/org_admin/phases/show.js b/app/assets/javascripts/views/org_admin/phases/show.js similarity index 100% rename from app/javascript/views/org_admin/phases/show.js rename to app/assets/javascripts/views/org_admin/phases/show.js diff --git a/app/javascript/views/org_admin/question_options/index.js b/app/assets/javascripts/views/org_admin/question_options/index.js similarity index 100% rename from app/javascript/views/org_admin/question_options/index.js rename to app/assets/javascripts/views/org_admin/question_options/index.js diff --git a/app/javascript/views/org_admin/questions/sharedEventHandlers.js b/app/assets/javascripts/views/org_admin/questions/sharedEventHandlers.js similarity index 100% rename from app/javascript/views/org_admin/questions/sharedEventHandlers.js rename to app/assets/javascripts/views/org_admin/questions/sharedEventHandlers.js diff --git a/app/javascript/views/org_admin/sections/index.js b/app/assets/javascripts/views/org_admin/sections/index.js similarity index 100% rename from app/javascript/views/org_admin/sections/index.js rename to app/assets/javascripts/views/org_admin/sections/index.js diff --git a/app/javascript/views/org_admin/templates/edit.js b/app/assets/javascripts/views/org_admin/templates/edit.js similarity index 100% rename from app/javascript/views/org_admin/templates/edit.js rename to app/assets/javascripts/views/org_admin/templates/edit.js diff --git a/app/javascript/views/org_admin/templates/index.js b/app/assets/javascripts/views/org_admin/templates/index.js similarity index 100% rename from app/javascript/views/org_admin/templates/index.js rename to app/assets/javascripts/views/org_admin/templates/index.js diff --git a/app/javascript/views/org_admin/templates/new.js b/app/assets/javascripts/views/org_admin/templates/new.js similarity index 100% rename from app/javascript/views/org_admin/templates/new.js rename to app/assets/javascripts/views/org_admin/templates/new.js diff --git a/app/javascript/views/orgs/admin_edit.js b/app/assets/javascripts/views/orgs/admin_edit.js similarity index 100% rename from app/javascript/views/orgs/admin_edit.js rename to app/assets/javascripts/views/orgs/admin_edit.js diff --git a/app/javascript/views/orgs/shibboleth_ds.js b/app/assets/javascripts/views/orgs/shibboleth_ds.js similarity index 100% rename from app/javascript/views/orgs/shibboleth_ds.js rename to app/assets/javascripts/views/orgs/shibboleth_ds.js diff --git a/app/javascript/views/plans/download.js b/app/assets/javascripts/views/plans/download.js similarity index 100% rename from app/javascript/views/plans/download.js rename to app/assets/javascripts/views/plans/download.js diff --git a/app/javascript/views/plans/edit_details.js b/app/assets/javascripts/views/plans/edit_details.js similarity index 100% rename from app/javascript/views/plans/edit_details.js rename to app/assets/javascripts/views/plans/edit_details.js diff --git a/app/javascript/views/plans/index.js b/app/assets/javascripts/views/plans/index.js similarity index 100% rename from app/javascript/views/plans/index.js rename to app/assets/javascripts/views/plans/index.js diff --git a/app/javascript/views/plans/new.js b/app/assets/javascripts/views/plans/new.js similarity index 100% rename from app/javascript/views/plans/new.js rename to app/assets/javascripts/views/plans/new.js diff --git a/app/javascript/views/plans/share.js b/app/assets/javascripts/views/plans/share.js similarity index 100% rename from app/javascript/views/plans/share.js rename to app/assets/javascripts/views/plans/share.js diff --git a/app/javascript/views/roles/edit.js b/app/assets/javascripts/views/roles/edit.js similarity index 100% rename from app/javascript/views/roles/edit.js rename to app/assets/javascripts/views/roles/edit.js diff --git a/app/javascript/views/shared/create_account_form.js b/app/assets/javascripts/views/shared/create_account_form.js similarity index 100% rename from app/javascript/views/shared/create_account_form.js rename to app/assets/javascripts/views/shared/create_account_form.js diff --git a/app/javascript/views/shared/my_org.js b/app/assets/javascripts/views/shared/my_org.js similarity index 100% rename from app/javascript/views/shared/my_org.js rename to app/assets/javascripts/views/shared/my_org.js diff --git a/app/javascript/views/shared/sign_in_form.js b/app/assets/javascripts/views/shared/sign_in_form.js similarity index 100% rename from app/javascript/views/shared/sign_in_form.js rename to app/assets/javascripts/views/shared/sign_in_form.js diff --git a/app/javascript/views/super_admin/notifications/edit.js b/app/assets/javascripts/views/super_admin/notifications/edit.js similarity index 100% rename from app/javascript/views/super_admin/notifications/edit.js rename to app/assets/javascripts/views/super_admin/notifications/edit.js diff --git a/app/javascript/views/super_admin/themes/new_edit.js b/app/assets/javascripts/views/super_admin/themes/new_edit.js similarity index 100% rename from app/javascript/views/super_admin/themes/new_edit.js rename to app/assets/javascripts/views/super_admin/themes/new_edit.js diff --git a/app/javascript/views/super_admin/users/edit.js b/app/assets/javascripts/views/super_admin/users/edit.js similarity index 100% rename from app/javascript/views/super_admin/users/edit.js rename to app/assets/javascripts/views/super_admin/users/edit.js diff --git a/app/javascript/views/usage/index.js b/app/assets/javascripts/views/usage/index.js similarity index 100% rename from app/javascript/views/usage/index.js rename to app/assets/javascripts/views/usage/index.js diff --git a/app/javascript/views/users/admin_grant_permissions.js b/app/assets/javascripts/views/users/admin_grant_permissions.js similarity index 100% rename from app/javascript/views/users/admin_grant_permissions.js rename to app/assets/javascripts/views/users/admin_grant_permissions.js diff --git a/app/javascript/views/users/notification_preferences.js b/app/assets/javascripts/views/users/notification_preferences.js similarity index 100% rename from app/javascript/views/users/notification_preferences.js rename to app/assets/javascripts/views/users/notification_preferences.js diff --git a/bin/setup b/bin/setup index acdb2c1389..e69bc22594 100755 --- a/bin/setup +++ b/bin/setup @@ -12,10 +12,12 @@ Dir.chdir APP_ROOT do system "gem install bundler --conservative" system "bundle check || bundle install" - # puts "\n== Copying sample files ==" - # unless File.exist?("config/database.yml") - # system "cp config/database.yml.sample config/database.yml" - # end + puts "\n== Copying sample files ==" + unless File.exist?("config/database.yml") + system "cp config/database.yml.sample config/database.yml" + system "cp config/branding.yml.sample config/branding.yml" + system "cp config/secrets.yml.sample config/secrets.yml" + end puts "\n== Preparing database ==" system "bin/rake db:setup" diff --git a/config/branding_example.yml b/config/branding.yml.sample similarity index 100% rename from config/branding_example.yml rename to config/branding.yml.sample diff --git a/config/database_example.yml b/config/database.yml.sample similarity index 100% rename from config/database_example.yml rename to config/database.yml.sample diff --git a/config/secrets_example.yml b/config/secrets.yml.sample similarity index 100% rename from config/secrets_example.yml rename to config/secrets.yml.sample diff --git a/config/webpacker.yml b/config/webpacker.yml index 6da493bcbb..391723bb24 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -1,7 +1,7 @@ # Note: You must restart bin/webpack-dev-server for changes to take effect default: &default - source_path: app/javascript + source_path: app/assets/javascript source_entry_path: packs public_output_path: packs cache_path: tmp/cache/webpacker diff --git a/spec/factories/orgs.rb b/spec/factories/orgs.rb index 44c4b44107..fe94eaac7d 100644 --- a/spec/factories/orgs.rb +++ b/spec/factories/orgs.rb @@ -39,7 +39,7 @@ Language.first_or_create(name: "English", abbreviation: "en-GB") || create(:language, name: "English", abbreviation: "en-GB") end - is_other false + is_other { false } contact_email { Faker::Internet.safe_email } contact_name { Faker::Name.name } trait :institution do