Merge pull request #19 from eballo/develop

Release 7.3

.gitignore

@@ -1,4 +1,7 @@
 .DS_Store
 .qicon
 .project
-.settings/
+.settings/
+node_modules/
+dist/
+.sonarlint/

Gruntfile.js

@@ -0,0 +1,139 @@
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    config: {
+      work: {
+        options: {
+          variables: {
+            'environment': 'work',
+            'configuration': 'catalunya-map-options-v2.js',
+            'style': 'src/css/catalunya-map-v2.css'
+          }
+        }
+      },
+      prod: {
+        options: {
+          variables: {
+            'environment': 'production',
+            'configuration': 'catalunya-map-options-v1.js',
+            'style': 'src/css/catalunya-map-v1.css'
+          }
+        }
+      },
+      map: {
+        options: {
+          variables: {
+            'environment': 'map',
+            'configuration': 'catalunya-map-options-v1.js',
+            'style': 'src/css/catalunya-map-v1.css'
+          }
+        }
+      },
+      demo: {
+        options: {
+          variables: {
+            'environment': 'demo',
+            'configuration': 'catalunya-map-options-v2.js',
+            'style': 'src/css/catalunya-map-v2.css'
+          }
+        }
+      }
+    },
+    "jsbeautifier": {
+      files: ["src/js/*.js"],
+      options: {}
+    },
+    uglify: {
+      options: {
+        // the banner is inserted at the top of the output
+        banner: '/*! Generated <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+      },
+      my_target: {
+        files: {
+          'assets/js/catalunya-map/catalunya-map.min.js': ['src/js/catalunya-map.js'],
+          'assets/js/catalunya-map/scale.raphael.min.js': ['src/js/scale.raphael.js'],
+          'assets/js/catalunya-map/jquery-3.2.1.min.js': ['src/js/jquery-3.2.1.js'],
+          'assets/js/catalunya-map/catalunya-map-init.min.js': ['src/js/catalunya-map-init.js'],
+          'assets/js/catalunya-map/bootstrap.min.js': ['src/js/bootstrap.js'],
+        }
+      }
+    },
+    copy: {
+      options: {
+        punctuation: ''
+      },
+      main: {
+        files: [{
+            src: ['src/js/<%= grunt.config.get("configuration") %>'],
+            dest: 'assets/js/catalunya-map/catalunya-map-options.js'
+          },
+          {
+            src:['src/css/bootstrap.min.css'],
+            dest: 'assets/css/catalunya-map/bootstrap.min.css'
+          },
+          {
+            src:['src/css/main.css'],
+            dest:'assets/css/catalunya-map/main.min.css'
+          },
+          {
+            src: ['src/css/bootstrap-theme.min.css'],
+            dest:'assets/css/catalunya-map/bootstrap-theme.min.css'
+          },
+          {
+            src: ['src/js/catalunya-map-path.json'],
+            dest:'assets/js/catalunya-map/catalunya-map-path.json'
+          },
+          {
+            src: ['src/js/raphael.min.js'],
+            dest:'assets/js/catalunya-map/raphael.min.js'
+          }
+
+        ],
+      },
+    },
+    clean: ['assets/js/', 'assets/css/'],
+    cssmin: {
+      target: {
+        files: [{
+          dest: 'assets/css/catalunya-map/catalunya-map.min.css',
+          src: ['<%= grunt.config.get("style") %>']
+        }]
+      }
+    },
+    // make a zipfile
+    compress: {
+      main: {
+        options: {
+          archive: 'dist/map-<%= grunt.config.get("environment") %>.zip'
+        },
+        files: [
+          {expand: true, cwd: 'assets/', src: ['**'], dest: 'map/assets'} // makes all src relative to cwd
+        ]
+      }
+    }
+  });
+
+  // Load required modules
+  grunt.loadNpmTasks('grunt-jsbeautifier');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-config');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
+  grunt.loadNpmTasks('grunt-contrib-compress');
+
+  // Task definitions
+  grunt.registerTask('map',  ['config:map', 'clean', 'jsbeautifier', 'uglify', 'copy', 'cssmin']);
+  grunt.registerTask('demo', ['config:demo', 'clean', 'jsbeautifier', 'uglify', 'copy', 'cssmin']);
+  grunt.registerTask('work', ['config:work', 'clean', 'jsbeautifier', 'uglify', 'copy', 'cssmin']);
+  grunt.registerTask('prod', ['config:prod', 'clean', 'jsbeautifier', 'uglify', 'copy', 'cssmin']);
+
+  grunt.registerTask('demo-compress',['demo','compress']);
+  grunt.registerTask('work-compress',['work','compress']);
+  grunt.registerTask('prod-compress',['prod','compress']);
+
+  grunt.registerTask('release', ['demo-compress','work-compress','prod-compress','default']);
+
+  grunt.registerTask('default', ['map']);
+};

README.md

@@ -28,6 +28,7 @@ Interactive vectorial map of Catalunya based on a SVG/VML and the library Rapha
 - [Demo v7.0](http://demo.catalunyamedieval.es/map7)
 - [Demo v7.1](http://demo.catalunyamedieval.es/map71)
 - [Demo v7.2](http://demo.catalunyamedieval.es/map71)
+- [Demo v7.3](http://demo.catalunyamedieval.es/map71)
 
 ## How to create a Map using a SVG file
 
@@ -88,7 +89,7 @@ Explanation :
 
 				<div id="container row">
 
-					<div class="mapWrapper">
+					<div class="map-wrapper">
 						<div id="text" class="col-md-4">
 							<div id="comarcaName">
 								<h1>Catalunya Medieval</h1></div>
@@ -179,6 +180,11 @@ v7.1
 v7.2
 - Fix styles
 
+v7.3
+- Grunt
+- nodejs
+- refactor
+- sonar fixes
 
 ## Webs using this map:
 - [blog cimasdestacables](http://cimasdestacables.blogspot.com/p/mapa-comarcal-de-catalunya.html)

assets/css/catalunya-map/main.min.css

@@ -0,0 +1,37 @@
+/* ------ genaral css file --------*/
+
+body {
+	background: #fff;
+	font-family: Helvetica, Arial, sans-serif;
+	text-align: center;
+}
+h1 {
+	font-size: 25px;
+	padding: 30px 0 10px;
+}
+p {
+	padding-bottom: 30px;
+}
+
+a {
+	color: #66bbdd;
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+}
+
+#container {
+	margin:20px auto;
+
+}
+
+.description {
+	margin-left: auto;
+	margin-right: auto;
+	width: 99%;
+}
+
+.description strong {
+	padding: 10px;
+}

assets/js/catalunya-map/catalunya-map-init.min.js

@@ -0,0 +1,3 @@
+/*! Generated 01-09-2017 */
+
+!function(a,n){$.ajax({url:n.URL_JSON,dataType:"json",async:!0,success:function(a){n.create(n.MAP_OPTIONS,a).loadMapAndText()}})}(window,window.Catmap);