Commit a3a4a2c3 authored by Tomas Pettersson's avatar Tomas Pettersson 🏸

using grunt

parent 30d8501e
......@@ -43,21 +43,9 @@ module.exports = function(grunt) {
overrides : {
"uikit": {
"main" : [
"js/uikit.js", "js/components/notify.min.js", "js/components/datepicker.min.js", "js/components/accordion.min.js",
"css/uikit.almost-flat.min.css", "css/components/notify.almost-flat.min.css", "css/components/datepicker.almost-flat.min.css", "css/components/accordion.almost-flat.min.css"
"js/uikit.js",
"css/uikit.almost-flat.min.css"
]
},
"ion.rangeSlider": {
"main" : ["js/ion.rangeSlider.min.js", "css/ion.rangeSlider.css", "css/ion.rangeSlider.skinNice.css" ]
},
"jquery-file-upload": {
"main" : ["js/vendor/jquery.ui.widget.js", "js/jquery.iframe-transport.js", "js/jquery.fileupload.js" ]
},
"DataTables" : {
"main" : ["media/js/jquery.dataTables.min.js", "media/js/dataTables.uikit.min.js", "media/css/jquery.dataTables.min.css", "media/css/dataTables.uikit.min.css"]
},
"jquery.inputmask" : {
"main" : "dist/jquery.inputmask.bundle.js"
}
}
}
......@@ -72,29 +60,10 @@ module.exports = function(grunt) {
relative: false
},
mainFiles: {
'leaflet': ['dist/leaflet-src.js', 'dist/leaflet.css'],
'leaflet.draw': ['dist/leaflet.draw-src.js', 'dist/leaflet.draw.css'],
'jquery.inputmask': 'dist/jquery.inputmask.bundle.js',
'DataTables': ['media/js/jquery.dataTables.min.js', 'media/js/dataTables.uikit.min.js', 'media/css/jquery.dataTables.min.css', 'media/css/dataTables.uikit.min.css'],
'datatables.net-select': 'js/dataTables.select.min.js',
'uikit': [
'js/uikit.js', 'js/components/notify.min.js', 'js/components/datepicker.min.js', 'js/components/accordion.min.js',
'css/uikit.almost-flat.min.css', 'css/components/notify.almost-flat.min.css','css/components/datepicker.almost-flat.min.css', 'css/components/accordion.almost-flat.min.css'
],
'jquery-file-upload': ['js/vendor/jquery.ui.widget.js', 'js/jquery.iframe-transport.js','js/jquery.fileupload.js' ],
'blueimp-canvas-to-blob' : 'js/canvas-to-blob.min.js',
'blueimp-load-image' : 'js/load-image.all.min.js',
'blueimp-tmpl' : 'js/tmpl.min.js',
'ion.rangeSlider': ['js/ion.rangeSlider.min.js', 'css/ion.rangeSlider.css', 'css/ion.rangeSlider.skinNice.css'],
'uikit': ['js/uikit.js', 'js/components/notify.min.js', 'css/uikit.almost-flat.min.css', 'css/components/notify.almost-flat.min.css']
},
dependencies: {
'leaflet.draw': 'leaflet',
'DataTables': 'jquery',
'datatables.net-select': 'DataTables',
'uikit': 'jquery',
'jquery-file-upload': 'jquery',
'leaflet-coordinates-control': ['jquery','leaflet','leaflet.draw', 'leaflet-container-control']
'uikit': 'jquery'
}
}
},
......@@ -118,13 +87,7 @@ module.exports = function(grunt) {
flatten: true,
src: 'bower_components/**/images/*',
dest: 'build/images/'
},
{
expand: true,
flatten: true,
src: 'bower_components/**/img/*',
dest: 'build/img/'
},
},
{
expand: true,
flatten: true,
......
......@@ -15,7 +15,8 @@
},
"dependencies": {
"leaflet": "https://github.com/Leaflet/Leaflet.git#v1.0.0-rc.1",
"leaflet-timedimension" : "https://github.com/socib/Leaflet.TimeDimension.git#v1.0.2"
"leaflet-timedimension" : "https://github.com/socib/Leaflet.TimeDimension.git#v1.0.2",
"moment": "latest"
},
"resolutions": {
"leaflet": "v1.0.0-rc.1"
......
......@@ -9,19 +9,33 @@
<meta name='copyright' content='STW'>
<meta name='owner' content='STW'>
<link href="../bower_components/leaflet/dist/leaflet.css" rel="stylesheet">
<link href="../bower_components/leaflet-timedimension/dist/leaflet.timedimension.control.min.css" rel="stylesheet">
<!-- bower:css -->
<link rel="stylesheet" href="../bower_components/leaflet/dist/leaflet.css" />
<link rel="stylesheet" href="../bower_components/leaflet-timedimension/dist/leaflet.timedimension.control.css" />
<!-- endbower -->
<!--<link href="../bower_components/leaflet/dist/leaflet.css" rel="stylesheet">
<link href="../bower_components/leaflet-timedimension/dist/leaflet.timedimension.control.min.css" rel="stylesheet"> -->
</head>
<body>
<div id="map" style="width: 800px; height: 600px"></div>
<!-- bower:js -->
<script src="../bower_components/leaflet/dist/leaflet-src.js"></script>
<script src="../bower_components/iso8601-js-period/iso8601.min.js"></script>
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/leaflet-timedimension/dist/leaflet.timedimension.src.js"></script>
<script src="../bower_components/moment/moment.js"></script>
<script src="../src/L.TimeDimension.layer.wms.picasso.js"></script>
<!-- endbower -->
<!--<script src="../bower_components/leaflet/dist/leaflet-src.js"></script>
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/moment/min/moment.min.js"></script>
<script src="../bower_components/iso8601-js-period/iso8601.min.js"></script>
<script src="../bower_components/leaflet-timedimension/dist/leaflet.timedimension.src.withlog.js"></script>
<script src="../src/L.TimeDimension.layer.wms.picasso.js"></script>
<script src="../src/L.TimeDimension.layer.wms.picasso.js"></script>-->
<script>
......@@ -35,7 +49,7 @@
}).addTo(map);
var wmsLayer = L.tileLayer.wms('http://wts.smhi.se/tile/', {
layers: "hiromb-BS01:oceancurrent-arrows_n-europe_4326_",
layers: "NEMO:NS02_oceancurrentarrows_neurope_",
transparent: true,
crs: L.CRS.EPSG900913,
format: 'image/png',
......
{
"name": "noderest",
"description": "Demo REST API with Node",
"version": "0.0.1",
"private": true,
"dependencies": {
"express": "4.x",
"path": "latest",
"request" : "latest"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment