Code

[RELEASE] v1.2#38

Code

Merged

sangminee merged 41 commits intomainTeam-OYA/web-business:mainfrom developTeam-OYA/web-business:developCopy head branch name to clipboardMar 7, 2024

+38-20

Commits

Commits on Feb 28, 2024

• header color 구분

  LSMJJAng

  committed
  082dee7

  Copy full SHA for 082dee7

• sideBar Active 상태 useState 적용 및 색상 변경

  LSMJJAng

  committed
  b3d9bcb

  Copy full SHA for b3d9bcb

• Merge pull request #12 from Team-OYA/feat-OYA-228-헤더색상변경

  Show description for 0189334
  LSMJJAng

  authored
  0189334

  Copy full SHA for 0189334

Commits on Feb 29, 2024

• [FEAT] 관리자 웹 수정 (#13)

  Show description for fd771fc
  sangminee

  authored
  fd771fc

  Copy full SHA for fd771fc

Commits on Mar 1, 2024

• 대시보드 기초 구조 생성 및 현황 view생성

  LSMJJAng

  committed
  54548c5

  Copy full SHA for 54548c5

• [FEAT] 로그인 기능 추가 (#14)

  Show description for a6c04ff
  sangminee

  authored
  a6c04ff

  Copy full SHA for a6c04ff

• [FEAT] 팝업스토어 순위 적용 및 게시글 목록 기초 생성

  LSMJJAng

  committed
  5c68f3a

  Copy full SHA for 5c68f3a

• 내 팝업스토어 게시글 목록 생성

  LSMJJAng

  committed
  8eeab2e

  Copy full SHA for 8eeab2e

Commits on Mar 2, 2024

• [FEAT] Statistics Chart 적용

  LSMJJAng

  committed
  72a60f7

  Copy full SHA for 72a60f7

• Merge branch 'develop' into feat-OYA-231-사업체-대시보드구현

  LSMJJAng

  authored
  811a3c0

  Copy full SHA for 811a3c0

• Merge pull request #15 from Team-OYA/feat-OYA-231-사업체-대시보드구현

  Show description for 81bde53
  LSMJJAng

  authored
  81bde53

  Copy full SHA for 81bde53

• [FEAT]axios baseApi 세팅

  LSMJJAng

  committed
  e2b7404

  Copy full SHA for e2b7404

• Merge pull request #16 from Team-OYA/feat-OYA-256-Base-Api

  Show description for cf94488
  LSMJJAng

  authored
  cf94488

  Copy full SHA for cf94488

• [FEAT] user, admin Base Api 분리

  LSMJJAng

  committed
  a2a8cbe

  Copy full SHA for a2a8cbe

• authApi 실제서버 기반 URL로 변경

  LSMJJAng

  committed
  fbd3aef

  Copy full SHA for fbd3aef

• [FEAT] 디테일 변경 (#17)

  Show description for a63b60f
  sangminee

  authored
  a63b60f

  Copy full SHA for a63b60f

• Merge branch 'develop' of https://github.com/Team-OYA/web-business into feat-OYA-255-대시보드-통신구현

  LSMJJAng

  committed
  0861580

  Copy full SHA for 0861580

• [FEAT]BaseApi class명 수정 및 통계 수정 및 데이터 적용

  LSMJJAng

  committed
  5b54344

  Copy full SHA for 5b54344

• [FEAT] 대시보드 통신 구현

  LSMJJAng

  committed
  547cceb

  Copy full SHA for 547cceb

• Merge pull request #18 from Team-OYA/feat-OYA-255-대시보드-통신구현

  Show description for 82afc7f
  LSMJJAng

  authored
  82afc7f

  Copy full SHA for 82afc7f

Commits on Mar 3, 2024

• [FEAT] 토스페이 결제 기능 구현 (#19)

  Show description for 291b949
  kyukong

  authored
  291b949

  Copy full SHA for 291b949

• [REFACTOR] 사업계획서 제안 및 광고 신청 시 이미지 업로드 기능 구현 (#20)

  Show description for 4201cb8
  kyukong

  authored
  4201cb8

  Copy full SHA for 4201cb8

• [REFACTOR] 내비바 페이지 연결 및 디자인 일부 수정 (#21)

  Show description for e56b117
  kyukong

  authored
  e56b117

  Copy full SHA for e56b117

• [FEATURE] 채팅 기능 (#22)

  Show description for 9eeef41
  sangminee

  authored
  9eeef41

  Copy full SHA for 9eeef41

• [FEATURE] not defined 해결 (#24)

  Show description for 6eb2ee7
  sangminee

  authored
  6eb2ee7

  Copy full SHA for 6eb2ee7

Commits on Mar 4, 2024

• [REFACTOR] 각종 에러 수정

  LSMJJAng

  committed
  2ef6e47

  Copy full SHA for 2ef6e47

• Merge pull request #26 from Team-OYA/feat-OYA-255-대시보드-통신구현

  Show description for cf3ed05
  LSMJJAng

  authored
  cf3ed05

  Copy full SHA for cf3ed05

• Merge branch 'main' into develop

  LSMJJAng

  authored
  649adbf

  Copy full SHA for 649adbf

• Merge branch 'main' into develop

  kyukong

  committed
  b595eac

  Copy full SHA for b595eac

• [REFACTOR] 결제 수단 버튼 추가 및 디자인 세부 수정 (#28)

  Show description for 07e2a77
  kyukong

  authored
  07e2a77

  Copy full SHA for 07e2a77

• [REFACTOR] Home 이미지 bg 추가

  LSMJJAng

  committed
  ddd54b9

  Copy full SHA for ddd54b9

Commits on Mar 5, 2024

• [Refactor] 펭지ㅣ 이동 버튼 수정

  LSMJJAng

  committed
  217c520

  Copy full SHA for 217c520

• Merge pull request #29 from Team-OYA/feat-OYA-234-메인페이지생성

  Show description for b2f548c
  LSMJJAng

  authored
  b2f548c

  Copy full SHA for b2f548c

• [Refactor] 로그인view수정, 표시 favicon 변경

  LSMJJAng

  committed
  011bbff

  Copy full SHA for 011bbff

• Merge pull request #31 from Team-OYA/feat-OYA-234-메인페이지생성

  Show description for 93d5f32
  LSMJJAng

  authored
  93d5f32

  Copy full SHA for 93d5f32

• Merge branch 'main' into develop

  LSMJJAng

  authored
  b912dab

  Copy full SHA for b912dab

• [FEAUTRE] 문의하기 수정 (#33)

  Show description for 673cf8e
  

  sangminee

  and

  LSMJJAng

  authored
  673cf8e

  Copy full SHA for 673cf8e

Commits on Mar 6, 2024

• Merge branch 'main' into develop

  kyukong

  committed
  7289806

  Copy full SHA for 7289806

• [FIX] 광고 팝업스토어 게시글 조회 시 잘못된 아이디 매핑 수정 (#35)

  kyukong

  authored
  0e2aea7

  Copy full SHA for 0e2aea7

Commits on Mar 7, 2024

• [FEATURE] 채팅 UI 수정 (#36)

  Show description for 986b999
  

  sangminee

  and

  LSMJJAng

  authored
  986b999

  Copy full SHA for 986b999

• [FEAT] 채팅리스트 조회 ui 변경 (#37)

  Show description for 5dc4024
  

  sangminee

  and

  LSMJJAng

  authored
  5dc4024

  Copy full SHA for 5dc4024