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

[Server] / #24 / 배포용 Server 환경 변수 설정 #98

Merged
merged 153 commits into from
Aug 29, 2021
Merged
Changes from 1 commit
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
e6bf10d
Update issue templates
mniYUNSU Aug 25, 2021
a221774
Merge pull request #16 from mniYUNSU/master
minjman2659 Aug 25, 2021
678bcac
Update issue templates
mniYUNSU Aug 25, 2021
0c9b772
Update issue templates
mniYUNSU Aug 25, 2021
6b32782
Update issue templates
mniYUNSU Aug 25, 2021
11a3611
:art: [Client] App.js : 메인페이지 구조 작성
NAPP4287 Aug 26, 2021
eb62d2e
[Client] app.js : 준비
youngseo-kangg Aug 26, 2021
3528b2d
Merge branch 'feat/app.js' of https://github.com/Lee-Na-eun/Jurimma i…
youngseo-kangg Aug 26, 2021
6bd1152
:sparkles: [Client] dummyData.js : App.js에서 사용할 테스트용 데이터
NAPP4287 Aug 26, 2021
8eb1cb3
Merge branch 'feat/app.js' of https://github.com/Lee-Na-eun/Jurimma i…
youngseo-kangg Aug 26, 2021
eaf1162
[Server] DB 환경 설정
mniYUNSU Aug 26, 2021
fb1aed2
[Server] routes, controllers 폴더 : ServerSetting
minjman2659 Aug 26, 2021
74b293c
Merge branch 'dev' of https://github.com/minjman2659/Jurimma into fea…
mniYUNSU Aug 26, 2021
ad00a35
:art: [Client] app.js : Search 컴포넌트 적용
youngseo-kangg Aug 26, 2021
7b98a45
:lipstick: [Client] app.css : app.js에 적용할 css 작성
youngseo-kangg Aug 26, 2021
aae729c
:sparkles: [Client] Search.js : Search.js 컴포넌트 생성 및 필요한 컴포넌트 SearchIn…
youngseo-kangg Aug 26, 2021
ee7eb72
[Server] Search Controller 구현
mniYUNSU Aug 26, 2021
158f209
Merge pull request #25 from Lee-Na-eun/feat/app.js
minjman2659 Aug 26, 2021
18202f4
Merge pull request #8 from mniYUNSU/dev
minjman2659 Aug 26, 2021
13d46f8
:lipstick: [Client] : styled-component 설치
youngseo-kangg Aug 26, 2021
fb9ac06
:lipstick: [Client] Search.js : SearchInput, SearchResult 작성
youngseo-kangg Aug 26, 2021
7660266
:lipstick: [Client] Search.js : app.js에서 search 컴포넌트 관련 수정
youngseo-kangg Aug 26, 2021
49e5d7e
Merge pull request #27 from Youngseo-kangg/feat/Search.js
minjman2659 Aug 26, 2021
0746653
:fire: [Client] App.js : 로고 호버 효과 빼기
youngseo-kangg Aug 26, 2021
a02a619
:art: [Client] App.js : search 컴포넌트 들어갈 부분 코드 다듬기
youngseo-kangg Aug 26, 2021
9216a3c
:lipstick: [Client] Search.js : SearchResult 값 여부에 따라 다른 디자인 구현
youngseo-kangg Aug 26, 2021
3524f1d
Merge pull request #28 from Youngseo-kangg/feat/Search.js
minjman2659 Aug 26, 2021
89abcf5
[Server] tokenFunction 및 dummy data 구현
mniYUNSU Aug 26, 2021
f6d340c
Merge pull request #29 from mniYUNSU/feat/tokenFunction
minjman2659 Aug 26, 2021
5b0cfac
:lipstick: [Client] App.js : 로고 수정
youngseo-kangg Aug 26, 2021
32f697a
[Server] Sequelize migrate / seed 수정
mniYUNSU Aug 26, 2021
aedaf8e
Merge pull request #31 from mniYUNSU/dev
minjman2659 Aug 26, 2021
4aed478
Merge branch 'dev' into feat/app.js
youngseo-kangg Aug 26, 2021
ef43880
Merge pull request #30 from Youngseo-kangg/feat/app.js
minjman2659 Aug 26, 2021
770e841
Recent Updated
minjman2659 Aug 26, 2021
bb345f1
:sparkles: [Client] Nav.js : 컴포넌트 제작 및 로그인 전 css 구현
NAPP4287 Aug 26, 2021
e81f805
:lipstick: [Client] Nav.js : 로그인 했을시 nav bar 구현
NAPP4287 Aug 26, 2021
d5b048e
Merge pull request #38 from Lee-Na-eun/feat/nav.js
minjman2659 Aug 27, 2021
d7238cd
Merge branch 'dev' of https://github.com/codestates/Jurimma into dev
minjman2659 Aug 27, 2021
b21f8e2
[Server] login.js : 로그인 기능 구현
minjman2659 Aug 27, 2021
83b519f
Not Yet
minjman2659 Aug 27, 2021
d5db368
:sparkles: [Client] searchResult.js : 검색했을 때 새로 만들기 버튼과 더보기 페이지로 가는 버…
NAPP4287 Aug 27, 2021
384f843
Not Yet
minjman2659 Aug 27, 2021
24ad497
[Server] signout.js, signup.js / 회원가입 및 탈퇴 API 구현
mniYUNSU Aug 27, 2021
9a79d31
[Server] logout.js : 로그아웃 기능 구현
minjman2659 Aug 27, 2021
25ea786
Merge pull request #44 from Lee-Na-eun/feat/newMoreBtn.js
minjman2659 Aug 27, 2021
7029d46
Merge branch 'feat/logout' into dev
minjman2659 Aug 27, 2021
646cd0c
Merge pull request #47 from minjman2659/feat/login
minjman2659 Aug 27, 2021
dcf4dcd
Merge branch 'dev' into feat/signUpandOut
minjman2659 Aug 27, 2021
e9d9e0c
Merge pull request #46 from mniYUNSU/feat/signUpandOut
minjman2659 Aug 27, 2021
44941f2
Merge branch 'dev' into feat/logout
minjman2659 Aug 27, 2021
573acd7
Merge pull request #48 from minjman2659/feat/logout
minjman2659 Aug 27, 2021
8fd1f1b
Merge branch 'dev' of https://github.com/codestates/Jurimma into dev
minjman2659 Aug 27, 2021
2eba7c8
[Server] userDirectory : 에러수정
minjman2659 Aug 27, 2021
1d3ed1b
Merge pull request #49 from minjman2659/dev
minjman2659 Aug 27, 2021
6462754
[Server] myContents.js : myContents API 구현
minjman2659 Aug 27, 2021
23d0825
:lipstick: [Client] Search.js : SearchInput.js / SearchResult.js css 수정
NAPP4287 Aug 27, 2021
e7abc32
Merge pull request #50 from minjman2659/feat/myContents
minjman2659 Aug 27, 2021
8b580c2
Merge branch 'dev' into feat/Search.js
NAPP4287 Aug 27, 2021
538a1b3
Merge pull request #51 from Lee-Na-eun/feat/Search.js
minjman2659 Aug 27, 2021
685360b
:sparkles: [Client] SearchMore.js : 더보기 페이지 만들기 및 상태값 변경
youngseo-kangg Aug 27, 2021
8e6605d
Merge branch 'dev' into feat/SearchMore.js
youngseo-kangg Aug 27, 2021
12470d6
:lipstick: [Client] : app.js : app.css에서 footer 부분 수정
NAPP4287 Aug 27, 2021
71e733c
Merge pull request #53 from Youngseo-kangg/feat/SearchMore.js
minjman2659 Aug 27, 2021
0f5f5a0
Merge pull request #54 from Lee-Na-eun/feat/app.js
minjman2659 Aug 27, 2021
3480d62
:package: [Client] package.json : fontawesome 모듈 추가
NAPP4287 Aug 27, 2021
9a13945
:lipstick: [Client] Nav.js : nav bar 왼쪽 고정
NAPP4287 Aug 27, 2021
4c82929
Merge pull request #55 from Lee-Na-eun/feat/nav.js
minjman2659 Aug 27, 2021
e4fa883
Merge pull request #56 from Lee-Na-eun/dev
minjman2659 Aug 27, 2021
dec2622
Update issue templates
mniYUNSU Aug 27, 2021
979f95c
[Client] modal ht성
NAPP4287 Aug 27, 2021
9dbc870
[Client] modal.js : css 수정
youngseo-kangg Aug 28, 2021
27ecf9a
[Server] contents.js : new(POST) 기능 구현
minjman2659 Aug 28, 2021
6c042cd
Not Yet
minjman2659 Aug 28, 2021
ef1dc79
[Server] thumsup.js : 좋아요 API 구현
mniYUNSU Aug 28, 2021
2abff8c
Not Yet
minjman2659 Aug 28, 2021
a6e9f0d
[Server] thumsup.js : 다대다테이블 구현
mniYUNSU Aug 28, 2021
dde21e6
:lipstick: [Client] Modal.js : Modal 창 기능구현 및 추가 수정
NAPP4287 Aug 28, 2021
44f3c45
[Server] edit.js : 유저정보수정 구현
mniYUNSU Aug 28, 2021
ad2498b
[Server] delete.js : contentDelete 구현
minjman2659 Aug 28, 2021
fe08149
[Server] edit.js : 유저정보수정 구현
mniYUNSU Aug 28, 2021
1ad82e3
:lipstick: [Client] SearchMore.js : 뜻 추가하기 버튼 제작
youngseo-kangg Aug 28, 2021
d96a54a
[Server] contents.js : 수정
minjman2659 Aug 28, 2021
1c914b7
Merge pull request #72 from minjman2659/feat/contentsNew
minjman2659 Aug 28, 2021
12f21c1
Merge pull request #73 from minjman2659/feat/contentsDelete
minjman2659 Aug 28, 2021
cce1851
Merge pull request #70 from mniYUNSU/feat/thumbs
minjman2659 Aug 28, 2021
c6a2fd0
Merge pull request #71 from mniYUNSU/feat/useredit
minjman2659 Aug 28, 2021
81af328
[Server] API 에러 수정
minjman2659 Aug 28, 2021
1b39dd1
Merge pull request #74 from minjman2659/dev
minjman2659 Aug 28, 2021
f80c7f7
Merge pull request #68 from Lee-Na-eun/feat/modal.js
minjman2659 Aug 28, 2021
289b7dd
Merge pull request #69 from Youngseo-kangg/feat/SearchMore.js
minjman2659 Aug 28, 2021
f9da4a7
[Server] contents.js : 새글 작성 기능 수정
minjman2659 Aug 28, 2021
c239434
Merge pull request #77 from minjman2659/dev
minjman2659 Aug 28, 2021
d58359f
[README] README.md 수정
mniYUNSU Aug 28, 2021
b2719df
[Git] gitignore 내용 수정
mniYUNSU Aug 28, 2021
439a6cd
[Git] gitignore 내용 수정
mniYUNSU Aug 28, 2021
f41e9ff
[Git] gitignore 내용 수정
mniYUNSU Aug 28, 2021
b65a0cb
[Git] gitignore 내용 수정
mniYUNSU Aug 28, 2021
3fd59b2
[Git] gitignore 내용 수정
mniYUNSU Aug 28, 2021
194ce0f
Merge pull request #78 from mniYUNSU/dev
minjman2659 Aug 28, 2021
aa718a0
:lipstick: [Client] WriteModal.js : modal 구현
NAPP4287 Aug 28, 2021
6295856
:lipstick: [Client] App.js : modal을 위한 css 수정
NAPP4287 Aug 28, 2021
e0c68f0
:sparkles: [Client] Mypage.js : Mypage 화면 구현 및 app.js에서 라우팅 작업
youngseo-kangg Aug 28, 2021
b7f8634
Merge pull request #79 from Lee-Na-eun/feat/writeModal.js
youngseo-kangg Aug 28, 2021
dfdca4f
Merge branch 'dev' into feat/Mypage.js
youngseo-kangg Aug 28, 2021
12482e4
Merge pull request #80 from Youngseo-kangg/feat/Mypage.js
youngseo-kangg Aug 28, 2021
80bc41b
:zap:[Client] merge 하면서 생긴 오류 수정
youngseo-kangg Aug 28, 2021
1a0385a
Merge pull request #81 from Youngseo-kangg/dev
youngseo-kangg Aug 28, 2021
1889cb5
fix fontsize & width/height size
NAPP4287 Aug 28, 2021
8a9cc7b
반응형 사이즈 수정
NAPP4287 Aug 28, 2021
91aa407
mypage main complete
NAPP4287 Aug 28, 2021
017b64a
:zap: [Client] : App.js : 라우팅 처리 수정
youngseo-kangg Aug 28, 2021
85f293d
Merge pull request #82 from Youngseo-kangg/dev
youngseo-kangg Aug 28, 2021
519cf94
fix router
NAPP4287 Aug 28, 2021
ce826a9
:lipstick: [Client] Mypage.js : hover와 size 수정
NAPP4287 Aug 28, 2021
47eb78d
Merge branch 'dev' into feat/Mypage.js
NAPP4287 Aug 28, 2021
72bef4e
Merge pull request #83 from Lee-Na-eun/feat/Mypage.js
youngseo-kangg Aug 28, 2021
51f5c0f
:lipstick: [Client] Nav.js : 충돌 전체 수정
NAPP4287 Aug 28, 2021
c7350ba
Merge pull request #84 from Lee-Na-eun/dev
NAPP4287 Aug 28, 2021
7182c36
[Server] delete.js : 여러 콘텐츠 삭제 기능 구현
minjman2659 Aug 29, 2021
d28d861
Merge pull request #91 from minjman2659/dev
minjman2659 Aug 29, 2021
e8499b0
[Server] app.js : port 번호 수정
mniYUNSU Aug 29, 2021
92d0fc7
:lipstick: [Client] app.css : fix css
NAPP4287 Aug 29, 2021
6a77168
Merge pull request #92 from Lee-Na-eun/dev
minjman2659 Aug 29, 2021
94cb453
:lipstick: [Client] Nav.js : nav bar display 수정
youngseo-kangg Aug 29, 2021
365da98
Merge branch 'dev' into dev
youngseo-kangg Aug 29, 2021
7ae2f50
Merge pull request #93 from Youngseo-kangg/dev
youngseo-kangg Aug 29, 2021
b13331d
[Server] 환경번수 변경
mniYUNSU Aug 29, 2021
2923e49
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
f578471
:lipstick: [Client] nav.js : 반응형 nav bar 구현중
youngseo-kangg Aug 29, 2021
866a13c
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
917935c
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
1600bc7
:lipstick: [Client] Nav.js : menu bar 수정
NAPP4287 Aug 29, 2021
6002480
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
04d3d5a
:lipstick: [Client] nav.js : nav bar 숨기기 기능 구현
youngseo-kangg Aug 29, 2021
0c952a8
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
363ba88
Merge pull request #94 from Lee-Na-eun/feat/nav.js
youngseo-kangg Aug 29, 2021
76067c2
Merge pull request #95 from Youngseo-kangg/feat/nav.js
youngseo-kangg Aug 29, 2021
4419fd1
:lipstick: [Client] Nav.js : hover 안 올라간 수정 다시 올림
NAPP4287 Aug 29, 2021
445801c
Merge pull request #96 from Lee-Na-eun/feat/nav.js
NAPP4287 Aug 29, 2021
07b1bb7
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
101f7fc
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
02fbaa8
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
23c3f2c
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
6aac694
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
645c429
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
bb9b069
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
cdf3748
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
285a15f
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
517e754
Merge branch 'dev' of https://github.com/codestates/Jurimma
mniYUNSU Aug 29, 2021
2c84ea7
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
2844323
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
cd0603f
[Server] 환경변수 변경
mniYUNSU Aug 29, 2021
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
[Server] tokenFunction 및 dummy data 구현
mniYUNSU committed Aug 26, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 89abcf58642f2046bd78df94e346fd6e5c6e356d
3 changes: 3 additions & 0 deletions server/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DATABASE_PASSWORD
ACCESS_SECRET
REFRESH_SECRET
23 changes: 23 additions & 0 deletions server/controllers/tokenFunction/accessToken.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
require("dotenv").config();
const { sign, verify } = require("jsonwebtoken");

