Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
7cbf2cf
Update README.md
chldudgus Oct 6, 2022
74cfd21
Create Frontend Branch
chldudgus Oct 6, 2022
4a8ad35
Add: Create MVP Folder Directory
chldudgus Oct 7, 2022
299a443
initial commit
jonggking Oct 7, 2022
9fee4cb
second commit
jonggking Oct 7, 2022
d760bc5
Feat: mvp별 페이지 전환 연결
chldudgus Oct 7, 2022
d11b98b
Add new files
chldudgus Oct 7, 2022
f223bf8
Revert "Add new files"
chldudgus Oct 7, 2022
93c9894
Design: Nav bar 정렬 정돈
chldudgus Oct 7, 2022
24848ca
Feat: connected to MySQL server
ryankim8815 Oct 7, 2022
b10e6ed
Create test branch
chldudgus Oct 8, 2022
e71944a
Design: Edit App css
chldudgus Oct 8, 2022
71a53d7
Feat: Slide navigation and pagination
chldudgus Oct 8, 2022
7642da8
Fix: 그래프 위치 선정
chldudgus Oct 8, 2022
19e5c30
Feat: 지도 mvp - 카카오맵 api 프로토타입 구현
chldudgus Oct 9, 2022
1615fa6
Feat register & login
94lfnv Oct 9, 2022
b742599
Feat: index.js, app.js, knex.js, schema (not working)
ryankim8815 Oct 10, 2022
e2de5aa
create myPage MVP
IMNE-C Oct 10, 2022
e975c72
Fix: typo on schema.js
ryankim8815 Oct 10, 2022
19fe7bb
[Feat]: 'user' CRU(D: not yet)
ryankim8815 Oct 10, 2022
e391bea
[Feat]: knex > MySQL2, connected to MySQL via MySQL2
ryankim8815 Oct 11, 2022
de54be7
[Docs]: back/src/db/dbDiagram.sql from dbdiagram.io
ryankim8815 Oct 11, 2022
c1e8b4e
[Docs]: edited dbDiagram.sql for createTable
ryankim8815 Oct 11, 2022
142e0f0
[Feat]: npm start -> server start
ryankim8815 Oct 11, 2022
06910e7
modify_diagram
jonggking Oct 11, 2022
c2f79d6
Feat MyFavCard & MyReviewCard & StarRate
IMNE-C Oct 11, 2022
6ef9c9c
[Feat]: userList feature, failed
ryankim8815 Oct 11, 2022
8a766dc
[Feat]: userList GET requst
ryankim8815 Oct 11, 2022
fbc590d
[Feat]: register - error, [Fix]: uerlist - changed result type as json
ryankim8815 Oct 12, 2022
b8eca21
Fix: 카카오맵 api 키 환경변수 처리
chldudgus Oct 12, 2022
c85830d
[Fix]: register - working, email duplicate check(not yet)
ryankim8815 Oct 12, 2022
ff797c9
feat: add modal
94lfnv Oct 12, 2022
6090c84
[Feat]: back_StoreRouter/get
Oct 12, 2022
67eb408
[Fix]: register - req/res working, email duplicate check(not yet)
ryankim8815 Oct 12, 2022
74c0338
[Fix]: register - req/res working, email duplicate check(not yet)
ryankim8815 Oct 12, 2022
f318826
Fix: 카카오맵 상 마커 표시 기능 구현
chldudgus Oct 12, 2022
c0f0531
[Fix]: register - req/res/email duplicate check are working
ryankim8815 Oct 12, 2022
f2ba5eb
Rename: 공통 파일 위치 변경
chldudgus Oct 12, 2022
b8dd677
Design css
94lfnv Oct 12, 2022
69020a8
Rename: introduction > chart
chldudgus Oct 12, 2022
d4be9b7
Merge into frontend
94lfnv Oct 12, 2022
9589f3f
Rename: Common
IMNE-C Oct 12, 2022
8dc9bf2
merge into frontend
IMNE-C Oct 12, 2022
96e2a0c
[Feat]: login with JWT web token - working
ryankim8815 Oct 12, 2022
a53fb0d
[Feat]: Back_storesRouter/post
Oct 12, 2022
848336a
Delete: remove useless files
chldudgus Oct 12, 2022
6c36cde
[Fix]: userRouter.js code rearrangement
ryankim8815 Oct 12, 2022
39b5065
[Fix]: userRegister, remove square bracket from response
ryankim8815 Oct 12, 2022
4e6f01d
[feat]: review post api 완료
jonggking Oct 12, 2022
f3ae205
[feat]reveiwList get 완성
jonggking Oct 13, 2022
9f6bc4a
Add: 서비스 소개 본문 수정
chldudgus Oct 13, 2022
1c07ef3
[Feat]: back_storesRouter/put,delete
Oct 13, 2022
8b22ca6
Feat: 리뷰 작성 기능 추가
chldudgus Oct 13, 2022
4b7917a
Merge branch 'back/review' into backend
jonggking Oct 13, 2022
eae721b
Merge branch 'b_stores' into backend
Oct 13, 2022
d6058fa
Merge branch 'USER_API' into backend
ryankim8815 Oct 13, 2022
d65ab39
Feat: API file(1)
94lfnv Oct 13, 2022
d37a6ab
[Fix] merge error(Duplicate error, module error)
Oct 13, 2022
7e173e7
Fix: api-del
94lfnv Oct 14, 2022
2cb39bb
[Feat]: GET,userCurrent partially working. login_required(not yet)
ryankim8815 Oct 14, 2022
978bf81
Merge branch 'USER_API_currentUser' into backend
Oct 14, 2022
39e608f
[Feat]: login_required.js - working, [Feat]: (GET)userCurrent api - w…
ryankim8815 Oct 14, 2022
1aba7c5
[Feat]: Back get:store address/ get:all store info
Oct 14, 2022
16cde20
Merge remote-tracking branch 'origin/USER_API_currentUser' into backend
Oct 14, 2022
93590ae
Fix: register & login
94lfnv Oct 14, 2022
0e72de0
Feat: 특정 스토어 리뷰 페이지 추가
chldudgus Oct 14, 2022
089eb80
[Feat]: review api photo빼고 구현.
jonggking Oct 14, 2022
a2bd027
[Feat]: (PUT)userUpdate api - partially working(profilephoto not yet)
ryankim8815 Oct 14, 2022
d86cf6f
Feat: 리뷰 작성 창 별점 함수 컴포넌트 추가
chldudgus Oct 15, 2022
d228cbf
Fix: 리뷰 작성 컴포넌트 간 프롭스 수정 중
chldudgus Oct 15, 2022
e21fae2
Fix: Map.jsx 필요없는 코드 삭제
chldudgus Oct 15, 2022
94ea711
Merge branch 'introduction/map' into frontend
chldudgus Oct 15, 2022
9a8e30b
fix: login
94lfnv Oct 15, 2022
8ffd3a8
Merge branch 'register/login2' into frontend
94lfnv Oct 15, 2022
e25c3c1
[Feat]: (POST)profileUpload - working, [Feat]: middleware/image_uploa…
ryankim8815 Oct 15, 2022
84f51d5
Merge branch 'frontend' of https://kdt-gitlab.elice.io/ai_track/class…
94lfnv Oct 15, 2022
bc8014a
Fix: login-token-name
94lfnv Oct 15, 2022
44ab1ac
Create introduction/map2 branch
chldudgus Oct 15, 2022
7d72d26
Fix: class>className, Page Route 관리, 인트로 내부컨텐츠 관리
chldudgus Oct 15, 2022
5c5cbfc
[Feat]: (DELETE)userDelete - working
ryankim8815 Oct 15, 2022
088dedf
review수정
jonggking Oct 16, 2022
d2a35f1
Merge remote-tracking branch 'origin/USER_API_currentUser' into backend
Oct 16, 2022
93e0684
Merge remote-tracking branch 'origin/back/reviewAPI' into backend
jonggking Oct 16, 2022
3f5d01e
Merge(test)
Oct 16, 2022
52773fb
Merge branch 'introduction/map2' into frontend
chldudgus Oct 16, 2022
b808d9d
Merge branch 'frontend' into dev
chldudgus Oct 16, 2022
db432df
Merge remote-tracking branch 'origin/USER_API_currentUser' into backend
ryankim8815 Oct 16, 2022
6cf3e3e
Merge branch 'backend' of https://kdt-gitlab.elice.io/ai_track/class0…
Oct 16, 2022
11ef232
Merge remote-tracking branch 'origin/backend' into dev
Oct 16, 2022
b466f95
[Docs]: back/package.json - add pm2 script
ryankim8815 Oct 16, 2022
a46c9dd
Merge branch 'backend' into dev
ryankim8815 Oct 16, 2022
8a6d38d
Fix: register
94lfnv Oct 16, 2022
20161ad
delete layout file
94lfnv Oct 16, 2022
d021bbd
Merge branch 'dev' of https://kdt-gitlab.elice.io/ai_track/class05/da…
94lfnv Oct 16, 2022
e191032
add LayOut file
94lfnv Oct 16, 2022
75ecf46
test용
94lfnv Oct 16, 2022
bf81a5f
Create new branch
chldudgus Oct 16, 2022
534c738
test용2
94lfnv Oct 17, 2022
e8409ff
Fix: 리뷰 작성/수정 프롭스 구조 수정 중
chldudgus Oct 17, 2022
d461d9f
[Fix]: login_required.js - error message changed
ryankim8815 Oct 17, 2022
93867dc
[Feat]: Seoul data for stores
Oct 17, 2022
860e297
Merge branch 'register/login3' into dev
94lfnv Oct 17, 2022
a4e53f3
Fix: layout
94lfnv Oct 17, 2022
8f962cc
[Fix]nameChange
Oct 17, 2022
dc11602
deleted Korean json file
Oct 17, 2022
97a6c58
Fix: storesRouter stores->store
Oct 17, 2022
1ccde8d
[fix]: review 코드리뷰 수정
jonggking Oct 17, 2022
18cdfc6
[Fix]: login_required.js - changed the token verification logic, user…
ryankim8815 Oct 17, 2022
9b95d73
[Fix]: login_required.js - deleted 'console.log()'
ryankim8815 Oct 17, 2022
576ae6f
create new branch
IMNE-C Oct 17, 2022
57ea5bd
Fix: 프롭스 구조 수정
chldudgus Oct 17, 2022
a9010e4
merge to dev2
chldudgus Oct 17, 2022
165eb7c
merge mypage2 to dev2
chldudgus Oct 17, 2022
00b1707
[Feat]: userRouter.js - (GET)mypageInfo - working, [Fix]: dbDiagam.sq…
ryankim8815 Oct 17, 2022
08d7333
[Fix]: 스토어이름 추가
jonggking Oct 17, 2022
2b630a4
[Fix]: userRouter.js & image_required.js - changed errorMessage form …
ryankim8815 Oct 17, 2022
a3714eb
[Fix]: userRouter.js - changed nickname to uniqe value
ryankim8815 Oct 17, 2022
e19caef
Add: geolocation 위치 상태
chldudgus Oct 17, 2022
0ba2919
[Feat] (GET)introRouter api - working, added csv file
ryankim8815 Oct 17, 2022
19e45b3
Fix: useGeolocation hook, useEffect 구조 수정
chldudgus Oct 17, 2022
0715347
db_csv,json file
Oct 17, 2022
920979a
Merge remote-tracking branch 'origin/fe/review' into b_stores
Oct 17, 2022
8a0bfc4
Merge remote-tracking branch 'origin/dev' into b_stores
Oct 17, 2022
87f4658
[Feat]: (GET)userRouter.js - added email & nickname checking api
ryankim8815 Oct 18, 2022
bda2857
[Fix]: (GET > POST)userRouter.js - added email & nickname checking api
ryankim8815 Oct 18, 2022
f388727
[Fix]: userRouter.js - (PUT)userUpdate api - added description, fores…
ryankim8815 Oct 18, 2022
da7cf3c
[Fix]: myPageRouter.js - moved mypageInfo api (userRouter.js > muPage…
ryankim8815 Oct 18, 2022
b5a6646
[Fix]: myPageRouter.js - (GET)mypageInfo api - removed password and u…
ryankim8815 Oct 18, 2022
4a8ba43
Fix: register
94lfnv Oct 18, 2022
8bdd542
Feat myPage
IMNE-C Oct 18, 2022
3355a9a
Merge remote-tracking branch 'origin/dev' into mypage3
IMNE-C Oct 18, 2022
d47918a
[Feat]:store like
Oct 18, 2022
41ec723
[Fix]: userRouter.js & myPageRouter.js - changed result message
ryankim8815 Oct 18, 2022
d9e1e73
Merge remote-tracking branch 'origin/dev' into b_stores
Oct 18, 2022
0e6eba2
[Fix]: 리뷰사진2장까지 업로드 가능.
jonggking Oct 18, 2022
e068bdd
Merge branch 'back/mypage/review' into dev
jonggking Oct 18, 2022
759ca4f
[Fix]: app.js - setted for static folder 'back/uploads'
ryankim8815 Oct 18, 2022
46714e1
Fix: login
94lfnv Oct 18, 2022
6d84a7c
[Fix]: 리뷰 미들웨어 추가완료
jonggking Oct 18, 2022
d6c059b
[Fix]: 리뷰 관련 API완료.
jonggking Oct 18, 2022
87f5d93
fix:store middleware
Oct 18, 2022
52e2892
Merge remote-tracking branch 'origin/dev' into b_stores
Oct 18, 2022
4a50a71
register/login/app 주석, 콘솔로그 정리
94lfnv Oct 18, 2022
8b49ea7
Merge branch 'dev' of https://kdt-gitlab.elice.io/ai_track/class05/da…
IMNE-C Oct 18, 2022
ef169d3
Fix: 프롭스 구조 수정 중, api 연결 전
chldudgus Oct 18, 2022
9f9acc9
Merge remote-tracking branch 'origin/dev' into fe/review
chldudgus Oct 18, 2022
f5a8686
[feat]: 연령대별 환경관심정도 데이터 api
jonggking Oct 18, 2022
5606249
Merge remote-tracking branch 'origin/b_stores' into fe/review
chldudgus Oct 18, 2022
c774ec7
Fix: 리뷰 api 연결 중
chldudgus Oct 18, 2022
029869e
[Feat]: introData API 완료
jonggking Oct 18, 2022
7b7cd75
Fix: review props route (editing)
chldudgus Oct 18, 2022
05d0a84
Merge branch 'data_EJ' into dev
jonggking Oct 18, 2022
25decd8
Fix: review props 수정 중
chldudgus Oct 18, 2022
799bf77
Feat: user_likestores
Oct 18, 2022
cbaee9b
store like_add like time
Oct 18, 2022
f91fbad
Merge remote-tracking branch 'origin/dev' into test_m_a
Oct 18, 2022
b6b4b09
Fix: isEditable 수정
chldudgus Oct 19, 2022
e4feb6b
Feat myReview API Get
IMNE-C Oct 19, 2022
2055bbc
Merge remote-tracking branch 'origin/test_m_a' into mypage3
IMNE-C Oct 19, 2022
002139a
fix: isEdditable 수정
chldudgus Oct 19, 2022
8f1035c
Fix: isAddable, Rating callbackprops 수정
chldudgus Oct 19, 2022
32c7c65
[Feat]: socialLoginRouter.js - KAKAO can get token only
ryankim8815 Oct 19, 2022
7605927
Merge remote-tracking branch 'origin/dev' into test_m_a
Oct 19, 2022
e0eae5f
[Fix]: socialLoginRouter.js - KAKAO can get user email
ryankim8815 Oct 19, 2022
9d5bffd
Fix: Kakao
94lfnv Oct 19, 2022
876790a
Merge branch 'N/Klogin' into dev
94lfnv Oct 19, 2022
003aca8
[Fix]: 리뷰 수정,삭제시 저장됐던 사진 파일 지움
jonggking Oct 19, 2022
f7385a5
Fix: review post 수정
chldudgus Oct 19, 2022
5ddd41c
Fix: 리뷰 수정폼 프롭스 수정
chldudgus Oct 19, 2022
0f158a2
[Fix]: userRouter.js - changed userUpdate api due to Gyujin's request
ryankim8815 Oct 19, 2022
930a382
Feat Change Info
IMNE-C Oct 19, 2022
3f08402
[Feat]: socialLoginRouter.js - (POST)kakaoSignin api
ryankim8815 Oct 19, 2022
76b04d0
FIX: kakao login
94lfnv Oct 19, 2022
81a3285
Merge branch 'master' of https://kdt-gitlab.elice.io/ai_track/class05…
94lfnv Oct 19, 2022
4670d90
sign in test
94lfnv Oct 19, 2022
0f22685
[Fix]: socialLoginRouter.js - (POST)kakaoSignin api
ryankim8815 Oct 19, 2022
c393fb2
Merge remote-tracking branch 'origin/dev' into N/Klogin2
94lfnv Oct 19, 2022
b23930f
Merge remote-tracking branch 'origin/dev' into N/Klogin2
94lfnv Oct 19, 2022
0938970
[Fix]: socialLoginRouter.js - (POST)kakaoSignin api type error
ryankim8815 Oct 19, 2022
0439c79
Merge remote-tracking branch 'origin/dev' into N/Klogin2
94lfnv Oct 19, 2022
876e722
test2
94lfnv Oct 19, 2022
53a9e5b
[Feat]: socialLoginRouter.js - (POST)kakaoLogin api
ryankim8815 Oct 19, 2022
e90a472
[Feat]: created map related api file, upload address csv file for DB
ryankim8815 Oct 19, 2022
376e184
[Fix]: socialLoginRouter.js - npm install related issue, resolved
ryankim8815 Oct 20, 2022
33dd3f5
[DOCS]: updated address table dur to import address data to DB follow…
ryankim8815 Oct 20, 2022
9153ac4
Fix: 지도 상 전체 가게 위치 표시 수정
chldudgus Oct 20, 2022
d40566d
[Fix]: 상점 별점평균 추가
jonggking Oct 20, 2022
f2decdf
Merge remote-tracking branch 'origin/test_m_a' into dev
jonggking Oct 20, 2022
d5282a3
[Feat]: 마이페이지 좋아하는 상점목록 api추가
jonggking Oct 20, 2022
edcb524
Merge remote-tracking branch 'origin/test_m_a' into fe/review
chldudgus Oct 20, 2022
511c51b
Fix: 가게 평균 별점 표시
chldudgus Oct 20, 2022
b1a341d
Feat Withdrawal
IMNE-C Oct 20, 2022
c236769
[Feat]: socialLoginRouter.js - Naver api signin, working
ryankim8815 Oct 20, 2022
94e0c6c
[Feat]: socialLoginRouter.js - Naver api login
ryankim8815 Oct 20, 2022
c442479
Merge remote-tracking branch 'origin/fe/review' into mypage3
IMNE-C Oct 20, 2022
f5303f7
Add: 상점 찜하기/찜 해제 버튼
chldudgus Oct 20, 2022
0d721c6
Fix: delete unused imported library
chldudgus Oct 20, 2022
ef05fa6
[Fix]: 상점 별점평균 null일때 0으로 가도록 수정
jonggking Oct 20, 2022
841bc34
Feat Pagination
IMNE-C Oct 20, 2022
a69fb3e
Merge branch 'mypage3' into dev
IMNE-C Oct 20, 2022
2c31301
Merge remote-tracking branch 'origin/fe/review' into dev
chldudgus Oct 20, 2022
faf2275
[Fix]: socialLoginRouter.js - changed to 2 in 1 due to Dasom's request.
ryankim8815 Oct 20, 2022
5ff33d1
Add: 리뷰 좋아요, 싫어요 기능 추가
chldudgus Oct 20, 2022
0f37615
[Fix]: update dbDiagram schema
jonggking Oct 20, 2022
52d49bc
login test
94lfnv Oct 20, 2022
826f7ce
Merge remote-tracking branch 'origin/dev' into N/Klogin2
94lfnv Oct 20, 2022
34a560c
delete info
94lfnv Oct 20, 2022
1b05bc0
Fix: edit form 오류 수정
chldudgus Oct 20, 2022
04ee354
Fix: 서비스 소개 - 차트 1번
chldudgus Oct 20, 2022
e3b93b3
Fix: 증가량 퍼센테이지 계산 결과 추가
chldudgus Oct 20, 2022
698fb3e
[Rename]: renamed default.png got default profile picture, [Feat]: ma…
ryankim8815 Oct 20, 2022
b407bab
[Fix]: mapRouter.js fixed algorithm error.
ryankim8815 Oct 20, 2022
3a482ff
[Fix]: userRouter.js - userCurrent api
ryankim8815 Oct 20, 2022
7bf824e
Feat ChangeInfo, Withdrawal
IMNE-C Oct 21, 2022
f958569
Merge branch 'dev' of https://kdt-gitlab.elice.io/ai_track/class05/da…
IMNE-C Oct 21, 2022
dd6eeae
Fix: 별점 표시 변경, 2번 차트 추가
chldudgus Oct 21, 2022
088636e
Fix kakao login
94lfnv Oct 21, 2022
b40b3f8
Merge branch 'N/Klogin2' into fe/merge
94lfnv Oct 21, 2022
4074caa
rename branch
IMNE-C Oct 21, 2022
8124c33
Merge branch 'starRate' into fe/merge
IMNE-C Oct 21, 2022
6b3533e
yarn lock error
chldudgus Oct 21, 2022
6d176a3
Fix: delete unused files
chldudgus Oct 21, 2022
6a7a123
Fix: delete unused files, props
chldudgus Oct 21, 2022
0ee8633
Merge branch 'fe/merge' of https://kdt-gitlab.elice.io/ai_track/class…
94lfnv Oct 21, 2022
b0e34fd
Merge branch 'fe/merge' of https://kdt-gitlab.elice.io/ai_track/class…
94lfnv Oct 21, 2022
b255636
Fix: correct typo
chldudgus Oct 21, 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
Binary file added .DS_Store
Binary file not shown.
75 changes: 0 additions & 75 deletions README.md

This file was deleted.

Binary file added back/.DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions back/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
.env
14 changes: 14 additions & 0 deletions back/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// reference:
// https://nodejs.org/en/docs/guides/getting-started-guide/
const app = require("./src/app");
require("dotenv").config();

const PORT = process.env.SERVER_PORT || 5000;

app
.listen(PORT, () => {
console.log(` 🚀Server started on port ${PORT}!`);
})
.on("error", (err) => console.log(err));
//---------------//
// const connection = require("./src/db/database.js");
Loading