diff --git a/src/assets/images/clusterListAppearance.svg b/src/assets/images/clusterListAppearance.svg new file mode 100644 index 00000000..e9897bde --- /dev/null +++ b/src/assets/images/clusterListAppearance.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/clusterListCleanliness.svg b/src/assets/images/clusterListCleanliness.svg new file mode 100644 index 00000000..ed8edba8 --- /dev/null +++ b/src/assets/images/clusterListCleanliness.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/clusterListCrowd.svg b/src/assets/images/clusterListCrowd.svg new file mode 100644 index 00000000..903a2221 --- /dev/null +++ b/src/assets/images/clusterListCrowd.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/clusterListFunction.svg b/src/assets/images/clusterListFunction.svg new file mode 100644 index 00000000..3829c532 --- /dev/null +++ b/src/assets/images/clusterListFunction.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/clusterListMaintenance.svg b/src/assets/images/clusterListMaintenance.svg new file mode 100644 index 00000000..0f0f21c3 --- /dev/null +++ b/src/assets/images/clusterListMaintenance.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/images/clusterListNoise.svg b/src/assets/images/clusterListNoise.svg new file mode 100644 index 00000000..f6b29d86 --- /dev/null +++ b/src/assets/images/clusterListNoise.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/images/clusterListOccupation.svg b/src/assets/images/clusterListOccupation.svg new file mode 100644 index 00000000..a680ac5c --- /dev/null +++ b/src/assets/images/clusterListOccupation.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/images/clusterListThermalComfort.svg b/src/assets/images/clusterListThermalComfort.svg new file mode 100644 index 00000000..1f8bac80 --- /dev/null +++ b/src/assets/images/clusterListThermalComfort.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/images/clusterListUsage.svg b/src/assets/images/clusterListUsage.svg new file mode 100644 index 00000000..9b4f3f21 --- /dev/null +++ b/src/assets/images/clusterListUsage.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/Drawer/ClusterDrawer/index.tsx b/src/components/Drawer/ClusterDrawer/index.tsx index 7720478b..50d137ee 100644 --- a/src/components/Drawer/ClusterDrawer/index.tsx +++ b/src/components/Drawer/ClusterDrawer/index.tsx @@ -24,7 +24,7 @@ import { poiStatusTypeMessageKeys, poiStatusValueMessageKeys, } from "../../../constants/model/poi"; -import { statusColor } from "../../../constants/statusStyle"; +import { clusterListStatusIcon } from "../../../constants/statusStyle"; import { getDownloadURL, getStorage, ref } from "firebase/storage"; import { firebaseApp } from "../../../utils/firebase"; import { getEntry } from "../../../constants/entry"; @@ -131,16 +131,23 @@ const PoiListItem: React.FC = (props) => { radius="sm" classNames={{ content: "px-0.5 whitespace-normal text-xs", - base: statusColor(poi.data.status.type), + base: "bg-transparent", }} > - {t(poiStatusTypeMessageKeys[poi.data.status.type], { - ns: ["model"], - })} - : - {t(poiStatusValueMessageKeys[poi.data.status.value], { - ns: ["model"], - })} + status icon +

+ {t(poiStatusTypeMessageKeys[poi.data.status.type], { + ns: ["model"], + })} + : + {t(poiStatusValueMessageKeys[poi.data.status.value], { + ns: ["model"], + })} +

diff --git a/src/components/Drawer/PoiDrawer/index.tsx b/src/components/Drawer/PoiDrawer/index.tsx index 107876db..6f82978f 100644 --- a/src/components/Drawer/PoiDrawer/index.tsx +++ b/src/components/Drawer/PoiDrawer/index.tsx @@ -19,7 +19,10 @@ import { import noImage from "../../../assets/images/noImage.svg"; import poiDrawerLocation from "../../../assets/images/poiDrawerLocation.svg"; import poiDrawerTargetSerial from "../../../assets/images/poiDrawerTargetSerial.svg"; -import { statusColor, statusIcon } from "../../../constants/statusStyle"; +import { + statusColor, + poiDrawerStatusIcon, +} from "../../../constants/statusStyle"; import { poiStatusTypeMessageKeys, poiStatusValueMessageKeys, @@ -39,7 +42,7 @@ const PoiDrawerStatus: React.FC<{ return (
- status + status