Merge branch 'hotfix/voucher_increment'

HarmlessKey · Nov 19, 2022 · a864a79 · a864a79
2 parents 352ed08 + 46c3a5d
commit a864a79
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 37 deletions.
diff --git a/src/css/styles.scss b/src/css/styles.scss
@@ -64,15 +64,15 @@ html body {
 		color: $neutral-2;
 	}
 
-  .text-uppercase {
-    text-transform: uppercase;
-  }
-  .text-capitalize {
-    text-transform: capitalize;
-  }
-  .text-lowercase {
-    text-transform: lowercase;
-  }
+	.text-uppercase {
+		text-transform: uppercase;
+	}
+	.text-capitalize {
+		text-transform: capitalize;
+	}
+	.text-lowercase {
+		text-transform: lowercase;
+	}
 
 	.text-shadow {
 		text-shadow: 0 0 5px $black;
@@ -814,14 +814,14 @@ html body {
 	}
 
 	.character-description {
-    .stat {
-      font-weight: bold;
-      cursor: default;
-    }
+		.stat {
+			font-weight: bold;
+			cursor: default;
+		}
 		:last-child {
 			margin-bottom: 0;
 		}
-  }
+	}
 
 	.validate {
 		margin-top: 5px;
@@ -971,14 +971,14 @@ html body {
 		background: $blue;
 		color: $neutral-1;
 		display: inline-block;
-    font-weight: 400;
-    text-align: center;
-    vertical-align: middle;
-    user-select: none;
-    border: 1px solid transparent;
-    padding: 0.375rem 0.75rem;
-    font-size: 1rem;
-    line-height: 1.5;
+		font-weight: 400;
+		text-align: center;
+		vertical-align: middle;
+		user-select: none;
+		border: 1px solid transparent;
+		padding: 0.375rem 0.75rem;
+		font-size: 1rem;
+		line-height: 1.5;
 		transition:
 			color 0.15s ease-in-out,
 			background-color 0.15s ease-in-out;
@@ -1009,7 +1009,7 @@ html body {
 		}
 		&.btn-block {
 			display: block;
-    	width: 100%;
+			width: 100%;
 		}
 		&.btn-clear {
 			background: none !important;
@@ -1047,17 +1047,17 @@ html body {
 	/*********************************************/
 	hr {
 		margin-top: 1rem;
-    margin-bottom: 1rem;
-    border: 0;
+		margin-bottom: 1rem;
+		border: 0;
 		border-top: 1px solid rgba(0, 0, 0, 0.1);
 		background: $neutral-4;
 	}
 	.container {
 		width: 100%;
-    padding-right: 15px;
-    padding-left: 15px;
-    margin-right: auto;
-    margin-left: auto;
+		padding-right: 15px;
+		padding-left: 15px;
+		margin-right: auto;
+		margin-left: auto;
 	}
 
 	.login-container {
@@ -1207,6 +1207,7 @@ html body {
 		.card-image {
 			position: relative;
 			min-height: 180px;
+			width: 100%;
 			background-position: center;
 			background-size: cover;
 			box-shadow: inset 0 -5px 25px rgba(0, 0, 0, 1);

diff --git a/src/services/vouchers.js b/src/services/vouchers.js
@@ -47,11 +47,8 @@ export class voucherService {
   }
 
   static async incrementVoucherUsage(voucher_name) {
-    return VOUCHER_REF.child(voucher_name).transaction((voucher) => {
-      if (voucher) {
-        voucher.times_used++
-      }
-      return voucher;
+    return VOUCHER_REF.child(voucher_name).child('times_used').transaction((value) => {
+      return value++;
     })
   }
 

diff --git a/src/views/Tools/index.vue b/src/views/Tools/index.vue
@@ -3,7 +3,7 @@
 		<div class="card-header" slot="header">
 			<h1><i aria-hidden="true" class="fas fa-tools mr-2" /> D&D 5e Tools</h1>
 		</div>
-		<div class="card-body row q-col-gutter-md">	
+		<div class="card-body row q-col-gutter-md">
 			<div v-for="(tool, key) in tools" class="col-12 col-sm-6 col-md-4" :key="key">
         <router-link :to="tool.url">
           <hk-card class="full-height tool">
@@ -95,14 +95,15 @@ a {
     filter: grayscale(50%);
     transition: all .5s ease-in-out;
     font-size: 95px;
+    width:inherit;
     text-align: center;
     line-height: 180px;
     text-shadow: 0 0 20px $black;
   }
   &:hover {
     background-color: $neutral-5;
     border-color: $neutral-4;
-    
+
     .card-header {
       background-color: $neutral-7;
     }
@@ -111,4 +112,4 @@ a {
     }
   }
 }
-</style>
+</style>