diff --git a/.gitignore b/.gitignore index 86c761680..8d4b9f69c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,8 @@ coverage node_modules /public/packs /public/packs-test +/public/system +/storage /node_modules /yarn-error.log yarn-debug.log* @@ -32,4 +34,5 @@ yarn-debug.log* tmp/cache/webpacker .byebug_history -db \ No newline at end of file +db + diff --git a/.gitmodules b/.gitmodules index 37ae0a64d..e9e019370 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "db"] path = db url = https://github.com/unepwcmc/protectedplanet-db.git - branch = master + branch = refresh diff --git a/.travis.yml b/.travis.yml index 298ba6eb4..0e4840024 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ branches: only: - master - develop + - refresh addons: code_climate: repo_token: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c21d2f55..06620b1e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### 3.2.5 + +* Add download tracking for links in CMS (e.g. OECM downloads) + +### 3.2.4 + +* Add country, pame_country and marine stats (WDPA December 2019 release). + ### 3.2.3 * Update reference on Target 11 Dashboard to DOPA - again diff --git a/Gemfile b/Gemfile index 5c16cf746..0076fea4a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,13 @@ source 'https://rubygems.org' -gem 'rails', '5.0.5' +gem 'rails', '5.2.0' gem 'webpacker', '~> 4.0.2' +gem 'bourbon' +gem "neat" + gem 'pg', '~> 0.21' -gem 'activerecord-postgis-adapter', '4.1.0' +gem 'activerecord-postgis-adapter', '5.1.0' gem 'dbf', '~> 2.0.7' # gem 'elasticsearch', '~> 7.2.0' @@ -12,7 +15,7 @@ gem 'elasticsearch', '~> 7.2.0' gem 'sass-rails', '~> 5.0.7' gem 'sprockets-rails', '~> 3.2.1' -gem 'uglifier', '~> 2.7.2' +gem 'uglifier', '~> 4.1.17' gem 'coffee-rails', '~> 4.2.2' gem "autoprefixer-rails" gem "exception_notification", '~> 4.3.0' @@ -101,9 +104,9 @@ gem 'turnout', '~> 2.5.0' gem 'bystander', '2.0.0', git: 'https://github.com/unepwcmc/bystander' -gem 'devise', '~> 4.6.2' # MAJOR VERSION CHANGE, CHECK DOCS +gem 'devise', '~> 4.7.1' # MAJOR VERSION CHANGE, CHECK DOCS -gem 'comfortable_mexican_sofa', '1.12.10' -gem 'nokogiri', '~> 1.10.1' +gem 'comfortable_mexican_sofa', '~> 2.0.0' +gem 'nokogiri', '~> 1.10.4' gem 'tinymce-rails', '~> 4.3.2' gem 'phantompdf', '~> 1.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 10a39d1d9..f916552ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,47 +8,51 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) - nio4r (>= 1.2, < 3.0) - websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) active_link_to (1.0.5) actionpack addressable - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.2.0) + activesupport (= 5.2.0) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) - arel (~> 7.0) - activerecord-postgis-adapter (4.1.0) - activerecord (~> 5.0.0) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activerecord-postgis-adapter (5.1.0) + activerecord (~> 5.1) rgeo-activerecord (~> 6.0) - activesupport (5.0.5) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.7.0) @@ -58,14 +62,17 @@ GEM appsignal (1.3.6) rack thread_safe - arel (7.1.4) - autoprefixer-rails (9.7.2) + arel (9.0.0) + autoprefixer-rails (9.7.3) execjs awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.246.0) + aws-partitions (1.263.0) aws-sdk (3.0.1) aws-sdk-resources (~> 3) + aws-sdk-accessanalyzer (1.1.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-acm (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) @@ -84,13 +91,13 @@ GEM aws-sdk-apigatewaymanagementapi (1.11.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.14.0) + aws-sdk-apigatewayv2 (1.15.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-appconfig (1.0.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-applicationautoscaling (1.34.0) + aws-sdk-applicationautoscaling (1.35.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-applicationdiscoveryservice (1.23.0) @@ -111,13 +118,16 @@ GEM aws-sdk-athena (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-augmentedairuntime (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-autoscalingplans (1.20.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-backup (1.10.0) + aws-sdk-backup (1.11.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-batch (1.27.0) @@ -126,7 +136,7 @@ GEM aws-sdk-budgets (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-chime (1.17.0) + aws-sdk-chime (1.18.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-cloud9 (1.19.0) @@ -138,7 +148,7 @@ GEM aws-sdk-cloudformation (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.23.0) + aws-sdk-cloudfront (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.19.0) @@ -162,10 +172,10 @@ GEM aws-sdk-cloudwatchevents (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.27.0) + aws-sdk-cloudwatchlogs (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codebuild (1.45.0) + aws-sdk-codebuild (1.47.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.30.0) @@ -174,12 +184,21 @@ GEM aws-sdk-codedeploy (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-codeguruprofiler (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-codegurureviewer (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-codepipeline (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-codestar (1.18.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-codestarconnections (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-codestarnotifications (1.0.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) @@ -192,10 +211,13 @@ GEM aws-sdk-cognitosync (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-comprehend (1.28.0) + aws-sdk-comprehend (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-comprehendmedical (1.12.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-comprehendmedical (1.11.0) + aws-sdk-computeoptimizer (1.0.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-configservice (1.40.0) @@ -207,7 +229,7 @@ GEM aws-sdk-connectparticipant (1.0.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.82.0) + aws-sdk-core (3.89.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -215,7 +237,7 @@ GEM aws-sdk-costandusagereportservice (1.18.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-costexplorer (1.34.0) + aws-sdk-costexplorer (1.36.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.30.0) @@ -233,7 +255,10 @@ GEM aws-sdk-dax (1.19.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-devicefarm (1.29.0) + aws-sdk-detective (1.1.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-devicefarm (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-directconnect (1.26.0) @@ -242,34 +267,37 @@ GEM aws-sdk-directoryservice (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-dlm (1.22.0) + aws-sdk-dlm (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-docdb (1.12.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.40.0) + aws-sdk-dynamodb (1.41.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-dynamodbstreams (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.121.0) + aws-sdk-ebs (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.132.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-ec2instanceconnect (1.3.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.23.0) + aws-sdk-ecr (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.53.0) + aws-sdk-ecs (1.55.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.23.0) + aws-sdk-efs (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.28.0) + aws-sdk-eks (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.29.0) @@ -287,7 +315,7 @@ GEM aws-sdk-elasticloadbalancingv2 (1.39.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.28.0) + aws-sdk-elasticsearchservice (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-elastictranscoder (1.18.0) @@ -302,7 +330,7 @@ GEM aws-sdk-firehose (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-fms (1.20.0) + aws-sdk-fms (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-forecastqueryservice (1.1.0) @@ -311,10 +339,13 @@ GEM aws-sdk-forecastservice (1.2.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-fsx (1.13.0) + aws-sdk-frauddetector (1.0.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-gamelift (1.26.0) + aws-sdk-fsx (1.14.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-gamelift (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-glacier (1.26.0) @@ -335,19 +366,22 @@ GEM aws-sdk-guardduty (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-health (1.20.0) + aws-sdk-health (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.32.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-imagebuilder (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-importexport (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv2 (~> 1.0) aws-sdk-inspector (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-iot (1.41.0) + aws-sdk-iot (1.42.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-iot1clickdevicesservice (1.18.0) @@ -377,7 +411,10 @@ GEM aws-sdk-iotthingsgraph (1.4.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.15.0) + aws-sdk-kafka (1.16.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-kendra (1.1.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.20.0) @@ -386,10 +423,10 @@ GEM aws-sdk-kinesisanalytics (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesisanalyticsv2 (1.12.0) + aws-sdk-kinesisanalyticsv2 (1.13.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesisvideo (1.20.0) + aws-sdk-kinesisvideo (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-kinesisvideoarchivedmedia (1.20.0) @@ -398,13 +435,16 @@ GEM aws-sdk-kinesisvideomedia (1.18.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.26.0) + aws-sdk-kinesisvideosignalingchannels (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-lakeformation (1.1.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.33.0) + aws-sdk-lambda (1.34.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-lambdapreview (1.16.0) @@ -413,13 +453,13 @@ GEM aws-sdk-lex (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-lexmodelbuildingservice (1.23.0) + aws-sdk-lexmodelbuildingservice (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-licensemanager (1.10.0) + aws-sdk-licensemanager (1.11.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-lightsail (1.26.0) + aws-sdk-lightsail (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-machinelearning (1.17.0) @@ -449,10 +489,10 @@ GEM aws-sdk-mediaconvert (1.40.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-medialive (1.39.0) + aws-sdk-medialive (1.40.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-mediapackage (1.24.0) + aws-sdk-mediapackage (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-mediapackagevod (1.8.0) @@ -467,7 +507,7 @@ GEM aws-sdk-mediatailor (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-migrationhub (1.19.0) + aws-sdk-migrationhub (1.20.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-migrationhubconfig (1.0.0) @@ -476,7 +516,7 @@ GEM aws-sdk-mobile (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-mq (1.23.0) + aws-sdk-mq (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-mturk (1.19.0) @@ -485,28 +525,34 @@ GEM aws-sdk-neptune (1.19.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-networkmanager (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-opsworks (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-opsworkscm (1.26.0) + aws-sdk-opsworkscm (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.35.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-outposts (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-personalize (1.8.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-personalizeevents (1.4.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-personalizeruntime (1.5.0) + aws-sdk-personalizeruntime (1.6.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-pi (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-pinpoint (1.31.0) + aws-sdk-pinpoint (1.32.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-pinpointemail (1.16.0) @@ -527,31 +573,32 @@ GEM aws-sdk-qldbsession (1.1.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-quicksight (1.15.0) + aws-sdk-quicksight (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-ram (1.13.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.72.0) + aws-sdk-rds (1.75.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-rdsdataservice (1.14.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.34.0) + aws-sdk-redshift (1.35.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-rekognition (1.32.0) + aws-sdk-rekognition (1.33.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-resourcegroups (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-resourcegroupstaggingapi (1.20.0) + aws-sdk-resourcegroupstaggingapi (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-resources (3.63.0) + aws-sdk-resources (3.70.0) + aws-sdk-accessanalyzer (~> 1) aws-sdk-acm (~> 1) aws-sdk-acmpca (~> 1) aws-sdk-alexaforbusiness (~> 1) @@ -567,6 +614,7 @@ GEM aws-sdk-appstream (~> 1) aws-sdk-appsync (~> 1) aws-sdk-athena (~> 1) + aws-sdk-augmentedairuntime (~> 1) aws-sdk-autoscaling (~> 1) aws-sdk-autoscalingplans (~> 1) aws-sdk-backup (~> 1) @@ -588,14 +636,18 @@ GEM aws-sdk-codebuild (~> 1) aws-sdk-codecommit (~> 1) aws-sdk-codedeploy (~> 1) + aws-sdk-codeguruprofiler (~> 1) + aws-sdk-codegurureviewer (~> 1) aws-sdk-codepipeline (~> 1) aws-sdk-codestar (~> 1) + aws-sdk-codestarconnections (~> 1) aws-sdk-codestarnotifications (~> 1) aws-sdk-cognitoidentity (~> 1) aws-sdk-cognitoidentityprovider (~> 1) aws-sdk-cognitosync (~> 1) aws-sdk-comprehend (~> 1) aws-sdk-comprehendmedical (~> 1) + aws-sdk-computeoptimizer (~> 1) aws-sdk-configservice (~> 1) aws-sdk-connect (~> 1) aws-sdk-connectparticipant (~> 1) @@ -606,6 +658,7 @@ GEM aws-sdk-datapipeline (~> 1) aws-sdk-datasync (~> 1) aws-sdk-dax (~> 1) + aws-sdk-detective (~> 1) aws-sdk-devicefarm (~> 1) aws-sdk-directconnect (~> 1) aws-sdk-directoryservice (~> 1) @@ -613,6 +666,7 @@ GEM aws-sdk-docdb (~> 1) aws-sdk-dynamodb (~> 1) aws-sdk-dynamodbstreams (~> 1) + aws-sdk-ebs (~> 1) aws-sdk-ec2 (~> 1) aws-sdk-ec2instanceconnect (~> 1) aws-sdk-ecr (~> 1) @@ -632,6 +686,7 @@ GEM aws-sdk-fms (~> 1) aws-sdk-forecastqueryservice (~> 1) aws-sdk-forecastservice (~> 1) + aws-sdk-frauddetector (~> 1) aws-sdk-fsx (~> 1) aws-sdk-gamelift (~> 1) aws-sdk-glacier (~> 1) @@ -642,6 +697,7 @@ GEM aws-sdk-guardduty (~> 1) aws-sdk-health (~> 1) aws-sdk-iam (~> 1) + aws-sdk-imagebuilder (~> 1) aws-sdk-importexport (~> 1) aws-sdk-inspector (~> 1) aws-sdk-iot (~> 1) @@ -655,12 +711,14 @@ GEM aws-sdk-iotsecuretunneling (~> 1) aws-sdk-iotthingsgraph (~> 1) aws-sdk-kafka (~> 1) + aws-sdk-kendra (~> 1) aws-sdk-kinesis (~> 1) aws-sdk-kinesisanalytics (~> 1) aws-sdk-kinesisanalyticsv2 (~> 1) aws-sdk-kinesisvideo (~> 1) aws-sdk-kinesisvideoarchivedmedia (~> 1) aws-sdk-kinesisvideomedia (~> 1) + aws-sdk-kinesisvideosignalingchannels (~> 1) aws-sdk-kms (~> 1) aws-sdk-lakeformation (~> 1) aws-sdk-lambda (~> 1) @@ -690,9 +748,11 @@ GEM aws-sdk-mq (~> 1) aws-sdk-mturk (~> 1) aws-sdk-neptune (~> 1) + aws-sdk-networkmanager (~> 1) aws-sdk-opsworks (~> 1) aws-sdk-opsworkscm (~> 1) aws-sdk-organizations (~> 1) + aws-sdk-outposts (~> 1) aws-sdk-personalize (~> 1) aws-sdk-personalizeevents (~> 1) aws-sdk-personalizeruntime (~> 1) @@ -721,6 +781,7 @@ GEM aws-sdk-sagemaker (~> 1) aws-sdk-sagemakerruntime (~> 1) aws-sdk-savingsplans (~> 1) + aws-sdk-schemas (~> 1) aws-sdk-secretsmanager (~> 1) aws-sdk-securityhub (~> 1) aws-sdk-serverlessapplicationrepository (~> 1) @@ -769,14 +830,14 @@ GEM aws-sdk-route53resolver (1.11.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.57.0) - aws-sdk-core (~> 3, >= 3.77.0) + aws-sdk-s3 (1.60.1) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-s3control (1.13.0) + aws-sdk-s3control (1.14.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sagemaker (1.47.0) + aws-sdk-sagemaker (1.49.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-sagemakerruntime (1.18.0) @@ -785,10 +846,13 @@ GEM aws-sdk-savingsplans (1.1.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) + aws-sdk-schemas (1.0.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.32.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.14.0) + aws-sdk-securityhub (1.15.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-serverlessapplicationrepository (1.23.0) @@ -806,7 +870,7 @@ GEM aws-sdk-ses (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sesv2 (1.1.0) + aws-sdk-sesv2 (1.2.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-shield (1.21.0) @@ -830,16 +894,16 @@ GEM aws-sdk-sqs (1.23.1) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.65.0) + aws-sdk-ssm (1.69.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sso (1.0.0) + aws-sdk-sso (1.1.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-ssooidc (1.0.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-states (1.23.0) + aws-sdk-states (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-storagegateway (1.34.0) @@ -851,19 +915,19 @@ GEM aws-sdk-swf (1.17.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-textract (1.11.0) + aws-sdk-textract (1.12.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-transcribeservice (1.33.0) + aws-sdk-transcribeservice (1.35.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-transcribestreamingservice (1.10.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-transfer (1.15.0) + aws-sdk-transfer (1.16.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-translate (1.18.0) + aws-sdk-translate (1.19.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-waf (1.26.0) @@ -887,10 +951,10 @@ GEM aws-sdk-workmailmessageflow (1.1.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-workspaces (1.32.0) + aws-sdk-workspaces (1.33.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-xray (1.21.0) + aws-sdk-xray (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.0.1) @@ -900,13 +964,9 @@ GEM best_in_place (3.0.3) actionpack (>= 3.2) railties (>= 3.2) - bootstrap-sass (3.4.1) - autoprefixer-rails (>= 5.2.1) - sassc (>= 2.0.0) - bootstrap_form (4.3.0) - actionpack (>= 5.0) - activemodel (>= 5.0) - builder (3.2.3) + bourbon (6.0.0) + thor (~> 0.19) + builder (3.2.4) byebug (9.1.0) capistrano (3.11.0) airbrussh (>= 1.0.0) @@ -940,9 +1000,6 @@ GEM xpath (~> 2.0) childprocess (3.0.0) chronic (0.10.2) - climate_control (0.2.0) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -950,36 +1007,34 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - comfortable_mexican_sofa (1.12.10) + comfortable_mexican_sofa (2.0.19) active_link_to (>= 1.0.0) - bootstrap-sass (>= 3.2.0) - bootstrap_form (>= 2.2.0) - codemirror-rails (>= 3.0.0) - coffee-rails (>= 3.1.0) - haml-rails (>= 0.3.0) - jquery-rails (>= 3.0.0) - jquery-ui-rails (>= 5.0.0) + comfy_bootstrap_form (>= 4.0.0) + haml-rails (>= 1.0.0) + jquery-rails (>= 4.3.1) kramdown (>= 1.0.0) - paperclip (>= 4.0.0) - plupload-rails (>= 1.2.1) - rails (>= 4.0.0, < 5.1) - rails-i18n (>= 4.0.0) - sass-rails (>= 4.0.3) + mimemagic (>= 0.3.2) + mini_magick (>= 4.8.0) + rails (>= 5.2.0) + rails-i18n (>= 5.0.0) + sassc-rails (>= 2.0.0) + comfy_bootstrap_form (4.0.8) + rails (>= 5.0.0) concurrent-ruby (1.1.5) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.5) - css_parser (1.7.0) + crass (1.0.6) + css_parser (1.7.1) addressable dalli (2.7.10) database_cleaner (1.7.0) dbf (2.0.13) fastercsv (~> 1.5) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) docile (1.3.2) @@ -995,6 +1050,7 @@ GEM elasticsearch-transport (7.2.1) faraday multi_json + erubi (1.9.0) erubis (2.7.0) exception_notification (4.3.0) actionmailer (>= 4.0, < 6) @@ -1005,7 +1061,7 @@ GEM factory_girl_rails (4.4.1) factory_girl (~> 4.4.0) railties (>= 3.0.0) - faraday (0.17.0) + faraday (1.0.0) multipart-post (>= 1.2, < 3) fastercsv (1.5.5) ffi (1.11.3) @@ -1015,12 +1071,12 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - haml-rails (1.0.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) + haml-rails (2.0.1) + actionpack (>= 5.1) + activesupport (>= 5.1) haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) - railties (>= 4.0.1) + railties (>= 5.1) hashdiff (1.0.0) html2haml (2.2.0) erubis (~> 2.7.0) @@ -1034,16 +1090,14 @@ GEM multipart-post httparty (0.15.7) multi_xml (>= 0.5.2) - i18n (0.9.5) + i18n (1.8.2) concurrent-ruby (~> 1.0) jmespath (1.4.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) - json (2.2.0) + json (2.3.0) kramdown (2.1.0) levenshtein (0.2.2) loofah (2.4.0) @@ -1051,42 +1105,40 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) metaclass (0.0.4) method_source (0.9.2) - mime-types (3.3) + mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) mimemagic (0.3.3) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) mocha (1.0.0) metaclass (~> 0.0.1) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) - mustermann (1.0.3) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + neat (4.0.0) + thor (~> 0.19) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) nio4r (2.5.2) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - paperclip (6.1.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) - mime-types - mimemagic (~> 0.3.0) - terrapin (~> 0.6.0) pg (0.21.0) phantomjs (2.1.1.0) phantompdf (1.2.2) json phantomjs rack - plupload-rails (1.2.1) - rails (>= 3.1) premailer (1.11.1) addressable css_parser (>= 1.6.0) @@ -1094,29 +1146,30 @@ GEM premailer-rails (1.10.3) actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) - public_suffix (4.0.1) - rack (2.0.7) + public_suffix (4.0.3) + rack (2.1.1) rack-accept (0.4.5) rack (>= 0.4) - rack-cache (1.10.0) + rack-cache (1.11.0) rack (>= 0.4) - rack-protection (2.0.7) + rack-protection (2.0.8.1) rack rack-proxy (0.6.5) rack - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.2.0) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -1130,15 +1183,15 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) redis (4.1.3) responders (3.0.0) @@ -1148,6 +1201,7 @@ GEM rgeo-activerecord (6.2.1) activerecord (>= 5.0) rgeo (>= 1.0.0) + ruby2_keywords (0.0.2) ruby_parser (3.14.1) sexp_processor (~> 4.9) rubyzip (2.0.0) @@ -1157,15 +1211,21 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.0.8) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) sassc (2.2.1) ffi (~> 1.9) - selenium-webdriver (3.142.6) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) sexp_processor (4.13.0) @@ -1179,10 +1239,10 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sinatra (2.0.7) + sinatra (2.0.8.1) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.7) + rack-protection (= 2.0.8.1) tilt (~> 2.0) slack-notifier (1.5.1) spring (2.1.0) @@ -1203,8 +1263,6 @@ GEM system (0.1.3) version (~> 1.0.0) temple (0.8.2) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) @@ -1216,11 +1274,10 @@ GEM rack (>= 1.3, < 3) rack-accept (~> 0.4) tilt (>= 1.4, < 3) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) version (1.0.0) vuejs-rails (2.3.2) warden (1.2.8) @@ -1233,7 +1290,7 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - websocket-driver (0.6.5) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) whenever (1.0.0) @@ -1246,12 +1303,13 @@ PLATFORMS ruby DEPENDENCIES - activerecord-postgis-adapter (= 4.1.0) + activerecord-postgis-adapter (= 5.1.0) appsignal (~> 1.3.6) autoprefixer-rails awesome_print aws-sdk (= 3.0.1) best_in_place (~> 3.0.1) + bourbon byebug (~> 9.0, >= 9.0.5) bystander (= 2.0.0)! capistrano (= 3.11.0) @@ -1265,11 +1323,11 @@ DEPENDENCIES capistrano-sidekiq (= 1.0.2) capybara (~> 2.3.0) coffee-rails (~> 4.2.2) - comfortable_mexican_sofa (= 1.12.10) + comfortable_mexican_sofa (~> 2.0.0) dalli (~> 2.7.2) database_cleaner dbf (~> 2.0.7) - devise (~> 4.6.2) + devise (~> 4.7.1) dotenv (~> 0.11.1) dotenv-deployment ejs @@ -1283,12 +1341,13 @@ DEPENDENCIES levenshtein (~> 0.2.2) minitest (~> 5.10, != 5.10.2) mocha (~> 1.0.0) - nokogiri (~> 1.10.1) + neat + nokogiri (~> 1.10.4) pg (~> 0.21) phantompdf (~> 1.2.2) premailer-rails rack-cache (~> 1.2) - rails (= 5.0.5) + rails (= 5.2.0) rails-controller-testing sass-rails (~> 5.0.7) selenium-webdriver @@ -1303,7 +1362,7 @@ DEPENDENCIES timecop (~> 0.7.1) tinymce-rails (~> 4.3.2) turnout (~> 2.5.0) - uglifier (~> 2.7.2) + uglifier (~> 4.1.17) vuejs-rails (~> 2.3.2) webmock (~> 1.22.0) webpacker (~> 4.0.2) diff --git a/app/assets/javascripts/content.js b/app/assets/javascripts/content.js index 68e296930..7613606e4 100644 --- a/app/assets/javascripts/content.js +++ b/app/assets/javascripts/content.js @@ -2,4 +2,5 @@ //= require 'base' //= require 'modules/cms/article_navigation' //= require 'modules/cms/external_links' +//= require 'modules/cms/tracked_download_links' //= require 'modules/cms/base' \ No newline at end of file diff --git a/app/assets/javascripts/modules/cms/base.js.coffee b/app/assets/javascripts/modules/cms/base.js.coffee index 4ffeb84a1..ca8163e7d 100644 --- a/app/assets/javascripts/modules/cms/base.js.coffee +++ b/app/assets/javascripts/modules/cms/base.js.coffee @@ -1,11 +1,14 @@ $(document).ready( -> - require(['cms:article_navigation', 'cms:external_links'], (ArticleNavigation, ExternalLinks) -> + require(['cms:article_navigation', 'cms:external_links', 'cms:tracked_download_links'], (ArticleNavigation, ExternalLinks, TrackedDownloadLinks) -> if $verticalNav = $('.vertical-nav') ArticleNavigation.initialize($verticalNav) if $links = $('.article a') ExternalLinks.initialize($links) + if $trackedDownloadLinks = $('[data-track]') + TrackedDownloadLinks.initialize($trackedDownloadLinks) + $cover = $('.hero__cover') if $cover.length > 0 diff --git a/app/assets/javascripts/modules/cms/tracked_download_links.js.coffee b/app/assets/javascripts/modules/cms/tracked_download_links.js.coffee new file mode 100644 index 000000000..984fbe6ab --- /dev/null +++ b/app/assets/javascripts/modules/cms/tracked_download_links.js.coffee @@ -0,0 +1,17 @@ +define('cms:tracked_download_links', [], -> + class TrackedDownloadLinks + @initialize: ($tracked_links) -> + new TrackedDownloadLinks($tracked_links).initialize() + + constructor: (@$tracked_links) -> + + initialize: -> + @$tracked_links.each((n, link) -> + label = link.dataset.track + + link.addEventListener('click', -> + if ga? + ga('send', 'event', "Downloads - CMS", 'click', label) + ) + ) +) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a5e372349..8a89c96a0 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,19 +1,3 @@ -/* - - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. - * - * *= require_self - */ - @import './utilities/rem-calc'; @import './settings'; @import './utilities/*'; @@ -22,11 +6,11 @@ @import './components/*'; @import './pages/*'; -// // grids -// // @import 'bourbon/core/bourbon'; -// @import 'bourbon-neat/app/assets/stylesheets/neat'; +// grids +// @import 'bourbon'; +// @import 'neat'; -// // // maps +// maps // @import 'leaflet/dist/leaflet'; // development mixins @@ -172,4 +156,5 @@ // @import './components/vue-agile'; -// @import 'utilities/u-classes'; \ No newline at end of file + +// @import 'utilities/u-classes'; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1358543a8..fb25a7065 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -29,7 +29,7 @@ def cover item end def protected_area_cover protected_area - version = Rails.application.secrets.mapbox['version'] + version = Rails.application.secrets.mapbox[:version] image_params = {id: protected_area.wdpa_id, type: "protected_area", version: version} image_tag( @@ -41,7 +41,7 @@ def protected_area_cover protected_area end def country_cover country - version = Rails.application.secrets.mapbox['version'] + version = Rails.application.secrets.mapbox[:version] image_params = {id: country.iso, type: "country", version: version} image_tag( @@ -73,7 +73,7 @@ def page_title(here= false) end end - def url_encode (text) + def url_encode(text) ERB::Util.url_encode(text) end @@ -106,7 +106,7 @@ def social_image_alt World Database on Protected Areas (WDPA), and the most comprehensive global database on terrestrial and marine protected areas. """ - + def seo_description if content_for?(:seo) content_for(:seo) diff --git a/app/helpers/protected_areas_helper.rb b/app/helpers/protected_areas_helper.rb index b5d664b07..d8b27df68 100644 --- a/app/helpers/protected_areas_helper.rb +++ b/app/helpers/protected_areas_helper.rb @@ -1,6 +1,6 @@ module ProtectedAreasHelper def map_bounds protected_area=nil - return Rails.application.secrets.default_map_bounds unless protected_area + return Rails.application.secrets.default_map_bounds.stringify_keys unless protected_area { 'from' => protected_area.bounds.first, @@ -14,7 +14,7 @@ def related_links? protected_area def url_for_related_source source, protected_area File.join( - Rails.application.secrets.related_sources_base_urls[source], + Rails.application.secrets.related_sources_base_urls[source.to_sym], protected_area.wdpa_id.to_s ) end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 840c6fa9e..19dea2be6 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -99,7 +99,7 @@ def title_with_filter params end def pa_autocomplete_link result - version = Rails.application.secrets.mapbox['version'] + version = Rails.application.secrets.mapbox[:version] image_params = {id: result[:identifier], type: result[:type], version: version} link_to protected_area_url(result[:identifier]), class: "autocompletion__result" do @@ -118,7 +118,7 @@ def pa_autocomplete_link result end def country_autocomplete_link result - version = Rails.application.secrets.mapbox['version'] + version = Rails.application.secrets.mapbox[:version] image_params = {id: result[:identifier], type: result[:type], version: version} type = (result[:type] == "country" ? "country/territory" : result[:type]) diff --git a/app/models/country.rb b/app/models/country.rb index b72a7e377..61aa44acb 100644 --- a/app/models/country.rb +++ b/app/models/country.rb @@ -10,7 +10,7 @@ class Country < ApplicationRecord belongs_to :region_for_index, -> { select('regions.id, regions.name') }, :class_name => 'Region', :foreign_key => 'region_id' has_many :sub_locations - has_many :designations, -> { uniq }, through: :protected_areas + has_many :designations, -> { distinct }, through: :protected_areas has_many :iucn_categories, through: :protected_areas belongs_to :parent, class_name: "Country", foreign_key: :country_id diff --git a/app/models/region.rb b/app/models/region.rb index 1203e15d0..32dccd589 100644 --- a/app/models/region.rb +++ b/app/models/region.rb @@ -3,7 +3,7 @@ class Region < ApplicationRecord has_many :countries has_many :protected_areas, through: :countries - has_many :designations, -> { uniq }, through: :protected_areas + has_many :designations, -> { distinct }, through: :protected_areas has_many :iucn_categories, through: :protected_areas has_one :regional_statistic diff --git a/app/views/admin/home_carousel_slides/edit.html.haml b/app/views/admin/home_carousel_slides/edit.html.haml index d993e28f9..c5afde94b 100644 --- a/app/views/admin/home_carousel_slides/edit.html.haml +++ b/app/views/admin/home_carousel_slides/edit.html.haml @@ -1,5 +1,5 @@ .page-header %h2 Edit Home Carousel Slide -= comfy_form_for [:admin, @home_carousel_slide] do |form| - = render form \ No newline at end of file += comfy_form_with model: [:admin, @home_carousel_slide] do |form| + = render form diff --git a/app/views/admin/home_carousel_slides/new.html.haml b/app/views/admin/home_carousel_slides/new.html.haml index 20f444d6a..8e11f8eba 100644 --- a/app/views/admin/home_carousel_slides/new.html.haml +++ b/app/views/admin/home_carousel_slides/new.html.haml @@ -1,5 +1,5 @@ .page-header %h2 New Home Carousel Slide -= comfy_form_for [:admin, @home_carousel_slide] do |form| - = render form \ No newline at end of file += comfy_form_with model: [:admin, @home_carousel_slide] do |form| + = render form diff --git a/app/views/cms/_article_nav.html.erb b/app/views/cms/_article_nav.html.erb index 0c748259a..0dfec1162 100644 --- a/app/views/cms/_article_nav.html.erb +++ b/app/views/cms/_article_nav.html.erb @@ -1,7 +1,7 @@

