Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update email regex #166

Merged
merged 26 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bf90d25
minor ux improvements
Prabalpsingh7115 Apr 13, 2024
ed3f19e
minor fix
Prabalpsingh7115 Apr 13, 2024
74a0bd7
minor ux improvements
Prabalpsingh7115 Apr 13, 2024
f0aa024
Merge branch 'main' of https://github.com/bsoc-bitbyte/getit
Prabalpsingh7115 Apr 13, 2024
43d72f4
minor fixes
Prabalpsingh7115 Apr 13, 2024
0b06ac8
minor fixes
Prabalpsingh7115 Apr 13, 2024
9568d2f
add redirect to home on logout
Prabalpsingh7115 Apr 14, 2024
977e464
merge branch
Prabalpsingh7115 Apr 14, 2024
955a15c
removed orders page without login
Prabalpsingh7115 Apr 14, 2024
f9ea359
Merge branch 'main' of https://github.com/bsoc-bitbyte/getit
Prabalpsingh7115 Apr 14, 2024
d7afbae
add respective status on payments page
Prabalpsingh7115 Apr 14, 2024
f75fc35
fix aspect ratio for event
Prabalpsingh7115 Apr 14, 2024
fbdb5ca
Merge branch 'main' into main
Prabalpsingh7115 Apr 14, 2024
05c5440
minor ui fix in event pages
Prabalpsingh7115 Apr 14, 2024
06781c3
Merge branch 'main' of https://github.com/bsoc-bitbyte/getit
Prabalpsingh7115 Apr 14, 2024
def8070
Merge branch 'main' of https://github.com/Prabalpsingh7115/GetIt
Prabalpsingh7115 Apr 14, 2024
bb4693a
clear cart before payment
Prabalpsingh7115 Apr 14, 2024
aa8f7da
Merge branch 'main' of https://github.com/bsoc-bitbyte/getit
Prabalpsingh7115 Apr 14, 2024
bf4f214
fixed ui in event page
Prabalpsingh7115 Apr 14, 2024
b66d883
Update checkOut.vue
Priyansh61 Apr 14, 2024
07d3358
merge branch
Prabalpsingh7115 Apr 15, 2024
1e80776
Merge branch 'main' of https://github.com/Prabalpsingh7115/GetIt
Prabalpsingh7115 Apr 15, 2024
3f3f0f0
update email regex
Prabalpsingh7115 Apr 17, 2024
2b1f307
Update Signup.vue
Priyansh61 Apr 17, 2024
4fae1b1
Update Signin.vue
Priyansh61 Apr 17, 2024
8a579a6
Update Signin.vue
Priyansh61 Apr 17, 2024
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
130 changes: 84 additions & 46 deletions frontend/pages/Signin.vue
Original file line number Diff line number Diff line change
@@ -1,25 +1,55 @@
<template>
<div class="main min-[1120px]:flex min-[1120px]:justify-evenly py-[2rem] md:py-[0rem] px-[0.1rem] md:mt-[2rem] mt-[1rem] ">
<div
class="main min-[1120px]:flex min-[1120px]:justify-evenly py-[2rem] md:py-[0rem] px-[0.1rem] md:mt-[2rem] mt-[1rem]"
>
<div class="left-panel mt-[5.5rem] max-[1119px]:hidden min-[1120px]:block">
<img src="../assets/37.order-delivered-3.png" class="border-1 border-gray-400 min-[1120px]:order-1 h-[50vh]" alt="delivery-img">
<img
src="../assets/37.order-delivered-3.png"
class="border-1 border-gray-400 min-[1120px]:order-1 h-[50vh]"
alt="delivery-img"
/>
</div>
<div class="right-panel max-[1119px]:px-[2rem] min-[1120px]:px-[0rem]">
<div class="form-container">
<form @submit.prevent="submitForm">
<div class="credentials - container min-[1120px]:order-2 min-[1120px]:mt-[3rem]">
<div
class="credentials - container min-[1120px]:order-2 min-[1120px]:mt-[3rem]"
>
<div class="catch-line-outer">
<div class="catch-line-inner">
<p class="text-slate-500 font-semibold py-[2rem]">Welcome back! Please enter your details</p>
<p class="text-slate-500 font-semibold py-[2rem]">
Welcome back! Please enter your details
</p>
</div>
</div>
<div class="credentials">
<div class="email py-[1.0rem]">
<p class="font-bold subpixel-antialiased text-slate-500/[.98] py-[0.1rem] tracking-wide text-slate-800 ">Email</p>
<input type="email" required class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg" v-model.trim.lazy="credentials.email" placeholder="Enter your email"/>
<p
class="font-bold subpixel-antialiased text-slate-500/[.98] py-[0.1rem] tracking-wide text-slate-800"
>
Email
</p>
<input
type="email"
required
class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg"
v-model.trim.lazy="credentials.email"
placeholder="Enter your email"
/>
</div>
<div class="password py-[1.0rem]">
<p class="font-bold subpixel-antialiased text-slate-500/[.98] tracking-wide py-[0.1rem] text-slate-800">Password</p>
<input type="password" required class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg" v-model.trim.lazy="credentials.password" placeholder="***********"/>
<div class="password py-[1.0rem]">
<p
class="font-bold subpixel-antialiased text-slate-500/[.98] tracking-wide py-[0.1rem] text-slate-800"
>
Password
</p>
<input
type="password"
required
class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg"
v-model.trim.lazy="credentials.password"
placeholder="***********"
/>
</div>
</div>
<!-- <div class="remember-forgot py-[1.0rem] flex justify-between hi"> -->
Expand All @@ -31,15 +61,26 @@
<!-- <a href="#" class="font-bold subpixel-antialiased tracking-wide text-slate-800 fp">Forgot password ?</a> -->
<!-- </div> -->
<!-- </div> -->
<div class="sign-in pt-[1rem] pb-[0rem]">
<button type="submit" class="signin w-full h-[3.25rem] rounded-[1.25rem]">
<p class="text-white hover:border-slate-500 py-[0rem]">Sign in</p>
<div class="sign-in pt-[1rem] pb-[0rem]">
<button
type="submit"
class="signin w-full h-[3.25rem] rounded-[1.25rem]"
>
<p class="text-white hover:border-slate-500 py-[0rem]">
Sign in
</p>
</button>
</div>
<div class="optional-sign-in mt-[0.7rem] hi">
<p class="flex justify-center hi gap-1">
<span class="account-text tracking-wider dha">Don't have an account?</span>
<nuxt-link to="/Signup" class="text-red-500 hover:underlined tracking-wider suf">Sign up </nuxt-link>
<span class="account-text tracking-wider dha"
>Don't have an account?</span
>
<nuxt-link
to="/Signup"
class="text-red-500 hover:underlined tracking-wider suf"
>Sign up
</nuxt-link>
</p>
</div>
</div>
Expand All @@ -50,35 +91,39 @@
</template>

