diff --git a/Gemfile b/Gemfile index f50c84c9d..ce1acf47b 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,6 @@ gem "initialjs-rails", "~> 0.2.0.9" gem "invisible_captcha", "~> 2.1.0" gem "jquery-fileupload-rails" gem "kaminari", "~> 1.2.2" -gem "leaflet-rails", "~> 1.9.3" gem "mini_magick", "~> 4.12.0" gem "omniauth", "~> 2.1.1" gem "omniauth-facebook", "~> 9.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index ecd71a942..bd7478e83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -317,8 +317,6 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - leaflet-rails (1.9.3) - rails (>= 4.2.0) letter_opener (1.8.1) launchy (>= 2.2, < 3) letter_opener_web (2.0.0) @@ -740,7 +738,6 @@ DEPENDENCIES kaminari (~> 1.2.2) knapsack_pro (~> 5.7.0) launchy (~> 2.5.2) - leaflet-rails (~> 1.9.3) letter_opener_web (~> 2.0.0) mdl (~> 0.12.0) mini_magick (~> 4.12.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3598b75b3..3c81c4161 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -104,7 +104,7 @@ //= require tree_navigator //= require tag_autocomplete //= require polls_admin -//= require leaflet +//= require leaflet/dist/leaflet //= require map //= require polls //= require sortable diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0d44d672e..1e4373b43 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,7 +11,7 @@ @import "jquery-ui/themes/base/autocomplete"; @import "jquery-ui/themes/base/datepicker"; @import "jquery-ui/themes/base/sortable"; -@import "leaflet"; +@import "leaflet/dist/leaflet"; @import "foundation_and_overrides"; @import "fonts"; diff --git a/package-lock.json b/package-lock.json index 814dcebbd..7bcd0376b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,8 @@ "dependencies": { "jquery": "^3.7.1", "jquery-ui": "^1.13.2", - "jquery-ujs": "^1.2.3" + "jquery-ujs": "^1.2.3", + "leaflet": "^1.9.4" } }, "node_modules/jquery": { @@ -31,6 +32,11 @@ "peerDependencies": { "jquery": ">=1.8.0" } + }, + "node_modules/leaflet": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", + "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==" } } } diff --git a/package.json b/package.json index ad268e159..2e861dbb9 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "dependencies": { "jquery": "^3.7.1", "jquery-ui": "^1.13.2", - "jquery-ujs": "^1.2.3" + "jquery-ujs": "^1.2.3", + "leaflet": "^1.9.4" } }