Skip to content

Commit

Permalink
[Design] - #42 카카오로그인 디자인
Browse files Browse the repository at this point in the history
  • Loading branch information
Yeonsu00-12 committed Aug 9, 2023
1 parent 3d0ce61 commit 3fc45e3
Show file tree
Hide file tree
Showing 128 changed files with 679 additions and 665 deletions.
2 changes: 2 additions & 0 deletions hustle_web/src/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
REACT_APP_REST_API_KEY = 170a8a097251697cc023f05857280065
REACT_APP_REDIRCT_URL = http://localhost:3000/kakaoLogin
10 changes: 5 additions & 5 deletions hustle_web/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from "react";
import Router from "./Router";
import React from 'react';
import Router from './Router';

// const loadingPage = <div>화면 로딩중...</div>;
// const DefaultLayout = React.lazy(() => import("./layout/DefaultLayout"));
// const Home = React.lazy(() => import("./pages/Home"));
// const Login = React.lazy(() => import("./pages/Login"));
// const DefaultLayout = React.lazy(() => import('./layout/DefaultLayout'));
// const Home = React.lazy(() => import('./pages/Home'));
// const Login = React.lazy(() => import('./pages/Login'));


const App = () => {
Expand Down
66 changes: 34 additions & 32 deletions hustle_web/src/Router.tsx
Original file line number Diff line number Diff line change
@@ -1,44 +1,46 @@
import React, { Suspense } from "react";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import Home from "./pages/Home";
import Competition from "./pages/Competition/Competition";
import Club from "./pages/Community/Club/Club";
import Question from "./pages/Community/Question/QuestionPage";
import FriendlyMatch from "./pages/FriendlyMatch/FriendlyMatch";
import Join from "./pages/Join/Join";
import Login from "./pages/Login";
import MyPageMain from "./pages/MyPage/MyPageMain";
import Community from "./pages/Community/CommunityPage";
import QuestionForm from "./components/Community/Question/QuestionForm";
import List1 from "./components/Competition/list1";
import PostMatch from "./components/FriendlyMatchPage/PostMatch/PostMatch";
import ApplyMatch from "./components/FriendlyMatchPage/ApplyMatch/ApplyMatch";
import ForgotPage from "./pages/Forgot/Forgotpage";
import ResetPage from "./pages/Forgot/Reset/Resetpage";
import React, { Suspense } from 'react';
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import Home from './pages/Home';
import Competition from './pages/Competition/Competition';
import Club from './pages/Community/Club/Club';
import Question from './pages/Community/Question/QuestionPage';
import FriendlyMatch from './pages/FriendlyMatch/FriendlyMatch';
import Join from './pages/Join/Join';
import Login from './pages/Login';
import MyPageMain from './pages/MyPage/MyPageMain';
import Community from './pages/Community/CommunityPage';
import QuestionForm from './components/Community/Question/QuestionForm';
import List1 from './components/Competition/list1';
import PostMatch from './components/FriendlyMatchPage/PostMatch/PostMatch';
import ApplyMatch from './components/FriendlyMatchPage/ApplyMatch/ApplyMatch';
import ForgotPage from './pages/Forgot/Forgotpage';
import ResetPage from './pages/Forgot/Reset/Resetpage';
import KakaoLogin from './components/Login/Kakao/KakaoLogin';

const loadingPage = <div>화면 로딩중...</div>;
const DefaultLayout = React.lazy(() => import("./layout/DefaultLayout"));
const DefaultLayout = React.lazy(() => import('./layout/DefaultLayout'));

const Router = () => {
return (
<BrowserRouter>
<Suspense fallback={loadingPage}>
<Routes>
<Route path="/" element={<DefaultLayout />}>
<Route path='/' element={<DefaultLayout />}>
<Route index element={<Home />} />
<Route path="/login" element={<Login />} />
<Route path="/competitions" element={<List1 />} />
<Route path="/mypage" element={<MyPageMain />} />
<Route path="/community" element={<Community />} />
<Route path="/community/club" element={<Club />} />
<Route path="/join" element={<Join />} />
<Route path="/community/question" element={<Question />} />
<Route path="/community/question/write" element={<QuestionForm />} />
<Route path="/match" element={<FriendlyMatch />} />
<Route path="/post" element={<PostMatch />} />
<Route path="/apply" element={<ApplyMatch />} />
<Route path="/forgot" element={<ForgotPage/>} />
<Route path="/reset" element={<ResetPage/>}/>
<Route path='/login' element={<Login />} />
<Route path='/competitions' element={<List1 />} />
<Route path='/mypage' element={<MyPageMain />} />
<Route path='/community' element={<Community />} />
<Route path='/community/club' element={<Club />} />
<Route path='/join' element={<Join />} />
<Route path='/community/question' element={<Question />} />
<Route path='/community/question/write' element={<QuestionForm />} />
<Route path='/match' element={<FriendlyMatch />} />
<Route path='/post' element={<PostMatch />} />
<Route path='/apply' element={<ApplyMatch />} />
<Route path='/forgot' element={<ForgotPage/>} />
<Route path='/kakaoLogin' element={<KakaoLogin/>}/>
<Route path='/reset' element={<ResetPage/>}/>
</Route>
</Routes>
</Suspense>
Expand Down
14 changes: 7 additions & 7 deletions hustle_web/src/assets/icons/HeaderLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions hustle_web/src/assets/icons/alarm-active_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions hustle_web/src/assets/icons/alarm-none_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions hustle_web/src/assets/icons/header_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions hustle_web/src/assets/icons/play.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions hustle_web/src/assets/icons/playOrigin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions hustle_web/src/assets/icons/profile_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3fc45e3

Please sign in to comment.