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

ADD: 글작성 기능 구현, DB 연동 확인 #12

Open
wants to merge 114 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
28f56a7
#5 passport kakao module install
AYoungSn Nov 26, 2021
0c2c8a0
#5 kakao oauth 구현 중
AYoungSn Nov 26, 2021
b88d497
#5 session module add
AYoungSn Nov 26, 2021
0a91521
#5 kakao login page 접근, console 에 result 찍힘
AYoungSn Nov 26, 2021
fc459d4
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server into oauth
AYoungSn Nov 26, 2021
756b65a
product 테이블 드라이진 추가
alreadynyeong Nov 29, 2021
171d3dc
merge
AYoungSn Dec 2, 2021
933d82f
main merge
AYoungSn Dec 3, 2021
4e2f1f1
ADD: 글작성 기능 구현, DB 연동 확인
parksewon Dec 3, 2021
5c4de33
#5 login 기능 구현 중
AYoungSn Dec 3, 2021
625d8af
modules connect-flash, cookie parser
AYoungSn Dec 3, 2021
f01d5c6
#5 passport kakao oauth success
AYoungSn Dec 3, 2021
5cd16e0
#13 - ADD: 글상세조회 기능 구현 추가
parksewon Dec 3, 2021
2f0df79
#10 검색 전 리스트 불러오기
alreadynyeong Dec 5, 2021
0ab2125
Merge pull request #14 from HiAlcohol/search_list
alreadynyeong Dec 5, 2021
15288c4
db table insert query 에러 수정
AYoungSn Dec 6, 2021
0588f5a
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 6, 2021
6cf9e70
#16 db like query edit
AYoungSn Dec 6, 2021
330e073
route -> routes 로 boardRouter 이동
AYoungSn Dec 7, 2021
b1548a3
#17 db connection 정보 분리
AYoungSn Dec 7, 2021
f7c6cd0
#17 db connection 경로 수정
alreadynyeong Dec 9, 2021
ddde19a
#10 검색 키워드 가져오기
alreadynyeong Dec 10, 2021
a066dfc
#10 검색기능 구현
alreadynyeong Dec 13, 2021
d2232f5
#19 map 화면, 지도 띄우기
alreadynyeong Dec 14, 2021
f4e741b
#19 맵 페이지 헤더 추가
alreadynyeong Dec 14, 2021
06280df
#19 지도에서 주류유통 위치 표시하기
alreadynyeong Dec 15, 2021
ea0e19b
#20 로그인 정보 세션에 담아서 유저정보로 프로필 띄우기
AYoungSn Dec 15, 2021
a2fd501
Merge pull request #21 from HiAlcohol/oauth
AYoungSn Dec 15, 2021
7c698aa
ADD : board 브랜치 병합
parksewon Dec 15, 2021
1c1d7ba
board 브랜치 재생성
parksewon Dec 15, 2021
d11ca4a
ADD : 글 상세보기 기능 수정
parksewon Dec 15, 2021
fea134e
#19 현재 위치 주변 주류유통 매장 표시하기
alreadynyeong Dec 17, 2021
129b374
메뉴버튼 수정
alreadynyeong Dec 17, 2021
f8c90ce
#10 search list 검색 기능 구현
AYoungSn Dec 17, 2021
e7ce39d
#10 main merge
AYoungSn Dec 17, 2021
8575c52
주석 수정
AYoungSn Dec 17, 2021
fe1ee57
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 17, 2021
96ccba8
주석 수정
AYoungSn Dec 17, 2021
d70e233
home menu button link 연결
AYoungSn Dec 17, 2021
eee3793
Merge branch 'search_list' of github.com:HiAlcohol/HiAlcohol_server i…
AYoungSn Dec 17, 2021
17519e7
board css 수정
AYoungSn Dec 17, 2021
25d4ba2
꿀조합 게시판 메뉴 레이아웃 수정
AYoungSn Dec 17, 2021
3b6f846
#10 search list 검색 기능 수정
alreadynyeong Dec 17, 2021
166db16
Merge pull request #22 from HiAlcohol/search_list
alreadynyeong Dec 17, 2021
1a310e0
#23 좋아요 리스트 구현
AYoungSn Dec 17, 2021
a703a55
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 17, 2021
f9c1b19
home 검색기능 연결
alreadynyeong Dec 17, 2021
e56243f
#23 게시글 상세보기 페이지 링크 연결
AYoungSn Dec 17, 2021
4a64292
#23 게시글 상세보기 페이지 링크 연결
AYoungSn Dec 17, 2021
7968bc2
Merge branch 'likes' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 17, 2021
a453b89
home menu button link 연결
AYoungSn Dec 17, 2021
f3f75c3
test-user insert sql 추가
AYoungSn Dec 17, 2021
773c1ad
home search CSS error 수정
AYoungSn Dec 17, 2021
80897db
test user delete, liked sql insert query 추가
AYoungSn Dec 17, 2021
447d3d3
ADD: #13 글쓰기 및 글 상세보기 기능 추가
parksewon Dec 17, 2021
27dda1b
ADD: #13 글쓰기 및 글 상세보기 기능 추가
parksewon Dec 17, 2021
da29d17
#10 검색 키워드 없을 경우 처리, 최소 넓이 설정
alreadynyeong Dec 17, 2021
983d26f
Merge pull request #25 from HiAlcohol/search_list
alreadynyeong Dec 17, 2021
c0eff25
hialcohol icon home page redirect link add
AYoungSn Dec 17, 2021
cf3924a
#10 콘솔 출력 제거
alreadynyeong Dec 17, 2021
0af0f14
Merge branch 'search_list'
alreadynyeong Dec 17, 2021
e6bbc7d
#13 board 게시판 수정
parksewon Dec 17, 2021
4d60471
#13 board 게시판 수정
parksewon Dec 17, 2021
106859f
Merge branch 'map'
alreadynyeong Dec 17, 2021
b3bf4b5
Merge branch 'main' of https://github.com/HiAlcohol/HiAlcohol_server
alreadynyeong Dec 17, 2021
919a2d2
merge
AYoungSn Dec 17, 2021
1393787
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 17, 2021
77b7bb5
#19 map 라우터 설정
alreadynyeong Dec 17, 2021
e9a1b29
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 17, 2021
160a9c9
link edit
AYoungSn Dec 17, 2021
0acb218
#13 글 상세보기 코드 수정
parksewon Dec 17, 2021
a8e4ee2
Merge branch 'main' of https://github.com/HiAlcohol/HiAlcohol_server …
parksewon Dec 17, 2021
cc4eb10
Merge pull request #26 from HiAlcohol/board_new
parksewon Dec 17, 2021
7dcbc96
menu edit, like router add
AYoungSn Dec 17, 2021
b3f47e2
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 17, 2021
21ee4d4
mapRouter -> mapRouter.js rename
AYoungSn Dec 17, 2021
adc3dec
#24 화면에 칵테일 이름, 비율, 설명 띄우기
alreadynyeong Dec 17, 2021
3c790b8
연결 링크 부분 수정
parksewon Dec 17, 2021
1071cb2
#7: 글 전체 조회
anyukyung Nov 28, 2021
be042fe
#7: fix conflict
anyukyung Dec 17, 2021
89aa93f
Merge pull request #27 from HiAlcohol/feature/#7
anyukyung Dec 17, 2021
5a3b9d3
#24 html, css 수정
alreadynyeong Dec 18, 2021
88ba61f
#24 검색리스트와 리스트 상세페이지 연결
alreadynyeong Dec 18, 2021
2916e33
Merge branch 'search_list'
alreadynyeong Dec 18, 2021
bf17ecb
#24 레시피 상세보기 페이지 수정, 레시피 테이블 오타 수정
alreadynyeong Dec 18, 2021
d8616ca
#10 search_list 페이지 헤더 수정
alreadynyeong Dec 18, 2021
ba93dfe
#29 database config data 분리
AYoungSn Dec 18, 2021
54e2fb8
Merge branch 'search_list'
alreadynyeong Dec 18, 2021
92fa95e
#30 search error 수정 (쿼리 정렬 추가)
AYoungSn Dec 18, 2021
544793b
Merge branch 'search_list' of github.com:HiAlcohol/HiAlcohol_server i…
AYoungSn Dec 18, 2021
3f21807
Merge branch 'main' of github.com:HiAlcohol/HiAlcohol_server
AYoungSn Dec 18, 2021
00826be
menu icon 주석 제거
AYoungSn Dec 18, 2021
86c9f32
#31 menu icon 링크 연결
AYoungSn Dec 18, 2021
fff4d52
#31 layout 수정
AYoungSn Dec 18, 2021
b44c46e
#32 이름 수정, 예시 데이터 연결
alreadynyeong Dec 18, 2021
44ddc2f
#31 map menu layout 수정
AYoungSn Dec 18, 2021
4cbffb0
좋아요 개수 class='cnt'
AYoungSn Dec 18, 2021
476563c
css link edit
AYoungSn Dec 18, 2021
4cd1d32
#32 랜덤으로 레시피 불러오기, 해당 상세보기 연결
alreadynyeong Dec 18, 2021
7e3c31d
#33 myboard 라우터 구현, like_list error edit
AYoungSn Dec 18, 2021
98b69dd
Merge pull request #34 from HiAlcohol/myboard
AYoungSn Dec 18, 2021
e0045c0
#36 중간 점검
parksewon Dec 18, 2021
0bd0b2f
#36 kakaoid 받아오도록 수정
parksewon Dec 18, 2021
5978ac6
#13 로그인 상태에서만 글작성 페이지로 넘어갈 수 있게 수정
parksewon Dec 18, 2021
83b342f
#36 글 상세보기 페이지에서 닉네임으로 나오도록 수정
parksewon Dec 18, 2021
7f05b3a
#35 게시글 UPDATE 기능 일부 구현
parksewon Dec 18, 2021
9922279
#35 게시글 UPDATE 기능 수정 - 접근 권한 설정
parksewon Dec 18, 2021
828b460
#37 글 수정 후 상세조회 화면 표시
parksewon Dec 19, 2021
4824fb1
Merge branch 'search_list'
alreadynyeong Dec 19, 2021
4ecede4
recipe 테이블 오타 수정
alreadynyeong Dec 19, 2021
577b539
#13 게시글 삭제 기능 구현
parksewon Dec 19, 2021
4f77ccc
Merge branch 'main' of https://github.com/HiAlcohol/HiAlcohol_server …
parksewon Dec 19, 2021
422f7b6
#38 메뉴와 지도가 겹치는 문제 해결
alreadynyeong Dec 19, 2021
451208c
merge
AYoungSn Dec 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Created by https://www.toptal.com/developers/gitignore/api/macos
# Edit at https://www.toptal.com/developers/gitignore?templates=macos

