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

Finaldev #1

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
bb7f7de
install global react-scripts
KeeDongMON Jan 8, 2024
e0e3cbd
라우터 세팅,
KeeDongMON Jan 9, 2024
916b3af
axios 설치
KeeDongMON Jan 9, 2024
86c5187
install query-string
KeeDongMON Jan 9, 2024
e6289d3
회원가입빼고 구현완
KeeDongMON Jan 11, 2024
71553d0
Merge branch 'main' into dev
KeeDongMON Jan 11, 2024
71192a3
Merge branch 'keedongmon' into dev
KeeDongMON Jan 11, 2024
6e79e2a
merge
KeeDongMON Jan 11, 2024
5be4cb1
branch change ver1
Oneourbefore Jan 11, 2024
13cafa7
뭐 하나 지움
KeeDongMON Jan 11, 2024
f207b01
Merge branch 'namdev' into dev
KeeDongMON Jan 11, 2024
4ba68ae
Merge branch 'keedongmon' into dev
KeeDongMON Jan 11, 2024
86d125a
회원가입 로직 구현
KeeDongMON Jan 11, 2024
2facfda
전 자러 갈게요
KeeDongMON Jan 11, 2024
8e8f9fd
change pageroute
Oneourbefore Jan 12, 2024
cd09046
why?
Oneourbefore Jan 12, 2024
e90a7a0
Merge branch 'dev' of https://github.com/GDSC-snowflowerthon/BookBrid…
KeeDongMON Jan 12, 2024
bd88496
수정
Oneourbefore Jan 12, 2024
7f81b85
change
Oneourbefore Jan 12, 2024
18c2e53
hi
Oneourbefore Jan 12, 2024
2cba685
inputfield 변경
KeeDongMON Jan 12, 2024
68a0211
Merge branch 'dev' of https://github.com/GDSC-snowflowerthon/BookBrid…
KeeDongMON Jan 12, 2024
7008ae1
process5 change
Oneourbefore Jan 12, 2024
d172f13
change
Oneourbefore Jan 12, 2024
ae2c267
inputfield2
KeeDongMON Jan 12, 2024
36e0a73
search
KeeDongMON Jan 12, 2024
460108c
Merge branch 'dev' of https://github.com/GDSC-snowflowerthon/BookBrid…
KeeDongMON Jan 12, 2024
85e49af
user login
Oneourbefore Jan 12, 2024
2c3f6ef
userlogin
Oneourbefore Jan 12, 2024
622cd60
Merge branch 'dev' of https://github.com/GDSC-snowflowerthon/GDSC-tea…
Oneourbefore Jan 12, 2024
e0ab1ea
책검색 구현
KeeDongMON Jan 12, 2024
43e8e71
Merge branch 'dev' of https://github.com/GDSC-snowflowerthon/BookBrid…
KeeDongMON Jan 12, 2024
b4b968c
choose-agencylogin연결
KeeDongMON Jan 12, 2024
5f3b800
before connect
Oneourbefore Jan 12, 2024
992a6f6
통신 구현 다듬기
KeeDongMON Jan 12, 2024
c2d2e00
Merge branch 'dev' of https://github.com/GDSC-snowflowerthon/BookBrid…
KeeDongMON Jan 12, 2024
d047d87
last commit
Oneourbefore Jan 12, 2024
6d36f91
axios 제거, 더미데이터 넣음
KeeDongMON Jan 12, 2024
2a60306
헤더 나오게 수정
KeeDongMON Jan 12, 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
257 changes: 257 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@reduxjs/toolkit": "^2.0.1",
"@tanstack/react-query": "^5.17.9",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^1.6.5",
"global": "^4.4.0",
"query-string": "^8.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-query": "^3.39.3",
"react-redux": "^9.0.4",
"react-router": "^6.21.1",
"react-router-dom": "^6.21.1",
Expand Down Expand Up @@ -40,5 +45,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@tanstack/react-query-devtools": "^5.17.9"
}
}
Binary file added public/example1.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/example2.jpg
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/example3.jpg
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/example4.jpg
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/example5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react'
import { Global } from '@emotion/react'
import { BrowserRouter } from 'react-router-dom'
import PageRoute from './PageRoute'

