From cc08f622afcf35f8d7636cd48a25391dfef9e3b1 Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Tue, 17 Apr 2018 12:16:22 +0100
Subject: [PATCH 1/2] fixed layout on dashboard

---
 .../dashboard-customer.component.html         | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html
index 5325ccc..b0c8895 100644
--- a/src/app/dashboard/dashboard-customer.component.html
+++ b/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="card">
-  <div class="card-block">
-    <div class="row">
-      <div class="col-12">
-        <h4 class="card-title mb-0">Weekly Spending by Category</h4>
+    <div *ngIf="showCategoryDoughnutChart" class="col-xl-4 col-md-6">
+      <div class="card">
+        <div class="card-block">
+          <div class="row">
+            <div class="col-12">
+              <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="card">
+    <div *ngIf="showEssentialBarChart" class="col-xl-4 col-md-6">
+      <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="card">
+    <div *ngIf="showCategoryBarChart" class="col-xl-4 col-md-6">
+      <div class="card">
         <div class="card-block">
           <div class="row">
             <div class="col-12">

From 4867a1ecaad7d2c9c1b815ffb5b39bc7ebc9ad6f Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Tue, 17 Apr 2018 14:17:57 +0100
Subject: [PATCH 2/2] made fixes

---
 bin/build-releases                    | 1 +
 src/app/panels/pie-panel.component.ts | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/bin/build-releases b/bin/build-releases
index 1abdb98..f7f5334 100755
--- a/bin/build-releases
+++ b/bin/build-releases
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -e
 
 VERSION=`git describe --tags`
 
diff --git a/src/app/panels/pie-panel.component.ts b/src/app/panels/pie-panel.component.ts
index 80f64e1..192105e 100644
--- a/src/app/panels/pie-panel.component.ts
+++ b/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 {
+  }
+
 }