Skip to content

Commit

Permalink
fix: 헤더 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kangyeeun0
Kangyeeun0 committed Aug 5, 2024
1 parent 9f7b489 commit 0a3ed48
Show file tree
Hide file tree
Showing 4 changed files with 367 additions and 382 deletions.
188 changes: 88 additions & 100 deletions src/App.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,107 +1,95 @@
import { useMediaQuery } from "react-responsive";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import Header from "./component/layout/Header";
import Footer from "./component/layout/Footer";
import MainPage from "./pages/Main";
import CentralClubPage from "./pages/CentralClub";
import SmallClubPage from "./pages/SmallClub";
import DetailPage from "./pages/DetailPage";
import ReviewWrite from "./component/detail/review/ReviewWrite";
import LoginPage from "./pages/LoginPage";
import KakaoRedirection from "./component/login/kakaoRedirection";
import HashTagPage from "./pages/HashTag";
import SearchPage from "./pages/SearchPage";
import SummaryPage from "./pages/Summary";
import BookMarkPage from "./pages/BookMarkPage";
import BranchCentralPage from "./pages/BranchCentral";
import BranchSmallPage from "./pages/BranchSmall";
import ReviewComment from "./component/detail/review/ReviewComment";
import MyReview from "./component/mypage/review/MyReview";
import AdminPage from "./pages/AdminPage";
import EditPage from "./component/admin/EditPage";
import PendingList from "./component/admin/pending/PendingList";
import Layout from "./component/admin/component/Layout";
import { useMediaQuery } from 'react-responsive';
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import Header from './component/layout/Header';
import Footer from './component/layout/Footer';
import MainPage from './pages/Main';
import CentralClubPage from './pages/CentralClub';
import SmallClubPage from './pages/SmallClub';
import DetailPage from './pages/DetailPage';
import ReviewWrite from './component/detail/review/ReviewWrite';
import LoginPage from './pages/LoginPage';
import KakaoRedirection from './component/login/kakaoRedirection';
import HashTagPage from './pages/HashTag';
import SearchPage from './pages/SearchPage';
import SummaryPage from './pages/Summary';
import BookMarkPage from './pages/BookMarkPage';
import BranchCentralPage from './pages/BranchCentral';
import BranchSmallPage from './pages/BranchSmall';
import ReviewComment from './component/detail/review/ReviewComment';
import MyReview from './component/mypage/review/MyReview';
import AdminPage from './pages/AdminPage';
import EditPage from './component/admin/EditPage';
import PendingList from './component/admin/pending/PendingList';
import Layout from './component/admin/component/Layout';

