Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/Image/photo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Image/pt1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Image/pt2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/Image/pt3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 31 additions & 29 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import './App.css';
import React, {useEffect, useState} from 'react';
import "./App.css";
import React, { useEffect, useState } from "react";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import axios from 'axios';
import axios from "axios";
import SelfAuth from "./Page/SignUp/SelfAuth";
import InputInfo from "./Page/SignUp/InputInfo";
import MemberAgree from "./Page/SignUp/MemberAgree";
Expand All @@ -13,39 +13,41 @@ import Auth from "./Page/Auth";
import Profile from "./Page/Profile";
import FindPw from "./Page/FindPw";
import MainPage from "./Page/MainPage";

import Register from "./Page/Register";
import RegisterSuccess from "./Page/RegisterSuccess";

function App() {
const [hello, setHello] = useState('')
const [hello, setHello] = useState("");

// useEffect(() => {
// axios.get('http://localhost:8080/api/hello')
// .then(response => setHello(response.data))
// .catch(error => console.log(error))
// }, []);
// useEffect(() => {
// axios.get('http://localhost:8080/api/hello')
// .then(response => setHello(response.data))
// .catch(error => console.log(error))
// }, []);

return (
return (
<div className="App">
<BrowserRouter>
<Routes>
<Route path="/" element={<MainPage />}></Route>
<Route path="/oauth/kakao/callback" element={<Auth />}></Route>
<Route path="/profile" element={<Profile />}></Route>
<Route path="/findPw" element={<FindPw />}></Route>
<Route path="/login" element={<LoginPage />}></Route>
{/* <Route path="/oauth/kakao/callback" element={<Auth />}></Route>
<BrowserRouter>
<Routes>
<Route path="/" element={<MainPage />}></Route>
<Route path="/oauth/kakao/callback" element={<Auth />}></Route>
<Route path="/profile" element={<Profile />}></Route>
<Route path="/findPw" element={<FindPw />}></Route>
<Route path="/login" element={<LoginPage />}></Route>

{/* <Route path="/oauth/kakao/callback" element={<Auth />}></Route>
<Route path="/profile" element={<Profile />}></Route>
<Route path="/findPw" element={<FindPw />}></Route> */}
<Route path="/selfAuth" element={<SelfAuth/>}></Route>
<Route path="/inputInfo" element={<InputInfo/>}></Route>
<Route path="/memberAgree" element={<MemberAgree/>}></Route>
<Route path="/memberSuccess" element={<MemberSuccess/>}></Route>

</Routes>
</BrowserRouter>
</div>
);
<Route path="/selfAuth" element={<SelfAuth />}></Route>
<Route path="/inputInfo" element={<InputInfo />}></Route>
<Route path="/memberAgree" element={<MemberAgree />}></Route>
<Route path="/memberSuccess" element={<MemberSuccess />}></Route>
<Route path="/register" element={<Register />}></Route>
<Route path="/registerSuccess" element={<RegisterSuccess />}></Route>
</Routes>
</BrowserRouter>
</div>
);
}

export default App;
5 changes: 3 additions & 2 deletions src/Components/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Heads = styled.div`
height: 70px;
`;
const Center = styled.div`
width: 1280px;
width: 1200px;
display: flex;
justify-content: space-between;
align-items: center;
Expand Down Expand Up @@ -57,11 +57,12 @@ const Head = () => {
src="Image/logo.png"
alt="logo"
style={{ width: "34px", height: "34px" }}
onClick={() => navigate("/")}
/>
<img src="Image/suit-carrier.png" alt="suit-carrier" />
</Logo>
<div>인기매물 확인</div>
<div>매물 등록하기</div>
<div onClick={() => navigate("/register")}>매물 등록하기</div>
<div>CONTACT_US</div>
</Title>
<User>
Expand Down
Loading