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

1218/jy #35

Open
wants to merge 150 commits into
base: main3
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
5675689
경로 수정
cmlim0070 Nov 8, 2022
9211f0f
페이지 링크
cmlim0070 Nov 8, 2022
57ba52b
주석 추가
cmlim0070 Nov 8, 2022
222cc8f
css 수정
YJin33 Nov 8, 2022
c6a4874
Update reviewAll.css
cmlim0070 Nov 8, 2022
48d3810
Rename reviewAll.css to ReviewAll.css
cmlim0070 Nov 8, 2022
e673796
CreateStorejs생성
zoo0YOON Nov 8, 2022
c596720
Header NavBar 추가
dlvcoth Nov 8, 2022
6ebca76
Update reviewAll.css
zoo0YOON Nov 8, 2022
26e6e70
Merge remote-tracking branch 'origin/1108ChaeMin' into 1108/jy
zoo0YOON Nov 8, 2022
5d5f34d
Merge remote-tracking branch 'origin/1108ChaeMin' into 1108/ym
dlvcoth Nov 8, 2022
19a6767
Deleted Login SignIn StoreListView reviewAll
euWna Nov 8, 2022
ff44c03
Update CreateStore.js
zoo0YOON Nov 8, 2022
e540e0b
Merge remote-tracking branch 'origin/1108/ym' into 1108/se
euWna Nov 8, 2022
657c49b
Merge remote-tracking branch 'origin/1108/jy' into 1108/se
euWna Nov 8, 2022
af9d2d3
Merge remote-tracking branch 'origin/1108/유진' into 1108/se
euWna Nov 8, 2022
5c05821
1109 Base
euWna Nov 8, 2022
64f6647
SignIn -> SignUp 변경, StoreDetail.js 생성
euWna Nov 10, 2022
3def48a
1109/jy+1110/se
euWna Nov 10, 2022
4242d57
Rename SignIn.js to SignUp.js
euWna Nov 10, 2022
3d5e284
Create StoreDetail.js
euWna Nov 10, 2022
40ba010
Rename SingIn -> SingUp
euWna Nov 10, 2022
2fc3312
페이지 연결(홈)
cmlim0070 Nov 13, 2022
4a9ffc1
css 수정+페이지 연결
cmlim0070 Nov 13, 2022
3722ece
flask-server please
euWna Nov 13, 2022
1cc5352
Update app.py
euWna Nov 13, 2022
0ba3148
css 정렬 수정
cmlim0070 Nov 13, 2022
e00986c
flask setting
euWna Nov 13, 2022
40c86d9
오전 2시 46분 css 수정..
cmlim0070 Nov 13, 2022
71b41d0
Merge branch '1114/cm' of https://github.com/euWna/osp_project into 1…
euWna Nov 13, 2022
6adae26
Update App.js
euWna Nov 13, 2022
a54639c
Delete backend directory
euWna Nov 13, 2022
8b8bb44
제출용 NavBar 추가
euWna Nov 13, 2022
13227cb
수정
zoo0YOON Nov 13, 2022
584f85b
수정
zoo0YOON Nov 13, 2022
685da71
Merge branch '1114/jy2' of https://github.com/euWna/osp_project into …
euWna Nov 13, 2022
eaa680c
flask_CreateStore_onProgress
euWna Nov 13, 2022
485f57f
app.py result > CreateStore 경로 수정
euWna Nov 14, 2022
7c3c874
Create pages 3개, app.py 수정
euWna Nov 14, 2022
c123d04
database 파일 생성
YJin33 Nov 15, 2022
0927b05
일단 수정본
zoo0YOON Nov 15, 2022
ea3ee7a
수정
zoo0YOON Nov 15, 2022
5f7a32b
1115/cm+juyoung
YJin33 Nov 18, 2022
45680bf
오후 9시 31분
cmlim0070 Nov 20, 2022
fa2b9d6
Submit_store로 수정, table명 대문자로 변경, print문 주석처리
euWna Nov 20, 2022
d3a71d5
라우팅을 위하여...
euWna Nov 21, 2022
60abb50
Update result.html
euWna Nov 21, 2022
95b76dc
result.html img src 태그 추가, DB 연결 모두 확인
euWna Nov 21, 2022
a72a008
Routing Success
euWna Nov 22, 2022
2315877
메뉴이름불러와짐
cmlim0070 Nov 22, 2022
27b0b68
뭐가뭔지
euWna Nov 27, 2022
bbe2cbd
뭐가뭦ㄴ지!!!
euWna Nov 27, 2022
6cc689f
StoreDetail css 수정 (메뉴)
euWna Nov 27, 2022
bb5a6a1
StoreDetail 얼추 완성 근데 왜 CreateMenu 로딩이 안돼죠 ㅠ
euWna Nov 27, 2022
f3c7537
환경변수 되돌려놓음
euWna Nov 27, 2022
3c28bdd
안되는중
cmlim0070 Nov 27, 2022
17dfdae
1
cmlim0070 Nov 27, 2022
06cdd09
json 데이터 넘어감
cmlim0070 Nov 29, 2022
a72249a
json data 콘솔에 넘어옴
cmlim0070 Nov 29, 2022
5ee6e7f
8시 41분
cmlim0070 Nov 29, 2022
ae4b0d2
데이터 불러와짐!!!!
cmlim0070 Nov 29, 2022
905ad64
storelistview-css 수정
cmlim0070 Dec 3, 2022
4d6a286
이미지 소스 불러오기 시도중
cmlim0070 Dec 4, 2022
996263b
Merge branch '1204/react' into 1204/cm
euWna Dec 4, 2022
d772566
이미지 불러오기 작업중
cmlim0070 Dec 4, 2022
ec1eb6f
이미지불러오기작업
cmlim0070 Dec 4, 2022
3a65d4d
이미지 불러오기 수정
cmlim0070 Dec 5, 2022
8f4bed6
d
cmlim0070 Dec 6, 2022
ed9264d
리스트 뜨는거 해결
cmlim0070 Dec 6, 2022
2d3b92c
이미지 불러오기 에러캐치
cmlim0070 Dec 6, 2022
654668f
맛집 모아보기 css 수정
cmlim0070 Dec 6, 2022
00e842e
수정
zoo0YOON Dec 6, 2022
e9582a3
?
cmlim0070 Dec 8, 2022
22c877d
송은+유진+채민
cmlim0070 Dec 8, 2022
3338c0d
store dupliacte check 수정
YJin33 Dec 8, 2022
a0463fb
컴포넌트별 라우팅
YJin33 Dec 8, 2022
a1992c9
컴포넌트 Storename 만 받아옴
YJin33 Dec 8, 2022
359476c
진전사항 없음 ㅠ
YJin33 Dec 8, 2022
44f743f
데이터 안넘어가는 중
YJin33 Dec 9, 2022
93534ea
저장용 커밋
YJin33 Dec 11, 2022
78a937c
info(image제외)data 넘어감(Linkto)
YJin33 Dec 13, 2022
ab4c683
고친거
zoo0YOON Dec 13, 2022
2502787
고침
zoo0YOON Dec 13, 2022
f7c40fa
Update CreateMenu.js
cmlim0070 Dec 13, 2022
0c12320
Update CreateStore_registered.js
euWna Dec 13, 2022
1dbdd96
Update app.py
euWna Dec 13, 2022
86b51ec
1206/jy 옮기기
YJin33 Dec 13, 2022
fe1486e
Update SignUp.js
euWna Dec 13, 2022
59f2a9a
1208/jy 기반 수정
YJin33 Dec 13, 2022
cd04303
merge 1차마감
YJin33 Dec 13, 2022
4b779fc
img경로 수정
YJin33 Dec 13, 2022
360579e
storedetail (맛집세부정보) 데이터 연결
cmlim0070 Dec 15, 2022
0d9cf8d
storedetail 메뉴불러오기 가능+메뉴추가/수정 버튼 활성화
cmlim0070 Dec 15, 2022
96c8e36
리뷰 등록 가능 + 리뷰 조회 가능
cmlim0070 Dec 15, 2022
a7b8ee1
storelistview 데이터 불러오기 완성
cmlim0070 Dec 15, 2022
fb90ff2
맛집모아보기/상세보기 완성
cmlim0070 Dec 15, 2022
75917f6
preview routing
YJin33 Dec 16, 2022
6d461f4
StoreDetail Info제외 출력
YJin33 Dec 16, 2022
f2f3eb6
filtering done, button not done
dlvcoth Dec 16, 2022
339a2dd
StoreDetail 다 나옴!!
YJin33 Dec 16, 2022
7606929
버튼 3개 라우팅 끝!
YJin33 Dec 16, 2022
52fa722
Review All
YJin33 Dec 16, 2022
57adaca
Review All 수정
YJin33 Dec 16, 2022
ebd61d8
가게 종류 분류버튼ing
dlvcoth Dec 16, 2022
3bfa960
info 버튼 2개 라우팅
YJin33 Dec 16, 2022
c17c99a
맛집 정보 수정 기능
euWna Dec 17, 2022
8280635
맛집 정보 수정 기능
euWna Dec 17, 2022
a8825fa
카테고리 버튼 완료
dlvcoth Dec 17, 2022
a4b2414
1217
cmlim0070 Dec 17, 2022
791705e
css수정
cmlim0070 Dec 17, 2022
218eb65
일단 주석처리...
YJin33 Dec 17, 2022
d97fc54
Merge 1214chaemin into 1217/se
euWna Dec 17, 2022
4c949be
ff
zoo0YOON Dec 17, 2022
61df006
Merge remote-tracking branch 'origin/1216/ym' into 1206/jy
zoo0YOON Dec 17, 2022
2caaaa1
gitignore add
euWna Dec 17, 2022
c36ee2c
gitignore 수정
zoo0YOON Dec 17, 2022
a479192
Update .gitignore
euWna Dec 17, 2022
ed1f78d
gitignore 수정!
zoo0YOON Dec 17, 2022
617c93e
Update .gitignore
euWna Dec 17, 2022
8f7c52c
gitignore 수정본 최종
zoo0YOON Dec 17, 2022
95bd758
git ignore
YJin33 Dec 17, 2022
8048863
delete pycache
euWna Dec 17, 2022
c94822e
삭제 수정
zoo0YOON Dec 17, 2022
fbdae47
gitignore
YJin33 Dec 17, 2022
405c7b7
Merge branch '1217yj' into 1217/jy
euWna Dec 17, 2022
77dd59a
Merge pull request #33 from euWna/1217/jy
euWna Dec 17, 2022
59f2e05
Merge branch '1217/se' into 1217yj
euWna Dec 17, 2022
d3b91e5
1217 작업까지 merge 완료
euWna Dec 17, 2022
7df3499
리뷰 건수 불러오기&CreateReview 이미지 불러오기& 라우팅 일부 수정
YJin33 Dec 19, 2022
eb990e6
이미지 수정 오류 수정
cmlim0070 Dec 19, 2022
e2ffdc9
state 주석처리(종속성 줄이기)
YJin33 Dec 19, 2022
42d7eeb
저장용 커밋
YJin33 Dec 19, 2022
fd4520f
homepage 수정(랜덤맛집/랜덤리뷰)
cmlim0070 Dec 19, 2022
f7b3db9
수정용
zoo0YOON Dec 19, 2022
8c1b059
수정수정
zoo0YOON Dec 19, 2022
5fa577c
홈페이지 수정
cmlim0070 Dec 19, 2022
ac4e7a6
수우정
zoo0YOON Dec 19, 2022
ae008ad
저장용 커밋(reviewAll 안되는 중)
YJin33 Dec 19, 2022
b7c7b82
주차장이 뜸
cmlim0070 Dec 19, 2022
a89e276
app.py 수정 완
zoo0YOON Dec 19, 2022
7e4f6a8
메뉴새로고침 수정
cmlim0070 Dec 19, 2022
ad431a5
timestamp&기타
YJin33 Dec 19, 2022
4366fb5
create store duplicate alert
dlvcoth Dec 19, 2022
f8aa1f8
Merge branch '1219chaemin' into 1218/ym
euWna Dec 19, 2022
17a5cb0
Merge pull request #37 from euWna/1218/ym
euWna Dec 19, 2022
dc98bf4
css 수정?
zoo0YOON Dec 19, 2022
912f383
Merge branch '1219chaemin' into 1218/yj
euWna Dec 19, 2022
4d1bc94
Merge pull request #38 from euWna/1218/yj
euWna Dec 19, 2022
df8bd89
jy까지 merge 완료
euWna Dec 19, 2022
639756a
Update paths.js
euWna Dec 19, 2022
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
Prev Previous commit
Next Next commit
css 정렬 수정
11월14일 오전 2시44분
cmlim0070 committed Nov 13, 2022
commit 0ba3148c8038f238d59b1df76083f03e9d0625aa
26 changes: 3 additions & 23 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -10,34 +10,14 @@
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->

