Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1828a25
feat: feature/hwahyeon 브랜치 추가
koh0074 Feb 7, 2025
45f48d1
feat: 브랜치 생성
zoosungah Feb 9, 2025
2328a7c
Merge remote-tracking branch 'origin/feature/minju' into feature/hwah…
koh0074 Feb 10, 2025
eac6f4d
init: 백엔드 초기세팅
koh0074 Feb 10, 2025
9c4d822
feat: 브랜치 생성
zoosungah Feb 10, 2025
f8a39bb
로그인/회원가입/로그아웃
zoosungah Feb 12, 2025
70c5722
add: 알라딘 api
koh0074 Feb 12, 2025
9d66ba2
로그인, 회원가입, 회원탈퇴까지
zoosungah Feb 12, 2025
d67cf00
로그인, 회원가입, 회원탈퇴, 닉변경
zoosungah Feb 12, 2025
005a349
로그인, 회원가입, 회원탈퇴, 닉변경, 한줄소개
zoosungah Feb 12, 2025
1fda821
로그인, 회원가입, 회원탈퇴, 닉변경, 한줄소개, 팔로잉기능
zoosungah Feb 12, 2025
70b227c
feat: 독자 유형 설문 결과 저장 기능 추가
inyeongjang Feb 12, 2025
5f8ecb2
feat: 독자 유형별 도서 추천 기능 추가
inyeongjang Feb 12, 2025
e352f43
feat: 독자 유형별 도서 추천 기능 추가
inyeongjang Feb 12, 2025
5c4bb35
feat: 독자 유형별 도서 추천 기능 추가
inyeongjang Feb 12, 2025
f0a5852
feat: 독자 유형 설문 결과 저장 기능 추가
inyeongjang Feb 12, 2025
3effc96
merge: 로그인&회원가입, 게시글 생성(게시글 조회 x)
koh0074 Feb 13, 2025
b8415cc
merge: hwahyeon+inyeong+sungah(로그인&회원가입)
koh0074 Feb 13, 2025
5d15cbe
로그인, 회원가입, 회원탈퇴, 닉변경, 한줄소개, 팔로잉기능 라우터분리
zoosungah Feb 13, 2025
19c5097
merge: feature/sungah(로그인&회원가입 기능 성공 전...)
koh0074 Feb 13, 2025
43fb5d4
수정... 아직 팔취 안함
zoosungah Feb 13, 2025
4355c70
feat: 좋아요, 감상평 crud, 감상평 목록 수정
koh0074 Feb 13, 2025
9cc48f4
팔취 버튼은 만들었는데 팔취가안됨...
zoosungah Feb 13, 2025
da56212
fix: 감상평 수정, 별점 수정
koh0074 Feb 13, 2025
6f2fb98
프로필 사진
zoosungah Feb 13, 2025
4e4aadf
feat: 댓글, 대댓글 crud 완
koh0074 Feb 13, 2025
00d4ba7
feat: 도서 추천 기능 보완
inyeongjang Feb 13, 2025
9cccd7c
feat: 독자 유형 저장 기능 보완
inyeongjang Feb 13, 2025
d0b2881
feat: 도서 추천 기능 보완할 예정
inyeongjang Feb 13, 2025
920d605
etc
inyeongjang Feb 13, 2025
8ba081e
merge BE
inyeongjang Feb 13, 2025
a6d78ff
feat: 감상평 삭제 수정, 검색 추가
koh0074 Feb 14, 2025
ada88dc
Merge remote-tracking branch 'origin/feature/inyeong2' into BE
koh0074 Feb 14, 2025
770a64c
~프로필사진업로드
zoosungah Feb 14, 2025
939a7ce
~프로필사진
zoosungah Feb 14, 2025
f6d2617
타 사용자 정보 불러오기 오류
zoosungah Feb 14, 2025
bba1b57
타 사용자 계정 열람 미완성
zoosungah Feb 14, 2025
6e010b6
merge: feature/sungah
koh0074 Feb 14, 2025
13261e3
feat: 다른 사용자 정보, 추천 시스템 추가 외 모두 완
koh0074 Feb 14, 2025
ec2b697
feat: 로그인/회원가입/로그아웃/회원탈퇴/팔로잉/팔로우/프로필사진/다른 유저 정보 불러오기/닉네임 변경
zoosungah Feb 14, 2025
420f62d
feat:fe 브랜치 생성
chacha-0409 Feb 14, 2025
61b9eaf
merge: feature/sungah 수정사항 받아옴
koh0074 Feb 14, 2025
35c0420
Merge branch 'BE' into feature/realFE
koh0074 Feb 14, 2025
06e76f9
FE
chacha-0409 Feb 15, 2025
fd31e53
feat: 베스트셀러, 회원가입, 로그인 수정
chacha-0409 Feb 15, 2025
c4fbc06
회원가입 ui 정렬, bestseller에 날씨 섹션 추가, bookdetail 기능 스타일 구현
chacha-0409 Feb 15, 2025
c5e3217
BookDetail 저자 이름 간결화
chacha-0409 Feb 16, 2025
47bc1fa
bestseller css 정상 버전
chacha-0409 Feb 16, 2025
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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#코너톤 4팀
<<<<<<< HEAD
#코너톤 4팀
147 changes: 125 additions & 22 deletions client/package-lock.json

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

