Merge branch 'release/2.20.6' into main

HarmlessKey · Jan 5, 2024 · 5e40e14 · 5e40e14
2 parents 4d1c3f1 + 76db5f3
commit 5e40e14
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.20.5",
+	"version": "2.20.6",
 	"name": "harmless_key",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Harmless Key",

diff --git a/src/schemas/hk-npc-schema.json b/src/schemas/hk-npc-schema.json
@@ -681,7 +681,7 @@
 		"action-range": {
 			"title": "Range",
 			"type": "string",
-			"pattern": "^[0-9]+(/[0-9]+)*$"
+			"pattern": "(^[0-9]+(/[0-9]+)*$|^$)"
 		},
 		"action-aoe-type": {
 			"title": "AOE type",

diff --git a/src/views/Pages/SignIn.vue b/src/views/Pages/SignIn.vue
@@ -6,44 +6,44 @@
 			<p v-if="error" class="red">
 				<i aria-hidden="true" class="fas fa-exclamation-triangle"></i> {{ error }}
 			</p>
-			<form v-if="!loading" v-on:submit.prevent>
-				<button class="google mb-2" @click="googleSignIn()">Sign in with Google</button>
-				<hr />
-				<h4 class="text-center neutral-2">With email and password</h4>
-				<q-input
-					:dark="$store.getters.theme === 'dark'"
-					filled
-					square
-					dense
-					autocomplete="username"
-					type="text"
-					v-model="email"
-					name="email"
-					placeholder="Email"
-					class="email"
-				/>
-				<q-input
-					:dark="$store.getters.theme === 'dark'"
-					filled
-					square
-					dense
-					autocomplete="off"
-					type="password"
-					v-model="password"
-					placeholder="password"
-					name="password"
-				/>
-				<button class="btn btn-block my-3" @click="signIn()">
-					Sign In <i aria-hidden="true" class="fas fa-sign-in-alt"></i>
-				</button>
-
-				<p class="text-center mb-1">
-					<small><router-link to="/forgot-password">Forgot password?</router-link></small>
-				</p>
-				<div class="text-center">
-					<small>No account yet? <router-link to="/sign-up">Create one here.</router-link></small>
-				</div>
-			</form>
+			<button class="google mb-2" @click="googleSignIn()">Sign in with Google</button>
+			<hr />
+			<ValidationObserver v-if="!loading" v-slot="{ handleSubmit }">
+				<q-form @submit="handleSubmit(signIn)" greedy>
+					<h4 class="text-center neutral-2">With email and password</h4>
+					<hk-input
+						v-model="email"
+						autocomplete="username"
+						type="text"
+						name="email"
+						placeholder="Email"
+						class="email"
+					/>
+					<hk-input
+						v-model="password"
+						placeholder="password"
+						autocomplete="password"
+						:type="showPw ? 'text' : 'password'"
+					>
+						<q-icon
+							slot="append"
+							:name="showPw ? 'fas fa-eye' : 'fas fa-eye-slash'"
+							class="cursor-pointer"
+							@click="showPw = !showPw"
+						/>
+      		</hk-input>
+					<button class="btn btn-block my-3" type="submit">
+						Sign In <i aria-hidden="true" class="fas fa-sign-in-alt"></i>
+					</button>
+
+					<p class="text-center mb-1">
+						<small><router-link to="/forgot-password">Forgot password?</router-link></small>
+					</p>
+					<div class="text-center">
+						<small>No account yet? <router-link to="/sign-up">Create one here.</router-link></small>
+					</div>
+				</q-form>
+			</ValidationObserver>
 			<hk-loader v-else prefix="Signing you in" noBackground />
 		</div>
 	</div>
@@ -57,6 +57,7 @@ export default {
 	name: "SignIn",
 	data() {
 		return {
+			showPw: false,
 			email: "",
 			password: "",
 			error: "",

diff --git a/src/views/Pages/SignUp.vue b/src/views/Pages/SignUp.vue
@@ -5,12 +5,12 @@
 			<h2>Create an account</h2>
 			<p v-if="error" class="red"><i aria-hidden="true" class="fas fa-exclamation-triangle"></i> {{ error }}</p>
 
+			<button class="google mt-2" @click="googleSignIn()">
+				Sign up with Google
+			</button>
+			<hr>
 			<ValidationObserver v-slot="{ handleSubmit, valid }">
 				<q-form v-if="!loading" @submit="handleSubmit(signUp)">
-					<button class="google mt-2" @click="googleSignIn()">
-						Sign up with Google
-					</button>
-					<hr>
 
 					<h4 class="text-center neutral-2">
 						With email and password
@@ -21,12 +21,11 @@
 						name="Email" 
 						v-slot="{ errors, invalid, validated}"
 					>
-						<q-input
-							:dark="$store.getters.theme === 'dark'" filled square dense 
+						<hk-input
 							autocomplete="username" 
 							class="email mb-2"
 							type="email" 
-							placeholder="Email" 
+							label="Email" 
 							v-model="email"
 							:error="invalid && validated"
 							:error-message="errors[0]"
@@ -38,11 +37,9 @@
 						name="Username" 
 						v-slot="{ errors, invalid, validated }"
 					>
-						<q-input 
-							:dark="$store.getters.theme === 'dark'" filled square dense
+						<hk-input 
 							type="text" 
 							class="mb-2"
-							autocomplete="off"
 							label="Username" 
 							maxlength="20"
 							minlength="3"
@@ -59,11 +56,10 @@
 						name="Password"
 						v-slot="{ errors, invalid, validated}"
 					>
-						<q-input
-							:dark="$store.getters.theme === 'dark'" filled square dense 
+						<hk-input
 							autocomplete="new-password" 
 							class="mb-2"
-							type="password" 
+							type="password"
 							placeholder="Password" 
 							v-model="password" 
 							name="password"
@@ -77,8 +73,7 @@
 						name="Confirm Password"
 						v-slot="{ errors, invalid, validated}"
 					>
-						<q-input
-							:dark="$store.getters.theme === 'dark'" filled square dense 
+						<hk-input
 							autocomplete="new-password"
 							class="mb-2"
 							type="password"