express-test.js
### macOS ###
# General
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

entry point: main.js

dependency: express, mysql, body-parser
dependency: express, mysql, body-parser, passport-kakao


#### database 생성
Expand Down
10 changes: 6 additions & 4 deletions config/db.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
var mysql = require('mysql');
const env = require('./env');

const db = mysql.createConnection({
host: 'localhost',
user: 'root',
password: 'qwerty123',
database: 'hialcohol'
host: env.host,
user: env.user,
password: env.password,
database: env.database,
dateStrings: 'date'
});

db.connect();
Expand Down
7 changes: 7 additions & 0 deletions config/env.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
host: 'localhost',
user: 'root',
password: 'qwerty123',
database: 'hialcohol',
port: 3000
};
297 changes: 297 additions & 0 deletions config/inclusion.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
INSERT INTO `inclusion`
VALUES(NULL, 1, 1);
INSERT INTO `inclusion`
VALUES(NULL, 1, 2);
INSERT INTO `inclusion`
VALUES(NULL, 2, 1);
INSERT INTO `inclusion`
VALUES(NULL, 2, 2);
INSERT INTO `inclusion`
VALUES(NULL, 2, 3);
INSERT INTO `inclusion`
VALUES(NULL, 3, 1);
INSERT INTO `inclusion`
VALUES(NULL, 3, 4);
INSERT INTO `inclusion`
VALUES(NULL, 3, 15);
INSERT INTO `inclusion`
VALUES(NULL, 4, 1);
INSERT INTO `inclusion`
VALUES(NULL, 4, 6);
INSERT INTO `inclusion`
VALUES(NULL, 4, 7);
INSERT INTO `inclusion`
VALUES(NULL, 4, 8);
INSERT INTO `inclusion`
VALUES(NULL, 5, 1);
INSERT INTO `inclusion`
VALUES(NULL, 5, 9);
INSERT INTO `inclusion`
VALUES(NULL, 5, 10);
INSERT INTO `inclusion`
VALUES(NULL, 6, 1);
INSERT INTO `inclusion`
VALUES(NULL, 6, 11);
INSERT INTO `inclusion`
VALUES(NULL, 7, 1);
INSERT INTO `inclusion`
VALUES(NULL, 7, 12);
INSERT INTO `inclusion`
VALUES(NULL, 8, 1);
INSERT INTO `inclusion`
VALUES(NULL, 8, 13);
INSERT INTO `inclusion`
VALUES(NULL, 8, 14);
INSERT INTO `inclusion`
VALUES(NULL, 9, 1);
INSERT INTO `inclusion`
VALUES(NULL, 9, 16);
INSERT INTO `inclusion`
VALUES(NULL, 9, 6);
INSERT INTO `inclusion`
VALUES(NULL, 9, 13);
INSERT INTO `inclusion`
VALUES(NULL, 10, 1);
INSERT INTO `inclusion`
VALUES(NULL, 10, 13);
INSERT INTO `inclusion`
VALUES(NULL, 10, 27);
INSERT INTO `inclusion`
VALUES(NULL, 10, 46);
INSERT INTO `inclusion`
VALUES(NULL, 11, 1);
INSERT INTO `inclusion`
VALUES(NULL, 11, 14);
INSERT INTO `inclusion`
VALUES(NULL, 12, 1);
INSERT INTO `inclusion`
VALUES(NULL, 12, 12);
INSERT INTO `inclusion`
VALUES(NULL, 12, 17);
INSERT INTO `inclusion`
VALUES(NULL, 13, 1);
INSERT INTO `inclusion`
VALUES(NULL, 13, 18);
INSERT INTO `inclusion`
VALUES(NULL, 13, 6);
INSERT INTO `inclusion`
VALUES(NULL, 14, 22);
INSERT INTO `inclusion`
VALUES(NULL, 14, 12);
INSERT INTO `inclusion`
VALUES(NULL, 14, 20);
INSERT INTO `inclusion`
VALUES(NULL, 15, 1);
INSERT INTO `inclusion`
VALUES(NULL, 15, 16);
INSERT INTO `inclusion`
VALUES(NULL, 15, 48);
INSERT INTO `inclusion`
VALUES(NULL, 16, 1);
INSERT INTO `inclusion`
VALUES(NULL, 16, 23);
INSERT INTO `inclusion`
VALUES(NULL, 16, 12);
INSERT INTO `inclusion`
VALUES(NULL, 16, 49);
INSERT INTO `inclusion`
VALUES(NULL, 17, 1);
INSERT INTO `inclusion`
VALUES(NULL, 17, 50);
INSERT INTO `inclusion`
VALUES(NULL, 17, 51);
INSERT INTO `inclusion`
VALUES(NULL, 18, 1);
INSERT INTO `inclusion`
VALUES(NULL, 18, 52);

