Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b45be9fafd | |||
| a3af650036 | |||
| 26d2ddf719 | |||
| 2afbbe305d |
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
import Toaster from "./components/Helpers/Toaster";
|
// import Toaster from "./components/Helpers/Toaster";
|
||||||
import Routers from "./Routers";
|
import Routers from "./Routers";
|
||||||
import Default from "./components/Partials/Default";
|
import Default from "./components/Partials/Default";
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@ function App() {
|
|||||||
<Default>
|
<Default>
|
||||||
<>
|
<>
|
||||||
<Routers />
|
<Routers />
|
||||||
<Toaster />
|
{/* <Toaster /> */}
|
||||||
</>
|
</>
|
||||||
</Default>
|
</Default>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { toast } from "react-toastify";
|
// import { toast } from "react-toastify";
|
||||||
import activeAidsBanner from "../../assets/images/active-aids-banner.jpg";
|
import activeAidsBanner from "../../assets/images/active-aids-banner.jpg";
|
||||||
import HeroUser from "../../assets/images/hero-user.png";
|
import HeroUser from "../../assets/images/hero-user.png";
|
||||||
import CountDown from "../Helpers/CountDown";
|
import CountDown from "../Helpers/CountDown";
|
||||||
@@ -10,10 +10,8 @@ export default function OverviewSection({ className }) {
|
|||||||
const favoriteHandler = () => {
|
const favoriteHandler = () => {
|
||||||
if (!addFavorite) {
|
if (!addFavorite) {
|
||||||
setValue(true);
|
setValue(true);
|
||||||
toast.success("Added to Favorite List");
|
|
||||||
} else {
|
} else {
|
||||||
setValue(false);
|
setValue(false);
|
||||||
toast.warn("Remove to Favorite List");
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -45,7 +45,10 @@ export default function Login() {
|
|||||||
// if (email === "support@mermsemr.com") {
|
// if (email === "support@mermsemr.com") {
|
||||||
if (loginResult.data.status > 0 && loginResult.data.session_token !='') { // just for a start
|
if (loginResult.data.status > 0 && loginResult.data.session_token !='') { // just for a start
|
||||||
localStorage.setItem("email", `${email}`);
|
localStorage.setItem("email", `${email}`);
|
||||||
|
localStorage.setItem("member_id", `${JSON.stringify(loginResult.data.member_id)}`);
|
||||||
|
localStorage.setItem("member_uuid", `${JSON.stringify(loginResult.data.member_uuid)}`);
|
||||||
localStorage.setItem("session_token", `${loginResult.data.session_token}`);
|
localStorage.setItem("session_token", `${loginResult.data.session_token}`);
|
||||||
|
localStorage.setItem("status", `${JSON.stringify(loginResult.data.status)}`);
|
||||||
localStorage.setItem("profile", `${JSON.stringify(loginResult.data.profile)}`);
|
localStorage.setItem("profile", `${JSON.stringify(loginResult.data.profile)}`);
|
||||||
setLoginLoading(true);
|
setLoginLoading(true);
|
||||||
// userApi.getUserReminders(); //testing
|
// userApi.getUserReminders(); //testing
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { toast } from "react-toastify";
|
// import { toast } from "react-toastify";
|
||||||
import localImgLoad from "../../lib/localImgLoad";
|
import localImgLoad from "../../lib/localImgLoad";
|
||||||
import CountDown from "../Helpers/CountDown";
|
import CountDown from "../Helpers/CountDown";
|
||||||
import Icons from "../Helpers/Icons";
|
import Icons from "../Helpers/Icons";
|
||||||
@@ -11,10 +11,8 @@ export default function ProductCardStyleOne({ datas, hidden = false }) {
|
|||||||
const favoriteHandler = () => {
|
const favoriteHandler = () => {
|
||||||
if (!addFavorite) {
|
if (!addFavorite) {
|
||||||
setValue(true);
|
setValue(true);
|
||||||
toast.success("Added to Favorite List");
|
|
||||||
} else {
|
} else {
|
||||||
setValue(false);
|
setValue(false);
|
||||||
toast.warn("Remove to Favorite List");
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { toast } from "react-toastify";
|
// import { toast } from "react-toastify";
|
||||||
import localImgLoad from "../../lib/localImgLoad";
|
import localImgLoad from "../../lib/localImgLoad";
|
||||||
import Icons from "../Helpers/Icons";
|
import Icons from "../Helpers/Icons";
|
||||||
|
|
||||||
@@ -14,10 +14,8 @@ export default function ProductCardStyleTwo({
|
|||||||
const favoriteHandler = () => {
|
const favoriteHandler = () => {
|
||||||
if (!addFavorite) {
|
if (!addFavorite) {
|
||||||
setValue(true);
|
setValue(true);
|
||||||
toast.success("Added to Favorite List");
|
|
||||||
} else {
|
} else {
|
||||||
setValue(false);
|
setValue(false);
|
||||||
toast.warn("Remove to Favorite List");
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { toast } from "react-toastify";
|
// import { toast } from "react-toastify";
|
||||||
import heroBg from "../../assets/images/hero-bg.svg";
|
import heroBg from "../../assets/images/hero-bg.svg";
|
||||||
import heroUser from "../../assets/images/hero-user.png";
|
import heroUser from "../../assets/images/hero-user.png";
|
||||||
import slider1 from "../../assets/images/slider-1.jpg";
|
import slider1 from "../../assets/images/slider-1.jpg";
|
||||||
@@ -21,10 +21,8 @@ export default function Hero({ className }) {
|
|||||||
const favoriteHandler = () => {
|
const favoriteHandler = () => {
|
||||||
if (!addFavorite) {
|
if (!addFavorite) {
|
||||||
setValue(true);
|
setValue(true);
|
||||||
toast.success("Added to Favorite List");
|
|
||||||
} else {
|
} else {
|
||||||
setValue(false);
|
setValue(false);
|
||||||
toast.warn("Remove to Favorite List");
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { toast } from "react-toastify";
|
// import { toast } from "react-toastify";
|
||||||
import useToggle from "../../hooks/useToggle";
|
import useToggle from "../../hooks/useToggle";
|
||||||
import { drawerToggle } from "../../store/drawer";
|
import { drawerToggle } from "../../store/drawer";
|
||||||
import ModalCom from "../Helpers/ModalCom";
|
import ModalCom from "../Helpers/ModalCom";
|
||||||
@@ -21,10 +21,14 @@ export default function Layout({ children }) {
|
|||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const logOut = () => {
|
const logOut = () => {
|
||||||
localStorage.removeItem("email");
|
localStorage.removeItem("email");
|
||||||
|
localStorage.removeItem('profile');
|
||||||
|
localStorage.removeItem('member_id');
|
||||||
|
localStorage.removeItem('member_uuid');
|
||||||
localStorage.removeItem('session_token');
|
localStorage.removeItem('session_token');
|
||||||
toast.success("Come Back Soon", {
|
localStorage.removeItem('status');
|
||||||
icon: `🙂`,
|
// toast.success("Come Back Soon", {
|
||||||
});
|
// icon: `🙂`,
|
||||||
|
// });
|
||||||
|
|
||||||
navigate("/login", { replace: true });
|
navigate("/login", { replace: true });
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, {useEffect} from "react";
|
import React, {useEffect} from "react";
|
||||||
import { Navigate, Outlet, useNavigate } from "react-router-dom";
|
import { Navigate, Outlet, useNavigate } from "react-router-dom";
|
||||||
import { toast } from "react-toastify";
|
// import { toast } from "react-toastify";
|
||||||
|
|
||||||
const AuthRoute = ({ redirectPath = "/login", children }) => {
|
const AuthRoute = ({ redirectPath = "/login", children }) => {
|
||||||
const isLogin = localStorage.getItem("email");
|
const isLogin = localStorage.getItem("email");
|
||||||
@@ -19,9 +19,6 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
|
|||||||
useEffect(()=>{
|
useEffect(()=>{
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
expireSession()
|
expireSession()
|
||||||
toast.success("Opps, session has expired", {
|
|
||||||
icon: `🙂`,
|
|
||||||
});
|
|
||||||
}, 300000) //expires user login session after 5 minutes
|
}, 300000) //expires user login session after 5 minutes
|
||||||
},[])
|
},[])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user