-
6e289bb231
feat(customer-vue): Just Pick-up 주문내역 페이지 구현
bum12ark
2022-03-07 16:47:46 +09:00
-
-
-
5f14ec7bfb
Merge pull request #38 from Development-team-1/리팩토링_컨트롤러_분리
백창훈
2022-03-07 16:44:38 +09:00
-
-
0d94f8819e
refactor(store-service): favorite store 테스트 코드 작성
hoon7566
2022-03-07 16:13:52 +09:00
-
d2b32078d3
refactor(customer-vue, store-service): 즐겨찾기 매장 조회
hoon7566
2022-03-07 13:45:51 +09:00
-
c5b2ec112d
refactor(order-service): 주문, 지난 주문 url 매핑 변경
bum12ark
2022-03-07 11:19:17 +09:00
-
c05f5e5718
refactor(owner-apigateway-service): cors allowedOrigins 변경
bum12ark
2022-03-07 11:17:58 +09:00
-
27e6a2c3a2
refactor(owner-vue): url 매핑 부분 변경 - 지난주문, 주문
bum12ark
2022-03-07 11:16:17 +09:00
-
c798e44cb2
refactor(customer-vue): 매장 검색 url 형식 변경으로 인한 수정
bum12ark
2022-03-04 18:43:53 +09:00
-
17117b3b26
refactor(store): 매장 검색 API, url mapping 변경
bum12ark
2022-03-04 18:31:22 +09:00
-
-
6e71f77dad
Merge pull request #35 from Development-team-1/고객_검색
백창훈
2022-03-04 18:26:01 +09:00
-
-
-
-
f617b3992d
feat(customer-vue): Just pickup 매장 검색 페이지 즐겨찾기 개수 추가
bum12ark
2022-03-04 18:13:11 +09:00
-
ff0b2e21c4
test(store): 매장 검색 API 즐겨찾기 회수 테스트 추가
bum12ark
2022-03-04 18:12:29 +09:00
-
df352a86a0
feat(store): 매장 검색 API 즐겨찾기 회수 추가
bum12ark
2022-03-04 18:04:55 +09:00
-
-
624c02905d
refactor(customer-frontend-service, owner-frontend-service): customer-frontend-service, owner-frontend-service 정리
hoon7566
2022-03-04 15:48:09 +09:00
-
82be43a238
Merge pull request #34 from Development-team-1/ssl_적용하기
Sangbum Park
2022-03-04 14:52:28 +09:00
-
-
f1ecaec79c
feat(customer vue, customer-gateway-service): SSL 적용
hoon7566
2022-03-04 14:47:50 +09:00
-
-
8363836299
Merge pull request #33 from Development-team-1/고객_검색
백창훈
2022-03-04 12:02:16 +09:00
-
-
3c45eacb85
Merge branch 'master' into 고객_검색
백창훈
2022-03-04 12:02:09 +09:00
-
-
-
-
b6bcc58df2
Merge pull request #32 from Development-team-1/customer_login_page
Sangbum Park
2022-03-04 11:47:33 +09:00
-
-
cf03d7e233
test(store, customer-vue): 매장 검색 API 테스트
bum12ark
2022-03-03 20:50:03 +09:00
-
d40258a95b
feat(customer vue, user-service): customer vue OAuth 인증
hoon7566
2022-03-03 20:29:19 +09:00
-
-
005e347cad
feat(customer-vue): Just pickup 매장 검색 페이지 구현
bum12ark
2022-03-03 19:38:05 +09:00
-
652d7acd75
feat(store-service): Just-Pickup 가게 검색 기능 추가
bum12ark
2022-03-03 16:08:55 +09:00
-
-
2252a53e26
style(customer-vue): Just pickup 레이아웃 변경
bum12ark
2022-03-02 17:09:25 +09:00
-
728bd4ed55
Merge pull request #31 from Development-team-1/refactor-feature
Sangbum Park
2022-03-02 16:45:56 +09:00
-
-
f1ac5fc654
fix(owner-gateway-service): access token 없어도 200 ok 리턴하는 문제 해결
hoon7566
2022-03-02 16:26:00 +09:00
-
5ee3ac28cf
refactor(store-service): refactoring user-id hardcode
hoon7566
2022-03-02 15:48:58 +09:00
-
888b39180b
Merge pull request #30 from Development-team-1/고객_프로젝트_생성
백창훈
2022-03-02 14:52:21 +09:00
-
-
a5bb4b4a8f
feat(customer-vue): 고객 프로젝트 생성
bum12ark
2022-03-02 14:38:01 +09:00
-
-
43a439a982
refactor(customer-vue): customer-vue 삭제
hoon7566
2022-03-02 14:29:31 +09:00
-
-
169902ff2f
Merge pull request #29 from Development-team-1/OAuth_사용자
Sangbum Park
2022-03-02 14:09:24 +09:00
-
-
eb68ed3554
feat(user-service): Oauth 사용자 JWT
hoon7566
2022-03-02 13:55:44 +09:00
-
-
1dcc72d0ba
Merge pull request #27 from Development-team-1/고객_프로젝트_세팅
백창훈
2022-03-01 16:15:20 +09:00
-
-
dbc384c6bf
Merge pull request #28 from Development-team-1/메뉴_등록
Sangbum Park
2022-03-01 16:14:48 +09:00
-
-
5dd8b44518
Merge branch 'master' into 메뉴_등록
Sangbum Park
2022-03-01 16:14:30 +09:00
-
-
-
-
53d709aed0
Merge pull request #26 from Development-team-1/점주_로그인
백창훈
2022-03-01 16:12:25 +09:00
-
-
3ce0fd6f13
feat(order-service): 주문 엔티티 생성 메소드 추가
bum12ark
2022-03-01 15:52:54 +09:00
-
3499902bb9
Merge remote-tracking branch 'origin/메뉴_등록' into 메뉴_등록
hoon7566
2022-03-01 15:45:43 +09:00
-
-
59f9651924
fix(store-service, owner-vue): item 저장 및 수정
hoon7566
2022-03-01 15:45:12 +09:00
-
be175b1fe3
refactor(owner-apigateway-service): jwt token validate 리턴 타입 변경
bum12ark
2022-03-01 15:35:27 +09:00
-
d6c655c37f
feat(owner-vue): url 매핑 및 interceptor 변경
bum12ark
2022-03-01 15:34:24 +09:00
-
8342264a8a
feat(customer-vue): 고객 페이지 vue 프로젝트 생성 및 설정
bum12ark
2022-03-01 12:08:23 +09:00
-
-
-
01d5cddd86
Merge branch 'master' into 메뉴_등록
Sangbum Park
2022-03-01 11:34:52 +09:00
-
-
-
-
5f46d73a22
feat(user-service): JWT 토큰 관련 로직 변경
bum12ark
2022-02-28 16:54:16 +09:00
-
b6b3e39380
feat(owner-apigateway-service): with credentials 및 exception handler 추가
bum12ark
2022-02-28 16:50:22 +09:00
-
516c192211
feat(owner-vue): JWT refresh Token 로직 추가
bum12ark
2022-02-28 16:47:04 +09:00
-
ca61356a2d
feat(store-service): 아이템 등록 테스트
hoon7566
2022-02-28 15:35:20 +09:00
-
9417f39c8a
feat(owner-vue, store-service): 메뉴 등록
hoon7566
2022-02-28 14:33:28 +09:00
-
54f19fcad2
feat(store-service, owner-vue): 아이템 수정하기 개발
hoon7566
2022-02-25 16:38:24 +09:00
-
731e79ece6
feat(owner-vue): 점주용 로그인 - 화면, 헤더 설정
bum12ark
2022-02-25 12:37:00 +09:00
-
-
b596004811
Merge pull request #22 from Development-team-1/점주_회원가입
백창훈
2022-02-25 12:30:07 +09:00
-
-
c78b360fc1
feat(owner-apigateway-service): cors preflight 관련 설정 추가
bum12ark
2022-02-24 21:49:38 +09:00
-
4af396636d
feat(user-service): 점주 회원가입 - 중복 이메일 로직 추가
bum12ark
2022-02-24 21:39:30 +09:00
-
ac9ba94883
feat(owner-vue): 점주용 회원가입 - 이메일 중복 체크 로직 추가
bum12ark
2022-02-24 21:38:21 +09:00
-
807f8c209f
test(user-service): 점주 회원가입 테스트 작성
bum12ark
2022-02-24 21:05:43 +09:00
-
eb7e7cc8b3
feat(owner-vue): 점주용 회원가입 페이지 구현
bum12ark
2022-02-24 20:10:12 +09:00
-
60de553804
feat(owner-vue, store-service): 메뉴 등록
hoon7566
2022-02-24 18:52:58 +09:00
-
-
-
4fb27f1807
Merge pull request #21 from Development-team-1/카테고리_item_보기
백창훈
2022-02-24 14:50:59 +09:00
-
-
dd123a9623
feat(owner-vue, store-service): 카테고리에서 바로 item리스트 view
hoon7566
2022-02-24 14:46:32 +09:00
-
-
f32f686608
feat(user-service): 점주 회원가입 로직 구현
bum12ark
2022-02-24 11:07:34 +09:00
-
-
933848cef4
Merge pull request #20 from Development-team-1/owner-vue
백창훈
2022-02-23 18:41:03 +09:00
-
-
38265ead5b
Merge branch 'master' into owner-vue
Sangbum Park
2022-02-23 18:37:48 +09:00
-
-
-
-
9c51bc08d5
Merge pull request #19 from Development-team-1/feature/authentication
백창훈
2022-02-23 18:26:12 +09:00
-
-
54f1781eda
Merge remote-tracking branch 'origin/owner-vue' into owner-vue
hoon7566
2022-02-23 18:25:07 +09:00
-
-
0f72041559
feat(owner-vue, store-service): 메뉴 관리 페이지네이션, 검색
hoon7566
2022-02-23 18:21:27 +09:00
-
bbd57d7232
feat(owner-vue): 점주용 주문 페이지 개발
bum12ark
2022-02-23 18:15:51 +09:00
-
21a41ab537
feat(owner-vue): 데이트 피커 컴포넌트화
bum12ark
2022-02-23 17:05:23 +09:00
-
f700e7374b
fix(owner-vue) : 카테고리 기능 버그 수정
hoon7566
2022-02-23 14:16:23 +09:00
-
83d1b1b8bc
feat(owner-vue): owner-vue에서 카테고리 기능
hoon7566
2022-02-23 14:12:08 +09:00
-
4034304b04
feat(owner-vue): owner vue에 카테고리 얻어오는 기능 추가
hoon7566
2022-02-22 19:41:55 +09:00
-
c3d28c7004
feat(owner-vue): 지난 주문 페이지 구현 (라우터, 데이터 테이블, 페이지네이션)
bum12ark
2022-02-22 21:59:41 +09:00
-
-
3da1bbb975
feat(owner-vue): 점주용 vue 프로젝트 추가
bum12ark
2022-02-22 14:36:49 +09:00
-
-
-
32e93aaad3
feat(customer-apigateway-service, user-servcie): customer gateway filter 추가
hoon7566
2022-02-18 15:10:50 +09:00
-
e0455da9a3
Merge branch 'oAuth-jwt' into feature/authentication
hoon7566
2022-02-18 14:15:19 +09:00
-
-
795606334a
feat(user-service): Oauth 로그인시 token생성
hoon7566
2022-02-18 14:01:39 +09:00
-
d7dad90720
feat(user-service): login 기능 및 cookie 생성 부분 변경
bum12ark
2022-02-18 12:06:30 +09:00
-
5cdb782870
refactor(owner-apigateway-service): jwt provider 변경, filter 수정
bum12ark
2022-02-17 16:18:56 +09:00
-
01538317f7
feat(user-service): logout 기능, cookie 기능 추가, redis 설정 추가
bum12ark
2022-02-17 16:11:35 +09:00
-
-
47faea59e4
fix(user-service): Oauth_2.0, jwt 브랜치 병합 후 충돌 해결
bum12ark
2022-02-16 12:09:01 +09:00
-
a01cf0a12d
Merge branch 'jwt' into feature/authentication
bum12ark
2022-02-16 12:00:14 +09:00
-
-
d16de3c3cc
feat(user-service): Naver Oauth 로그인 추가.
hoon7566
2022-02-16 11:48:06 +09:00
-
16f881a1b1
feat(owner-apigateway-service): access token 검증 부분 추가
bum12ark
2022-02-16 11:44:21 +09:00
-
b6274466b6
feat(user-service): access token, refresh token 검증
bum12ark
2022-02-16 11:42:25 +09:00
-
496711e47e
feat(user-service): Google Oauth 추가, github Oauth 삭제
hoon7566
2022-02-15 19:03:31 +09:00
-
72c52e4b58
feat(user-service): Spring Security 및 JWT 로그인 인증, 인가 구현
bum12ark
2022-02-15 16:19:10 +09:00
-
285ca1cd25
feat(user-service): 엔티티 양식 변경, userDetailService 구현
bum12ark
2022-02-15 16:16:51 +09:00
-
4b2e5865c4
feat(user-service): Oauth 기능 추가
hoon7566
2022-02-15 13:25:17 +09:00
-
-
07f1e48c58
build(user-service, apigateway-services): 인증 관련 라이브러리 추가
bum12ark
2022-02-14 14:59:10 +09:00
-
-
fc069f4439
delete apigateway service
hoon7566
2022-02-14 11:34:13 +09:00
-
556045ce86
Merge pull request #18 from Development-team-1/feature/owner-prev-order
백창훈
2022-02-14 10:22:59 +09:00
-
-
b3e502db57
feat(owner-frontend-service): 점주 서비스 - 지난 주문 페이지 구현
bum12ark
2022-02-11 16:52:49 +09:00
-
388b38918a
test(order): 점주용 지난 주문 컨트롤러 테스트 작성
bum12ark
2022-02-11 16:50:03 +09:00
-
fea140c45f
feat(order): 점주용 지난 주문 Back-end 기능 추가
bum12ark
2022-02-11 16:42:54 +09:00
-
911fc6d192
feat(order): 점주용 지난 주문 Back-end 구현
bum12ark
2022-02-10 20:25:38 +09:00
-
-
c3b0ce4d17
Merge pull request #16 from Development-team-1/common/p6spy-query-format
백창훈
2022-02-10 17:46:36 +09:00
-
-
91ec9875c4
Merge branch 'master' into common/p6spy-query-format
Sangbum Park
2022-02-10 17:42:05 +09:00
-
-
-
-
de24aff502
Merge pull request #17 from Development-team-1/add-category-function
Sangbum Park
2022-02-10 17:40:39 +09:00
-
-
028ca31494
Merge branch 'master' into add-category-function
백창훈
2022-02-10 17:27:09 +09:00
-
-
-
-
b6f68567d3
category 기능 테스트 코드/restdocs 추가
dev-Hoony-93
2022-02-10 17:04:51 +09:00
-
f43520b883
카테고리 리스트 저장 및 삭제, 순서변경 추가
dev-Hoony-93
2022-02-09 22:08:33 +09:00