diff --git a/backend/src/main/java/org/ftclub/cabinet/club/domain/ClubRegistration.java b/backend/src/main/java/org/ftclub/cabinet/club/domain/ClubRegistration.java
index 291435f8a..20d2c6ab5 100644
--- a/backend/src/main/java/org/ftclub/cabinet/club/domain/ClubRegistration.java
+++ b/backend/src/main/java/org/ftclub/cabinet/club/domain/ClubRegistration.java
@@ -13,6 +13,7 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
@@ -30,7 +31,7 @@
@ToString(exclude = {"user", "club"})
@Log4j2
@EntityListeners(AuditingEntityListener.class)
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class ClubRegistration {
@Id
diff --git a/backend/src/main/java/org/ftclub/cabinet/item/domain/SectionAlarm.java b/backend/src/main/java/org/ftclub/cabinet/item/domain/SectionAlarm.java
index 79166cbbb..27d261d28 100644
--- a/backend/src/main/java/org/ftclub/cabinet/item/domain/SectionAlarm.java
+++ b/backend/src/main/java/org/ftclub/cabinet/item/domain/SectionAlarm.java
@@ -32,7 +32,7 @@
public class SectionAlarm {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f782c59f8..1e2b3b809 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10,7 +10,7 @@
"dependencies": {
"@nivo/bar": "^0.80.0",
"@nivo/core": "^0.80.0",
- "@nivo/line": "0.80.0",
+ "@nivo/line": "^0.80.0",
"@nivo/pie": "^0.80.0",
"@types/react-color": "^3.0.7",
"axios": "^1.2.1",
@@ -1958,6 +1958,22 @@
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
"integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
},
+ "node_modules/@esbuild/darwin-arm64": {
+ "version": "0.16.9",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.9.tgz",
+ "integrity": "sha512-d7D7/nrt4CxPul98lx4PXhyNZwTYtbdaHhOSdXlZuu5zZIznjqtMqLac8Bv+IuT6SVHiHUwrkL6ywD7mOgLW+A==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
"node_modules/@eslint/eslintrc": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz",
@@ -5714,6 +5730,43 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/esbuild": {
+ "version": "0.16.9",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.9.tgz",
+ "integrity": "sha512-gkH83yHyijMSZcZFs1IWew342eMdFuWXmQo3zkDPTre25LIPBJsXryg02M3u8OpTwCJdBkdaQwqKkDLnAsAeLQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "optionalDependencies": {
+ "@esbuild/android-arm": "0.16.9",
+ "@esbuild/android-arm64": "0.16.9",
+ "@esbuild/android-x64": "0.16.9",
+ "@esbuild/darwin-arm64": "0.16.9",
+ "@esbuild/darwin-x64": "0.16.9",
+ "@esbuild/freebsd-arm64": "0.16.9",
+ "@esbuild/freebsd-x64": "0.16.9",
+ "@esbuild/linux-arm": "0.16.9",
+ "@esbuild/linux-arm64": "0.16.9",
+ "@esbuild/linux-ia32": "0.16.9",
+ "@esbuild/linux-loong64": "0.16.9",
+ "@esbuild/linux-mips64el": "0.16.9",
+ "@esbuild/linux-ppc64": "0.16.9",
+ "@esbuild/linux-riscv64": "0.16.9",
+ "@esbuild/linux-s390x": "0.16.9",
+ "@esbuild/linux-x64": "0.16.9",
+ "@esbuild/netbsd-x64": "0.16.9",
+ "@esbuild/openbsd-x64": "0.16.9",
+ "@esbuild/sunos-x64": "0.16.9",
+ "@esbuild/win32-arm64": "0.16.9",
+ "@esbuild/win32-ia32": "0.16.9",
+ "@esbuild/win32-x64": "0.16.9"
+ }
+ },
"node_modules/escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -6595,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": [
@@ -10049,395 +10101,6 @@
"vite": "^2.6.0 || 3 || 4"
}
},
- "node_modules/vite/node_modules/@esbuild/android-arm": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
- "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/android-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
- "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/android-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
- "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
- "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/darwin-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
- "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
- "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
- "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-arm": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
- "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
- "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-ia32": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
- "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-loong64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
- "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
- "cpu": [
- "loong64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
- "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
- "cpu": [
- "mips64el"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
- "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
- "cpu": [
- "ppc64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
- "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
- "cpu": [
- "riscv64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-s390x": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
- "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
- "cpu": [
- "s390x"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/linux-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
- "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
- "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "netbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
- "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "openbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/sunos-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
- "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "sunos"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/win32-arm64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
- "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/win32-ia32": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
- "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/@esbuild/win32-x64": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
- "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/vite/node_modules/esbuild": {
- "version": "0.16.17",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz",
- "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==",
- "dev": true,
- "hasInstallScript": true,
- "bin": {
- "esbuild": "bin/esbuild"
- },
- "engines": {
- "node": ">=12"
- },
- "optionalDependencies": {
- "@esbuild/android-arm": "0.16.17",
- "@esbuild/android-arm64": "0.16.17",
- "@esbuild/android-x64": "0.16.17",
- "@esbuild/darwin-arm64": "0.16.17",
- "@esbuild/darwin-x64": "0.16.17",
- "@esbuild/freebsd-arm64": "0.16.17",
- "@esbuild/freebsd-x64": "0.16.17",
- "@esbuild/linux-arm": "0.16.17",
- "@esbuild/linux-arm64": "0.16.17",
- "@esbuild/linux-ia32": "0.16.17",
- "@esbuild/linux-loong64": "0.16.17",
- "@esbuild/linux-mips64el": "0.16.17",
- "@esbuild/linux-ppc64": "0.16.17",
- "@esbuild/linux-riscv64": "0.16.17",
- "@esbuild/linux-s390x": "0.16.17",
- "@esbuild/linux-x64": "0.16.17",
- "@esbuild/netbsd-x64": "0.16.17",
- "@esbuild/openbsd-x64": "0.16.17",
- "@esbuild/sunos-x64": "0.16.17",
- "@esbuild/win32-arm64": "0.16.17",
- "@esbuild/win32-ia32": "0.16.17",
- "@esbuild/win32-x64": "0.16.17"
- }
- },
"node_modules/vitest": {
"version": "0.28.3",
"resolved": "https://registry.npmjs.org/vitest/-/vitest-0.28.3.tgz",
diff --git a/frontend/src/Cabinet/components/Store/Inventory/InventoryItem.tsx b/frontend/src/Cabinet/components/Store/Inventory/InventoryItem.tsx
index 4e378ed30..c448215e2 100644
--- a/frontend/src/Cabinet/components/Store/Inventory/InventoryItem.tsx
+++ b/frontend/src/Cabinet/components/Store/Inventory/InventoryItem.tsx
@@ -1,11 +1,11 @@
-import { useState } from "react";
+import {useState} from "react";
import styled from "styled-components";
import UnavailableDataInfo from "@/Cabinet/components/Common/UnavailableDataInfo";
-import { ItemIconMap, ItemTypeLabelMap } from "@/Cabinet/assets/data/maps";
+import {ItemIconMap, ItemTypeLabelMap} from "@/Cabinet/assets/data/maps";
import CautionIcon from "@/Cabinet/assets/images/cautionSign.svg";
-import { ReactComponent as SelectIcon } from "@/Cabinet/assets/images/select.svg";
-import { IStoreItem } from "@/Cabinet/types/dto/store.dto";
-import { StoreItemType } from "@/Cabinet/types/enum/store.enum";
+import {ReactComponent as SelectIcon} from "@/Cabinet/assets/images/select.svg";
+import {IStoreItem} from "@/Cabinet/types/dto/store.dto";
+import {StoreItemType} from "@/Cabinet/types/enum/store.enum";
const convertToItemTypeLabel = (itemType: string) => {
switch (itemType) {
@@ -38,13 +38,13 @@ const convertToItemType = (itemType: string) => {
const convertToItemTooltip = (itemType: string) => {
switch (itemType) {
case "extensionItems":
- return "연장권은 사물함을 대여한 상태에서 우측 상단의 사물함 아이콘을 선택하면 연장권 사용하기 버튼이 있습니다";
+ return "사물함을 대여한 상태에서 우측 상단의 사물함 아이콘을 선택하면 연장권 사용하기 버튼이 있습니다";
case "swapItems":
- return "이사권은 사물함을 대여한 상태에서 다른 개인 사물함을 선택하면 대여버튼 대신에 이사하기 버튼이 있습니다";
+ return "사물함을 대여한 상태에서 다른 개인 사물함을 선택하면 대여버튼 대신에 이사하기 버튼이 있습니다";
case "alarmItems":
- return "알림 등록권은 동아리 사물함을 제외한 사물함들이 있는 페이지의 우측 상단에 하트를 누르면 사용할 수 있습니다";
+ return "사물함 페이지의 우측 상단에 하트를 눌러 사용합니다. 프로파일에서 설정한 경로로 알림을 받습니다";
case "penaltyItems":
- return "페널티 감면권은 페널티가 있는 상태에서 프로파일 -> 내 정보 -> 대여정보카드의 우측상단에 버튼이 있습니다.";
+ return "페널티가 있는 유저에 한해 프로파일 -> 내 정보 -> 대여정보카드의 우측상단에 버튼이 활성화 됩니다";
}
};
@@ -54,9 +54,9 @@ const extractNumber = (str: string) => {
};
const InventoryItem = ({
- itemsType,
- items,
-}: {
+ itemsType,
+ items,
+ }: {
itemsType: string;
items: IStoreItem[];
}) => {
@@ -83,69 +83,69 @@ const InventoryItem = ({
};
return (
- <>
-
-
-
- {convertToItemTypeLabel(itemsType)}
-
-
- {showTooltip && (
- handleMouseEnter()}
- onMouseLeave={() => handleMouseLeave()}
- >
- {itemTooltip}
-
- )}
-
-
-
-
-
- {sortedItems.length ? (
- <>
- {sortedItems.map((item, idx) => {
- const hasTypes =
- item.itemDetails !== convertToItemTypeLabel(itemsType);
- return (
-
-
-
-
-
+ <>
+
+
+
+ {convertToItemTypeLabel(itemsType)}
+
+
+ {showTooltip && (
+ handleMouseEnter()}
+ onMouseLeave={() => handleMouseLeave()}
+ >
+ {itemTooltip}
+
+ )}
+
+
+
+
+
+ {sortedItems.length ? (
+ <>
+ {sortedItems.map((item, idx) => {
+ const hasTypes =
+ item.itemDetails !== convertToItemTypeLabel(itemsType);
+ return (
+
+
+
+
+
{convertToItemTypeLabel(itemsType)}
- {hasTypes && {item.itemDetails}}
-
-
- );
- })}
-
- ) : (
- !isToggled && (
-
- )
- )}
-
-
-
+ {hasTypes && {item.itemDetails}}
+
+
+ );
+ })}
+
+ ) : (
+ !isToggled && (
+
+ )
+ )}
+
+
+
);
};
@@ -171,7 +171,7 @@ const ItemIconStyled = styled.div<{ itemType: StoreItemType }>`
& > svg > path {
stroke: var(--sys-main-color);
stroke-width: ${(props) =>
- props.itemType === StoreItemType.EXTENSION ? "2.8px" : "1.5px"};
+ props.itemType === StoreItemType.EXTENSION ? "2.8px" : "1.5px"};
}
`;
@@ -210,7 +210,7 @@ const ItemTitleWrapperStyled = styled.div<{ isToggled: boolean }>`
z-index: 2;
height: 30px;
transform: ${(props) =>
- props.isToggled ? "rotate(180deg)" : "rotate(0deg)"};
+ props.isToggled ? "rotate(180deg)" : "rotate(0deg)"};
}
& > button > svg > path {
@@ -248,6 +248,7 @@ const CautionIconStyled = styled.img`
width: 16px;
height: 16px;
opacity: 0.6;
+
:hover {
cursor: pointer;
opacity: 1;
@@ -288,9 +289,9 @@ const TooltipBoxDateStyled = styled.div`
margin-top: -5px;
border-width: 5px;
border-style: solid;
- border-color: transparent var(--tooltip-shadow-color) transparent
- transparent;
+ border-color: transparent var(--tooltip-shadow-color) transparent transparent;
}
+
${ItemTitleStyled}:hover & {
opacity: 1;
}
diff --git a/frontend/src/Cabinet/components/Store/StoreCoinPick.tsx b/frontend/src/Cabinet/components/Store/StoreCoinPick.tsx
index 75795d48c..52c130ea8 100644
--- a/frontend/src/Cabinet/components/Store/StoreCoinPick.tsx
+++ b/frontend/src/Cabinet/components/Store/StoreCoinPick.tsx
@@ -16,7 +16,7 @@ const StoreCoinPick = () => {
<>
- 누군가가 매일 흘리는 동점을 주워보세요💰
+ 누군가가 매일 흘리는 동전을 주워보세요💰
동전은 하루에 한 번씩 획득할 수 있습니다
toggleStore()}>