From 54ea33a33d7be9c1676fb933a2f0a7b3f57c1eea Mon Sep 17 00:00:00 2001 From: "junghoon86.park" Date: Fri, 19 Jul 2024 14:25:03 +0900 Subject: [PATCH] =?UTF-8?q?today=20deals=20=EB=B6=80=EB=B6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EA=B4=80=EB=A0=A8=20=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/de/strings.json | 1 + .../resources/en/strings.json | 1 + .../resources/gb/strings.json | 1 + .../resources/ru/strings.json | 3 +- .../views/HomePanel/HomeBanner/RandomUnit.jsx | 56 ++++++++++++------- .../HomeBanner/RandomUnit.module.less | 12 +++- 6 files changed, 52 insertions(+), 22 deletions(-) diff --git a/com.twin.app.shoptime/resources/de/strings.json b/com.twin.app.shoptime/resources/de/strings.json index 3277262b..40efeb4f 100644 --- a/com.twin.app.shoptime/resources/de/strings.json +++ b/com.twin.app.shoptime/resources/de/strings.json @@ -98,6 +98,7 @@ "SERIES": "SERIEN", "SHOWROOM": "SHOWROOM", "TODAY'S DEALS": "Heutige Angebote", + "TODAY's DEALS": "Heutige Angebote", "SAVE": "Rabatt", "UPCOMING": "VORSCHAU", "Reminder Setted": "Erinnerung eingestellt", diff --git a/com.twin.app.shoptime/resources/en/strings.json b/com.twin.app.shoptime/resources/en/strings.json index 7fa07e52..80fc93f5 100644 --- a/com.twin.app.shoptime/resources/en/strings.json +++ b/com.twin.app.shoptime/resources/en/strings.json @@ -98,6 +98,7 @@ "SERIES": "SERIES", "SHOWROOM": "SHOWROOM", "TODAY'S DEALS": "TODAY'S DEALS", + "TODAY's DEALS": "TODAY's DEALS", "SAVE": "SAVE", "UPCOMING": "UPCOMING", "Reminder Setted": "Reminder Setted", diff --git a/com.twin.app.shoptime/resources/gb/strings.json b/com.twin.app.shoptime/resources/gb/strings.json index dbd5c32c..66a5c400 100644 --- a/com.twin.app.shoptime/resources/gb/strings.json +++ b/com.twin.app.shoptime/resources/gb/strings.json @@ -98,6 +98,7 @@ "SERIES": "SERIES", "SHOWROOM": "SHOWROOM", "TODAY'S DEALS": "TODAY'S DEALS", + "TODAY's DEALS": "TODAY's DEALS", "SAVE": "SAVE", "UPCOMING": "UPCOMING", "Reminder Setted": "Reminder Setted", diff --git a/com.twin.app.shoptime/resources/ru/strings.json b/com.twin.app.shoptime/resources/ru/strings.json index e17cdfe7..906dc7a3 100644 --- a/com.twin.app.shoptime/resources/ru/strings.json +++ b/com.twin.app.shoptime/resources/ru/strings.json @@ -97,7 +97,8 @@ "RECOMMENDED SHOWS": "РЕКОМЕНДУЕМЫЕ ШОУ", "SERIES": "СЕРИИ", "SHOWROOM": "ШОУ-РУМ", - "TODAY'S DEALS": "Предложения на сегодня", + "TODAY'S DEALS": "Сегодняшние предложения", + "TODAY's DEALS": "Сегодняшние предложения", "SAVE": "Сэкономьте", "UPCOMING": "СКОРО В ЭФИРЕ", "Reminder Setted": "Напоминание установлено", diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx b/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx index 272b117f..316eddca 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.jsx @@ -4,32 +4,47 @@ import React, { useMemo, useRef, useState, -} from "react"; +} from 'react'; -import classNames from "classnames"; -import { useDispatch, useSelector } from "react-redux"; +import classNames from 'classnames'; +import { + useDispatch, + useSelector, +} from 'react-redux'; -import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDecorator"; -import Spottable from "@enact/spotlight/Spottable"; +import SpotlightContainerDecorator + from '@enact/spotlight/SpotlightContainerDecorator'; +import Spottable from '@enact/spotlight/Spottable'; -import btnPlay from "../../../../assets/images/btn/btn-play-thumb-nor.png"; -import defaultLogoImg from "../../../../assets/images/ic-tab-partners-default@3x.png"; -import emptyHorImage from "../../../../assets/images/img-home-banner-empty-hor.png"; -import emptyVerImage from "../../../../assets/images/img-home-banner-empty-ver.png"; -import defaultImageItem from "../../../../assets/images/img-thumb-empty-product@3x.png"; -import liveShow from "../../../../assets/images/tag-liveshow.png"; +import btnPlay from '../../../../assets/images/btn/btn-play-thumb-nor.png'; +import defaultLogoImg + from '../../../../assets/images/ic-tab-partners-default@3x.png'; +import emptyHorImage + from '../../../../assets/images/img-home-banner-empty-hor.png'; +import emptyVerImage + from '../../../../assets/images/img-home-banner-empty-ver.png'; +import defaultImageItem + from '../../../../assets/images/img-thumb-empty-product@3x.png'; +import liveShow from '../../../../assets/images/tag-liveshow.png'; +import { sendLogTopContents } from '../../../actions/logActions'; //import { sendBroadCast } from "../../../actions/commonActions"; -import { pushPanel } from "../../../actions/panelActions"; +import { pushPanel } from '../../../actions/panelActions'; import { finishVideoPreview, startVideoPlayer, -} from "../../../actions/playActions"; -import CustomImage from "../../../components/CustomImage/CustomImage"; -import usePriceInfo from "../../../hooks/usePriceInfo"; -import { LOG_MENU, LOG_TP_NO, panel_names } from "../../../utils/Config"; -import { $L, formatGMTString } from "../../../utils/helperMethods"; -import css from "./RandomUnit.module.less"; -import { sendLogTopContents } from "../../../actions/logActions"; +} from '../../../actions/playActions'; +import CustomImage from '../../../components/CustomImage/CustomImage'; +import usePriceInfo from '../../../hooks/usePriceInfo'; +import { + LOG_MENU, + LOG_TP_NO, + panel_names, +} from '../../../utils/Config'; +import { + $L, + formatGMTString, +} from '../../../utils/helperMethods'; +import css from './RandomUnit.module.less'; const SpottableComponent = Spottable("div"); @@ -58,7 +73,7 @@ export default function RandomUnit({ const homeCategory = useSelector( (state) => state.home.menuData?.data?.homeCategory ); - + const countryCode = useSelector((state) => state.common.httpHeader.cntry_cd); const [randomData, setRandomData] = useState(""); const [priceInfos, setpriceInfos] = useState(""); const [isFocused, setIsFocused] = useState(false); @@ -506,6 +521,7 @@ export default function RandomUnit({ className={classNames( css.itemBox, css.todaysDeals, + countryCode === "RU" ? css.ru : "", isHorizontal && css.isHorizontal )} onClick={todayDealClick} diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.module.less b/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.module.less index 7c10e46e..f83efa67 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.module.less +++ b/com.twin.app.shoptime/src/views/HomePanel/HomeBanner/RandomUnit.module.less @@ -78,6 +78,16 @@ background-position: left top; border-radius: 10px; padding: 73px 36px 0; + &.ru { + .productInfo { + .todaysDealTitle { + font-size: 58px; + line-height: 60px; + font-weight: 900; + font-family: @arialFontBold; + } + } + } .productInfo { margin-bottom: 33px; .todaysDealTitle { @@ -90,7 +100,7 @@ color: #151515; text-align: center; line-height: 76px; - font-family: Arial, Helvetica, sans-serif; + font-family: @arialFont; font-weight: 900; } .textBox {