+
Date: Sat, 28 Oct 2023 00:36:22 +0530
Subject: [PATCH 14/15] chore: replaced click action function with normal link
---
src/app/page.tsx | 16 ++++------------
src/components/carousel/Carousel.tsx | 2 +-
src/components/carousel/CarouselItem.tsx | 9 ++++++---
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 66c38ce..a00745f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -15,17 +15,13 @@ export default function HomePage() {
{
title: 'Life in a bubble',
subtitle: 'The van',
- clickAction: () => {
- return;
- },
+ link: '/',
imgSrc: '/images/test.png',
},
{
title: 'Life in a bubble',
subtitle: 'The van',
- clickAction: () => {
- return;
- },
+ link: '/',
imgSrc: '/images/test.png',
},
],
@@ -36,17 +32,13 @@ export default function HomePage() {
{
title: 'Life in a bubble',
subtitle: 'The van',
- clickAction: () => {
- return;
- },
+ link: '/',
imgSrc: '/images/test.png',
},
{
title: 'Life in a bubble',
subtitle: 'The van',
- clickAction: () => {
- return;
- },
+ link: '/',
imgSrc: '/images/test.png',
},
],
diff --git a/src/components/carousel/Carousel.tsx b/src/components/carousel/Carousel.tsx
index d0271b6..68f8fb4 100644
--- a/src/components/carousel/Carousel.tsx
+++ b/src/components/carousel/Carousel.tsx
@@ -15,7 +15,7 @@ export default function Carousel({ data }: CarouselProps) {
title={v.title}
subtitle={v.subtitle}
imgSrc={v.imgSrc}
- clickAction={v.clickAction}
+ link={v.link}
/>
))}
diff --git a/src/components/carousel/CarouselItem.tsx b/src/components/carousel/CarouselItem.tsx
index efa6832..0da5b4f 100644
--- a/src/components/carousel/CarouselItem.tsx
+++ b/src/components/carousel/CarouselItem.tsx
@@ -1,3 +1,6 @@
+'use client';
+import { redirect } from 'next/navigation';
+
import clsxm from '@/lib/clsxm';
import NextImage from '@/components/NextImage';
@@ -5,7 +8,7 @@ import NextImage from '@/components/NextImage';
export interface CarouselItemProps {
title: string;
subtitle: string;
- clickAction: () => void;
+ link: string;
imgSrc: string;
className?: string;
}
@@ -13,7 +16,7 @@ export interface CarouselItemProps {
export default function CarouselItem({
title,
subtitle,
- clickAction,
+ link,
imgSrc,
className,
}: CarouselItemProps) {
@@ -23,7 +26,7 @@ export default function CarouselItem({
className,
'text-light font-quicksand hover:bg-light flex w-fit cursor-pointer select-none flex-col gap-1 rounded-3xl p-3 transition-all ease-linear hover:bg-opacity-10'
)}
- onClick={() => clickAction()}
+ onClick={() => redirect(link)}
>
Date: Sat, 28 Oct 2023 11:05:24 +0530
Subject: [PATCH 15/15] fix: changed logout page to server side
---
src/app/logout/layout.tsx | 24 ------------------------
src/app/logout/page.tsx | 14 +++++++++-----
2 files changed, 9 insertions(+), 29 deletions(-)
delete mode 100644 src/app/logout/layout.tsx
diff --git a/src/app/logout/layout.tsx b/src/app/logout/layout.tsx
deleted file mode 100644
index 4a09b11..0000000
--- a/src/app/logout/layout.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-'use client';
-import { useRouter } from 'next/navigation';
-import { useEffect } from 'react';
-
-export default function LogoutPage() {
- const router = useRouter();
- const signedin = true;
-
- useEffect(() => {
- if (signedin) {
- // todo: request logout
- }
-
- router.push('/login');
- }, [router, signedin]);
-
- return signedin ? (
-
-
Logging you out...
-
- ) : (
- <>
- );
-}
diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsx
index 065d262..07e668c 100644
--- a/src/app/logout/page.tsx
+++ b/src/app/logout/page.tsx
@@ -1,8 +1,12 @@
-import { Metadata } from "next";
+import { Metadata } from 'next';
+import { redirect } from 'next/navigation';
export const metadata: Metadata = {
- title: "Logout",
+ title: 'Logout',
+};
+
+export default function LogoutPage() {
+ const signedin = true;
+
+ return signedin ? redirect('/') : <>;
}
-export default function Logout(){
- return;
-}
\ No newline at end of file