From 0cb600589114c2cccaee5b93acc0b419004ab6c5 Mon Sep 17 00:00:00 2001 From: "junghoon86.park" Date: Wed, 7 Feb 2024 10:22:31 +0900 Subject: [PATCH] =?UTF-8?q?[HomePanel]=20=ED=8C=8C=EC=9D=BC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=97=90=EB=9F=AC?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20-=20=ED=8C=8C=EC=9D=BC=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=EB=B3=80=EA=B2=BD.=20-=20PopularShow=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=9D=98=EC=A1=B4=EC=84=B1=20=EB=B0=B0=EC=97=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/HomePanel/BestSeller/BestSeller.jsx | 2 +- .../BestSellerItem/BestSellerItem.jsx | 2 +- .../BestSellerItem/BestSellerItem.module.less | 4 +-- .../views/HomePanel/HomeOnSale/HomeOnSale.jsx | 2 +- .../HomeOnSaleItem/HomeOnSaleItem.jsx | 0 .../HomeOnSaleItem/HomeOnSaleItem.module.less | 2 +- .../HomePanel/PopularShow/PopularShow.jsx | 21 ++++++----- .../PopularShowItem/PopularShowItem.jsx | 0 .../PopularShowItem.module.less | 2 +- .../HomePanel/SubCategory/SubCategory.jsx | 35 +++++++------------ .../SubCategoryItem/SubCategoryItem.jsx | 0 .../SubCategoryItem.module.less | 4 +-- 12 files changed, 34 insertions(+), 40 deletions(-) rename com.twin.app.shoptime/src/views/HomePanel/{ => BestSeller}/BestSellerItem/BestSellerItem.jsx (86%) rename com.twin.app.shoptime/src/views/HomePanel/{ => BestSeller}/BestSellerItem/BestSellerItem.module.less (96%) rename com.twin.app.shoptime/src/views/HomePanel/{ => HomeOnSale}/HomeOnSaleItem/HomeOnSaleItem.jsx (100%) rename com.twin.app.shoptime/src/views/HomePanel/{ => HomeOnSale}/HomeOnSaleItem/HomeOnSaleItem.module.less (97%) rename com.twin.app.shoptime/src/views/HomePanel/{ => PopularShow}/PopularShowItem/PopularShowItem.jsx (100%) rename com.twin.app.shoptime/src/views/HomePanel/{ => PopularShow}/PopularShowItem/PopularShowItem.module.less (96%) rename com.twin.app.shoptime/src/views/HomePanel/{ => SubCategory}/SubCategoryItem/SubCategoryItem.jsx (100%) rename com.twin.app.shoptime/src/views/HomePanel/{ => SubCategory}/SubCategoryItem/SubCategoryItem.module.less (95%) diff --git a/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSeller.jsx b/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSeller.jsx index 170f3f75..3febf609 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSeller.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSeller.jsx @@ -11,8 +11,8 @@ import ri from "@enact/ui/resolution"; import SectionTitle from "../../../components/SectionTitle/SectionTitle"; import TGrid from "../../../components/TGrid/TGrid"; import { $L } from "../../../utils/helperMethods"; -import BestSellerItem from "../BestSellerItem/BestSellerItem"; import css from "./BestSeller.module.less"; +import BestSellerItem from "./BestSellerItem/BestSellerItem"; const Container = SpotlightContainerDecorator( { enterTo: "last-focused", leaveFor: { left: "", right: "" } }, diff --git a/com.twin.app.shoptime/src/views/HomePanel/BestSellerItem/BestSellerItem.jsx b/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSellerItem/BestSellerItem.jsx similarity index 86% rename from com.twin.app.shoptime/src/views/HomePanel/BestSellerItem/BestSellerItem.jsx rename to com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSellerItem/BestSellerItem.jsx index d257530b..36cc3a6c 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/BestSellerItem/BestSellerItem.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSellerItem/BestSellerItem.jsx @@ -1,6 +1,6 @@ import React from "react"; -import TItemCard from "../../../components/TItemCard/TItemCard"; +import TItemCard from "../../../../components/TItemCard/TItemCard"; import css from "../BestSellerItem/BestSellerItem.module.less"; export default function ({ bestSellerData, itemData, ...rest }) { diff --git a/com.twin.app.shoptime/src/views/HomePanel/BestSellerItem/BestSellerItem.module.less b/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSellerItem/BestSellerItem.module.less similarity index 96% rename from com.twin.app.shoptime/src/views/HomePanel/BestSellerItem/BestSellerItem.module.less rename to com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSellerItem/BestSellerItem.module.less index 93267fb1..740f1cdf 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/BestSellerItem/BestSellerItem.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/BestSeller/BestSellerItem/BestSellerItem.module.less @@ -1,5 +1,5 @@ -@import "../../../style/CommonStyle.module.less"; -@import "../../../style/utils.module.less"; +@import "../../../../style/CommonStyle.module.less"; +@import "../../../../style/utils.module.less"; /* vertical type (Thumbnail) */ .vertical { diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.jsx b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.jsx index f6795653..954e72de 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSale.jsx @@ -8,8 +8,8 @@ import ri from "@enact/ui/resolution"; import TGrid from "../../../components/TGrid/TGrid"; import { $L } from "../../../utils/helperMethods"; -import HomeOnSaleItem from "../HomeOnSaleItem/HomeOnSaleItem"; import css from "./HomeOnSale.module.less"; +import HomeOnSaleItem from "./HomeOnSaleItem/HomeOnSaleItem"; const SALE_ITEM_CONF = { ITEM_WIDTH: 630 * 2, diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSaleItem/HomeOnSaleItem.jsx b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.jsx similarity index 100% rename from com.twin.app.shoptime/src/views/HomePanel/HomeOnSaleItem/HomeOnSaleItem.jsx rename to com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.jsx diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSaleItem/HomeOnSaleItem.module.less b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less similarity index 97% rename from com.twin.app.shoptime/src/views/HomePanel/HomeOnSaleItem/HomeOnSaleItem.module.less rename to com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less index e9f109e1..e55ed072 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeOnSaleItem/HomeOnSaleItem.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeOnSale/HomeOnSaleItem/HomeOnSaleItem.module.less @@ -1,4 +1,4 @@ -@import "../../../style/CommonStyle.module.less"; +@import "../../../../style/CommonStyle.module.less"; .onSaleItemList { width: 630px; height: 300px; diff --git a/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx index 5707e30c..f03f1abb 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx @@ -1,4 +1,4 @@ -import React, { useCallback, useEffect } from "react"; +import React, { useCallback, useEffect, useState } from "react"; import classNames from "classnames"; import { useDispatch, useSelector } from "react-redux"; @@ -7,11 +7,10 @@ import { VirtualGridList } from "@enact/sandstone/VirtualList"; import { SpotlightContainerDecorator } from "@enact/spotlight/SpotlightContainerDecorator"; import ri from "@enact/ui/resolution"; -import { getTop20Show } from "../../../actions/mainActions"; import TGrid from "../../../components/TGrid/TGrid"; import { $L } from "../../../utils/helperMethods"; import css from "../PopularShow/PopularShow.module.less"; -import PopularShowItem from "../PopularShowItem/PopularShowItem"; +import PopularShowItem from "./PopularShowItem/PopularShowItem"; const Container = SpotlightContainerDecorator( { enterTo: "last-focused" }, @@ -21,12 +20,16 @@ const Container = SpotlightContainerDecorator( const PopularShow = ({ ...rest }) => { const dispatch = useDispatch(); const topInfos = useSelector((state) => state.main.top20ShowData.topInfos); - const renderItem = useCallback(({ index, ...rest }) => { - const itemData = topInfos[index]; - return ( - - ); - }, []); + + const renderItem = useCallback( + ({ index, ...rest }) => { + const itemData = topInfos[index]; + return ( + + ); + }, + [topInfos] + ); return ( diff --git a/com.twin.app.shoptime/src/views/HomePanel/PopularShowItem/PopularShowItem.jsx b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShowItem/PopularShowItem.jsx similarity index 100% rename from com.twin.app.shoptime/src/views/HomePanel/PopularShowItem/PopularShowItem.jsx rename to com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShowItem/PopularShowItem.jsx diff --git a/com.twin.app.shoptime/src/views/HomePanel/PopularShowItem/PopularShowItem.module.less b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShowItem/PopularShowItem.module.less similarity index 96% rename from com.twin.app.shoptime/src/views/HomePanel/PopularShowItem/PopularShowItem.module.less rename to com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShowItem/PopularShowItem.module.less index f93737ca..e3e7b3dd 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/PopularShowItem/PopularShowItem.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShowItem/PopularShowItem.module.less @@ -1,4 +1,4 @@ -@import "../../../style/CommonStyle.module.less"; +@import "../../../../style/CommonStyle.module.less"; .listItem { width: 546px; height: 438px; diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx index fa51f8dd..0a49fca4 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx @@ -1,28 +1,19 @@ -import React, { - useCallback, - useEffect, - useState, -} from 'react'; +import React, { useCallback, useEffect, useState } from "react"; -import { - useDispatch, - useSelector, -} from 'react-redux'; +import { useDispatch, useSelector } from "react-redux"; -import VirtualGridList from '@enact/sandstone/VirtualList'; -import { - SpotlightContainerDecorator, -} from '@enact/spotlight/SpotlightContainerDecorator'; -import Spottable from '@enact/spotlight/Spottable'; -import ri from '@enact/ui/resolution'; +import VirtualGridList from "@enact/sandstone/VirtualList"; +import { SpotlightContainerDecorator } from "@enact/spotlight/SpotlightContainerDecorator"; +import Spottable from "@enact/spotlight/Spottable"; +import ri from "@enact/ui/resolution"; -import { getSubCategory } from '../../../actions/mainActions'; -import { getOnSaleInfo } from '../../../actions/onSaleActions'; -import TGrid from '../../../components/TGrid/TGrid'; -import TItemCard from '../../../components/TItemCard/TItemCard'; -import css from '../../HomePanel/SubCategory/SubCategory.module.less'; -import CategoryNav from '../../OnSalePanel/CategoryNav/CategoryNav'; -import SubCategoryItem from '../SubCategoryItem/SubCategoryItem'; +import { getSubCategory } from "../../../actions/mainActions"; +import { getOnSaleInfo } from "../../../actions/onSaleActions"; +import TGrid from "../../../components/TGrid/TGrid"; +import TItemCard from "../../../components/TItemCard/TItemCard"; +import css from "../../HomePanel/SubCategory/SubCategory.module.less"; +import CategoryNav from "../../OnSalePanel/CategoryNav/CategoryNav"; +import SubCategoryItem from "./SubCategoryItem/SubCategoryItem"; const SpottableComponent = Spottable("div"); const Container = SpotlightContainerDecorator( diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategoryItem/SubCategoryItem.jsx b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategoryItem/SubCategoryItem.jsx similarity index 100% rename from com.twin.app.shoptime/src/views/HomePanel/SubCategoryItem/SubCategoryItem.jsx rename to com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategoryItem/SubCategoryItem.jsx diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategoryItem/SubCategoryItem.module.less b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategoryItem/SubCategoryItem.module.less similarity index 95% rename from com.twin.app.shoptime/src/views/HomePanel/SubCategoryItem/SubCategoryItem.module.less rename to com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategoryItem/SubCategoryItem.module.less index 8c52e85a..c334c696 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategoryItem/SubCategoryItem.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategoryItem/SubCategoryItem.module.less @@ -1,5 +1,5 @@ -@import "../../../style/CommonStyle.module.less"; -@import "../../../style/utils.module.less"; +@import "../../../../style/CommonStyle.module.less"; +@import "../../../../style/utils.module.less"; .vertical { /* normal */ position: relative;