Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
84b8e39
카카오 서비스 인증
harrysci May 9, 2021
12d701c
server erro conflict
harrysci May 9, 2021
228565e
console 확인
harrysci May 9, 2021
3751910
env.dev git ingore 에서 삭제
KIMBEOBWOO May 10, 2021
367863e
git ignore dist directory
KIMBEOBWOO May 10, 2021
4d04e4d
Merge pull request #7 from DSC-AIChatBot/connect/mongodb
jawoon1120 May 13, 2021
49d3555
카카오 리다이렉트 완료
harrysci May 14, 2021
9cf03b1
conflict resolve
harrysci May 14, 2021
d2c7104
Merge pull request #9 from DSC-AIChatBot/server/login/kakao
harrysci May 14, 2021
eb4977b
2021.05.17 add mongodb module
jawoon1120 May 17, 2021
92aca74
2021.05.19 feature/naver/login
jawoon1120 May 19, 2021
2564a40
resolve conflict
jawoon1120 May 19, 2021
79e6050
revoke kakao login
jawoon1120 May 19, 2021
366f1f2
🎨 Implements google auth env
knoa0405 May 19, 2021
04d0785
conflict resolve
KIMBEOBWOO May 19, 2021
5fb293e
temp
jawoon1120 May 19, 2021
938c439
mongodb
harrysci May 19, 2021
ed219ae
conflict resolve
harrysci May 19, 2021
d8a0efe
mongoDB 연결 테스트
harrysci May 19, 2021
f45175b
DB test
harrysci May 19, 2021
41c9163
🎨 Implements graphql + typeorm for definition types
knoa0405 May 19, 2021
76cc8ec
🎨
knoa0405 May 19, 2021
59a3f4b
DB연결
harrysci May 20, 2021
09b56fe
Merge pull request #10 from DSC-AIChatBot/feature/naver/login
jawoon1120 May 23, 2021
b9f366f
conflict resolve
KIMBEOBWOO May 23, 2021
59eb3c2
Merge pull request #11 from DSC-AIChatBot/server/login/google
KIMBEOBWOO May 23, 2021
bdfad48
Apply .gitignore
KIMBEOBWOO May 23, 2021
9497a34
confict save
KIMBEOBWOO May 23, 2021
3c447e0
confict resolve
KIMBEOBWOO May 23, 2021
e644c43
Merge pull request #13 from DSC-AIChatBot/feature/feelCalendar
KIMBEOBWOO May 23, 2021
4a8361f
confict resolve
KIMBEOBWOO May 23, 2021
797f55c
confict resolve
KIMBEOBWOO May 23, 2021
f664e18
jwt Guard test
KIMBEOBWOO May 24, 2021
dbb3757
social login request dto add
KIMBEOBWOO May 24, 2021
1ff736a
jwt startegy 1차 완료
KIMBEOBWOO May 25, 2021
9adf313
Implements graphql-v2
knoa0405 May 25, 2021
988a026
merge
knoa0405 May 25, 2021
4661142
conflict
KIMBEOBWOO May 27, 2021
9723b6f
conflict resolve
KIMBEOBWOO May 27, 2021
fb6a5cf
Implements graphql chat
knoa0405 May 27, 2021
1605ec1
Merge pull request #14 from DSC-AIChatBot/server/graphql/v2
knoa0405 May 27, 2021
149dc5c
🎨 Implements graphql chat
knoa0405 May 28, 2021
b0eac87
Implements chatting
knoa0405 Jun 15, 2021
5f7982c
Merge pull request #15 from DSC-AIChatBot/feature/jwt
KIMBEOBWOO Jun 29, 2021
4b3ec8c
Implements chat backend
knoa0405 Jun 29, 2021
333af4a
Implements code
knoa0405 Jun 29, 2021
2a70e08
Implements code
knoa0405 Jun 29, 2021
fd12b28
test
KIMBEOBWOO Jun 29, 2021
4fb1007
confilct resolve
jawoon1120 Jun 29, 2021
e36e838
resolve conflict
jawoon1120 Jun 29, 2021
2a06338
code
knoa0405 Jun 29, 2021
8362ff1
Implements code
knoa0405 Jun 29, 2021
34de76a
Merge branch 'develope' into graphql
knoa0405 Jun 29, 2021
59fd1e6
Merge pull request #17 from DSC-AIChatBot/graphql
knoa0405 Jun 29, 2021
634603f
conflict resolve
KIMBEOBWOO Jun 29, 2021
89a56f2
Delete src/auth directory
jawoon1120 Jun 29, 2021
ecca51f
Delete src/common/guard directory
jawoon1120 Jun 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
2 changes: 2 additions & 0 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
GOOGLE_CLIENT_ID="536102247256-v9v23gbdg7bs85j4udvq9plstad116sh.apps.googleusercontent.com"
GOOGLE_CLIENT_SECRET="F3MANkbVc0-oLIl4rfueHZbh"
31 changes: 18 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
sourceType: 'module',
env: {
node:true,
browser: true,
es6: true,
jest: true,
},
plugins: ['@typescript-eslint/eslint-plugin'],
plugins: ['@typescript-eslint'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
'plugin:@typescript-eslint/eslint-recommended',
'eslint:recommended',
],
root: true,
env: {
node: true,
jest: true,
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaFeatures: {
jsx: true,
tsx: true,
},
ecmaVersion: 11,
sourceType: 'module',
},
ignorePatterns: ['.eslintrc.js'],
rules: {
semi: [2, "always"],
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
};
};
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ lerna-debug.log*
!.vscode/extensions.json

# .env
.env.dev
# .env.dev 개발 기간 동안 push 허용
.env.product
4 changes: 0 additions & 4 deletions .prettierrc

This file was deleted.

Loading