const App = () =>{
import PageRoute from "./PageRoute";
import { BrowserRouter as Router } from "react-router-dom";
import React from "react";
import { Global } from "@emotion/react";
import { BrowserRouter } from "react-router-dom";

const App = () => {
return (
<BrowserRouter>
<PageRoute/>
<PageRoute />
</BrowserRouter>
);
};

export default App;
export default App;
100 changes: 56 additions & 44 deletions src/PageRoute.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,60 @@
import React from 'react'
import { Routes, Route, useParams} from 'react-router-dom'
import Dongui from './pages/donate/donategui.js'
import Mydonation from './pages/donate/mydonation.js'
import Mypage from './pages/donate/mypage.js'
import Nickname from './pages/donate/nickname.js'
import Userlogin from './pages/donate/userlogin.js'
import Process1 from './pages/donate/process1.js'
import Process2 from './pages/donate/process2.js'
import Process3 from './pages/donate/process3.js'
import Process4 from './pages/donate/process4.js'
import Process5 from './pages/donate/process5.js'
import Process6 from './pages/donate/process6.js'
import Done from './pages/donate/done.js'
import React from "react";
import { Routes, Route, useParams } from "react-router-dom";
import Dongui from "./pages/donate/donategui.js";
import Mydonation from "./pages/donate/mydonation.js";
import Mypage from "./pages/donate/mypage.js";
// import Nickname from "./pages/donate/nickname.js";
import Process1 from "./pages/donate/process1.js";
import Process3 from "./pages/donate/process3.js";
import Process4 from "./pages/donate/process4.js";
import Process5 from "./pages/donate/process5.js";
import Process6 from "./pages/donate/process6.js";
import Done from "./pages/donate/done.js";
import AgencyLogin from "./pages/reciever/agencylogin.js";
import AgencySignUp from "./pages/reciever/agencysignup.js";
import BookList from "./pages/reciever/booklist.js";
import Finish from "./pages/reciever/finish.js";
import SearchBooks from "./pages/reciever/searchbooks.js";
import Choose from "./pages/main/choose.js";
import Gui from "./pages/main/gui.js";
import Check from "./pages/main/check.js";
import Login from "./pages/main/userlogin.js";
import Usersingup from "./pages/main/usersignup.js";
import SearchBookList from "./pages/reciever/searchbooklist.js";
import BookInfo from "./pages/reciever/bookinfo.js";
import Process2 from "./pages/donate/process2.js";

import Choose from './pages/main/choose.js'
import Gui from './pages/main/gui.js'
import Check from './pages/main/check.js'
import Login from './pages/main/login.js'



const PageRoute = () =>{
const { id } = useParams();
return (
const PageRoute = () => {
return (
<Routes>
<Route path='/' element={<Gui />}></Route>
<Route path='/choose' element={<Choose />}></Route>
<Route path='/check' element={<Check />}></Route>
<Route path='/login' element={<Login />}></Route>
<Route path='/donate/gui' element={<Dongui />}></Route>
<Route path='/donate/userlogin' element={<Userlogin />}></Route>
<Route path='/donate/nickname' element={<Nickname />}></Route>
<Route path='/donate/process1' element={<Process1 />}></Route>
<Route path='/donate/process2' element={<Process2 />}></Route>
<Route path='/donate/process3' element={<Process3 />}></Route>
<Route path='/donate/process4' element={<Process4 />}></Route>
<Route path='/donate/process5' element={<Process5 />}></Route>
<Route path='/donate/process6' element={<Process6 />}></Route>
<Route path='/donate/done' element={<Done />}></Route>
<Route path='/donate/mypage' element={<Mypage />}></Route>
<Route path='/donate/mydonation' element={<Mydonation />}></Route>
<Route path="/" element={<Gui />}></Route>
<Route path="/choose" element={<Choose />}></Route>
<Route path="/check" element={<Check />}></Route>
<Route path="/login" element={<Login />}></Route>
<Route path="/signup" element={<Usersingup />}></Route>
<Route path="/donate/gui" element={<Dongui />}></Route>
{/* <Route path="/donate/nickname" element={<Nickname />}></Route> */}
<Route path="/donate/process1" element={<Process1 />}></Route>
<Route path="/donate/process2" element={<Process2 />}></Route>
<Route path="/donate/process3" element={<Process3 />}></Route>
<Route path="/donate/process4" element={<Process4 />}></Route>
<Route path="/donate/process5" element={<Process5 />}></Route>
<Route path="/donate/process6" element={<Process6 />}></Route>
<Route path="/donate/done" element={<Done />}></Route>
<Route path="/donate/mypage" element={<Mypage />}></Route>
<Route path="/donate/mydonation" element={<Mydonation />}></Route>
<Route path="/reciever/agencylogin" element={<AgencyLogin />}></Route>
<Route path="/reciever/agencysignup" element={<AgencySignUp />}></Route>
<Route path="/reciever/booklist" element={<BookList />}></Route>
<Route path="/reciever/searchbooks" element={<SearchBooks />}></Route>
<Route path="/reciever/bookinfo" element={<BookInfo />}></Route>
<Route path="/reciever/finish" element={<Finish />}></Route>
<Route
path="/reciever/searchbooklist"
element={<SearchBookList />}
></Route>
</Routes>
)
}

);
};

export default PageRoute;
export default PageRoute;
Binary file added src/assets/background.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/giftbox_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions src/components/BookStatus.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import { Link, useNavigate } from "react-router-dom";
import { Navigate } from "react-router-dom";
const BookStatus = ({
id,
title,
curriculum,
subject,
publisher,
outsideImageUrl,
}) => {
const handleClick = () => {
navigate("/reciever/bookinfo", {
state: {
title: title,
curriculum: curriculum,
subject: subject,
publisher: publisher,
outsideImageUrl: outsideImageUrl,
},
});
};
const navigate = useNavigate();
return (
<div
onClick={handleClick}
style={{ textDecoration: "none", color: "black" }}
>
<div
style={{
width: 353,
height: 120,
background: "white",
boxShadow: "0px 0px 10px rgba(0, 0, 0, 0.08)",
borderRadius: 12,
display: "flex",
alignItems: "center",
padding: "5px",
}}
>
<div
style={{
marginRight: "10px",
}}
>
<img
src={outsideImageUrl}
alt="Book"
style={{
width: "84px",
height: "111px",
borderRadius: "5%",
}}
/>
</div>

{/* Text container */}
<div style={{ textAlign: "left" }}>
<div style={{ marginBottom: "5px", fontWeight: "700" }}>
책 제목 : {title}
</div>
<div style={{ marginBottom: "5px", fontWeight: "700" }}>
학년 : {curriculum}
</div>
<div style={{ marginBottom: "5px", fontWeight: "700" }}>
과목 : {subject}
</div>
<div style={{ fontWeight: "700" }}>출판사 : {publisher}</div>
</div>
</div>
</div>
);
};

export default BookStatus;
Empty file added src/components/Form1.js
Empty file.
16 changes: 16 additions & 0 deletions src/components/InputField.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import "../styles/inputfield.css";

const InputField = ({ label, type, placeholder, value, onChange }) => (
<div className="inputfield-container">
<div className="input-label">{label}</div>
<input
className="signup-input"
type={type}
placeholder={placeholder}
value={value}
onChange={onChange}
/>
</div>
);

export default InputField;
15 changes: 15 additions & 0 deletions src/components/InputField2.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import "../styles/inputfield.css";

const InputField2 = ({ type, placeholder, value, onChange }) => (
<div className="textinputfield-container">
<input
style={{ width: "80%" }}
type={type}
placeholder={placeholder}
value={value}
onChange={onChange}
/>
</div>
);

export default InputField2;
Loading