fix image roots, refactoring

rendyramon · Sep 9, 2015 · d54d360 · d54d360
1 parent e6e6cac
commit d54d360
Show file tree

Hide file tree

Showing 74 changed files with 658 additions and 771 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -48,7 +48,7 @@ var imgSrc = [
   './src/assets/pictures/*',
   './src/app/pages/dashboard/widgets/timeline/img/*',
   './src/app/pages/profile/img/*',
-  './src/app/pages/icons/widgets/kameleon/*',
+  './src/app/pages/icons/widgets/kameleon-img/*',
   './src/assets/js/lib/amChart/images/*',
   './src/app/pages/maps/widgets/leaflet/images/*',
 ];

diff --git a/src/app/pages/charts/widgets/areaChart/areaChart.js b/src/app/pages/charts/widgets/areaChart/areaChart.js
@@ -3,126 +3,126 @@
 app.controller('areaChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var areaChart = AmCharts.makeChart(id, {
-    "type": "serial",
-    "theme": "blur",
-    "dataProvider": [
+    type: "serial",
+    theme: "blur",
+    dataProvider: [
       {
-        "lineColor": colorDanger,
-        "date": "2012-01-01",
-        "duration": 408
+        lineColor: colorDanger,
+        date: "2012-01-01",
+        duration: 408
       },
       {
-        "date": "2012-01-02",
-        "duration": 482
+        date: "2012-01-02",
+        duration: 482
       },
       {
-        "date": "2012-01-03",
-        "duration": 562
+        date: "2012-01-03",
+        duration: 562
       },
       {
-        "date": "2012-01-04",
-        "duration": 379
+        date: "2012-01-04",
+        duration: 379
       },
       {
-        "lineColor": colorSuccess,
-        "date": "2012-01-05",
-        "duration": 501
+        lineColor: colorSuccess,
+        date: "2012-01-05",
+        duration: 501
       },
       {
-        "date": "2012-01-06",
-        "duration": 443
+        date: "2012-01-06",
+        duration: 443
       },
       {
-        "date": "2012-01-07",
-        "duration": 405
+        date: "2012-01-07",
+        duration: 405
       },
       {
-        "date": "2012-01-08",
-        "duration": 309,
-        "lineColor": colorPrimary
+        date: "2012-01-08",
+        duration: 309,
+        lineColor: colorPrimary
       },
       {
-        "date": "2012-01-09",
-        "duration": 287
+        date: "2012-01-09",
+        duration: 287
       },
       {
-        "date": "2012-01-10",
-        "duration": 485
+        date: "2012-01-10",
+        duration: 485
       },
       {
-        "date": "2012-01-11",
-        "duration": 890
+        date: "2012-01-11",
+        duration: 890
       },
       {
-        "date": "2012-01-12",
-        "duration": 810
+        date: "2012-01-12",
+        duration: 810
       }
     ],
-    "balloon": {
-      "cornerRadius": 6,
-      "horizontalPadding": 15,
-      "verticalPadding": 10
+    balloon: {
+      cornerRadius: 6,
+      horizontalPadding: 15,
+      verticalPadding: 10
     },
-    "valueAxes": [
+    valueAxes: [
       {
-        "duration": "mm",
-        "durationUnits": {
-          "hh": "h ",
-          "mm": "min"
+        duration: "mm",
+        durationUnits: {
+          hh: "h ",
+          mm: "min"
         },
-        "axisAlpha": 0
+        axisAlpha: 0
       }
     ],
-    "graphs": [
+    graphs: [
       {
-        "bullet": "square",
-        "bulletBorderAlpha": 1,
-        "bulletBorderThickness": 1,
-        "fillAlphas": 0.3,
-        "fillColorsField": "lineColor",
-        "legendValueText": "[[value]]",
-        "lineColorField": "lineColor",
-        "title": "duration",
-        "valueField": "duration"
+        bullet: "square",
+        bulletBorderAlpha: 1,
+        bulletBorderThickness: 1,
+        fillAlphas: 0.3,
+        fillColorsField: "lineColor",
+        legendValueText: "[[value]]",
+        lineColorField: "lineColor",
+        title: "duration",
+        valueField: "duration"
       }
     ],
 
-    "chartCursor": {
-      "categoryBalloonDateFormat": "YYYY MMM DD",
-      "cursorAlpha": 0,
-      "fullWidth": true
+    chartCursor: {
+      categoryBalloonDateFormat: "YYYY MMM DD",
+      cursorAlpha: 0,
+      fullWidth: true
     },
-    "dataDateFormat": "YYYY-MM-DD",
-    "categoryField": "date",
-    "categoryAxis": {
-      "dateFormats": [
+    dataDateFormat: "YYYY-MM-DD",
+    categoryField: "date",
+    categoryAxis: {
+      dateFormats: [
         {
-          "period": "DD",
-          "format": "DD"
+          period: "DD",
+          format: "DD"
         },
         {
-          "period": "WW",
-          "format": "MMM DD"
+          period: "WW",
+          format: "MMM DD"
         },
         {
-          "period": "MM",
-          "format": "MMM"
+          period: "MM",
+          format: "MMM"
         },
         {
-          "period": "YYYY",
-          "format": "YYYY"
+          period: "YYYY",
+          format: "YYYY"
         }
       ],
-      "parseDates": true,
-      "autoGridCount": false,
-      "axisColor": "#555555",
-      "gridAlpha": 0,
-      "gridCount": 50
+      parseDates: true,
+      autoGridCount: false,
+      axisColor: "#555555",
+      gridAlpha: 0,
+      gridCount: 50
     },
-    "export": {
-      "enabled": true
+    export: {
+      enabled: true
     },
-    "pathToImages": '/release/img/'
+    pathToImages: 'release/img/'
   });
 
   areaChart.addListener("dataUpdated", zoomAreaChart);

diff --git a/src/app/pages/charts/widgets/barChart/barChart.js b/src/app/pages/charts/widgets/barChart/barChart.js
@@ -3,73 +3,73 @@
 app.controller('barChartCtrl', ['$scope', '$timeout', '$element', function($scope, $timeout, $element) {
   var id = $element[0].getAttribute('id');
   var barChart = AmCharts.makeChart(id, {
-    "type": "serial",
-    "theme": "blur",
-    "dataProvider": [
+    type: "serial",
+    theme: "blur",
+    dataProvider: [
       {
-        "country": "USA",
-        "visits": 3025,
-        "color": colorPrimary
+        country: "USA",
+        visits: 3025,
+        color: colorPrimary
       },
       {
-        "country": "China",
-        "visits": 1882,
-        "color": colorDanger
+        country: "China",
+        visits: 1882,
+        color: colorDanger
 
       },
       {
-        "country": "Japan",
-        "visits": 1809,
-        "color": colorPrimaryLight
+        country: "Japan",
+        visits: 1809,
+        color: colorPrimaryLight
       },
       {
-        "country": "Germany",
-        "visits": 1322,
-        "color": colorSuccess
+        country: "Germany",
+        visits: 1322,
+        color: colorSuccess
       },
       {
-        "country": "UK",
-        "visits": 1122,
-        "color": colorWarning
+        country: "UK",
+        visits: 1122,
+        color: colorWarning
       },
       {
-        "country": "France",
-        "visits": 1114,
-        "color": colorDefault
+        country: "France",
+        visits: 1114,
+        color: colorDefault
       }
     ],
-    "valueAxes": [
+    valueAxes: [
       {
-        "axisAlpha": 0,
-        "position": "left",
-        "title": "Visitors from country"
+        axisAlpha: 0,
+        position: "left",
+        title: "Visitors from country"
       }
     ],
-    "startDuration": 1,
-    "graphs": [
+    startDuration: 1,
+    graphs: [
       {
-        "balloonText": "<b>[[category]]: [[value]]</b>",
-        "fillColorsField": "color",
-        "fillAlphas": 0.9,
-        "lineAlpha": 0.2,
-        "type": "column",
-        "valueField": "visits"
+        balloonText: "<b>[[category]]: [[value]]</b>",
+        fillColorsField: "color",
+        fillAlphas: 0.9,
+        lineAlpha: 0.2,
+        type: "column",
+        valueField: "visits"
       }
     ],
-    "chartCursor": {
-      "categoryBalloonEnabled": false,
-      "cursorAlpha": 0,
-      "zoomable": false
+    chartCursor: {
+      categoryBalloonEnabled: false,
+      cursorAlpha: 0,
+      zoomable: false
     },
-    "categoryField": "country",
-    "categoryAxis": {
-      "gridPosition": "start",
-      "labelRotation": 45
+    categoryField: "country",
+    categoryAxis: {
+      gridPosition: "start",
+      labelRotation: 45
     },
-    "export": {
-      "enabled": true
+    export: {
+      enabled: true
     },
-    "creditsPosition": "top-right",
-    "pathToImages": '/release/img/'
+    creditsPosition: "top-right",
+    pathToImages: "release/img/"
   });
 }]);