diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannels.jsx b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannels.jsx index a1d2e713..f45201d9 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannels.jsx +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveChannels.jsx @@ -6,8 +6,8 @@ import ri from "@enact/ui/resolution"; import SectionTitle from "../../../components/SectionTitle/SectionTitle"; import TItemCard from "../../../components/TItemCard/TItemCard"; import { $L } from "../../../utils/helperMethods"; -import LiveVideoCard from "../LiveVideoCard/LiveVideoCard"; import css from "./LiveChannels.module.less"; +import LiveVideoCard from "./LiveVideoCard/LiveVideoCard"; // getBrandLiveChannelInfo → brandChanInfo → brandProductInfo // brandProductInfo = { @@ -21,19 +21,6 @@ import css from "./LiveChannels.module.less"; // soldoutFlag, // } -/* - -*/ - const LIVE_CHANNELS_STRING = "LIVE CHANNELS"; const LIST_ITEM_CONF = { @@ -65,8 +52,6 @@ export default function LiveChannels({ brandChanInfo, brandChannelCnt }) { vtctpYn, // 영상 세로 여부 } = brandChanInfo; - console.log(); - const renderItem = ({ index, ...rest }) => { const { prdtImgUrl, prdtId, prdtNm, priceInfo, soldoutFlag } = brandProductInfo[index]; diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/LiveVideoCard.jsx b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/LiveVideoCard.jsx similarity index 85% rename from com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/LiveVideoCard.jsx rename to com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/LiveVideoCard.jsx index e8c4c339..1d3d2fde 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/LiveVideoCard.jsx +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/LiveVideoCard.jsx @@ -2,10 +2,10 @@ import React, { memo, useCallback, useState } from "react"; import Spottable from "@enact/spotlight/Spottable"; -import IcWarning from "../../../../assets/icon/ic-warning.svg"; -import IcLiveShow from "../../../../assets/icon/tag/tag-liveshow.svg"; -import VideoOverlayWithPhoneNumber from "../../../components/VideoOverlayWithPhoneNumber/VideoOverlayWithPhoneNumber"; -import { $L } from "../../../utils/helperMethods"; +import IcWarning from "../../../../../assets/icon/ic-warning.svg"; +import IcLiveShow from "../../../../../assets/icon/tag/tag-liveshow.svg"; +import VideoOverlayWithPhoneNumber from "../../../../components/VideoOverlayWithPhoneNumber/VideoOverlayWithPhoneNumber"; +import { $L } from "../../../../utils/helperMethods"; import css from "./LiveVideoCard.module.less"; const SpottableComponent = Spottable("div"); diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/LiveVideoCard.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/LiveVideoCard.module.less similarity index 94% rename from com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/LiveVideoCard.module.less rename to com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/LiveVideoCard.module.less index 4adcd85d..79013b19 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/LiveVideoCard.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/LiveVideoCard.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"; .container { /* normal */ diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/package.json b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/package.json similarity index 100% rename from com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveVideoCard/package.json rename to com.twin.app.shoptime/src/views/FeaturedBrandsPanel/LiveChannels/LiveVideoCard/package.json diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenu.jsx b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenu.jsx index 4e14ce4d..82019c1c 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenu.jsx +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenu.jsx @@ -4,7 +4,7 @@ import { VirtualGridList } from "@enact/sandstone/VirtualList"; import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDecorator"; import ri from "@enact/ui/resolution"; -import QuickMenuItem from "../QuickMenuItem/QuickMenuItem"; +import QuickMenuItem from "../QuickMenu/QuickMenuItem/QuickMenuItem"; import css from "./QuickMenu.module.less"; const LIST_ITEM_CONF = { diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/QuickMenuItem.jsx b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/QuickMenuItem.jsx similarity index 94% rename from com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/QuickMenuItem.jsx rename to com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/QuickMenuItem.jsx index 14c474ca..383fbd6c 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/QuickMenuItem.jsx +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/QuickMenuItem.jsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import Spottable from "@enact/spotlight/Spottable"; -import { $L } from "../../../utils/helperMethods"; +import { $L } from "../../../../utils/helperMethods"; import css from "./QuickMenuItem.module.less"; const SpottableComponent = Spottable("div"); diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/QuickMenuItem.module.less b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/QuickMenuItem.module.less similarity index 78% rename from com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/QuickMenuItem.module.less rename to com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/QuickMenuItem.module.less index 810028cd..da965d93 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/QuickMenuItem.module.less +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/QuickMenuItem.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"; .item { /* normal */ @@ -49,7 +49,7 @@ // outline > span { - background-image: url("../../../../assets/images/partners/ic-tab-partners-focus@3x.png"); + background-image: url("../../../../../assets/images/partners/ic-tab-partners-focus@3x.png"); } } @@ -67,7 +67,7 @@ // outline > span { - background-image: url("../../../../assets/images/partners/ic-tab-partners-selected@3x.png"); + background-image: url("../../../../../assets/images/partners/ic-tab-partners-selected@3x.png"); } } } diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/package.json b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/package.json similarity index 100% rename from com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenuItem/package.json rename to com.twin.app.shoptime/src/views/FeaturedBrandsPanel/QuickMenu/QuickMenuItem/package.json diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNav.jsx b/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNav.jsx index 19548e7b..ae54f686 100644 --- a/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNav.jsx +++ b/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNav.jsx @@ -4,7 +4,7 @@ import { VirtualGridList } from "@enact/sandstone/VirtualList"; import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDecorator"; import ri from "@enact/ui/resolution"; -import CategoryNavItem from "../CategoryNavItem/CategoryNavItem"; +import CategoryNavItem from "../CategoryNav/CategoryNavItem/CategoryNavItem"; import css from "./CategoryNav.module.less"; const LIST_ITEM_CONF = { diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/CategoryNavItem.jsx b/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/CategoryNavItem.jsx similarity index 100% rename from com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/CategoryNavItem.jsx rename to com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/CategoryNavItem.jsx diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/CategoryNavItem.module.less b/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/CategoryNavItem.module.less similarity index 52% rename from com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/CategoryNavItem.module.less rename to com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/CategoryNavItem.module.less index 71f6ff1b..5d493f2a 100644 --- a/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/CategoryNavItem.module.less +++ b/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/CategoryNavItem.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"; .category { /* normal */ @@ -24,62 +24,62 @@ &.category-icon-1017 { // LG Electronics - background-image: url("../../../../assets/category/ic-category-lgelectronics-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-lgelectronics-nor@3x.png"); } // Garden and Outdoors &.category-icon-1008 { - background-image: url("../../../../assets/category/ic-category-garden-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-garden-nor@3x.png"); } // Fashion &.category-icon-1000 { - background-image: url("../../../../assets/category/ic-category-fashion-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-fashion-nor@3x.png"); } // Beauty &.category-icon-1003 { - background-image: url("../../../../assets/category/ic-category-beauty-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-beauty-nor@3x.png"); } // Jewelry &.category-icon-1004 { - background-image: url("../../../../assets/category/ic-category-jewelry-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-jewelry-nor@3x.png"); } // Home &.category-icon-1006 { - background-image: url("../../../../assets/category/ic-category-home-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-home-nor@3x.png"); } // Kitchen & Food &.category-icon-1007 { - background-image: url("../../../../assets/category/ic-category-kitchen-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-kitchen-nor@3x.png"); } // Accessories &.category-icon-1014 { - background-image: url("../../../../assets/category/ic-category-accessories-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-accessories-nor@3x.png"); } // Heaclth & Fitness &.category-icon-1009 { - background-image: url("../../../../assets/category/ic-category-health-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-health-nor@3x.png"); } // Crafts & Sewing &.category-icon-1011 { - background-image: url("../../../../assets/category/ic-category-cw-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-cw-nor@3x.png"); } // Electronics &.category-icon-1010 { - background-image: url("../../../../assets/category/ic-category-electronics-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-electronics-nor@3x.png"); } // Clearance &.category-icon-1013 { - background-image: url("../../../../assets/category/ic-category-clearance-nor@3x.png"); + background-image: url("../../../../../assets/category/ic-category-clearance-nor@3x.png"); } } } @@ -107,62 +107,62 @@ span { // LG Electronics &.category-icon-1017 { - background-image: url("../../../../assets/category/ic-category-lgelectronics-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-lgelectronics-foc@3x.png"); } // Garden and Outdoors &.category-icon-1008 { - background-image: url("../../../../assets/category/ic-category-garden-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-garden-foc@3x.png"); } // Fashion &.category-icon-1000 { - background-image: url("../../../../assets/category/ic-category-fashion-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-fashion-foc@3x.png"); } // Beauty &.category-icon-1003 { - background-image: url("../../../../assets/category/ic-category-beauty-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-beauty-foc@3x.png"); } // Jewelry &.category-icon-1004 { - background-image: url("../../../../assets/category/ic-category-jewelry-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-jewelry-foc@3x.png"); } // Home &.category-icon-1006 { - background-image: url("../../../../assets/category/ic-category-home-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-home-foc@3x.png"); } // Kitchen & Food &.category-icon-1007 { - background-image: url("../../../../assets/category/ic-category-kitchen-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-kitchen-foc@3x.png"); } // Accessories &.category-icon-1014 { - background-image: url("../../../../assets/category/ic-category-accessories-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-accessories-foc@3x.png"); } // Heaclth & Fitness &.category-icon-1009 { - background-image: url("../../../../assets/category/ic-category-health-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-health-foc@3x.png"); } // Crafts & Sewing &.category-icon-1011 { - background-image: url("../../../../assets/category/ic-category-cw-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-cw-foc@3x.png"); } // Electronics &.category-icon-1010 { - background-image: url("../../../../assets/category/ic-category-electronics-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-electronics-foc@3x.png"); } // Clearance &.category-icon-1013 { - background-image: url("../../../../assets/category/ic-category-clearance-foc@3x.png"); + background-image: url("../../../../../assets/category/ic-category-clearance-foc@3x.png"); } } } diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/package.json b/com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/package.json similarity index 100% rename from com.twin.app.shoptime/src/views/OnSalePanel/CategoryNavItem/package.json rename to com.twin.app.shoptime/src/views/OnSalePanel/CategoryNav/CategoryNavItem/package.json diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/OnSaleProductItem.jsx b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/OnSaleProductItem.jsx similarity index 89% rename from com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/OnSaleProductItem.jsx rename to com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/OnSaleProductItem.jsx index 84548fc3..75de58ab 100644 --- a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/OnSaleProductItem.jsx +++ b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/OnSaleProductItem.jsx @@ -1,6 +1,6 @@ import React, { memo } from "react"; -import TItemCard from "../../../components/TItemCard/TItemCard"; +import TItemCard from "../../../../components/TItemCard/TItemCard"; import css from "./OnSaleProductItem.module.less"; export default memo(function OnSaleProductItem({ diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/OnSaleProductItem.module.less b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/OnSaleProductItem.module.less similarity index 100% rename from com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/OnSaleProductItem.module.less rename to com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/OnSaleProductItem.module.less diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/package.json b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/package.json similarity index 100% rename from com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductItem/package.json rename to com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductItem/package.json diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductList.jsx b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductList.jsx index 6d269d09..029c4ee5 100644 --- a/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductList.jsx +++ b/com.twin.app.shoptime/src/views/OnSalePanel/OnSaleProductList/OnSaleProductList.jsx @@ -5,7 +5,7 @@ import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDeco import ri from "@enact/ui/resolution"; import SectionTitle from "../../../components/SectionTitle/SectionTitle"; -import OnSaleProductItem from "../OnSaleProductItem/OnSaleProductItem"; +import OnSaleProductItem from "../OnSaleProductList/OnSaleProductItem/OnSaleProductItem"; import css from "./OnSaleProductList.module.less"; const LIST_ITEM_CONF = {