Sections

- <% Nokogiri::HTML(cms_block_content(:content)).css('h2').each do |section| %> + <% Nokogiri::HTML(cms_fragment_content(:content)).css('h2').each do |section| %> <%= section.content %> <% end %>
diff --git a/app/views/cms/_child_dropdown.html.erb b/app/views/cms/_child_dropdown.html.erb index 8031932fb..237b09376 100644 --- a/app/views/cms/_child_dropdown.html.erb +++ b/app/views/cms/_child_dropdown.html.erb @@ -7,11 +7,11 @@ object = {} object[:title] = child.label - object[:text] = cms_block_content_render(:text, child) - object[:url] = cms_block_content(:url, child) - - if(cms_block_content(:image, child).try(:file) && cms_block_content(:image, child).file.url(:dropdownImage)) - object[:image] = cms_block_content(:image, child).file.url(:dropdownImage) + object[:text] = cms_fragment_content(:text, child) + object[:url] = cms_fragment_content(:url, child) + + if(cms_fragment_content(:image, child).try(:file) && cms_fragment_content(:image, child).file.url(:dropdownImage)) + object[:image] = cms_fragment_content(:image, child).file.url(:dropdownImage) end @options.push(object) @@ -20,4 +20,4 @@ end %> - \ No newline at end of file + diff --git a/app/views/cms/versions/_version_alert.html.erb b/app/views/cms/versions/_version_alert.html.erb index 2b8e0c228..3a717f61b 100644 --- a/app/views/cms/versions/_version_alert.html.erb +++ b/app/views/cms/versions/_version_alert.html.erb @@ -1,4 +1,4 @@ -<% if cms_block_content(:display_version_alert) == "1" %> +<% if cms_fragment_content(:display_version_alert) %>