Merge branch 'Release-0.1.9'

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 # Next Release
 
+# 0.1.9
+
+* Made layout change to make it neater when chart doesn't show
+* Made hotfix
+
 # 0.1.8
 
 * Amended how category is pulled from server

bin/build-releases

@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 
 VERSION=`git describe --tags`
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "localloop-web",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "localloop-web",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "LocalLoop Web - Web interface for LocalLoop app",
   "author": "",
   "url": "http://www.peartrade.org",

src/app/dashboard/dashboard-customer.component.html

@@ -14,29 +14,29 @@
     <div class="col-xl-4 col-md-6">
       <panel-pie></panel-pie>
     </div><!--/.col-->
-    <div class="col-xl-4 col-md-6">
+    <div *ngIf="showCategoryDoughnutChart" class="col-xl-4 col-md-6">
-      <div *ngIf="showCategoryDoughnutChart" class="card">
+      <div class="card">
-  <div class="card-block">
+        <div class="card-block">
-    <div class="row">
+          <div class="row">
-      <div class="col-12">
+            <div class="col-12">
-        <h4 class="card-title mb-0">Weekly Spending by Category</h4>
+              <h4 class="card-title mb-0">Weekly Spending by Category</h4>
+            </div>
+          </div>
+          <div class="chart-wrapper">
+            <canvas baseChart class="chart"
+            [datasets]="doughnutChartDataCategory"
+            [labels]="doughnutChartLabelsCategory"
+            [options]="doughtnutChartOptionsCategory"
+            [legend]="chartLegend"
+            [chartType]="chartType"
+            (chartHover)="chartHovered($event)"
+            (chartClick)="chartClicked($event)"></canvas>
+          </div>
+        </div>
       </div>
-    </div>
-    <div class="chart-wrapper">
-      <canvas baseChart class="chart"
-      [datasets]="doughnutChartDataCategory"
-      [labels]="doughnutChartLabelsCategory"
-      [options]="doughtnutChartOptionsCategory"
-      [legend]="chartLegend"
-      [chartType]="chartType"
-      (chartHover)="chartHovered($event)"
-      (chartClick)="chartClicked($event)"></canvas>
-    </div>
-  </div>
-</div>
     </div><!--/.col-->
-    <div class="col-xl-4 col-md-6">
+    <div *ngIf="showEssentialBarChart" class="col-xl-4 col-md-6">
-      <div *ngIf="showEssentialBarChart" class="card">
+      <div class="card">
         <div class="card-block">
           <div class="row">
             <div class="col-12">
@@ -55,8 +55,8 @@
         </div>
       </div>
     </div><!--/.col-->
-    <div class="col-xl-4 col-md-6">
+    <div *ngIf="showCategoryBarChart" class="col-xl-4 col-md-6">
-      <div *ngIf="showCategoryBarChart" class="card">
+      <div class="card">
         <div class="card-block">
           <div class="row">
             <div class="col-12">

src/app/panels/pie-panel.component.ts

@@ -52,4 +52,11 @@ export class PiePanel implements OnInit {
     return rgba;
   }
 
+  // events
+  public chartClicked(e: any): void {
+  }
+
+  public chartHovered(e: any): void {
+  }
+
 }