-- 데킬라

INSERT INTO `inclusion`
VALUES(NULL, 19, 24);
INSERT INTO `inclusion`
VALUES(NULL, 19, 25);
INSERT INTO `inclusion`
VALUES(NULL, 19, 12);
INSERT INTO `inclusion`
VALUES(NULL, 19, 17);
INSERT INTO `inclusion`
VALUES(NULL, 20, 24);
INSERT INTO `inclusion`
VALUES(NULL, 20, 25);
INSERT INTO `inclusion`
VALUES(NULL, 20, 47);
INSERT INTO `inclusion`
VALUES(NULL, 20, 17);
INSERT INTO `inclusion`
VALUES(NULL, 20, 4);
INSERT INTO `inclusion`
VALUES(NULL, 21, 24);
INSERT INTO `inclusion`
VALUES(NULL, 21, 25);
INSERT INTO `inclusion`
VALUES(NULL, 21, 18);
INSERT INTO `inclusion`
VALUES(NULL, 21, 6);

-- 럼

INSERT INTO `inclusion`
VALUES(NULL, 22, 26);
INSERT INTO `inclusion`
VALUES(NULL, 22, 27);
INSERT INTO `inclusion`
VALUES(NULL, 22, 28);

INSERT INTO `inclusion`
VALUES(NULL, 23, 26);
INSERT INTO `inclusion`
VALUES(NULL, 23, 6);
INSERT INTO `inclusion`
VALUES(NULL, 23, 38);

