Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit
This commit is contained in:
@@ -145,6 +145,7 @@ export default function AuthProfile() {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<ActivitiesTab />
|
||||
</div>
|
||||
</Layout>
|
||||
</>
|
||||
|
||||
@@ -4,6 +4,7 @@ import { toast } from "react-toastify";
|
||||
import googleLogo from "../../../assets/images/google-logo.svg";
|
||||
// import titleShape from "../../../assets/images/shape/title-shape.svg";
|
||||
import titleShape from "../../../assets/images/shape/login_straight_underline.svg";
|
||||
import usersService from "../../../services/UsersService";
|
||||
import InputCom from "../../Helpers/Inputs/InputCom";
|
||||
import AuthLayout from "../AuthLayout";
|
||||
|
||||
@@ -19,21 +20,30 @@ export default function Login() {
|
||||
};
|
||||
|
||||
// email
|
||||
const [email, setMail] = useState("support@chiefsoft.com");
|
||||
const [email, setMail] = useState("");
|
||||
const handleEmail = (e) => {
|
||||
setMail(e.target.value);
|
||||
};
|
||||
// password
|
||||
const [password, setPassword] = useState("123456");
|
||||
const [password, setPassword] = useState("");
|
||||
const handlePassword = (e) => {
|
||||
setPassword(e.target.value);
|
||||
};
|
||||
const navigate = useNavigate();
|
||||
const doLogin = () => {
|
||||
const userApi = new usersService();
|
||||
const doLogin = async () => {
|
||||
if (email !== "" && password !== "") {
|
||||
if (email === "support@chiefsoft.com") {
|
||||
var postData = {
|
||||
username: email,
|
||||
password: password
|
||||
};
|
||||
const loginResult = await userApi.logInUser(postData); // just for a test
|
||||
// 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}`);
|
||||
setLoginLoading(true);
|
||||
// userApi.getUserReminders(); //testing
|
||||
setTimeout(() => {
|
||||
toast.success("Login Successfully");
|
||||
navigate("/", { replace: true });
|
||||
@@ -57,7 +67,7 @@ export default function Login() {
|
||||
<h1 className="text-5xl font-bold leading-[74px] text-dark-gray dark:text-white">
|
||||
Log In
|
||||
</h1>
|
||||
<div className="shape -mt-2">
|
||||
<div className="shape mb-[10px]">
|
||||
<img src={titleShape} alt="shape" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -66,7 +76,7 @@ export default function Login() {
|
||||
<InputCom
|
||||
value={email}
|
||||
inputHandler={handleEmail}
|
||||
placeholder="support@chiefsoft.com"
|
||||
placeholder="support@mermsemr.com"
|
||||
label="Email Address"
|
||||
name="email"
|
||||
type="email"
|
||||
@@ -122,9 +132,8 @@ export default function Login() {
|
||||
<button
|
||||
onClick={doLogin}
|
||||
type="button"
|
||||
className={`btn-login rounded-[50px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center ${
|
||||
loginLoading ? "active" : ""
|
||||
}`}
|
||||
className={`btn-login rounded-[50px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center ${loginLoading ? "active" : ""
|
||||
}`}
|
||||
>
|
||||
{loginLoading ? (
|
||||
<div className="signup btn-loader"></div>
|
||||
@@ -133,7 +142,7 @@ export default function Login() {
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
{loginError && <p class="text-center text-red-600 pb-4">Invalid Credential</p>}
|
||||
{loginError && <p class="text-center text-red-700 pb-4">Invalid username or password</p>}
|
||||
<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"
|
||||
|
||||
@@ -22,11 +22,11 @@ export default function SignUp() {
|
||||
</div>
|
||||
*/}
|
||||
<div className="thumbnail flex justify-center">
|
||||
{/*<img src={loginThumb} alt="login-thumb" /> */}
|
||||
{/*<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
|
||||
Welcome to myFit
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -37,7 +37,7 @@ export default function SignUp() {
|
||||
<h1 className="sm:text-5xl text-4xl font-bold text-dark-gray dark:text-white leading-2">
|
||||
Create Account
|
||||
</h1>
|
||||
<div className="shape sm:w-[377px] w-[280px] -mt-2.5 ml-5">
|
||||
<div className="shape sm:w-[377px] w-[280px] mb-[10px] ml-5">
|
||||
<img src={titleShape} alt="shape" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -104,9 +104,7 @@ export default function SellHistoryMarketVisitorAnalytic({ className }) {
|
||||
}`}
|
||||
>
|
||||
<div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4">
|
||||
<div className="lg:w-1/2 w-full mb-10 lg:mb-0">
|
||||
<SellHistoryWidget />
|
||||
</div>
|
||||
|
||||
<div className="flex-1 ">
|
||||
<div className="market-visitor w-full md:p-8 p-4 h-full bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow">
|
||||
<div className="flex flex-col justify-between h-full">
|
||||
@@ -127,6 +125,11 @@ export default function SellHistoryMarketVisitorAnalytic({ className }) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="lg:w-1/2 w-full mb-10 lg:mb-0">
|
||||
<SellHistoryWidget />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -21,7 +21,7 @@ export default function Layout({ children }) {
|
||||
const navigate = useNavigate();
|
||||
const logOut = () => {
|
||||
localStorage.removeItem("email");
|
||||
localStorage.clear();
|
||||
localStorage.removeItem('session_token');
|
||||
toast.success("Come Back Soon", {
|
||||
icon: `🙂`,
|
||||
});
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,12 +1,29 @@
|
||||
import React from "react";
|
||||
import HistoryAnalyticsCard from "../Cards/HistoryAnalyticsCard";
|
||||
import Layout from "../Partials/Layout";
|
||||
import ReminderTable from "./ReminderTable";
|
||||
import React from 'react'
|
||||
import HistoryAnalyticsCard from '../Cards/HistoryAnalyticsCard'
|
||||
import Layout from '../Partials/Layout'
|
||||
import ReminderTable from './ReminderTable'
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
export default function Reminders() {
|
||||
return (
|
||||
<>
|
||||
<Layout>
|
||||
<div className="content-wrapper-profile-only w-full mb-6">
|
||||
<div className="auth-tab-content relative mb-10">
|
||||
<div className="lg:flex justify-between">
|
||||
<div className="tab-items"></div>
|
||||
<div style={{ transform: 'translateY(-22px)' }}>
|
||||
<Link
|
||||
to="/add-reminder"
|
||||
className="btn-gradient lg:flex hidden w-[153px] h-[46px] rounded-full text-white justify-center items-center"
|
||||
>
|
||||
Add Reminder
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
<div className="hidden lg:block w-full h-[1px] bg-[#DCD5FE] dark:bg-[#5356fb29] absolute top-[42px] left-0"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="history-wrapper w-full mb-10">
|
||||
<div className="main-wrapper w-full">
|
||||
<ReminderTable />
|
||||
@@ -14,5 +31,5 @@ export default function Reminders() {
|
||||
</div>
|
||||
</Layout>
|
||||
</>
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
@@ -8,246 +8,135 @@ export default function LoginActivityTab() {
|
||||
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
|
||||
<tbody>
|
||||
<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29] default-border-b dark:border-[#5356fb29] ottom ">
|
||||
<td className="py-4 text-center">OS</td>
|
||||
<td className="py-4 text-center">Browser</td>
|
||||
<td className="py-4 text-center">Channel</td>
|
||||
<td className="py-4 text-center">Date</td>
|
||||
<td className="py-4 text-center">Location</td>
|
||||
<td className="py-4 text-center">Last session</td>
|
||||
<td className="py-4 text-center">Status</td>
|
||||
<td className="py-4 text-center"></td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Windows
|
||||
Desktop
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Google Chrome
|
||||
10-10-2035
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
Dhaka , Bangladesh
|
||||
10.0.0.1000
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Mac
|
||||
Desktop
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Firefox
|
||||
10-10-2035
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
Tokyo,japan
|
||||
10.0.0.1000
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
5 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-red text-white capitalize">
|
||||
Inactive
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
App
|
||||
Desktop
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
App
|
||||
10-10-2035
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
Barhin,Dubai
|
||||
10.0.0.1000
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Windows
|
||||
Desktop
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Google Chrome
|
||||
10-10-2035
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
Dhaka , Bangladesh
|
||||
10.0.0.1000
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Mac
|
||||
Desktop
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
Firefox
|
||||
10-10-2035
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
Tokyo,japan
|
||||
10.0.0.1000
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
5 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-red text-white capitalize">
|
||||
Inactive
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className="text-center py-4">
|
||||
<div className="flex items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
App
|
||||
Mobile
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<div className="flex space-x-1 items-center justify-center">
|
||||
<span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap px-2">
|
||||
App
|
||||
10-10-2035
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-dark-gray dark:text-white whitespace-nowrap px-2">
|
||||
Barhin,Dubai
|
||||
10.0.0.1000
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-base text-thin-light-gray font-medium whitespace-nowrap px-2">
|
||||
2 days ago
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<span className="text-sm px-[10px] py-[6px] rounded-full bg-light-green text-white capitalize">
|
||||
active
|
||||
</span>
|
||||
</td>
|
||||
<td className="text-center py-4">
|
||||
<button
|
||||
type="button"
|
||||
className=" text-thin-light-gray hover:text-red-400"
|
||||
>
|
||||
<Icons name="deep-delete" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user