<script>
import { useAuthStore } from '../store/auth'

import { useAuthStore } from "../store/auth";
import { useRouter } from "vue-router";

export default {
name: 'Signin',
name: "Signin",
setup() {
const credentials = {
email: '',
password: '',
}
email: "",
password: "",
};

const store = useAuthStore()
const router = useRouter()
const store = useAuthStore();
const router = useRouter();

if (store.isAuthenticated) {
router.push("/");
}

const submitForm = async (e) => {
e.preventDefault();
const data = await store.login(credentials);
}
};

return {
credentials,
submitForm
}
}
}
submitForm,
};
},
};
</script>
<style scoped>
.main{
font-family: 'Poppins', sans-serif;
.main {
font-family: "Poppins", sans-serif;
font-smooth: always;
position: inherit;
height: 100%;
Expand All @@ -89,18 +134,16 @@ export default {
bottom: 0;
background-color: white;
}
.signin{
background-color:rgba(234, 69, 76, 1);
.signin {
background-color: rgba(234, 69, 76, 1);
}
@media (max-width: 420px) {
.hil{
.hil {
margin-left: -20px !important;
}
.hir
{
.hir {
margin-right: -20px !important;
}

}
@media (max-width: 420px) {
/* .hil{
Expand All @@ -110,8 +153,7 @@ export default {
{
margin-right: -40px !important;
} */
.hi
{
.hi {
display: flex;
flex-direction: column !important;
gap: 5px;
Expand All @@ -120,28 +162,23 @@ export default {
/* justify-content: center; */
text-align: center;
}
.dha
{
.dha {
display: inline-block;
/* font-size:larger; */
margin-left: -30px !important;
margin-right: -40px !important;
text-align: center !important;

}
.suf
{
.suf {
display: inline-block;
/* font-size:larger; */
margin-left: -48px !important;
margin-right: -45px !important;
text-align: center !important;
}
.fp
{
.fp {
margin-left: -25px !important;
text-align: center;

}
/* .hil{
margin-left: 16px !important;
Expand All @@ -156,4 +193,5 @@ export default {
margin-right: -43px !important;
}
} */
</style>../store/auth
</style>
../store/auth
Loading
Loading