<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>맛집 웹사이트</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<noscript></noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
6 changes: 3 additions & 3 deletions src/component/NavBar.js
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@ function NavBar(){
return(
<nav>
맛집 상세 조회
<Link to="/ReviewAll" class={styles.nava}>리뷰 모아보기</Link>
<Link to="/CreateStore" class={styles.nava}>맛집 정보 추가하기</Link>
<Link to="/StoreListView" class={styles.nava}>맛집 모아보기</Link>
<Link to="/ReviewAll" >리뷰 모아보기</Link>
<Link to="/CreateStore" >맛집 정보 추가하기</Link>
<Link to="/StoreListView" >맛집 모아보기</Link>
</nav>
);
}
6 changes: 3 additions & 3 deletions src/component/header.js
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ function Header(){
<header>
<Link to="/"><img id={styles.homelogo} src={homelogo}/></Link>
<div class={styles.signInUp}>
<Link to="/Login">로그인</Link>
<Link to="/SignUp">회원가입</Link>
</div>
<Link to="/Login">로그인</Link>
<Link to="/SignUp">회원가입</Link>
</div>
</header>
</div>
);
Empty file added src/component/menuPost.js
Empty file.
Empty file added src/component/reviewPost.js
Empty file.
20 changes: 14 additions & 6 deletions src/css/CreateStore.module.css
Original file line number Diff line number Diff line change
@@ -2,10 +2,16 @@ body{
background-color: rgb(238, 238, 238);
}