module.exports = {
generateAccessToken: (data) => {
// TODO: Access token으로 sign합니다.
return sign(data, process.env.ACCESS_SECRET, { expiresIn: "2h" });
},
isAuthorized: (req) => {
// TODO: JWT 토큰 정보를 받아서 검증합니다.
const token = req.headers.Authorization;
if (!token) {
return null;
} else {
try {
const realToken = token.split(" ")[1];
return verify(realToken, process.env.ACCESS_SECRET);
} catch (error) {
return null;
}
}
},
};
29 changes: 29 additions & 0 deletions server/controllers/tokenFunction/refreshToken.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
require("dotenv").config();
const { sign, verify } = require("jsonwebtoken");

module.exports = {
generateRefreshToken: (data) => {
return sign(data, process.env.REFRESH_SECRET, { expiresIn: "30d" });
},
sendRefreshToken: (res, refreshToken) => {
// TODO: JWT 토큰을 쿠키로 전달합니다.
res.cookie("jwt", refreshToken, {
httpOnly: true,
secure: true,
sameSite: "none",
});
},
isAuthorized: (req) => {
// TODO: JWT 토큰 정보를 받아서 검증합니다.
const token = req.cookies;
if (!token) {
return null;
} else {
try {
return verify(token.jwt, process.env.REFRESH_SECRET);
} catch (error) {
return null;
}
}
},
};
44 changes: 40 additions & 4 deletions server/seeders/20210826045551-demo-user.js
Original file line number Diff line number Diff line change
@@ -6,10 +6,46 @@ module.exports = {
"users",
[
{
username: "John Doe",
email: "[email protected]",
password: "asdf!",
phone: "010010000",
username: "배윤수",
email: "[email protected]",
password: "yunsu12345",
phone: "01012341234",
userPic: "",
createdAt: new Date(),
updatedAt: new Date(),
},
{
username: "김민재",
email: "[email protected]",
password: "minjman2659123",
phone: "01012341234",
userPic: "",
createdAt: new Date(),
updatedAt: new Date(),
},
{
username: "이나은",
email: "[email protected]",
password: "naunendjfiasdf",
phone: "01012341234",
userPic: "",
createdAt: new Date(),
updatedAt: new Date(),
},
{
username: "강영서",
email: "[email protected]",
password: "kangggg123",
phone: "01012341234",
userPic: "",
createdAt: new Date(),
updatedAt: new Date(),
},
{
username: "권지용",
email: "[email protected]",
password: "gdragon8888",
phone: "01088888888",
userPic: "",
createdAt: new Date(),
updatedAt: new Date(),
72 changes: 72 additions & 0 deletions server/seeders/20210826051026-demo-content.js
Original file line number Diff line number Diff line change
@@ -13,6 +13,78 @@ module.exports = {
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "스불재",
wordMean: "스스로 불러온 재앙",
thumbsup: 0,
userId: 1,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "자강두천",
wordMean: "자존심 강한 두 천재의 대결",
thumbsup: 0,
userId: 2,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "갑분싸",
wordMean: "갑자기 분위기 싸해짐",
thumbsup: 0,
userId: 3,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "자만추",
wordMean: "자장면에 만두 추가",
thumbsup: 5,
userId: 4,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "자만추",
wordMean: "자신만만 추성훈",
thumbsup: 20,
userId: 5,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "자만추",
wordMean: "자신만만 추사랑",
thumbsup: 0,
userId: 2,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "번달번줌",
wordMean: "번호 달라고 하면 번호줌?",
thumbsup: 10,
userId: 5,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "별다줄",
wordMean: "별걸 다 줄인다",
thumbsup: 7,
userId: 1,
createdAt: new Date(),
updatedAt: new Date(),
},
{
wordName: "애빼시",
wordMean: "애교 빼면 시체",
thumbsup: 2,
userId: 3,
createdAt: new Date(),
updatedAt: new Date(),
},
],
{}
);
36 changes: 36 additions & 0 deletions server/seeders/20210826051319-demo-thumbs.js
Original file line number Diff line number Diff line change
@@ -9,6 +9,42 @@ module.exports = {
user_Id: 1,
content_Id: 1,
},
{
user_Id: 1,
content_Id: 2,
},
{
user_Id: 2,
content_Id: 3,
},
{
user_Id: 3,
content_Id: 4,
},
{
user_Id: 4,
content_Id: 5,
},
{
user_Id: 5,
content_Id: 6,
},
{
user_Id: 2,
content_Id: 7,
},
{
user_Id: 5,
content_Id: 8,
},
{
user_Id: 1,
content_Id: 9,
},
{
user_Id: 3,
content_Id: 10,
},
],
{}
);