Skip to content

Commit 4ac60b2

Browse files
author
Arman Badalyan
committed
geophystech#192 Upgrade packages from npm
1 parent 8f66d4b commit 4ac60b2

File tree

7 files changed

+26
-71
lines changed

7 files changed

+26
-71
lines changed

index.html

-25
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<link rel="shortcut icon" type="image/png" href="/static/img/favicon.ico"/>
6-
7-
<script src="https://unpkg.com/leaflet@1.3.1/dist/leaflet.js"
8-
integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgBtaRJQEIFCW+oC506aPT2L1zw=="
9-
crossorigin=""></script>
10-
<script src='/static/js/Leaflet.fullscreen.min.js'></script>
11-
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/leaflet-dvf.markers.min.js"
12-
integrity="sha256-d4jm/DxK0vxzigVql4lmwFikmXIlItcko9Me2md/mwI="
13-
crossorigin="anonymous"></script>
14-
<script src="/static/js/leaflet.zoomhome.min.js"></script>
15-
<script src="https://unpkg.com/leaflet.markercluster@1.2.0/dist/leaflet.markercluster.js"></script>
16-
<script src="https://unpkg.com/leaflet.gridlayer.googlemutant@latest/Leaflet.GoogleMutant.js"></script>
17-
18-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
19-
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
20-
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.1/dist/leaflet.css"
21-
integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ=="
22-
crossorigin=""/>
23-
<link href='/static/css/leaflet.fullscreen.css' rel='stylesheet' />
24-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet-dvf/0.3.1/css/dvf.min.css"
25-
integrity="sha256-5uAy8QzyDa8Zw5Peo+DoYafYtmaukqtPsHhnaL7bAWA="
26-
crossorigin="anonymous" />
27-
<link rel="stylesheet" href="https://unpkg.com/leaflet.markercluster@1.2.0/dist/MarkerCluster.Default.css">
28-
<link rel="stylesheet" href="https://unpkg.com/leaflet.markercluster@1.2.0/dist/MarkerCluster.css">
29-
306
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300&amp;subset=cyrillic" rel="stylesheet">
31-
327
<link href="/static/css/global.css" rel="stylesheet">
338
</head>
349
<body>

package.json

+7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@
1717
"axios": "^0.16.2",
1818
"bootstrap": "^4.1.2",
1919
"chart.js": "^2.7.0",
20+
"font-awesome": "^4.7.0",
2021
"idle-vue": "^2.0.5",
22+
"leaflet": "^1.3.4",
23+
"leaflet-dvf": "^0.3.1",
24+
"leaflet-fullscreen": "^1.0.2",
25+
"leaflet-zoomhome": "github:armd-pro/leaflet.zoomhome",
26+
"leaflet.gridlayer.googlemutant": "^0.7.0",
27+
"leaflet.markercluster": "^1.4.1",
2128
"vue": "^2.5.16",
2229
"vue-analytics": "^5.10.2",
2330
"vue-axios": "^2.0.2",

src/main.js

+19
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@ import 'bootstrap/dist/css/bootstrap.css'
2323
import 'bootstrap-vue/dist/bootstrap-vue.css'
2424
import 'moment/locale/ru'
2525

26+
// Leaflet
27+
28+
import 'leaflet/dist/leaflet'
29+
import 'leaflet/dist/leaflet.css'
30+
31+
import 'leaflet-fullscreen/dist/Leaflet.fullscreen'
32+
import 'leaflet-fullscreen/dist/leaflet.fullscreen.css'
33+
34+
import 'leaflet-dvf/dist/leaflet-dvf'
35+
import 'leaflet-dvf/dist/css/dvf.css'
36+
37+
import 'leaflet-zoomhome/dist/leaflet.zoomhome'
38+
39+
import 'leaflet.markercluster/dist/leaflet.markercluster'
40+
import 'leaflet.markercluster/dist/MarkerCluster.css'
41+
import 'leaflet.markercluster/dist/MarkerCluster.Default.css'
42+
43+
import 'leaflet.gridlayer.googlemutant/Leaflet.GoogleMutant'
44+
2645
Vue.config.productionTip = false
2746

2847
Vue.use(BootstrapVue)

static/css/leaflet.fullscreen.css

-40
This file was deleted.

static/img/leaflet/fullscreen.png

-420 Bytes
Binary file not shown.

static/js/Leaflet.fullscreen.min.js

-1
This file was deleted.

static/js/leaflet.zoomhome.min.js

-5
This file was deleted.

0 commit comments

Comments
 (0)