From 1ca98cec248ddf683980eabd554066e33b207751 Mon Sep 17 00:00:00 2001
From: Akhil Gupta <akhil.gupta@faballey.com>
Date: Tue, 1 Jun 2021 21:43:41 +0530
Subject: [PATCH] fix change password and support 3 decimal places

---
 README.md                             | 4 ++--
 Shreenshots.md => Screenshots.md      | 0
 server/controllers/auth.go            | 2 +-
 server/models/auth.go                 | 2 +-
 ui/src/router/views/createExpense.vue | 2 +-
 ui/src/router/views/createFillup.vue  | 6 +++---
 ui/src/router/views/settings.vue      | 8 ++++++--
 7 files changed, 14 insertions(+), 10 deletions(-)
 rename Shreenshots.md => Screenshots.md (100%)

diff --git a/README.md b/README.md
index 1d35651..814312d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
   </a> -->
 
   <h1 align="center" style="margin-bottom:0">Hammond</h1>
-  <p align="center">Current Version - 2021.05.29</p>
+  <p align="center">Current Version - 2021.06.01</p>
 
   <p align="center">
     A self-hosted vehicle expense tracking system with support for multiple users.
@@ -55,7 +55,7 @@ The current version of Hammond is written using GO for backend and Vuejs for the
 
 Also I had initially thought of a 2 container approach (1 for backend and 1 for the frontend) so that they can be independently maintained and updated. I eventually decided against this idea for the sake of simplicity. Although it is safe to assume that most self-hosters are fairly tech capable it still is much better to have a single container that you can fire and forget.
 
-![Product Name Screen Shot][product-screenshot] [More Screenshots](Shreenshots.md)
+![Product Name Screen Shot][product-screenshot] [More Screenshots](Screenshots.md)
 
 ### Built With
 
diff --git a/Shreenshots.md b/Screenshots.md
similarity index 100%
rename from Shreenshots.md
rename to Screenshots.md
diff --git a/server/controllers/auth.go b/server/controllers/auth.go
index be7a01a..9e25e36 100644
--- a/server/controllers/auth.go
+++ b/server/controllers/auth.go
@@ -169,7 +169,7 @@ func changePassword(c *gin.Context) {
 	}
 
 	if user.CheckPassword(request.OldPassword) != nil {
-		c.JSON(http.StatusForbidden, common.NewError("changePassword", errors.New("Not Registered email or invalid password")))
+		c.JSON(http.StatusForbidden, common.NewError("changePassword", errors.New("Incorrect old password")))
 		return
 	}
 
diff --git a/server/models/auth.go b/server/models/auth.go
index 6bf4bc4..cdc52e8 100644
--- a/server/models/auth.go
+++ b/server/models/auth.go
@@ -25,6 +25,6 @@ type RegisterRequest struct {
 }
 
 type ChangePasswordRequest struct {
-	OldPassword string `form:"oldPassword" json:"oldPassword" binding:"required,min=8,max=255"`
+	OldPassword string `form:"oldPassword" json:"oldPassword" binding:"required,max=255"`
 	NewPassword string `form:"newPassword" json:"newPassword" binding:"required,min=8,max=255"`
 }
diff --git a/ui/src/router/views/createExpense.vue b/ui/src/router/views/createExpense.vue
index 756c9a0..e286d36 100644
--- a/ui/src/router/views/createExpense.vue
+++ b/ui/src/router/views/createExpense.vue
@@ -195,7 +195,7 @@ export default {
           type="number"
           min="0"
           expanded
-          step=".01"
+          step=".001"
           required
         ></b-input>
       </b-field>
diff --git a/ui/src/router/views/createFillup.vue b/ui/src/router/views/createFillup.vue
index 3aa8037..f046945 100644
--- a/ui/src/router/views/createFillup.vue
+++ b/ui/src/router/views/createFillup.vue
@@ -206,7 +206,7 @@ export default {
         <b-input
           v-model.number="fillupModel.fuelQuantity"
           type="number"
-          step=".01"
+          step=".001"
           min="0"
           expanded
           required
@@ -225,7 +225,7 @@ export default {
           v-model.number="fillupModel.perUnitPrice"
           type="number"
           min="0"
-          step=".01"
+          step=".001"
           expanded
           required
         ></b-input>
@@ -238,7 +238,7 @@ export default {
           v-model.number="fillupModel.totalAmount"
           type="number"
           min="0"
-          step=".01"
+          step=".001"
           expanded
           required
         ></b-input>
diff --git a/ui/src/router/views/settings.vue b/ui/src/router/views/settings.vue
index 6b44396..ea8c018 100644
--- a/ui/src/router/views/settings.vue
+++ b/ui/src/router/views/settings.vue
@@ -69,9 +69,13 @@ export default {
             .catch((err) => console.log('error:', err))
         })
         .catch((ex) => {
+          let errorMessage= ex.message;
+          if(ex.response && ex.response.data?.errors?.changePassword){
+            errorMessage=ex.response.data?.errors?.changePassword
+          }
           this.$buefy.toast.open({
             duration: 5000,
-            message: ex.message,
+            message: errorMessage,
             position: 'is-bottom',
             type: 'is-danger',
           })
@@ -168,7 +172,7 @@ export default {
         <table class="table is-hoverable">
           <tr>
             <td>Current Version</td>
-            <td>2021.05.29</td>
+            <td>2021.06.01</td>
           </tr>
           <tr>
             <td>Website</td>