function App() {
const isPc = useMediaQuery({
query: "(min-width:769px)",
});
const isMobile = useMediaQuery({
query: "(max-width:769px)",
});
const isPc = useMediaQuery({
query: '(min-width:769px)',
});
const isMobile = useMediaQuery({
query: '(max-width:769px)',
});

return (
<>
{isPc && (
<BrowserRouter>
<Header />
<Routes>
<Route path="/" element={<MainPage />} />
<Route path="/central" element={<CentralClubPage />} />
{/* <Route path="/menu/central_club/detail_page/review_write" element={<ReviewWrite />} /> */}
<Route path="/small" element={<SmallClubPage />} />
<Route path="/clubs/:clubId" element={<DetailPage />} />
<Route path="/clubs/:clubId/review" element={<ReviewWrite />} />
<Route
path="/clubs/:clubId/review/comment"
element={<ReviewComment />}
/>
<Route path="/central/divisions" element={<BranchCentralPage />} />
<Route path="/login" element={<LoginPage />} />
<Route
path="/v1/auths/oauth/kakao"
element={<KakaoRedirection />}
/>
<Route path="/small/colleges" element={<BranchSmallPage />} />
<Route path="/hashtag" element={<HashTagPage />} />
<Route path="/search" element={<SearchPage />} />
<Route path="/summary" element={<SummaryPage />} />
<Route path="/bookmark" element={<BookMarkPage />} />
<Route path="/user/reviews" element={<MyReview />} />
return (
<>
{isPc && (
<BrowserRouter>
<Header />
<Routes>
<Route path="/" element={<MainPage />} />
<Route path="/central" element={<CentralClubPage />} />
{/* <Route path="/menu/central_club/detail_page/review_write" element={<ReviewWrite />} /> */}
<Route path="/small" element={<SmallClubPage />} />
<Route path="/clubs/:clubId" element={<DetailPage />} />
<Route path="/clubs/:clubId/review" element={<ReviewWrite />} />
<Route path="/clubs/:clubId/review/comment" element={<ReviewComment />} />
<Route path="/central/divisions" element={<BranchCentralPage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/v1/auths/oauth/kakao" element={<KakaoRedirection />} />
<Route path="/small/colleges" element={<BranchSmallPage />} />
<Route path="/hashtag" element={<HashTagPage />} />
<Route path="/search" element={<SearchPage />} />
<Route path="/summary" element={<SummaryPage />} />
<Route path="/bookmark" element={<BookMarkPage />} />
<Route path="/user/reviews" element={<MyReview />} />

<Route path="/admin" element={<Layout />}>
<Route index element={<AdminPage />} />
<Route path="/admin/edit/:clubId" element={<EditPage />} />
<Route path="/admin/mypage/pending" element={<PendingList />} />
</Route>
</Routes>
<Footer />
</BrowserRouter>
)}
<Route path="/admin" element={<Layout />}>
<Route index element={<AdminPage />} />
<Route path="/admin/edit/:clubId" element={<EditPage />} />
<Route path="/admin/mypage/pending" element={<PendingList />} />
</Route>
</Routes>
<Footer />
</BrowserRouter>
)}

{isMobile && (
<BrowserRouter>
<Header />
<Routes>
<Route path="/" element={<MainPage />} />
<Route path="/central" element={<CentralClubPage />} />
<Route path="/small" element={<SmallClubPage />} />
<Route path="/clubs/:clubId" element={<DetailPage />} />
<Route path="/clubs/:clubId/review" element={<ReviewWrite />} />
<Route
path="/clubs/:clubId/review/comment"
element={<ReviewComment />}
/>
<Route path="/central/divisions" element={<BranchCentralPage />} />
<Route path="/login" element={<LoginPage />} />
<Route
path="/v1/auths/oauth/kakao"
element={<KakaoRedirection />}
/>
<Route path="/small/colleges" element={<BranchSmallPage />} />
<Route path="/hashtag" element={<HashTagPage />} />
<Route path="/search" element={<SearchPage />} />
<Route path="/summary" element={<SummaryPage />} />
<Route path="/bookmark" element={<BookMarkPage />} />
<Route path="/user/reviews" element={<MyReview />} />
<Route path="/admin" element={<AdminPage />} />
<Route path="/admin/edit/:clubId" element={<EditPage />} />
<Route path="/admin/mypage/pending" element={<PendingList />} />
</Routes>
<Footer />
</BrowserRouter>
)}
</>
);
{isMobile && (
<BrowserRouter>
<Header />
<Routes>
<Route path="/" element={<MainPage />} />
<Route path="/central" element={<CentralClubPage />} />
<Route path="/small" element={<SmallClubPage />} />
<Route path="/clubs/:clubId" element={<DetailPage />} />
<Route path="/clubs/:clubId/review" element={<ReviewWrite />} />
<Route path="/clubs/:clubId/review/comment" element={<ReviewComment />} />
<Route path="/central/divisions" element={<BranchCentralPage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/v1/auths/oauth/kakao" element={<KakaoRedirection />} />
<Route path="/small/colleges" element={<BranchSmallPage />} />
<Route path="/hashtag" element={<HashTagPage />} />
<Route path="/search" element={<SearchPage />} />
<Route path="/summary" element={<SummaryPage />} />
<Route path="/bookmark" element={<BookMarkPage />} />
<Route path="/user/reviews" element={<MyReview />} />
<Route path="/admin" element={<AdminPage />} />
<Route path="/admin/edit/:clubId" element={<EditPage />} />
<Route path="/admin/mypage/pending" element={<PendingList />} />
</Routes>
<Footer />
</BrowserRouter>
)}
</>
);
}
export default App;
9 changes: 6 additions & 3 deletions src/component/admin/EditPage.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
import { customAxios } from '../../config/axios-config';
import EditIntroduction from './EditIntroduction';
import styles from './editPage.module.css';
import axios from 'axios';

export default function EditPage() {
const accessToken = localStorage.getItem('accessToken');
Expand Down Expand Up @@ -85,11 +86,13 @@ export default function EditPage() {
}
);

console.log(data.data);
console.log(imageFile.type);

// 이미지 파일을 presigned URL로 업로드
await customAxios.put(data.data.presignedUrl, imageFile, {
'Content-Type': imageFile.type,
await axios.put(data.data.presignedUrl, imageFile, {
headers: {
'Content-Type': imageFile.type,
},
});

setImageUrl(data.data.imageUrl.split('?')[0]);
Expand Down
Loading

0 comments on commit 0a3ed48

Please sign in to comment.