Merge pull request #213 from haiafara/development

[release] 2019-09-04 - Tailwind CSS & Security

.eslintrc.js

@@ -1,7 +1,9 @@
 module.exports = {
   'env': {
     'browser': true,
-    'es6': true
+    'es6': true,
+    'node': true,
+    'amd': true
   },
   'extends': [
     'eslint:recommended',

.overcommit.yml

@@ -0,0 +1,49 @@
+# Use this file to configure the Overcommit hooks you wish to use. This will
+# extend the default configuration defined in:
+# https://github.com/sds/overcommit/blob/master/config/default.yml
+#
+# At the topmost level of this YAML file is a key representing type of hook
+# being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
+# customize each hook, such as whether to only run it on certain files (via
+# `include`), whether to only display output if it fails (via `quiet`), etc.
+#
+# For a complete list of hooks, see:
+# https://github.com/sds/overcommit/tree/master/lib/overcommit/hook
+#
+# For a complete list of options that you can use to customize hooks, see:
+# https://github.com/sds/overcommit#configuration
+#
+# Uncomment the following lines to make the configuration take effect.
+
+#PreCommit:
+#  RuboCop:
+#    enabled: true
+#    on_warn: fail # Treat all warnings as failures
+#
+#  TrailingWhitespace:
+#    enabled: true
+#    exclude:
+#      - '**/db/structure.sql' # Ignore trailing whitespace in generated files
+#
+#PostCheckout:
+#  ALL: # Special hook name that customizes all hooks of this type
+#    quiet: true # Change all post-checkout hooks to only display output on failure
+#
+#  IndexTags:
+#    enabled: true # Generate a tags file with `ctags` each time HEAD changes
+
+PreCommit:
+  ALL:
+    problem_on_unmodified_line: report
+    requires_files: true
+    quiet: false
+  EsLint:
+    enabled: true
+    required_executable: 'eslint'
+    on_warn: fail
+#    flags: ['--ext', '.js,.vue', 'app/javascript/']
+    include:
+      - 'app/javascript/**/*.js'
+      - 'app/javascript/**/*.vue'
+  RuboCop:
+    enabled: true

.postcssrc.yml

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

.rubocop.yml

@@ -0,0 +1,26 @@
+# The behavior of RuboCop can be controlled via the .rubocop.yml
+# configuration file. It makes it possible to enable/disable
+# certain cops (checks) and to alter their behavior if they accept
+# any parameters. The file can be placed either in your home
+# directory or in some project directory.
+#
+# RuboCop will start looking for the configuration file in the directory
+# where the inspected file is and continue its way up to the root directory.
+#
+# See https://github.com/rubocop-hq/rubocop/blob/master/manual/configuration.md
+
+require:
+  - rubocop-rails
+  - rubocop-rspec
+
+AllCops:
+  Exclude:
+    - 'node_modules/**/*'
+
+# Metrics/BlockLength:
+#   Enabled: true
+#   Exclude:
+#     - spec/**/*
+
+# Documentation:
+#  Enabled: false

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    { "language": "vue", "autoFix": true }
+  ],
+  "vetur.validation.template": false
+}

Gemfile

@@ -37,8 +37,8 @@ gem 'jbuilder', '~> 2.5'
 gem 'bootsnap', '>= 1.1.0', require: false
 
 gem 'capistrano'
-gem 'capistrano-rails'
 gem 'capistrano-passenger'
+gem 'capistrano-rails'
 gem 'capistrano-rvm'
 gem 'capistrano-sidekiq'
 
@@ -47,53 +47,59 @@ gem 'loofah', '>= 2.2.3'
 gem 'rack', '>= 2.0.6'
 
 # monitoring, etc
-gem 'skylight'
 gem 'sentry-raven'
+gem 'skylight'
 
 # my gems
 gem 'administrate'
 gem 'administrate-field-shrine', github: 'haiafara/administrate-field-shrine'
 gem 'aws-sdk-s3'
 gem 'devise'
-gem 'friendly_id', '~> 5.2.0'
 gem 'fast_jsonapi'
+gem 'friendly_id', '~> 5.2.0'
 gem 'image_processing', '~> 1.0'
 gem 'rgeo-geojson'
-gem 'sitemap_generator'
-gem 'sidekiq'
 gem 'shrine'
+gem 'sidekiq', '~> 5.2.7'
+gem 'sitemap_generator'
 
 gem 'underpass'
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-  gem 'rspec-rails', '~> 3.8'
+  # Call 'byebug' anywhere in the code to stop execution
+  # and get a debugger console
+  gem 'byebug', platforms: %i[mri mingw x64_mingw]
   gem 'database_cleaner'
   gem 'factory_bot_rails', '~> 5.0'
   gem 'pry'
+  gem 'rspec-rails', '~> 3.8'
+  gem 'rubocop'
+  gem 'rubocop-rails'
+  gem 'rubocop-rspec'
 end
 
 group :development do
-  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'rubocop'
   gem 'rubocop-rails'
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  # Spring speeds up development by keeping your application running in the
+  # background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  # Access an interactive console on exception pages
+  # or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
 end
 
 group :test do
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '>= 2.15'
+  gem 'coveralls', require: false
   gem 'selenium-webdriver'
   # Easy installation and use of chromedriver to run system tests with Chrome
   # gem 'chromedriver-helper'
