fix: update config and bump

solfacil · Jul 22, 2021 · b48e2a3 · b48e2a3
1 parent f43e762
commit b48e2a3
Show file tree

Hide file tree

Showing 7 changed files with 689 additions and 381 deletions.
diff --git a/package.json b/package.json
@@ -31,22 +31,22 @@
   "dependencies": {
     "chart.js": "2.9.4",
     "core-js": "^3.15.2",
-    "html2canvas": "^1.0.0",
+    "html2canvas": "^1.1.4",
     "tailwindcss": "^1.9.6",
     "vue": "^2.6.14",
     "vue-chartjs": "^3.5.1",
     "vue2-datepicker": "^3.9.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.6",
+    "@babel/core": "^7.14.8",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/preset-env": "^7.14.7",
+    "@babel/preset-env": "^7.14.8",
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
-    "@storybook/addon-actions": "^6.3.2",
-    "@storybook/addon-essentials": "^6.3.2",
-    "@storybook/addon-links": "^6.3.2",
-    "@storybook/vue": "^6.3.2",
+    "@storybook/addon-actions": "^6.3.4",
+    "@storybook/addon-essentials": "^6.3.4",
+    "@storybook/addon-links": "^6.3.4",
+    "@storybook/vue": "^6.3.4",
     "@vue/cli-plugin-babel": "~4.5.13",
     "@vue/cli-plugin-eslint": "~4.5.13",
     "@vue/cli-plugin-router": "~4.5.13",
@@ -55,17 +55,17 @@
     "@vue/cli-service": "~4.5.13",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/server-test-utils": "^1.2.1",
-    "@vue/test-utils": "^1.2.1",
+    "@vue/test-utils": "^1.2.2",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-plugin-transform-require-context": "^0.1.1",
     "eslint": "^6.8.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-prettier-vue": "^2.1.1",
-    "eslint-plugin-vue": "^7.9.0",
+    "eslint-plugin-vue": "^7.14.0",
     "gh-pages": "^3.2.3",
-    "husky": "^7.0.0",
+    "husky": "^7.0.1",
     "jest": "^26.6.3",
     "ngrok": "^4.0.1",
     "node-sass": "4.14.1",
@@ -93,4 +93,4 @@
     "javascript",
     "storybook"
   ]
