From 80f0fa6c0b56c3ad62df0cda71c4d940c4cf9964 Mon Sep 17 00:00:00 2001 From: Rama Priyanto Date: Tue, 27 May 2025 12:19:58 +0700 Subject: [PATCH 1/2] fix:login flow --- components/form/login.tsx | 9 ++++++++- components/landing/footer-new.tsx | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/components/form/login.tsx b/components/form/login.tsx index 517a464..af7a3c8 100644 --- a/components/form/login.tsx +++ b/components/form/login.tsx @@ -1,6 +1,6 @@ "use client"; import { Input } from "@heroui/input"; -import React, { useState } from "react"; +import React, { useEffect, useState } from "react"; import { EyeFilledIcon, EyeSlashFilledIcon } from "../icons"; import { Button } from "@heroui/button"; import Link from "next/link"; @@ -26,6 +26,7 @@ import PasswordChecklist from "react-password-checklist"; import { Image, InputOtp } from "@heroui/react"; export default function Login() { + const accessToken = Cookies.get("access_token"); const router = useRouter(); const [isVisible, setIsVisible] = useState(false); const [isVisibleSetup, setIsVisibleSetup] = useState([false, false]); @@ -47,6 +48,12 @@ export default function Login() { const [checkUsernameValue, setCheckUsernameValue] = useState(""); const MySwal = withReactContent(Swal); + useEffect(() => { + if (accessToken) { + router.push("/admin/dashboard"); + } + }, []); + const setValUsername = (e: any) => { const uname = e.replaceAll(/[^\w.-]/g, ""); setUsername(uname.toLowerCase()); diff --git a/components/landing/footer-new.tsx b/components/landing/footer-new.tsx index f5f6d34..d4f2fc8 100644 --- a/components/landing/footer-new.tsx +++ b/components/landing/footer-new.tsx @@ -16,9 +16,11 @@ import { useEffect, useState } from "react"; import Image from "next/image"; import { error, success } from "@/config/swal"; import { subscription } from "@/services/subscribe"; +import Cookies from "js-cookie"; export default function FooterNew(props: { margin?: boolean }) { const [emailValue, setEmailValue] = useState(""); + const accessToken = Cookies.get("access_token"); const doSubscribe = async () => { const isValidEmail = (email: string): boolean => { @@ -208,7 +210,7 @@ export default function FooterNew(props: { margin?: boolean }) { - + From cf15b939f8907888eeadf1c92a748ec3fe6f7ce6 Mon Sep 17 00:00:00 2001 From: Rama Priyanto Date: Tue, 27 May 2025 12:28:02 +0700 Subject: [PATCH 2/2] fix:feedback ui --- .../table/suggestions/suggestions-table.tsx | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/components/table/suggestions/suggestions-table.tsx b/components/table/suggestions/suggestions-table.tsx index 93451de..2578e5c 100644 --- a/components/table/suggestions/suggestions-table.tsx +++ b/components/table/suggestions/suggestions-table.tsx @@ -560,10 +560,9 @@ export default function SuggestionsTable() { 10 - -
+ +
+

Start Date

+
+
+

End Date

+ + {/*
+ +
*/} +