Browse Source

updated dependencies to latest

package_update
DPTeamMember 6 years ago
parent
commit
f6bcf692be
22 changed files with 207 additions and 122 deletions
  1. +2
    -2
      README.md
  2. +1
    -1
      forms.php
  3. +15
    -13
      package.json
  4. +99
    -83
      src/assets/scripts/vectorMaps/index.js
  5. +1
    -1
      src/basic-table.html
  6. +1
    -1
      src/blank.html
  7. +1
    -1
      src/buttons.html
  8. +1
    -1
      src/calendar.html
  9. +1
    -1
      src/charts.html
  10. +1
    -1
      src/chat.html
  11. +1
    -1
      src/compose.html
  12. +1
    -1
      src/datatable.html
  13. +1
    -1
      src/email.html
  14. +1
    -1
      src/forms.html
  15. +1
    -1
      src/google-maps.html
  16. +25
    -4
      src/index.html
  17. +1
    -1
      src/ui.html
  18. +18
    -5
      src/vector-maps.html
  19. +1
    -1
      webpack/plugins/htmlPlugin.js
  20. +1
    -1
      webpack/plugins/internal.js
  21. +16
    -0
      webpack/rules/fonts.js
  22. +17
    -0
      webpack/rules/images.js

+ 2
- 2
README.md View File

