From 0b187e50f4d4ac20a8a7fc2ebb207fa89c02b321 Mon Sep 17 00:00:00 2001 From: jnkeniaem Date: Tue, 16 Jul 2024 13:48:09 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[FE]=20DOCS:=20github=20issue=20UI=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=EC=B0=BD=EA=B5=AC=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/ui_improvement.yml | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/ui_improvement.yml diff --git a/.github/ISSUE_TEMPLATE/ui_improvement.yml b/.github/ISSUE_TEMPLATE/ui_improvement.yml new file mode 100644 index 000000000..0a01bccf0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/ui_improvement.yml @@ -0,0 +1,46 @@ +name: "UI 개선 창구" +description: UI 개선점 작성 기본 양식입니다. +labels: ["ui"] +body: + - type: markdown + attributes: + value: | + 작성 예시 : "[FE] 지도-E/V 버튼 눌렀을때 나타나는 로고 색 다크모드 적용" + - type: textarea + id: ui-description + attributes: + label: UI 문제점 설명 + description: 문제가 언제/어떻게 발생했는지 명확하게 적어주세요. + placeholder: 설명을 적어주세요. + validations: + required: true + - type: textarea + id: reproduction + attributes: + label: 재현 방법 + description: 문제가 재현되는 상황을 설명해주세요. + placeholder: 설명을 적어주세요. + validations: + required: true + - type: textarea + id: improvement + attributes: + label: 기대하는 UI + description: 기대하는 UI에 대해서 설명해주세요. + placeholder: 설명을 적어주세요. + validations: + required: true + - type: textarea + id: system-info + attributes: + label: 시스템 환경 (선택 사항) + description: 현재 버그가 발생한 시스템 환경을 적어주세요. + render: shell + placeholder: OS, 브라우저 등을 적어주세요. + validations: + required: false + - type: textarea + id: additional-context + attributes: + label: 추가 건의사항 + description: Cabi에 바라시는 점이나, 하시고 싶은 말씀을 적어주세요. From d45d03b82153da88b723eadc4f0cfa1e49ca6029 Mon Sep 17 00:00:00 2001 From: Woo Joo Chae Date: Tue, 16 Jul 2024 14:38:09 +0900 Subject: [PATCH 2/9] [BE] FIX: config - swap limit 7days -> 1days --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 4ba0fb6f5..dbe683d73 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 4ba0fb6f55e1d3fee4a8f9a6e07da0d9c38aa25c +Subproject commit dbe683d7377027eed09fb0efe098a16def6331be From 6221ad6c81ddb6f65e50ecfabb13bd5a491e0b07 Mon Sep 17 00:00:00 2001 From: Woo Joo Chae Date: Tue, 16 Jul 2024 14:54:20 +0900 Subject: [PATCH 3/9] [BE] HOTFIX: Share ban limit message fixed ( unbanned_at deleted) --- .../org/ftclub/cabinet/lent/service/LentPolicyService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentPolicyService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentPolicyService.java index 7fe2abbbb..9ac733204 100644 --- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentPolicyService.java +++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentPolicyService.java @@ -59,10 +59,7 @@ private void handlePolicyStatus(LentPolicyStatus status, LocalDateTime policyDat throw new CustomExceptionStatus(ExceptionStatus.ALL_BANNED_USER, unbannedAtString).asCustomServiceException(); case SHARE_BANNED_USER: - unbannedAtString = policyDate.format( - DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")); - throw new CustomExceptionStatus(ExceptionStatus.SHARE_CODE_TRIAL_EXCEEDED, - unbannedAtString).asCustomServiceException(); + throw ExceptionStatus.SHARE_CODE_TRIAL_EXCEEDED.asServiceException(); case BLACKHOLED_USER: throw ExceptionStatus.BLACKHOLED_USER.asServiceException(); case PENDING_CABINET: From 18d72f4e1b7f3f102337b3e95bafbfff46165e5b Mon Sep 17 00:00:00 2001 From: jnkeniaem Date: Tue, 16 Jul 2024 15:23:52 +0900 Subject: [PATCH 4/9] =?UTF-8?q?[FE]=20DOCS:=20ui=20=EA=B0=9C=EC=84=A0=20?= =?UTF-8?q?=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=AC=B8=EA=B5=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/ui_improvement.yml | 4 ++-- config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/ui_improvement.yml b/.github/ISSUE_TEMPLATE/ui_improvement.yml index 0a01bccf0..f34b2ba71 100644 --- a/.github/ISSUE_TEMPLATE/ui_improvement.yml +++ b/.github/ISSUE_TEMPLATE/ui_improvement.yml @@ -1,5 +1,5 @@ -name: "UI 개선 창구" -description: UI 개선점 작성 기본 양식입니다. +name: "UI 개선 건의" +description: UI 개선 건의 작성 기본 양식입니다. labels: ["ui"] body: - type: markdown diff --git a/config b/config index dbe683d73..4ba0fb6f5 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit dbe683d7377027eed09fb0efe098a16def6331be +Subproject commit 4ba0fb6f55e1d3fee4a8f9a6e07da0d9c38aa25c From 6acb7272c678a4cd615fdaf55417c05dda291cfe Mon Sep 17 00:00:00 2001 From: Jihyun Kim Date: Tue, 16 Jul 2024 15:30:23 +0900 Subject: [PATCH 5/9] =?UTF-8?q?[COMMON]=20DOCS:=20readme=EC=97=90=20saymyn?= =?UTF-8?q?ame=20=EA=B3=BC=EC=A0=9C=20=EC=88=98=ED=96=89=20=EB=B0=8F=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 6075e13fb..1618e7c8d 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,9 @@ | [ 🐶 surlee](https://github.com/Elineely) | [ 🐣 hyowchoi](https://github.com/chyo1/) | [ 👽 sohyupar](https://github.com/saewoo1) | [🦝 jimchoi](https://github.com/jimchoi9) | [ 🛼 jeekim](https://github.com/jnkeniaem) | [🍾 miyu](https://github.com/Minkyu01) | [🧸 gykoh](https://github.com/gykoh42) | | ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- | +| [ 🐶 jihykim2](https://github.com/jihyunk03) | +| -------------------------------------------- | + | | | --------------------------------------------------------------------------------------------------------------------------------------------------------- | From 33cb2de7eb870c37d828863c76102c4fad11781e Mon Sep 17 00:00:00 2001 From: seonmin Date: Tue, 16 Jul 2024 15:31:36 +0900 Subject: [PATCH 6/9] =?UTF-8?q?[COMMON]=20DOCS:=20README=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ frontend/package-lock.json | 1 + 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 6075e13fb..18c445e5e 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,9 @@ | [ 🐶 surlee](https://github.com/Elineely) | [ 🐣 hyowchoi](https://github.com/chyo1/) | [ 👽 sohyupar](https://github.com/saewoo1) | [🦝 jimchoi](https://github.com/jimchoi9) | [ 🛼 jeekim](https://github.com/jnkeniaem) | [🍾 miyu](https://github.com/Minkyu01) | [🧸 gykoh](https://github.com/gykoh42) | | ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- | +| [⛄️ seonmiki](https://github.com/seonmiki) | +| ------------------------------------------ | + | | | --------------------------------------------------------------------------------------------------------------------------------------------------------- | diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1e2b3b809..6cab8e9e4 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6648,6 +6648,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "optional": true, "os": [ From 523e8b00b4402b352395e87521bf4b7f6190fba0 Mon Sep 17 00:00:00 2001 From: Jihyun Kim Date: Tue, 16 Jul 2024 15:40:33 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[COMMON]=20DOCS:=20readme=EC=97=90=20saymyn?= =?UTF-8?q?ame=20=EA=B3=84=EC=A0=95=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1618e7c8d..87fd9f29c 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ | [ 🐶 surlee](https://github.com/Elineely) | [ 🐣 hyowchoi](https://github.com/chyo1/) | [ 👽 sohyupar](https://github.com/saewoo1) | [🦝 jimchoi](https://github.com/jimchoi9) | [ 🛼 jeekim](https://github.com/jnkeniaem) | [🍾 miyu](https://github.com/Minkyu01) | [🧸 gykoh](https://github.com/gykoh42) | | ----------------------------------------- | ----------------------------------------- | ------------------------------------------ | ----------------------------------------- | ------------------------------------------ | -------------------------------------- | -------------------------------------- | -| [ 🐶 jihykim2](https://github.com/jihyunk03) | +| [ 🐰 jihykim2](https://github.com/jihyunk03) | | -------------------------------------------- | | | From 90b9ff70290d1a284f05f5e8be7d768e7ece4f28 Mon Sep 17 00:00:00 2001 From: seonmin Date: Tue, 16 Jul 2024 15:49:55 +0900 Subject: [PATCH 8/9] =?UTF-8?q?[COMMON]=20ETC:=20json=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EB=B3=B5=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 6cab8e9e4..1e2b3b809 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -6648,7 +6648,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ From 471e8845647919b03c9f3d99b021765b200ca147 Mon Sep 17 00:00:00 2001 From: Woo Joo Chae Date: Tue, 16 Jul 2024 15:55:11 +0900 Subject: [PATCH 9/9] [BE] HOTFIX: Share Ban bug fix (session reset issue) --- .../java/org/ftclub/cabinet/lent/service/LentFacadeService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java index 62a615afd..2d293beac 100644 --- a/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java +++ b/backend/src/main/java/org/ftclub/cabinet/lent/service/LentFacadeService.java @@ -338,6 +338,7 @@ public void cancelShareCabinetLent(Long userId, Long cabinetId) { Cabinet cabinet = cabinetQueryService.getCabinetForUpdate(cabinetId); cabinetCommandService.changeStatus(cabinet, CabinetStatus.AVAILABLE); } + lentRedisService.clearCabinetSession(cabinetId); } /**