5 changes: 5 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
"name": "my-app",
"version": "0.1.0",
"private": true,
"proxy": "http://localhost:3002",
"_comment" : "cors Proxy 설정 추가",

"dependencies": {
"axios": "^1.7.9",
"cra-template": "1.2.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-router-dom": "^7.1.5",
"react-scripts": "5.0.1",
"web-vitals": "^4.2.4"
},
Expand Down
43 changes: 23 additions & 20 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
//App.js
import './App.css';
import axios from "axios";
import {useEffect} from "react";
import React from "react";
import { Routes, Route, Link } from "react-router-dom";

function App() {
const callApi = async () => {
axios.get('/api')
.then((res) => {
console.log(res.data.test)
})
.catch((err) => {
console.log(err);
})
};

useEffect(() => {
callApi();
}, []);
import Main from "./pages/Main";
import Login from "./pages/Login";
import Account from "./pages/Account";
import MyDrawer from "./pages/MyDrawer";
import Test from "./pages/Test";
import Bestseller from "./pages/Bestseller";
import Community from "./pages/Community";
import BookDetail from "./pages/BookDetail";

function App() {
return (
<div>test react</div>
<div className="App">
<Routes>
<Route path="/" element={<Main />} />
<Route path="/login" element={<Login />} />
<Route path="/account" element={<Account />} />
<Route path="/myDrawer" element={<MyDrawer />} />
<Route path="/test" element={<Test />} />
<Route path="/bestseller" element={<Bestseller />} />
<Route path="/book/:title" element={<BookDetail />} />
<Route path="/community" element={<Community />} />
</Routes>
</div>
);
}

export default App;
Binary file added client/src/assets/FaSearch.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 client/src/assets/book.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 client/src/assets/bookicon.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 client/src/assets/good.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 client/src/assets/lamp.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 client/src/assets/logo.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 client/src/assets/user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added client/src/components/Button.js
Empty file.
38 changes: 38 additions & 0 deletions client/src/components/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React, { useState } from "react";
import { Link } from "react-router-dom";
import "../styles/Header.css";
import bookIcon from "../assets/bookicon.png";
import lamp from "../assets/lamp.png";

const Bestseller= () => {
return (
<div className="main-container">
<header className="header">
<div className="img-group">
<img src={lamp} className="lamp" alt="lamp" />
<img src={lamp} className="lamp" alt="lamp" />
<img src={lamp} className="lamp" alt="lamp" />
</div>
<div className="nav-group">
<div className="nav-item">
<Link to="/account">베스트셀러</Link>
<img src={bookIcon} className="book-icon" alt="book icon" />
</div>
<div className="nav-item">
<Link to="/account">북루미 테스트</Link>
<div className="underline"></div>
</div>
<div className="nav-item">
<Link to="/login">북작북작</Link>
<div className="underline"></div>
</div>
<div className="nav-item">
<Link to="/myDrawer">나의 서랍</Link>
<div className="underline"></div>
</div>
</div>
</header>
</div>
);
};
export default Bestseller;
14 changes: 4 additions & 10 deletions client/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
import {BrowserRouter} from "react-router-dom";

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
);

// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
<BrowserRouter>
<App />
</BrowserRouter>);
Loading