[FE] FIX: 어드민 store 페이지 그리드 수정 #1604

innovationacademy-kr · Jun 4, 2024 · d37f1db · d37f1db
1 parent bfb6466
commit d37f1db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 71 deletions.
diff --git a/frontend/src/Cabinet/components/AdminInfo/Chart/ItemBarChart.tsx b/frontend/src/Cabinet/components/AdminInfo/Chart/ItemBarChart.tsx
@@ -12,25 +12,6 @@ interface ITransformedItem {
   [key: string]: number | string;
 }
 
-
-/*
-    if (existingItem) {
-      existingItem[`${itemName}-${itemDetails}`] = userCount;
-    } else {
-      const newItem: ITransformedItem = {
-        item: itemName,
-      };
-
-      if (itemName === itemDetails) {
-        newItem[itemDetails] = userCount;
-      } else {
-        newItem[`${itemName}-${itemDetails}`] = userCount;
-      }
-
-      transformedData.push(newItem);
-    }
-  });
-*/
 const transformData = (itemArr: IItemUseCountDto[]): ITransformedItem[] => {
   const transformedData: ITransformedItem[] = [];
 
@@ -59,27 +40,7 @@ const transformData = (itemArr: IItemUseCountDto[]): ITransformedItem[] => {
   console.log(transformedData);
   return transformedData;
 };
-// const transformData = (itemArr: IItemUseCountDto[]): ITransformedItem[] => {
-//   const transformedData: ITransformedItem[] = [];
-
-//   itemArr.forEach((item) => {
-//     const { itemName, itemDetails, userCount } = item;
-//     const existingItem = transformedData.find(
-//       (transformed) => transformed.item === itemName
-//     );
 
-//     if (existingItem) {
-//       existingItem[`${itemName}-${itemDetails}`] = userCount;
-//     } else {
-//       const newItem: ITransformedItem = {
-//         item: itemName,
-//         [itemDetails]: userCount,
-//       };
-//       transformedData.push(newItem);
-//     }
-//   });
-//   return transformedData;
-// };
 
 const ItemBarChart = ({ data }: { data: IItemUseCountDto[] }) => (
   <ItemBarChartStyled>

diff --git a/frontend/src/Cabinet/pages/admin/AdminStorePage.tsx b/frontend/src/Cabinet/pages/admin/AdminStorePage.tsx
@@ -58,7 +58,7 @@ const mockData: ICoinCollectInfo[] = [
 // 아이템 통계 그래프 확인용
 const itemList: IItemUseCountDto[] = [
   { itemName: "연장권", itemDetails: "출석 연장권 보상", userCount: 38 },
-  { itemName: "연장권", itemDetails: "31일", userCount: 83 },
+  { itemName: "연장권", itemDetails: "31일", userCount: 503 },
   { itemName: "연장권", itemDetails: "15일", userCount: 22 },
   { itemName: "연장권", itemDetails: "3일", userCount: 30 },
   { itemName: "페널티 감면권", itemDetails: "31일", userCount: 10 },
@@ -299,22 +299,22 @@ const ContainerStyled = styled.div`
   }
   @media screen and (max-width: 1300px) {
     &:nth-child(1) {
-      order: 6;
+      order: 1;
     }
     &:nth-child(2) {
-      order: 5;
+      order: 2;
     }
     &:nth-child(3) {
-      order: 4;
+      order: 3;
     }
     &:nth-child(4) {
-      order: 3;
+      order: 4;
     }
     &:nth-child(5) {
-      order: 2;
+      order: 5;
     }
     &:nth-child(6) {
-      order: 1;
+      order: 6;
     }
   }
 `;
@@ -337,28 +337,3 @@ const CoinCollectTitleWrapperStyled = styled.div`
 
 export default AdminStorePage;
 
-// interface IItemUseCountDto {
-//   itemName: string;
-//   itemDetails: string;
-//   userCount: number;
-// }
-
-// interface ITransformedItem {
-//   item: string;
-//   [key: string]: number | string;
-// }
-
-// interface IItemUseCountDtoarr {
-//   arr : IItemUseCountDto[];
-
-// };
-
-// const data: ITransformedItem[] = [
-//   { item: "연장권", "출석 연장권 보상": 0, "31일": 1, "15일": 2, "3일": 0 },
-//   { item: "페널티 감면권", "31일": 0, "7일": 0, "3일": 0 },
-//   { item: "이사권", "이사권": 0 },
-//   { item: "알림 등록권", "알림 등록권": 0 },
-// ];
-// //     itemName별로 묶어서 1. 0: 1. item: "연장권" 2. 3일: 3 3. 15일: 15 4. 31일: 31 5. 연장권 보상 : 10 2. 1: 1. item: "알림권" 2. 알림권: 10
-// // 1. 2: 1. item: "이사권" 2. 이사권: 10
-// // 2. 3: 1. item: "패널티 축소권" 2. 3일: 3 3. 7일: 7 4. 31일: 31 이런 형식으로 만들고싶어