From ad24e884b63b02df3fdf157a2d3dfc0405c5b42b Mon Sep 17 00:00:00 2001 From: Italo A Date: Mon, 27 Nov 2023 19:25:08 -0300 Subject: [PATCH] Fix/125-chat-reload (#133) * style: cards justify * fix: chat reloading when access history page --- frontend/src/app/(private)/game/history/[id]/page.tsx | 5 +---- frontend/src/app/(private)/game/page.tsx | 5 +---- frontend/src/app/(private)/layout.tsx | 8 ++++---- frontend/src/components/MatchHistory/index.tsx | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/(private)/game/history/[id]/page.tsx b/frontend/src/app/(private)/game/history/[id]/page.tsx index 4e2dbf8c..3ff18ef0 100644 --- a/frontend/src/app/(private)/game/history/[id]/page.tsx +++ b/frontend/src/app/(private)/game/history/[id]/page.tsx @@ -2,7 +2,6 @@ import Chat from "@/components/Chat"; import Header from "@/components/Header"; import MatchHistory from "@/components/MatchHistory"; -import { ChatProvider } from "@/contexts/ChatContext"; import { ArrowLeft } from "@phosphor-icons/react"; import Link from "next/link"; @@ -22,9 +21,7 @@ export default function HistoryPage({ params }: { params: { id: string } }) {
- - - +
); diff --git a/frontend/src/app/(private)/game/page.tsx b/frontend/src/app/(private)/game/page.tsx index ab8506a8..d0cc4fff 100644 --- a/frontend/src/app/(private)/game/page.tsx +++ b/frontend/src/app/(private)/game/page.tsx @@ -1,7 +1,6 @@ import Chat from "@/components/Chat"; import Header from "@/components/Header"; import { LeaderBoard } from "@/components/LeaderBoard"; -import { ChatProvider } from "@/contexts/ChatContext"; export default function GamePage() { return ( @@ -11,9 +10,7 @@ export default function GamePage() {
- - - +
); diff --git a/frontend/src/app/(private)/layout.tsx b/frontend/src/app/(private)/layout.tsx index aa5696ae..0a70bf8f 100644 --- a/frontend/src/app/(private)/layout.tsx +++ b/frontend/src/app/(private)/layout.tsx @@ -2,8 +2,6 @@ import type { Metadata } from "next"; // These styles apply to every route in the application import "../../styles/globals.css"; -import Chat from "@/components/Chat"; -import Header from "@/components/Header"; import Providers from "../auth/providers"; import { ChatProvider } from "@/contexts/ChatContext"; import { Toaster } from "react-hot-toast"; @@ -22,8 +20,10 @@ export default function RootPrivateLayout({ -
{children}
- + +
{children}
+ + diff --git a/frontend/src/components/MatchHistory/index.tsx b/frontend/src/components/MatchHistory/index.tsx index 1d45976b..a8d5158e 100644 --- a/frontend/src/components/MatchHistory/index.tsx +++ b/frontend/src/components/MatchHistory/index.tsx @@ -23,7 +23,7 @@ export default function MatchHistory({ id }: { id: string }) { return (