Skip to content

Commit 07533fa

Browse files
committed
fix: loader issue solved
1 parent 390632a commit 07533fa

File tree

4 files changed

+55
-19
lines changed

4 files changed

+55
-19
lines changed

src/app/(pages)/layout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const Layout = ({ children }: Props) => {
2525
<>
2626
<div className="flex w-full h-full relative">
2727
<div className="absolute top-0 left-0 w-[80px] hover:w-[200px] min-h-screen z-50 transition-width duration-500 ease-in-out hidden md:flex flex-col items-start gap-8 overflow-hidden bg-black">
28-
<Sidebar />
28+
<Sidebar verified={verifiedEmail} />
2929
</div>
3030

3131
<div className="flex-1 w-full ml-0 md:ml-[80px]">

src/components/LandingPage/index.tsx

+4-9
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import React, { useEffect } from "react";
33
import Text from "./Text";
44
import { store } from "@/app/Redux/store";
5-
import { decrement, increment } from "@/app/Redux/Features/loader/loaderSlice";
5+
import { decrement } from "@/app/Redux/Features/loader/loaderSlice";
66
import dynamic from "next/dynamic";
77
import { useSelector } from "react-redux";
88

99
export default function LandingPage() {
10-
const counter = useSelector((state: any) => state.counter);
10+
const session = useSelector((state: any) => state.user);
1111
const SparklesCore = dynamic(
1212
() => import("../ui/sparkles").then((mod) => mod.SparklesCore),
1313
{
@@ -18,13 +18,8 @@ export default function LandingPage() {
1818
}
1919
);
2020
useEffect(() => {
21-
if (counter.value > 0) {
22-
store.dispatch(decrement());
23-
return () => {
24-
store.dispatch(increment());
25-
};
26-
}
27-
}, []);
21+
store.dispatch(decrement());
22+
}, [session]);
2823
return (
2924
<main className="min-h-screen w-full flex flex-col items-center justify-center overflow-hidden gap-12 md:gap-8 mt-16 md:mt-0 py-24">
3025
<div className="container">

src/components/Login/Login.tsx

+34-5
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,19 @@ import { store } from "@/app/Redux/store";
2929
import { Skeleton } from "../ui/skeleton";
3030
import Cookies from "js-cookie";
3131
import { resetProfile } from "@/app/Redux/Features/profile/profileSlice";
32+
import { cn } from "@/lib/utils";
3233

3334
const Login = () => {
3435
const { data: session, status } = useSession() as any;
3536
const router = useRouter();
3637
const pathname = usePathname();
3738
const dispatch = useDispatch();
3839
const user = useSelector((state: any) => state.user);
40+
const sessionToVerifyEmail = useSelector((state: any) => state.user);
41+
42+
useEffect(() => {
43+
console.log("session", sessionToVerifyEmail.isVerifiedEmail);
44+
});
3945

4046
interface SessionUser {
4147
name?: string | null;
@@ -207,7 +213,12 @@ const Login = () => {
207213
{/* Changed DropdownMenuLabel to DropdownMenuItem which is the correct way to create dropdown menu */}
208214
<DropdownMenuItem
209215
asChild
210-
className="cursor-pointer flex md:hidden"
216+
className={cn(
217+
"cursor-pointer",
218+
sessionToVerifyEmail.isVerifiedEmail
219+
? "flex md:hidden"
220+
: "hidden"
221+
)}
211222
>
212223
<Link prefetch href="/dashboard" className="w-full">
213224
<div className="flex items-center gap-4 justify-between w-full">
@@ -219,7 +230,12 @@ const Login = () => {
219230

220231
<DropdownMenuItem
221232
asChild
222-
className="cursor-pointer flex md:hidden"
233+
className={cn(
234+
"cursor-pointer",
235+
sessionToVerifyEmail.isVerifiedEmail
236+
? "flex md:hidden"
237+
: "hidden"
238+
)}
223239
>
224240
<Link prefetch href="/repoinitialize">
225241
<div className="flex items-center gap-4 justify-between w-full">
@@ -231,7 +247,12 @@ const Login = () => {
231247

232248
<DropdownMenuItem
233249
asChild
234-
className="cursor-pointer flex md:hidden"
250+
className={cn(
251+
"cursor-pointer",
252+
sessionToVerifyEmail.isVerifiedEmail
253+
? "flex md:hidden"
254+
: "hidden"
255+
)}
235256
>
236257
<Link prefetch href="/connect">
237258
<div className="flex items-center gap-4 justify-between w-full">
@@ -243,7 +264,12 @@ const Login = () => {
243264

244265
<DropdownMenuItem
245266
asChild
246-
className="cursor-pointer flex md:hidden"
267+
className={cn(
268+
"cursor-pointer",
269+
sessionToVerifyEmail.isVerifiedEmail
270+
? "flex md:hidden"
271+
: "hidden"
272+
)}
247273
>
248274
<Link prefetch href="/leaderboard">
249275
<div className="flex items-center gap-4 justify-between w-full">
@@ -255,7 +281,10 @@ const Login = () => {
255281

256282
<DropdownMenuItem
257283
asChild
258-
className="cursor-pointer flex flex-col"
284+
className={cn(
285+
"cursor-pointer flex-col",
286+
sessionToVerifyEmail.isVerifiedEmail ? "flex " : "hidden"
287+
)}
259288
>
260289
<Link prefetch href={`/p/${user?.login}`}>
261290
<div className="relative flex md:hidden">

src/components/Sidebar/index.tsx

+16-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { IconChartHistogram } from "@tabler/icons-react";
33
import { Blocks, CopyPlus, HomeIcon, User } from "lucide-react";
44
import Link from "next/link";
5-
import React from "react";
5+
import React, { useEffect } from "react";
66
import { useSelector } from "react-redux";
77
import {
88
Tooltip,
@@ -11,19 +11,31 @@ import {
1111
TooltipTrigger,
1212
} from "@/components/ui/tooltip";
1313
import { usePathname } from "next/navigation";
14+
import { cn } from "@/lib/utils";
1415

15-
type Props = {};
16+
type Props = {
17+
verified: boolean;
18+
};
1619

17-
const Sidebar = (props: Props) => {
20+
const Sidebar = ({ verified }: Props) => {
1821
const user = useSelector((state: any) => state.user);
1922
const pathname = usePathname();
2023

2124
const isActive = (linkPath: string) => pathname.includes(linkPath);
2225

26+
useEffect(() => {
27+
console.log("session", verified);
28+
}, [verified]);
29+
2330
return (
2431
<>
2532
<div className="w-full flex justify-between">
26-
<div className="w-full pt-24 pb-4 min-h-screen z-50 overflow-hidden flex flex-col items-start gap-8 px-5 transition-all duration-500 ease-in-out group hover:w-[200px] relative">
33+
<div
34+
className={cn(
35+
"w-full pt-24 pb-4 min-h-screen overflow-hidden flex flex-col items-start gap-8 px-5 transition-all duration-500 ease-in-out group hover:w-[200px] relative",
36+
verified ? "z-50" : "z-0 hidden"
37+
)}
38+
>
2739
<TooltipProvider>
2840
<Tooltip>
2941
<TooltipTrigger>

0 commit comments

Comments
 (0)