INSERT INTO `inclusion`
VALUES(NULL, 24, 26);
INSERT INTO `inclusion`
VALUES(NULL, 24, 9);
INSERT INTO `inclusion`
VALUES(NULL, 24, 10);
INSERT INTO `inclusion`
VALUES(NULL, 24, 5);
INSERT INTO `inclusion`
VALUES(NULL, 24, 29);

INSERT INTO `inclusion`
VALUES(NULL, 25, 26);
INSERT INTO `inclusion`
VALUES(NULL, 25, 30);
INSERT INTO `inclusion`
VALUES(NULL, 25, 9);
INSERT INTO `inclusion`
VALUES(NULL, 25, 47);

INSERT INTO `inclusion`
VALUES(NULL, 26, 26);
INSERT INTO `inclusion`
VALUES(NULL, 26, 27);
INSERT INTO `inclusion`
VALUES(NULL, 26, 36);
INSERT INTO `inclusion`
VALUES(NULL, 26, 37);
INSERT INTO `inclusion`
VALUES(NULL, 26, 38);


-- 위스키

INSERT INTO `inclusion`
VALUES(NULL, 27, 31);
INSERT INTO `inclusion`
VALUES(NULL, 27, 32);

-- INSERT INTO `inclusion`

INSERT INTO `inclusion`
VALUES(NULL, 28, 33);
INSERT INTO `inclusion`
VALUES(NULL, 28, 37);

