first commit

This commit is contained in:
Olu Amey
2023-02-07 07:00:04 -05:00
parent 9b2145ff00
commit f437f27b66
17 changed files with 436 additions and 257 deletions
+2 -16
View File
@@ -1,6 +1,6 @@
import React from "react";
import loginThumb from "../../assets/images/auth-thumb.svg";
import logo from "../../assets/images/light-logo.png"; //logo-1.svg";
import logo from "../../assets/images/wrenchboard.png"; //logo-1.svg";
export default function LoginLayout({ slogan, children }) {
const checkScreenHeight = window.screen.height;
@@ -15,21 +15,7 @@ export default function LoginLayout({ slogan, children }) {
<div className="layout-wrapper">
<div className={`main-wrapper w-full ${screen}`}>
<div className="flex w-full h-full">
<div className="xl:flex hidden w-1/2 h-full p-[70px] flex-col justify-between primary-home">
{/*
<div className="logo">
<img src={logo} alt="logo" />
</div>
*/}
<div className="thumbnail flex justify-center">
{/* <img src={loginThumb} alt="login-thumb" />*/}
</div>
<div className="article w-[600px]">
<p className="text-[60px] font-bold leading-[72px] text-white">
{slogan}
</p>
</div>
</div>
<div className="flex-1 flex justify-center items-center">
{children && children}
</div>
+41 -7
View File
@@ -35,13 +35,26 @@ export default function Login() {
if (email !== "" && password !== "") {
var postData = {
username: email,
password: password
password: password,
sessionid: 'STARTING'
};
const loginResult = await userApi.logInUser(postData); // just for a test
//debugger;
// if (email === "support@mermsemr.com") {
if (loginResult.data.status > 0 && loginResult.data.session_token !='') { // just for a start
localStorage.setItem("email", `${email}`);
localStorage.setItem("session_token", `${loginResult.data.session_token}`);
if (loginResult.data.status > 0 && loginResult.data.internal_return ==100 && loginResult.data.session !='') { // just for a start
localStorage.setItem("email", `${loginResult.data.email}`);
localStorage.setItem("member_id", `${loginResult.data.member_id}`);
localStorage.setItem("uid", `${loginResult.data.uid}`);
localStorage.setItem("session_token", `${loginResult.data.session}`);
localStorage.setItem("added", `${loginResult.data.added}`);
localStorage.setItem("city", `${loginResult.data.city}`);
localStorage.setItem("country", `${loginResult.data.country}`);
localStorage.setItem("firstname", `${loginResult.data.firstname}`);
localStorage.setItem("last_login", `${loginResult.data.last_login}`);
localStorage.setItem("lastname", `${loginResult.data.lastname}`);
localStorage.setItem("state", `${loginResult.data.state}`);
localStorage.setItem("zip_code", `${loginResult.data.zip_code}`);
localStorage.setItem("session", `${loginResult.data.session}`);
setLoginLoading(true);
// userApi.getUserReminders(); //testing
setTimeout(() => {
@@ -67,9 +80,6 @@ export default function Login() {
<h1 className="text-5xl font-bold leading-[74px] text-dark-gray dark:text-white">
Log In
</h1>
<div className="shape mb-[10px]">
<img src={titleShape} alt="shape" />
</div>
</div>
<div className="input-area">
<div className="input-item mb-5">
@@ -143,6 +153,7 @@ export default function Login() {
</button>
</div>
{loginError && <p class="text-center text-red-700 pb-4">Invalid username or password</p>}
<div className="flex justify-center bottomMargin">
<a
href="#"
className="w-full border border-light-purple dark:border-[#5356fb29] rounded-[50px] h-[58px] flex justify-center bg-[#FAFAFA] dark:bg-[#11131F] items-center"
@@ -152,6 +163,29 @@ export default function Login() {
Sign In with Google
</span>
</a>
</div>
<div className="flex justify-center bottomMargin">
<a
href="#"
className="w-full border border-light-purple dark:border-[#5356fb29] rounded-[50px] h-[58px] flex justify-center bg-[#FAFAFA] dark:bg-[#11131F] items-center"
>
<img className="mr-3" src={googleLogo} alt="google logo" />
<span className="text-lg text-thin-light-gray font-normal">
Sign In with faceBook
</span>
</a>
</div>
<div className="flex justify-center bottomMargin">
<a
href="#"
className="w-full border border-light-purple dark:border-[#5356fb29] rounded-[50px] h-[58px] flex justify-center bg-[#FAFAFA] dark:bg-[#11131F] items-center"
>
<img className="mr-3" src={googleLogo} alt="google logo" />
<span className="text-lg text-thin-light-gray font-normal">
Sign In with Apple
</span>
</a>
</div>
</div>
<div className="signup-area flex justify-center">
<p className="sm:text-lg text-sm text-thin-light-gray font-normal">
-15
View File
@@ -15,21 +15,6 @@ export default function SignUp() {
<div className="layout-wrapper">
<div className="main-wrapper w-full xl:h-screen h-full xl:py-0 py-12">
<div className="flex w-full h-full">
<div className="xl:flex hidden w-1/2 h-full p-[70px] flex-col justify-between primary-home">
{/*
<div className="logo">
<img src={logo} alt="logo" />
</div>
*/}
<div className="thumbnail flex justify-center">
{/*<img src={loginThumb} alt="login-thumb" /> */}
</div>
<div className="article w-[600px]">
<p className="text-[60px] font-bold leading-[72px] text-white">
Welcome to myFit
</p>
</div>
</div>
<div className="flex-1 flex justify-center items-center">
<div className="content-wrapper xl:bg-white dark:bg-dark-white xl:px-7 px-5 2xl:px-[100px] h-[840px] rounded-xl flex flex-col justify-center">
<div>