Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/components/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<input class="field" type="password" required placeholder="Password" v-model="password">
<button v-if="!loading" @click="handleSubmit" class="hvr-grow">Sign In</button>
<button v-else class="disabled hvr-grow">Signing In</button>
<p v-if="credError" class="error-line" >Invalid credentials</p>
<p v-else-if="internalError" class="error-line" > Something went wrong, please try again.</p>
<p @click="handleClick">Don’t have an account? Sign up instead</p>
</div>
</div>
Expand All @@ -29,14 +31,25 @@ export default {
const email = ref("")
const password = ref("")
const loading = ref(false)

const credError = ref(null);
const internalError = ref(null);
const handleSubmit = async () => {
loading.value = true
await login(email.value, password.value)
loading.value = false
if (!error.value) {
context.emit("login")
}
else if (error.value==="Incorrect login credentials"){
credError.value = error.value;
email.value="";
password.value="";
}
else{
internalError.value=error.value;
email.value="";
password.value="";
}
}

const {err, googleLogin} = useSignInGoogle()
Expand All @@ -54,7 +67,7 @@ export default {
context.emit("toggleAuth")
}

return {email, password, loading, handleSubmit, handleGoogleSubmit, handleClick}
return {email, password, loading, handleSubmit, handleGoogleSubmit, handleClick,credError,internalError}
}
}
</script>
Expand Down Expand Up @@ -193,7 +206,10 @@ export default {

cursor: pointer;
}

.error-line{
color: rgb(235 230 56) !important;
cursor:default !important;
}
@media (max-width:900px) {
.signInGoogle{
width: initial;
Expand Down
32 changes: 29 additions & 3 deletions src/components/Signup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<input class="field" type="password" required placeholder="Password" v-model="password">
<button v-if="!loading" @click="handleSubmit" class="hvr-grow">Sign Up</button>
<button v-else class="disabled hvr-grow">Signing In</button>
<p v-if="preExistingEmailError" class="error-line" >The email address is already in use by another account.</p>
<p v-if="passwordLenghtError" class="error-line" > Password must be atleast 8 characters long.</p>
<p v-else-if="internalError" class="error-line" > Something went wrong, please try again.</p>
<p @click="handleClick">Already have an account? Sign in instead</p>
</div>
</div>
Expand All @@ -32,7 +35,9 @@ export default {
const email = ref("")
const password = ref("")
const loading = ref(null)

const preExistingEmailError= ref(null);
const passwordLenghtError = ref(null);
const internalError = ref(null);
const { error, signup } = useSignup()
const { e, addDoc} = addUsers("Users")

Expand All @@ -46,6 +51,24 @@ export default {
await addDoc({...data, score: 0})
context.emit('login')
}
else if(error.value==="Firebase: The email address is already in use by another account. (auth/email-already-in-use)."){
preExistingEmailError.value = "Firebase: The email address is already in use by another account. (auth/email-already-in-use).";
email.value='';
password.value='';
loading.value= false;
}
else if(error.value==="Firebase: Password should be at least 6 characters (auth/weak-password)."){
passwordLenghtError.value = "Firebase: Password should be at least 6 characters (auth/weak-password).";
password.value='';
loading.value= false;
}
else{
displayName.value="";
email.value="";
password.value="";
internalError.value=error.value;
loading.value=false;
}
}

const { err, googleLogin } = useSignInGoogle()
Expand All @@ -67,7 +90,7 @@ export default {
}


return { displayName, email, password, handleSubmit, loading, handleGoogleSubmit, handleClick }
return { displayName, email, password, handleSubmit, loading, handleGoogleSubmit, handleClick, error,preExistingEmailError,passwordLenghtError,internalError }
}
}
</script>
Expand Down Expand Up @@ -206,7 +229,10 @@ export default {

cursor: pointer;
}

.error-line{
color: rgb(235 230 56) !important;
cursor:default !important;
}
@media (max-width:900px) {
.signInGoogle{
width: initial;
Expand Down