-}
+}
diff --git a/src/components/Charts/Bar/Bar.vue b/src/components/Charts/Bar/Bar.vue
@@ -77,10 +77,10 @@ export default {
       scales: {
         xAxes: [
           {
-            maxBarThickness: 16,
             gridLines: {
               display: false,
               gridLines: true,
+              maxBarThickness: 16,
               offsetGridLines: true,
             },
             ticks: {
@@ -257,7 +257,7 @@ export default {
       this.chartdata.datasets[0].data = this.dataChart.datasets[0];
       this.chartdata.datasets[1].data = this.dataChart.datasets[1];
 
-      this.options.scales.xAxes[0].maxBarThickness =
+      this.chartdata.datasets[0].maxBarThickness =
         this.view === 'month' ? 16 : 32;
 
       this.options.layout.padding.bottom = this.view === 'month' ? 29 : 19;

diff --git a/src/components/Charts/LineSeries/ChartLineSeries.stories.js b/src/components/Charts/LineSeries/ChartLineSeries.stories.js
@@ -22,140 +22,140 @@ Default.args = {
   id: 'lineSeries',
   chartdata: {
     labels: [
-      '2021-05-02 08:35:00',
-      '2021-05-02 08:40:00',
-      '2021-05-02 08:45:00',
-      '2021-05-02 08:50:00',
-      '2021-05-02 08:55:00',
-      '2021-05-02 09:00:00',
-      '2021-05-02 09:05:00',
-      '2021-05-02 09:10:00',
-      '2021-05-02 09:15:00',
-      '2021-05-02 09:20:00',
-      '2021-05-02 09:25:00',
-      '2021-05-02 09:30:00',
-      '2021-05-02 09:35:00',
-      '2021-05-02 09:40:00',
-      '2021-05-02 09:45:00',
-      '2021-05-02 09:50:00',
-      '2021-05-02 09:55:00',
-      '2021-05-02 10:00:00',
-      '2021-05-02 10:05:00',
-      '2021-05-02 10:10:00',
-      '2021-05-02 10:15:00',
-      '2021-05-02 10:20:00',
-      '2021-05-02 10:25:00',
-      '2021-05-02 10:30:00',
-      '2021-05-02 10:35:00',
-      '2021-05-02 10:40:00',
-      '2021-05-02 10:45:00',
-      '2021-05-02 10:50:00',
-      '2021-05-02 10:55:00',
-      '2021-05-02 11:00:00',
-      '2021-05-02 11:05:00',
-      '2021-05-02 11:10:00',
-      '2021-05-02 11:15:00',
-      '2021-05-02 11:20:00',
-      '2021-05-02 11:25:00',
-      '2021-05-02 11:30:00',
-      '2021-05-02 11:35:00',
-      '2021-05-02 11:40:00',
-      '2021-05-02 11:45:00',
-      '2021-05-02 11:50:00',
-      '2021-05-02 11:55:00',
-      '2021-05-02 12:00:00',
-      '2021-05-02 12:05:00',
-      '2021-05-02 12:10:00',
-      '2021-05-02 12:15:00',
-      '2021-05-02 12:20:00',
-      '2021-05-02 12:25:00',
-      '2021-05-02 12:30:00',
-      '2021-05-02 12:35:00',
-      '2021-05-02 12:40:00',
-      '2021-05-02 12:45:00',
-      '2021-05-02 12:50:00',
-      '2021-05-02 12:55:00',
-      '2021-05-02 13:00:00',
-      '2021-05-02 13:05:00',
-      '2021-05-02 13:10:00',
-      '2021-05-02 13:15:00',
-      '2021-05-02 13:20:00',
-      '2021-05-02 13:25:00',
-      '2021-05-02 13:30:00',
-      '2021-05-02 13:35:00',
-      '2021-05-02 13:40:00',
-      '2021-05-02 13:45:00',
-      '2021-05-02 13:50:00',
-      '2021-05-02 13:55:00',
-      '2021-05-02 14:00:00',
-      '2021-05-02 14:05:00',
-      '2021-05-02 14:10:00',
-      '2021-05-02 14:15:00',
-      '2021-05-02 14:20:00',
-      '2021-05-02 14:25:00',
-      '2021-05-02 14:30:00',
-      '2021-05-02 14:35:00',
-      '2021-05-02 14:40:00',
-      '2021-05-02 14:45:00',
-      '2021-05-02 14:50:00',
-      '2021-05-02 14:55:00',
-      '2021-05-02 15:00:00',
-      '2021-05-02 15:05:00',
-      '2021-05-02 15:10:00',
-      '2021-05-02 15:15:00',
-      '2021-05-02 15:20:00',
-      '2021-05-02 15:25:00',
-      '2021-05-02 15:30:00',
-      '2021-05-02 15:35:00',
-      '2021-05-02 15:40:00',
-      '2021-05-02 15:45:00',
-      '2021-05-02 15:50:00',
-      '2021-05-02 15:55:00',
-      '2021-05-02 16:00:00',
-      '2021-05-02 16:05:00',
-      '2021-05-02 16:10:00',
-      '2021-05-02 16:15:00',
-      '2021-05-02 16:20:00',
-      '2021-05-02 16:25:00',
-      '2021-05-02 16:30:00',
-      '2021-05-02 16:35:00',
-      '2021-05-02 16:40:00',
-      '2021-05-02 16:45:00',
-      '2021-05-02 16:50:00',
-      '2021-05-02 16:55:00',
-      '2021-05-02 17:00:00',
-      '2021-05-02 17:05:00',
-      '2021-05-02 17:10:00',
-      '2021-05-02 17:15:00',
-      '2021-05-02 17:20:00',
-      '2021-05-02 17:25:00',
-      '2021-05-02 17:30:00',
-      '2021-05-02 17:35:00',
-      '2021-05-02 17:40:00',
-      '2021-05-02 17:45:00',
-      '2021-05-02 17:50:00',
-      '2021-05-02 17:55:00',
-      '2021-05-02 18:00:00',
-      '2021-05-02 18:05:00',
-      '2021-05-02 18:10:00',
-      '2021-05-02 18:15:00',
-      '2021-05-02 18:20:00',
-      '2021-05-02 18:25:00',
-      '2021-05-02 18:30:00',
-      '2021-05-02 18:35:00',
-      '2021-05-02 18:40:00',
-      '2021-05-02 18:45:00',
-      '2021-05-02 18:50:00',
-      '2021-05-02 18:55:00',
-      '2021-05-02 19:00:00',
-      '2021-05-02 19:05:00',
-      '2021-05-02 19:10:00',
-      '2021-05-02 19:15:00',
-      '2021-05-02 19:20:00',
-      '2021-05-02 19:25:00',
-      '2021-05-02 19:30:00',
-      '2021-05-02 19:35:00',
-      '2021-05-02 19:40:00',
+      '2021-06-02 08:35:00',
+      '2021-06-02 08:40:00',
+      '2021-06-02 08:45:00',
+      '2021-06-02 08:50:00',
+      '2021-06-02 08:55:00',
+      '2021-06-02 09:00:00',
+      '2021-06-02 09:05:00',
+      '2021-06-02 09:10:00',
+      '2021-06-02 09:15:00',
+      '2021-06-02 09:20:00',
+      '2021-06-02 09:25:00',
+      '2021-06-02 09:30:00',
+      '2021-06-02 09:35:00',
+      '2021-06-02 09:40:00',
+      '2021-06-02 09:45:00',
+      '2021-06-02 09:50:00',
+      '2021-06-02 09:55:00',
+      '2021-06-02 10:00:00',
+      '2021-06-02 10:05:00',
+      '2021-06-02 10:10:00',
+      '2021-06-02 10:15:00',
+      '2021-06-02 10:20:00',
+      '2021-06-02 10:25:00',
+      '2021-06-02 10:30:00',
+      '2021-06-02 10:35:00',
+      '2021-06-02 10:40:00',
+      '2021-06-02 10:45:00',
+      '2021-06-02 10:50:00',
+      '2021-06-02 10:55:00',
+      '2021-06-02 11:00:00',
+      '2021-06-02 11:05:00',
+      '2021-06-02 11:10:00',
+      '2021-06-02 11:15:00',
+      '2021-06-02 11:20:00',
+      '2021-06-02 11:25:00',
+      '2021-06-02 11:30:00',
+      '2021-06-02 11:35:00',
+      '2021-06-02 11:40:00',
+      '2021-06-02 11:45:00',
+      '2021-06-02 11:50:00',
+      '2021-06-02 11:55:00',
+      '2021-06-02 12:00:00',
+      '2021-06-02 12:05:00',
+      '2021-06-02 12:10:00',
+      '2021-06-02 12:15:00',
+      '2021-06-02 12:20:00',
+      '2021-06-02 12:25:00',
+      '2021-06-02 12:30:00',
+      '2021-06-02 12:35:00',
+      '2021-06-02 12:40:00',
+      '2021-06-02 12:45:00',
+      '2021-06-02 12:50:00',
+      '2021-06-02 12:55:00',
+      '2021-06-02 13:00:00',
+      '2021-06-02 13:05:00',
+      '2021-06-02 13:10:00',
+      '2021-06-02 13:15:00',
+      '2021-06-02 13:20:00',
+      '2021-06-02 13:25:00',
+      '2021-06-02 13:30:00',
+      '2021-06-02 13:35:00',
+      '2021-06-02 13:40:00',
+      '2021-06-02 13:45:00',
+      '2021-06-02 13:50:00',
+      '2021-06-02 13:55:00',
+      '2021-06-02 14:00:00',
+      '2021-06-02 14:05:00',
+      '2021-06-02 14:10:00',
+      '2021-06-02 14:15:00',
+      '2021-06-02 14:20:00',
+      '2021-06-02 14:25:00',
+      '2021-06-02 14:30:00',
+      '2021-06-02 14:35:00',
+      '2021-06-02 14:40:00',
+      '2021-06-02 14:45:00',
+      '2021-06-02 14:50:00',
+      '2021-06-02 14:55:00',
+      '2021-06-02 15:00:00',
+      '2021-06-02 15:05:00',
+      '2021-06-02 15:10:00',
+      '2021-06-02 15:15:00',
+      '2021-06-02 15:20:00',
+      '2021-06-02 15:25:00',
+      '2021-06-02 15:30:00',
+      '2021-06-02 15:35:00',
+      '2021-06-02 15:40:00',
+      '2021-06-02 15:45:00',
+      '2021-06-02 15:50:00',
+      '2021-06-02 15:55:00',
+      '2021-06-02 16:00:00',
+      '2021-06-02 16:05:00',
+      '2021-06-02 16:10:00',
+      '2021-06-02 16:15:00',
+      '2021-06-02 16:20:00',
+      '2021-06-02 16:25:00',
+      '2021-06-02 16:30:00',
+      '2021-06-02 16:35:00',
+      '2021-06-02 16:40:00',
+      '2021-06-02 16:45:00',
+      '2021-06-02 16:50:00',
+      '2021-06-02 16:55:00',
+      '2021-06-02 17:00:00',
+      '2021-06-02 17:05:00',
+      '2021-06-02 17:10:00',
+      '2021-06-02 17:15:00',
+      '2021-06-02 17:20:00',
+      '2021-06-02 17:25:00',
+      '2021-06-02 17:30:00',
+      '2021-06-02 17:35:00',
+      '2021-06-02 17:40:00',
+      '2021-06-02 17:45:00',
+      '2021-06-02 17:50:00',
+      '2021-06-02 17:55:00',
+      '2021-06-02 18:00:00',
+      '2021-06-02 18:05:00',
+      '2021-06-02 18:10:00',
+      '2021-06-02 18:15:00',
+      '2021-06-02 18:20:00',
+      '2021-06-02 18:25:00',
+      '2021-06-02 18:30:00',
+      '2021-06-02 18:35:00',
+      '2021-06-02 18:40:00',
+      '2021-06-02 18:45:00',
+      '2021-06-02 18:50:00',
+      '2021-06-02 18:55:00',
+      '2021-06-02 19:00:00',
+      '2021-06-02 19:05:00',
+      '2021-06-02 19:10:00',
+      '2021-06-02 19:15:00',
+      '2021-06-02 19:20:00',
+      '2021-06-02 19:25:00',
+      '2021-06-02 19:30:00',
+      '2021-06-02 19:35:00',
+      '2021-06-02 19:40:00',
     ],
     datasets: [
       1.58, 0, 32.17, 130.41, 152.04, 219.25, 315.12, 355.18, 340.2, 384.2,

diff --git a/src/components/Charts/LineSeries/LineSeries.vue b/src/components/Charts/LineSeries/LineSeries.vue
@@ -76,8 +76,6 @@ export default {
           {
             type: 'time',
             time: {
-              min: new Date('2021-05-02 01:00:00'),
-              max: new Date('2021-05-02 23:00:00'),
               unit: 'hour',
               unitStepSize: 2,
               displayFormats: { hour: 'H:mm' },
@@ -88,6 +86,8 @@ export default {
               offsetGridLines: true,
             },
             ticks: {
+              min: null,
+              max: null,
               display: true,
               beginAtZero: false,
               fontColor: '#666',
@@ -184,6 +184,13 @@ export default {
     },
   },
 
+  created() {
+    this.options.scales.xAxes[0].ticks.min = new Date(this.dataChart.labels[0]);
+    this.options.scales.xAxes[0].ticks.max = new Date(
+      this.dataChart.labels[this.dataChart.labels.length - 1],
+    );
+  },
+
   beforeMount() {
     this.setData();
   },

diff --git a/src/components/Charts/MultiAxisLine/MultiAxisLine.vue b/src/components/Charts/MultiAxisLine/MultiAxisLine.vue
@@ -95,8 +95,8 @@ export default {
               offsetGridLines: true,
             },
             ticks: {
-              min: new Date('2021-05-02 01:00'),
-              max: new Date('2021-05-02 21:00'),
+              min: null,
+              max: null,
               display: true,
               beginAtZero: false,
               fontColor: '#666',