section{
display: flex;
justify-content: center;
min-width: 1400px;
}

aside{
width:200px;
/* width:200px; */
height:400px;
background-color: rgb(238, 238, 238);
/* background-color: rgb(238, 238, 238); */
padding:20px ;
float:left;
}
@@ -16,7 +22,7 @@ background-color: white;
border: solid #dcdcdc 2px;
width:230px;
height:130px;
left:30px;
/* left:30px; */
}

.up{
@@ -35,26 +41,28 @@ right:22px;
display:table;
width:900px;
}

.cell {display: table-cell; padding: 3px; border-bottom: 1px solid #DDD;}

.row{
position: relative;
background-color:white;
left:80px;
/* left:80px; */
top :20px;
border: solid #dcdcdc 0.5px;
}

.col1{
position:relative;
top:15px;
top:10px;
left: 20px;
width:150px;
height:50px;
}

.col2{
position:relative;
top:15px;
top:8px;
height:50px;
}

38 changes: 36 additions & 2 deletions src/css/Header.module.css
Original file line number Diff line number Diff line change
@@ -12,21 +12,55 @@ a{
}

header{
display: flex;
padding: 20px;
/* margin-bottom: 30px; */
min-width: 1400px;
justify-content: space-between
}

.signInUp {
display: flex;
float: right;
top: 25px;
align-items: center
}

.signInUp a{
float: right;
margin-left: 30px;
position: relative;
}

.signInUp a:hover {
color: #01c9ca;
}

.signInUp a:before {
content: '';
position: absolute;
bottom: 0;
left: 0;
display: block;
width: 100%;
height: 1px;
background: #000;
transform: scale(0);
transition: all 0.2s;
}

.signInUp a:hover:before {
background: #01c9ca;
transform: scale(1);
}

#homelogo {
display: flex;
width: 50px;
height: 50px;
}