-  gem 'simplecov', require: false
-  gem 'coveralls', require: false
   gem 'shrine-memory'
+  gem 'simplecov', require: false
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -53,8 +53,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     administrate (0.11.0)
       actionpack (>= 4.2, < 6.0)
       actionview (>= 4.2, < 6.0)
@@ -66,35 +66,35 @@ GEM
       momentjs-rails (~> 2.8)
       sass-rails (~> 5.0)
       selectize-rails (~> 0.6)
-    airbrussh (1.3.2)
+    airbrussh (1.3.3)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (9.0.0)
     ast (2.4.0)
     autoprefixer-rails (9.6.0)
       execjs
     aws-eventstream (1.0.3)
-    aws-partitions (1.172.0)
-    aws-sdk-core (3.54.2)
+    aws-partitions (1.207.0)
+    aws-sdk-core (3.65.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.21.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
+    aws-sdk-kms (1.24.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.53.0)
+    aws-sdk-s3 (1.48.0)
+      aws-sdk-core (~> 3, >= 3.61.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     bcrypt (3.1.13)
     bindex (0.7.0)
-    bootsnap (1.4.4)
+    bootsnap (1.4.5)
       msgpack (~> 1.0)
     builder (3.2.3)
     byebug (11.0.1)
-    capistrano (3.11.0)
+    capistrano (3.11.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -112,15 +112,15 @@ GEM
     capistrano-sidekiq (1.0.2)
       capistrano (>= 3.9.0)
       sidekiq (>= 3.4)
-    capybara (3.28.0)
+    capybara (3.29.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.5)
       xpath (~> 3.2)
-    childprocess (1.0.1)
+    childprocess (2.0.0)
       rake (< 13.0)
     coderay (1.1.2)
     coffee-rails (5.0.0)
@@ -214,7 +214,7 @@ GEM
     minitest (5.11.3)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
-    msgpack (1.2.10)
+    msgpack (1.3.1)
     multipart-post (2.1.1)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
@@ -224,16 +224,16 @@ GEM
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.0)
       ast (~> 2.4.0)
     pg (1.1.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     puma (3.12.1)
     rack (2.0.7)
-    rack-protection (2.0.5)
+    rack-protection (2.0.7)
       rack
     rack-proxy (0.6.5)
       rack
@@ -303,9 +303,11 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.3.1)
+    rubocop-rails (2.3.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
+    rubocop-rspec (1.35.0)
+      rubocop (>= 0.60.0)
     ruby-progressbar (1.10.1)
     ruby-vips (2.0.13)
       ffi (~> 1.9)
@@ -323,8 +325,8 @@ GEM
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     selectize-rails (0.12.6)
-    selenium-webdriver (3.142.3)
-      childprocess (>= 0.5, < 2.0)
+    selenium-webdriver (3.142.4)
+      childprocess (>= 0.5, < 3.0)
       rubyzip (~> 1.2, >= 1.2.2)
     sentry-raven (2.11.0)
       faraday (>= 0.7.6, < 1.0)
@@ -360,7 +362,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.18.2)
+    sshkit (1.20.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     term-ansicolor (1.7.1)
@@ -429,12 +431,13 @@ DEPENDENCIES
   rspec-rails (~> 3.8)
   rubocop
   rubocop-rails
+  rubocop-rspec
   sass-rails (~> 5.0)
   selenium-webdriver
   sentry-raven
   shrine
   shrine-memory
-  sidekiq
+  sidekiq (~> 5.2.7)
   simplecov
   sitemap_generator
   skylight

README.md

@@ -13,11 +13,12 @@
 
 ## Uses
 
-*   [Vuetify](https://vuetifyjs.com/en/)
+*   [Tailwind CSS](https://tailwindcss.com/)
 *   [Leaflet](https://leafletjs.com/)
 *   [Leaflet.fullscreen](https://github.com/Leaflet/Leaflet.fullscreen)
+*   [Leaflet-active-area](https://github.com/Mappy/Leaflet-active-area)
 *   [CSS Element Queries](https://github.com/marcj/css-element-queries)
-*   [vue-image-lightbox](https://github.com/pexea12/vue-image-lightbox)  
+*   [vue-image-lightbox](https://github.com/pexea12/vue-image-lightbox)
 
 ## License
 

app/controllers/admin/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # All Administrate controllers inherit from this `Admin::ApplicationController`,
 # making it the ideal place to put authentication logic or other
 # before_actions.

app/controllers/admin/photos_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class PhotosController < Admin::ApplicationController
     # To customize the behavior of this controller,

app/controllers/admin/pois_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class POIsController < Admin::ApplicationController
     # To customize the behavior of this controller,

app/controllers/admin/regions_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class RegionsController < Admin::ApplicationController
     # To customize the behavior of this controller,

app/controllers/admin/zones_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class ZonesController < Admin::ApplicationController
     # To customize the behavior of this controller,

app/controllers/api/pois_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class API::POIsController < ApplicationController
   include POILoader
   def show

app/controllers/api/zones_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class API::ZonesController < ApplicationController
   include ZoneLoader
   def show

app/controllers/application_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
 end