Compare commits

..

4 Commits

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