Skip to content

Commit

Permalink
fix:로그인다시 연결
Browse files Browse the repository at this point in the history
  • Loading branch information
Hanjuri committed Sep 10, 2024
1 parent 900046c commit 3423e9b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
26 changes: 15 additions & 11 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,27 @@ import { PeopleListPage } from "./pages/PeopleListPage/PeopleListPage.jsx";
import { PeopleDetailPage } from "./pages/PeopleDetailPage/PeopleDetailPage.jsx";
import ChatPage from "./pages/chat/ChatPage";
import RTCPage from "./pages/WebRTC/VideoPage.jsx";
import LoginPage from "./pages/kakaologin/LoginPage.jsx";
import KakaoRedirect from "./pages/join/KakoRedirect.jsx";
import JoinPage from "./pages/join/JoinPage.jsx";

// QueryClient 인스턴스 생성ß
const queryClient = new QueryClient();

function App() {
return (
<QueryClientProvider client={queryClient}>
<Router>
<Routes>
<Route path="/" element={<HomeMain />}></Route>
<Route path="/chat" element={<ChatPage />}></Route>
<Route path="/video/:roomName" element={<RTCPage />}></Route>
<Route path="/list" element={<PeopleListPage />} />
<Route path="/details" element={<PeopleDetailPage />} />
</Routes>
</Router>
</QueryClientProvider>
<Router>
<Routes>
<Route path="/" element={<PeopleListPage />}></Route>
<Route path="/chat" element={<ChatPage />}></Route>
<Route path="/video/:roomName" element={<RTCPage />}></Route>
<Route path="/list" element={<PeopleListPage />} />
<Route path="/details" element={<PeopleDetailPage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/auth/code/kakao" element={<KakaoRedirect />} />
<Route path="/join" element={<JoinPage />} />
</Routes>
</Router>
);
}

Expand Down
11 changes: 7 additions & 4 deletions src/components/Common/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ function Header() {
</styles.LogoWrapper>

<styles.NavBar>
<styles.NavItem href="/">카부 게시판</styles.NavItem>
<styles.NavItem href="/login">카부 프로젝트</styles.NavItem>
<styles.NavItem href="/">카부 편의</styles.NavItem>
<styles.NavItem href="/list">카부 게시판</styles.NavItem>
<styles.NavItem href="/list">카부 프로젝트</styles.NavItem>
<styles.NavItem href="/list">카부 편의</styles.NavItem>
<styles.NavItem href="/chat">카부 커넥션</styles.NavItem>
</styles.NavBar>
</styles.HeaderSubContainer>
<styles.PeopleLogoWrapper>
<styles.PeopleLogo src={peoplelogo} />
<styles.PeopleLogo
onClick={() => {
navigate("/login");
}} src={peoplelogo} />
</styles.PeopleLogoWrapper>
</styles.HeaderContainer>
);
Expand Down

0 comments on commit 3423e9b

Please sign in to comment.