Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[김영주] Sprint11 #316

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
913aa82
refactor: PageLayout 추가, header 여부에 따라 페이지 분리
purplenib Aug 11, 2024
70d1825
rename: icon 폴더 생성 및 icon 파일 이동
purplenib Aug 11, 2024
8059b28
chore: lightGray 색상 추가
purplenib Aug 11, 2024
d5afd7b
rename: 이미지 추가
purplenib Aug 11, 2024
ee94fff
feat: 회원가입 페이지 HTML 추가
purplenib Aug 11, 2024
b962655
feat: 로그인 페이지 HTML 추가
purplenib Aug 11, 2024
70cddd6
feat: 홈페이지 HTML 추가
purplenib Aug 11, 2024
9bfd6df
refactor: 리네이밍 , Image -> Img 축약
purplenib Aug 11, 2024
1a1e286
feat: Main 컴포넌트, 홈페이지 확인 속성 추가
purplenib Aug 11, 2024
6ec1bb0
refactor: Footer 컴포넌트 분리
purplenib Aug 11, 2024
e6d0190
refactor: next -> react 전환
purplenib Aug 22, 2024
5f6cd59
refactor: api 분리 및 적용
purplenib Aug 22, 2024
fff8dcc
rename: core 폴더 구조 정리, api 및 constants 세분화
purplenib Aug 22, 2024
4584af6
rename: 리네이밍, useFetch -> useApiGet
purplenib Aug 22, 2024
2265d37
feat: useApiPost 훅 추가
purplenib Aug 22, 2024
b5b2896
rename: 리네이밍, PageLayout -> HeaderLayout
purplenib Aug 22, 2024
7fc8382
remove: 사용하지 않는 파일 제거
purplenib Aug 22, 2024
96ed80b
rename: assets 폴더로 global.css 이동
purplenib Aug 22, 2024
97ce7a1
comment: 주석 제거
purplenib Aug 22, 2024
81157fd
chore: react-hook-form 설치
purplenib Aug 22, 2024
ad5bf99
feat: react-hook-form 적용 및 폼 컴포넌트 분리
purplenib Aug 22, 2024
a044bcb
remove: 사용하지 않는 부분 제거
purplenib Aug 22, 2024
8e54121
design: z-index 적용
purplenib Aug 22, 2024
9778f26
refactor: className 변수 범위 변경
purplenib Aug 22, 2024
4300f40
refactor: HomeLogo 컴포넌트 추가
purplenib Aug 23, 2024
f88a2ba
style: react.fc 제거
purplenib Aug 23, 2024
2f874c0
feat: auth 리스폰스 초기값 추가
purplenib Aug 23, 2024
ee44a21
refactor: 타입 지정
purplenib Aug 23, 2024
826985e
refactor: HomeLogo 컴포넌트 적용
purplenib Aug 23, 2024
c72dbfa
design: FormButton디자인 적용
purplenib Aug 23, 2024
9ad9315
feat: Link 경로 추가
purplenib Aug 23, 2024
d3dffa1
feat: authDTO 추가
purplenib Aug 23, 2024
d50a400
feat: 로그인한 유저 프로필 컴포넌트 렌더링
purplenib Aug 23, 2024
8e905b3
comment: 주석 제거
purplenib Aug 23, 2024
f8c9b90
chore: Authorization 헤더에 jwt 조건부 전송
purplenib Aug 23, 2024
d93e951
refactor: 타입 수정
purplenib Aug 23, 2024
9ed0025
rename: 기본 이미지 변수 리네이밍
purplenib Aug 23, 2024
9698973
comment: 테스트 코드 제거
purplenib Aug 23, 2024
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
129 changes: 73 additions & 56 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"next": "^14.2.5",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.25.1",
"react-hook-form": "^7.52.2",
"react-router-dom": "^6.26.1",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
44 changes: 26 additions & 18 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
import React from "react";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import Header from "./components/common/Layout/Header";
import Home from "./pages/Home";
import SignIn from "./pages/SignIn";
import Items from "./pages/Items";
import ItemInfo from "./pages/ItemInfo";
import AddItem from "./pages/AddItem";
import Boards from "./pages/Boards";
import NotFound from "./pages/NotFound";
import HeaderLayout from "components/@shared/Layout/HeaderLayout";
import Home from "pages/Home";
import SignIn from "pages/SignIn";
import Items from "pages/Items";
import ItemInfo from "pages/ItemInfo";
import AddItem from "pages/AddItem";
import Boards from "pages/Boards";
import NotFound from "pages/NotFound";
import SignUp from "pages/SignUp";
import ArticleInfo from "pages/ArticleInfo";
import AddBoard from "pages/AddBoard";

const Router: React.FC = () => {
const App = () => {
return (
<BrowserRouter>
<Header />
<Routes>
<Route path="/" element={<Home />} />
{/* Header 포함 페이지 */}
<Route element={<HeaderLayout />}>
<Route path="/" element={<Home />} />
<Route path="/items" element={<Items />} />
<Route path="/items/:productId" element={<ItemInfo />} />
<Route path="/addItem" element={<AddItem />} />
<Route path="/boards" element={<Boards />} />
<Route path="/addBoard" element={<AddBoard />} />
<Route path="/boards/:articleId" element={<ArticleInfo />} />
<Route path="*" element={<NotFound />} />
</Route>
{/* Header 불포함 페이지 */}
<Route path="/signIn" element={<SignIn />} />
<Route path="/items" element={<Items />} />
<Route path="/items/:productId" element={<ItemInfo />} />
<Route path="/addItem" element={<AddItem />} />
<Route path="/boards" element={<Boards />} />
<Route path="*" element={<NotFound />} />
<Route path="/signUp" element={<SignUp />} />
</Routes>
</BrowserRouter>
);
};

export default Router;
export default App;
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added src/assets/icons/ic_check.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 src/assets/icons/ic_facebook.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 src/assets/icons/ic_google.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added src/assets/icons/ic_instagram.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 src/assets/icons/ic_kakao.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 src/assets/icons/ic_kebab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added src/assets/icons/ic_twitter.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 src/assets/icons/ic_visibility_off.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 src/assets/icons/ic_visibility_on.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 src/assets/icons/ic_youtube.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 removed src/assets/images/ic_medal.png
Binary file not shown.
Binary file removed src/assets/images/ic_profile.png
Binary file not shown.
Binary file added src/assets/images/img_home_bottom.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 src/assets/images/img_home_hotItem.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 src/assets/images/img_home_register.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 src/assets/images/img_home_search.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 src/assets/images/img_home_top.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 src/assets/images/img_profile.png
2 changes: 1 addition & 1 deletion src/index.css → src/assets/styles/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

@font-face {
font-family: "Pretendard";
src: url("./assets/fonts/PretendardVariable.woff2") format("woff2");
src: url("../fonts/PretendardVariable.woff2") format("woff2");
font-weight: 100 900;
font-display: swap;
}
Expand Down
Loading
Loading