From 3a1642435a0fb067b508179007519d878325d472 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 7 Jan 2021 14:43:54 +0300 Subject: [PATCH 1/2] #6 Notation and information part design on the map --- package.json | 3 +++ webpack.mix.js | 1 + 2 files changed, 4 insertions(+) diff --git a/package.json b/package.json index a5d22e8d9..6aa43294f 100644 --- a/package.json +++ b/package.json @@ -22,5 +22,8 @@ "sass-loader": "^7.1.0", "vue": "^2.5.17", "vue-template-compiler": "^2.6.11" + }, + "dependencies": { + "ol": "^6.5.0" } } diff --git a/webpack.mix.js b/webpack.mix.js index 69594ff2d..045a028cc 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,4 +13,5 @@ let mix = require('laravel-mix'); mix .js('resources/assets/js/app.js', 'public/js') + .js('addons/default/visiosoft/*/resources/js/init.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css'); From fef2c51316a45677d8c6765493c8f3adee5a2a6a Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 7 Jan 2021 16:08:34 +0300 Subject: [PATCH 2/2] revert --- package.json | 3 --- webpack.mix.js | 1 - 2 files changed, 4 deletions(-) diff --git a/package.json b/package.json index 6aa43294f..a5d22e8d9 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,5 @@ "sass-loader": "^7.1.0", "vue": "^2.5.17", "vue-template-compiler": "^2.6.11" - }, - "dependencies": { - "ol": "^6.5.0" } } diff --git a/webpack.mix.js b/webpack.mix.js index 045a028cc..69594ff2d 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,5 +13,4 @@ let mix = require('laravel-mix'); mix .js('resources/assets/js/app.js', 'public/js') - .js('addons/default/visiosoft/*/resources/js/init.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css');