/* 네비게이션 바 */

nav {
justify-content: center;
color: white;
@@ -43,7 +77,7 @@ nav .pageName{
nav a {
padding-left: 20px;
padding-right: 20px;
border-right: 1px solid white;
/* border-right: 1px solid white; */
font-size: 15px;
float: right;
/* margin-top:10px; */
25 changes: 3 additions & 22 deletions src/css/HomePage.module.css
Original file line number Diff line number Diff line change
@@ -24,27 +24,8 @@ body {
font-family: 'Noto Sans KR';
font-size:17px;
line-height:1.5;
}

* {
box-sizing: border-box;
}

/* header {
padding-top: 50px;
padding-bottom: 50px;
text-align: center;
background: rgb(238, 238, 238);
min-width: 1400px;
} */

/* Nav {
background-color: var(--egreen);
color: white;
height: 60px;
line-height: 60px;
text-align: center;
} */
}

.section {
text-align: center;
@@ -58,7 +39,7 @@ body {
}

.hottitle {
/* display: inline-block; */
display: inline-block;
font-size: 18px;
color: rgb(255, 255, 255);
margin-top: 20px;
@@ -105,7 +86,7 @@ p {
.link-1 a:after { right: 0; }

.link-1 a:hover:before, .link-1 a:hover:after {
width: 50%;
width: 52%;
}

.link-1 a:before, .link-1 a:after {
5 changes: 3 additions & 2 deletions src/css/MyPage.module.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
* {
/* * {
box-sizing: border-box;
}
} */

body {
margin : 0;
}
4 changes: 2 additions & 2 deletions src/css/MyPageBookmark.module.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

* {
/* * {
box-sizing: border-box;
}
} */

body {
margin : 0;
4 changes: 2 additions & 2 deletions src/css/MyPageMenu.module.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

* {
/* * {
box-sizing: border-box;
}
} */

body {
margin : 0;
1 change: 0 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@ root.render(
<body style={styles}>
<Section></Section>
</body> */}

<App></App>
</React.StrictMode>
);
10 changes: 6 additions & 4 deletions src/pages/CreateStore.js
Original file line number Diff line number Diff line change
@@ -5,14 +5,15 @@ import NavBar from '../component/NavBar';

function CreateStore(){
return (
<body>
<div>
<NavBar></NavBar>
<aside>
<section>
<aside>
<div class={styles.asideleft}>
<div class={styles.up}>기본정보</div>
<div class={styles.down}>메뉴</div>
</div>
</aside><section>
</aside>
<div id={styles.table}>
<div class={styles.row}>
<span class={`${styles.cell} ${styles.col1}`}>매장명</span>
@@ -62,7 +63,8 @@ function CreateStore(){
<span class={`${styles.cell} ${styles.col2}`}><input type="button" value="기본 정보 등록" /></span>
</div>
</div>
</section></body>
</section>
</div>
)
}

6 changes: 1 addition & 5 deletions src/pages/Homepage.js
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ function Section(){
<div class={styles.green}>
<div class = {styles.hottitle}>
{/* <h2>HOT TOPIC</h2> */}
<div class={styles.link-1}>
<div class={styles['link-1']}>
<a class={styles.hottopic} href="#">
<span class={styles.thick}>HOT </span><span class={styles.thin}>TOPIC</span>
</a>
@@ -81,17 +81,13 @@ function Section(){
function Homepage() {
return (
<div className="">
<head>
</head>
<body>
<Section></Section>
<div class = {styles.Hbox}>
<Link to="/StoreListView" class={styles.homeButton}>맛집 모아보기</Link>
<Link to="/CreateStore" class={styles.homeButton}>맛집 정보 추가하기</Link>
<Link to="/reviewAll" class={styles.homeButton}>리뷰 모아보기</Link>
{/* 페이지 링크는 이렇게 걸어주세요 */}
</div>
</body>
</div>
);
}
18 changes: 9 additions & 9 deletions src/pages/ReviewAll.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { Link } from 'react-router-dom';
import sample from "../img/sample.PNG";
import styles from '../css/ReviewAll.module.css';
import NavBar from '../component/NavBar';

@@ -14,23 +15,24 @@ function ReviewSection() {
<div class={styles.store_location}>신촌동 xxx xxx</div>
<div class={styles.review_title}>리뷰 제목입니다.</div>
<div class={styles.review_desc}>본문샘플<br/>본문샘플</div>
<div class={styles.review_img}><img src="sample.PNG" width="250" height="230" /></div>
<div class={styles.review_img}><img src={sample} width="250" height="230"/></div>

</div>
<div class = {styles.pr_description}>
<div class={styles.user_name}>사용자</div>
<div class={styles.store_name}>음식점 이름</div>
<div class={styles.store_location}>신촌동 xxx xxx</div>
<div class={styles.review_title}>리뷰 제목입니다.</div>
<div class={styles.review_desc}>본문샘플<br/>본문샘플</div>
<div class={styles.review_img}><img src="sample.PNG" width="250" height="230" /></div>
<div class={styles.review_img}><img src={sample} width="250" height="230"/></div>
</div>
<div class = {styles.pr_description}>
<div class={styles.user_name}>사용자</div>
<div class={styles.store_name}>음식점 이름</div>
<div class={styles.store_location}>신촌동 xxx xxx</div>
<div class={styles.review_title}>리뷰 제목입니다.</div>
<div class={styles.review_desc}>본문샘플<br/>본문샘플</div>
<div class={styles.review_img}><img src="sample.PNG" width="250" height="230" /></div>
<div class={styles.review_img}><img src={sample} width="250" height="230"/></div>
</div>
</div>
<div class = {styles.hotreview}>
@@ -46,12 +48,10 @@ function ReviewSection() {
function ReviewAll() {
return (
<div class={styles.default}>
<head>
</head>
<body class={styles.body}>
<NavBar></NavBar>
<ReviewSection></ReviewSection>
</body>
<div class={styles.body}>
<NavBar></NavBar>
<ReviewSection></ReviewSection>
</div>
</div>
);
}
3 changes: 0 additions & 3 deletions src/pages/SignUp.js
Original file line number Diff line number Diff line change
@@ -46,9 +46,6 @@ class SignUp extends React.Component {
</tr>
</table><br></br>
<button type="button" name="join_button">회원가입 완료하기</button>



</div>
);
}
Loading