fix bug
All checks were successful
Build and Release / release (push) Successful in 27s

This commit is contained in:
2026-04-20 11:22:13 +07:00
parent 3dc7804b10
commit 2ee5c8da36
4 changed files with 22 additions and 36 deletions

View File

@@ -4,7 +4,10 @@ import { useSidebar } from "@/context/SidebarContext";
import AppHeader from "@/layout/AppHeader";
import AppSidebar from "@/layout/AppSidebar";
import Backdrop from "@/layout/Backdrop";
import React from "react";
import { apiGetCurrentUser } from "@/service/auth";
import { setUserData } from "@/store/features/userSlice";
import React, { useEffect } from "react";
import { useDispatch } from "react-redux";
export default function AdminLayout({
children,
@@ -12,13 +15,27 @@ export default function AdminLayout({
children: React.ReactNode;
}) {
const { isExpanded, isHovered, isMobileOpen } = useSidebar();
const dispatch = useDispatch()
useEffect(() => {
const fetchUser = async () => {
try {
const userData = await apiGetCurrentUser();
dispatch(setUserData(userData.data));
} catch (err) {
console.error("Lỗi:", err);
}
};
fetchUser();
}, [])
// Dynamic class for main content margin based on sidebar state
const mainContentMargin = isMobileOpen
? "ml-0"
: isExpanded || isHovered
? "lg:ml-[290px]"
: "lg:ml-[90px]";
? "lg:ml-[290px]"
: "lg:ml-[90px]";
return (
<div className="min-h-screen xl:flex">

View File

@@ -109,7 +109,7 @@ export default function SignInForm() {
</p>
</div>
<div>
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 sm:gap-5">
<div className="grid grid-cols-1 gap-3 sm:gap-5">
<button
onClick={() => {
const redirectUrl = HOME_URL;
@@ -143,19 +143,6 @@ export default function SignInForm() {
</svg>
Sign in with Google
</button>
{/* <button className="inline-flex items-center justify-center gap-3 py-3 text-sm font-normal text-gray-700 transition-colors bg-gray-100 rounded-lg px-7 hover:bg-gray-200 hover:text-gray-800 dark:bg-white/5 dark:text-white/90 dark:hover:bg-white/10">
<svg
width="21"
className="fill-current"
height="20"
viewBox="0 0 21 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M15.6705 1.875H18.4272L12.4047 8.75833L19.4897 18.125H13.9422L9.59717 12.4442L4.62554 18.125H1.86721L8.30887 10.7625L1.51221 1.875H7.20054L11.128 7.0675L15.6705 1.875ZM14.703 16.475H16.2305L6.37054 3.43833H4.73137L14.703 16.475Z" />
</svg>
Sign in with X
</button> */}
</div>
<div className="relative py-3 sm:py-5">
<div className="absolute inset-0 flex items-center">

View File

@@ -150,7 +150,7 @@ export default function SignUpForm() {
{step === 1 && (
<>
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2 sm:gap-5">
<div className="grid grid-cols-1 gap-3 sm:gap-5">
<button
onClick={() => {
const redirectUrl = HOME_URL;
@@ -184,9 +184,6 @@ export default function SignUpForm() {
</svg>
Sign up with Google
</button>
{/* <button className="inline-flex items-center justify-center gap-3 py-3 text-sm font-normal text-gray-700 transition-colors bg-gray-100 rounded-lg px-7 hover:bg-gray-200 hover:text-gray-800 dark:bg-white/5 dark:text-white/90 dark:hover:bg-white/10">
Sign up with X
</button> */}
</div>
<div className="relative py-3 sm:py-5">
<div className="absolute inset-0 flex items-center">

View File

@@ -1,8 +1,5 @@
"use client";
import { apiGetCurrentUser } from "@/service/auth";
import { setUserData } from "@/store/features/userSlice";
import React, { createContext, useContext, useState, useEffect } from "react";
import { useDispatch } from "react-redux";
type SidebarContextType = {
isExpanded: boolean;
@@ -36,7 +33,6 @@ export const SidebarProvider: React.FC<{ children: React.ReactNode }> = ({
const [isHovered, setIsHovered] = useState(false);
const [activeItem, setActiveItem] = useState<string | null>(null);
const [openSubmenu, setOpenSubmenu] = useState<string | null>(null);
const dispatch = useDispatch();
useEffect(() => {
const handleResize = () => {
@@ -55,17 +51,6 @@ export const SidebarProvider: React.FC<{ children: React.ReactNode }> = ({
};
}, []);
useEffect(() => {
const fetchUser = async () => {
try {
const userData = await apiGetCurrentUser();
dispatch(setUserData(userData.data));
} catch (err) {
console.error("Lỗi:", err);
}
};
fetchUser();
}, [])
const toggleSidebar = () => {
setIsExpanded((prev) => !prev);