@ -63,7 +63,7 @@ Here is a brief explanation of the template folder structure and some of its mai
│ │ │ └── sidebar # Sidebar JS code.
│ │ │ └── skycons # Animated icons plugin init.
│ │ │ └── utils # Basic utils used for proper rendering.
│ │ │ └── vectorMaps # Vector maps plugin init.
│ │ │ └── MapboxGLMaps # Mapbox GL Maps plugin init.
│ │ │ └── index.js # Indicator file.
│ │ │
│ │ └── static # Contains the non-code files.
@ -134,7 +134,7 @@ Used to create a local dev server in order to preview the final output of build
- [Fullcalendar](https://fullcalendar.io/)
- [Jquery](https://jquery.com/)
- [Jquery Sparkline](https://omnipotent.net/jquery.sparkline/)
- [Jvectormap](http://jvectormap.com/)
- [Mapbox](https://www.mapbox.com/)
- [Load Google Maps API](https://github.com/yuanqing/load-google-maps-api)
- [Lodash](https://lodash.com/)
- [Masonry](https://masonry.desandro.com/)


+ 1
- 1
forms.php View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 15
- 13
package.json View File

@ -46,23 +46,25 @@
"webpack-dev-server": "^2.9.3"
},
"dependencies": {
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.0.0",
"bootstrap-datepicker": "^1.7.1",
"brand-colors": "^2.0.1",
"chart.js": "^2.9.2",
"datatables": "^1.10.13",
"@babel/polyfill": "^7.10.1",
"@popperjs/core": "^2.4.2",
"bootstrap": "^4.5.0",
"bootstrap-datepicker": "^1.9.0",
"brand-colors": "^2.1.1",
"chart.js": "^2.9.3",
"datatables": "^1.10.18",
"easy-pie-chart": "^2.1.7",
"file-loader": "^1.1.5",
"fullcalendar": "^3.6.2",
"jquery": "^3.2.1",
"fullcalendar": "3.10.0",
"jquery": "^3.5.1",
"jquery-sparkline": "^2.4.0",
"jvectormap": "^2.0.4",
"load-google-maps-api": "^1.0.0",
"lodash": "^4.17.4",
"masonry-layout": "^4.2.0",
"moment": "^2.19.1",
"perfect-scrollbar": "^1.1.0",
"load-google-maps-api": "^2.0.2",
"lodash": "^4.17.15",
"mapbox-gl": "^1.11.0",
"masonry-layout": "^4.2.2",
"moment": "^2.27.0",
"perfect-scrollbar": "^1.5.0",
"popper.js": "^1.12.6",
"skycons": "^1.0.0"
}


+ 99
- 83
src/assets/scripts/vectorMaps/index.js View File

@ -1,94 +1,110 @@
import * as $ from 'jquery';
import 'jvectormap';
import mapboxgl from "mapbox-gl";
import 'jvectormap/jquery-jvectormap.css';
import './jquery-jvectormap-world-mill.js';
import { debounce } from 'lodash';
export default (function () {
const vectorMapInit = () => {
if ($('#world-map-marker').length > 0) {
// This is a hack, as the .empty() did not do the work
$('#vmap').remove();
// export default (function () {
// const vectorMapInit = () => {
// if ($('#world-map-marker').length > 0) {
// // This is a hack, as the .empty() did not do the work
// $('#vmap').remove();
// we recreate (after removing it) the container div, to reset all the data of the map
$('#world-map-marker').append(`
<div
id="vmap"
style="
height: 490px;
position: relative;
overflow: hidden;
background-color: transparent;
"
>
</div>
`);
// // we recreate (after removing it) the container div, to reset all the data of the map
// $('#world-map-marker').append(`
// <div
// id="vmap"
// style="
// height: 490px;
// position: relative;
// overflow: hidden;
// background-color: transparent;
// "
// >
// </div>
// `);
$('#vmap').vectorMap({
map: 'world_mill',
backgroundColor: '#fff',
borderColor: '#fff',
borderOpacity: 0.25,
borderWidth: 0,
color: '#e6e6e6',
regionStyle : {
initial : {
fill : '#e4ecef',
},
},
// $('#vmap').vectorMap({
// map: 'world_mill',
// backgroundColor: '#fff',
// borderColor: '#fff',
// borderOpacity: 0.25,
// borderWidth: 0,
// color: '#e6e6e6',
// regionStyle : {
// initial : {
// fill : '#e4ecef',
// },
// },
markerStyle: {
initial: {
r: 7,
'fill': '#fff',
'fill-opacity':1,
'stroke': '#000',
'stroke-width' : 2,
'stroke-opacity': 0.4,
},
},
// markerStyle: {
// initial: {
// r: 7,
// 'fill': '#fff',
// 'fill-opacity':1,
// 'stroke': '#000',
// 'stroke-width' : 2,
// 'stroke-opacity': 0.4,
// },
// },
markers : [{
latLng : [21.00, 78.00],
name : 'INDIA : 350',
}, {
latLng : [-33.00, 151.00],
name : 'Australia : 250',
}, {
latLng : [36.77, -119.41],
name : 'USA : 250',
}, {
latLng : [55.37, -3.41],
name : 'UK : 250',
}, {
latLng : [25.20, 55.27],
name : 'UAE : 250',
}],
series: {
regions: [{
values: {
'US': 298,
'SA': 200,
'AU': 760,
'IN': 200,
'GB': 120,
},
scale: ['#03a9f3', '#02a7f1'],
normalizeFunction: 'polynomial',
}],
},
hoverOpacity: null,
normalizeFunction: 'linear',
zoomOnScroll: false,
scaleColors: ['#b6d6ff', '#005ace'],
selectedColor: '#c9dfaf',
selectedRegions: [],
enableZoom: false,
hoverColor: '#fff',
});
}
};
// markers : [{
// latLng : [21.00, 78.00],
// name : 'INDIA : 350',
// }, {
// latLng : [-33.00, 151.00],
// name : 'Australia : 250',
// }, {
// latLng : [36.77, -119.41],
// name : 'USA : 250',
// }, {
// latLng : [55.37, -3.41],
// name : 'UK : 250',
// }, {
// latLng : [25.20, 55.27],
// name : 'UAE : 250',
// }],
// series: {
// regions: [{
// values: {
// 'US': 298,
// 'SA': 200,
// 'AU': 760,
// 'IN': 200,
// 'GB': 120,
// },
// scale: ['#03a9f3', '#02a7f1'],
// normalizeFunction: 'polynomial',
// }],
// },
// hoverOpacity: null,
// normalizeFunction: 'linear',
// zoomOnScroll: false,
// scaleColors: ['#b6d6ff', '#005ace'],
// selectedColor: '#c9dfaf',
// selectedRegions: [],
// enableZoom: false,
// hoverColor: '#fff',
// });
// }
// };
vectorMapInit();
$(window).resize(debounce(vectorMapInit, 150));
})();
// vectorMapInit();
// $(window).resize(debounce(vectorMapInit, 150));
// })();
$(document).ready(() => {
//MapBox-GL
if (document.getElementById("world-map-marker")) {
mapboxgl.accessToken = 'pk.eyJ1IjoiZGFzaGJvYXJlZHBhY2siLCJhIjoiY2s5bWlhZHRqMDAxazNsbnlpbXhhdDcwMSJ9.YU6cxTiRujREOAIVO6iLmA';
var coordinates = document.getElementById('coordinates');
var map = new mapboxgl.Map({
container: 'world-map-marker',
style: 'mapbox://styles/mapbox/streets-v11',
center: [0, 0],
zoom: 1
});
}
});

+ 1
- 1
src/basic-table.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/blank.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/buttons.html View File

@ -168,7 +168,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/calendar.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/charts.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/chat.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/compose.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/datatable.html View File

@ -219,7 +219,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/email.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/forms.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 1
- 1
src/google-maps.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 25
- 4
src/index.html View File

@ -6,6 +6,16 @@
<title>Dashboard</title>
<style>
#world-map-marker {
position: absolute;
top: 11px;
left: 11px;
bottom: 0;
width: 838px;
height: 521px;
margin: 0;
padding: 0;
}
#loader {
transition: all 0.3s ease-in-out;
opacity: 1;
@ -34,6 +44,20 @@
animation: sk-scaleout 1.0s infinite ease-in-out;
}
@media screen and (max-width: 812px) {
#world-map-marker {
display: none;
position: absolute;
top: 11px;
left: 11px;
bottom: 0;
width: 400px;
height: 70px;
margin: 0;
padding: 0;
}
}
@-webkit-keyframes sk-scaleout {
0% { -webkit-transform: scale(0) }
100% {
@ -217,7 +241,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>
@ -601,9 +625,6 @@
<div class="peers fxw-nw@lg+ ai-s">
<div class="peer peer-greed w-70p@lg+ w-100@lg- p-20">
<div class="layers">
<div class="layer w-100 mB-10">
<h6 class="lh-1">Site Visits</h6>
</div>
<div class="layer w-100">
<div id="world-map-marker"></div>
</div>


+ 1
- 1
src/ui.html View File

@ -218,7 +218,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>


+ 18
- 5
src/vector-maps.html View File

@ -3,8 +3,9 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Vector Maps</title>
<title>Mapbox GL</title>
<style>
#world-map-marker { position: absolute; top: 13px; left: 29px; bottom: 0; width: 1142px; height: 538px; margin: 0; padding: 0;}
#loader {
transition: all 0.3s ease-in-out;
opacity: 1;
@ -35,6 +36,19 @@
animation: sk-scaleout 1.0s infinite ease-in-out;
}
@media screen and (max-width: 812px) {
#world-map-marker {
position: absolute;
top: 8px;
left: 20px;
bottom: 0;
width: 325px;
height: 538px;
margin: 0;
padding: 0;
}
}
@-webkit-keyframes sk-scaleout {
0% { -webkit-transform: scale(0) }
100% {
@ -218,7 +232,7 @@
<a href="google-maps.html">Google Map</a>
</li>
<li>
<a href="vector-maps.html">Vector Map</a>
<a href="vector-maps.html">Mapbox GL Map</a>
</li>
</ul>
</li>
@ -516,11 +530,10 @@
<main class='main-content bgc-grey-100'>
<div id='mainContent'>
<div class="container-fluid">
<h4 class="c-grey-900 mT-10 mB-30">Vector Maps</h4>
<h4 class="c-grey-900 mT-10 mB-30">Mapbox GL Map</h4>
<div class="row">
<div class="col-md-12">
<div class="bgc-white bd bdrs-3 p-20 mB-20">
<h6 class="c-grey-900 mB-20">Jquery Vector Maps</h6>
<div class="bgc-white bd bdrs-3 p-20 mB-20" style="height: 580px;">
<div id="world-map-marker"></div>
</div>
</div>


+ 1
- 1
webpack/plugins/htmlPlugin.js View File

@ -18,7 +18,7 @@ const titles = {
'signin': 'Signin',
'signup': 'Signup',
'ui': 'UI',
'vector-maps': 'Vector Maps',
'vector-maps': 'Mapbox GL Maps',
'404': '404',
'500': '500',
'basic-table': 'Basic Table',


+ 1
- 1
webpack/plugins/internal.js View File

@ -47,7 +47,7 @@ plugins.push(
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery',
Popper: ['popper.js', 'default'],
Popper: ['@popperjs/core', 'default'],
})
);


+ 16
- 0
webpack/rules/fonts.js View File

@ -3,3 +3,19 @@ module.exports = {
exclude : /(node_modules)/,
use : ['file-loader'],
};
// module.exports = {
// module: {
// rules: [
// {
// test: /\.(png|jpe?g|gif)$/i,
// exclude : /(node_modules)/,
// use: [
// {
// loader: 'file-loader',
// },
// ],
// },
// ],
// },
// };

+ 17
- 0
webpack/rules/images.js View File

@ -8,3 +8,20 @@ module.exports = {
},
}],
};
// module.exports = {
// module: {
// rules: [
// {
// test: /\.(png|gif|jpg|svg)$/i,
// exclude: /(node_modules)/,
// use: [{
// loader: 'file-loader',
// options: {
// outputPath: 'assets',
// },
// }],
// },
// ],
// },
// };

Loading…
Cancel
Save