INSERT INTO `inclusion`
VALUES(NULL, 29, 33);

INSERT INTO `inclusion`
VALUES(NULL, 30, 33);
INSERT INTO `inclusion`
VALUES(NULL, 30, 11);

INSERT INTO `inclusion`
VALUES(NULL, 31, 34);
INSERT INTO `inclusion`
VALUES(NULL, 31, 35);
INSERT INTO `inclusion`
VALUES(NULL, 31, 38);
INSERT INTO `inclusion`
VALUES(NULL, 31, 3);


-- 진
INSERT INTO `inclusion`
VALUES(NULL, 32, 39);
INSERT INTO `inclusion`
VALUES(NULL, 32, 40);
INSERT INTO `inclusion`
VALUES(NULL, 32, 47);
INSERT INTO `inclusion`
VALUES(NULL, 32, 37);
INSERT INTO `inclusion`
VALUES(NULL, 32, 4);
INSERT INTO `inclusion`
VALUES(NULL, 33, 39);
INSERT INTO `inclusion`
VALUES(NULL, 33, 6);
INSERT INTO `inclusion`
VALUES(NULL, 34, 39);
INSERT INTO `inclusion`
VALUES(NULL, 34, 53);
INSERT INTO `inclusion`
VALUES(NULL, 35, 39);
INSERT INTO `inclusion`
VALUES(NULL, 35, 47);
INSERT INTO `inclusion`
VALUES(NULL, 35, 38);
INSERT INTO `inclusion`
VALUES(NULL, 35, 37);
INSERT INTO `inclusion`
VALUES(NULL, 36, 39);
INSERT INTO `inclusion`
VALUES(NULL, 36, 41);
INSERT INTO `inclusion`
VALUES(NULL, 37, 39);
INSERT INTO `inclusion`
VALUES(NULL, 37, 42);
INSERT INTO `inclusion`
VALUES(NULL, 37, 17);
INSERT INTO `inclusion`
VALUES(NULL, 38, 39);
INSERT INTO `inclusion`
VALUES(NULL, 38, 47);
INSERT INTO `inclusion`
VALUES(NULL, 38, 38);
INSERT INTO `inclusion`
VALUES(NULL, 38, 37);
INSERT INTO `inclusion`
VALUES(NULL, 38, 4);
INSERT INTO `inclusion`
VALUES(NULL, 38, 29);


-- 리큐어

INSERT INTO `inclusion`
VALUES(NULL, 39, 52);
INSERT INTO `inclusion`
VALUES(NULL, 39, 54);
INSERT INTO `inclusion`
VALUES(NULL, 40, 55);
INSERT INTO `inclusion`
VALUES(NULL, 40, 43);
INSERT INTO `inclusion`
VALUES(NULL, 40, 13);
INSERT INTO `inclusion`
VALUES(NULL, 41, 56);
INSERT INTO `inclusion`
VALUES(NULL, 41, 15);
INSERT INTO `inclusion`
VALUES(NULL, 42, 57);
INSERT INTO `inclusion`
VALUES(NULL, 42, 12);
INSERT INTO `inclusion`
VALUES(NULL, 43, 21);
INSERT INTO `inclusion`
VALUES(NULL, 43, 44);
INSERT INTO `inclusion`
VALUES(NULL, 43, 45);
INSERT INTO `inclusion`
VALUES(NULL, 43, 47);
INSERT INTO `inclusion`
VALUES(NULL, 43, 9);
14 changes: 14 additions & 0 deletions config/liked.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
INSERT INTO `liked`
VALUES (NULL, 1, 1);

INSERT INTO `liked`
VALUES (NULL, 2, 2);

INSERT INTO `liked`
VALUES (NULL, 2, 1);

INSERT INTO `liked`
VALUES (NULL, 3, 1);

INSERT INTO `liked`
VALUES (NULL, 4, 3);
4 changes: 1 addition & 3 deletions config/material.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
-- insert into `recipe` values(null, 'cocktail', 'content')
-- 재료테이블
-- 재료테이블

INSERT INTO `material`
VALUES(1, '보드카');

Expand Down Expand Up @@ -161,9 +162,6 @@ VALUES(52, '깔루아');
INSERT INTO `material`
VALUES(53, '토닉워터');

INSERT INTO `material`
VALUES(53, '칼루아');

INSERT INTO `material`
VALUES(54, '우유');

Expand Down
Loading