Skip to content

Commit

Permalink
style: lint 오류 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
daepan committed Jul 25, 2023
1 parent 726ae44 commit a991f08
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 38 deletions.
33 changes: 18 additions & 15 deletions src/pages/Store/StoreDetailPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ function StoreDetailPage() {
<span>운영시간</span>
{storeDetail?.open
? `${storeDetail?.open[getDayOfWeek()].open_time} ~ ${
storeDetail?.open[getDayOfWeek()].close_time
}`
storeDetail?.open[getDayOfWeek()].close_time
}`
: '-'}
<br />
<span>주소정보</span>
Expand Down Expand Up @@ -101,8 +101,8 @@ function StoreDetailPage() {
</div>
)}
<div className={styles.image}>
{storeDetail?.image_urls &&
storeDetail.image_urls.map((img, index) => (
{
storeDetail?.image_urls && storeDetail.image_urls.map((img, index) => (
<div key={`${img}`} className={styles.image__content}>
<button
className={styles.image__button}
Expand All @@ -113,35 +113,38 @@ function StoreDetailPage() {
<img className={styles.image__poster} src={`${img}`} alt="상점이미지" />
</button>
</div>
))}
))
}
</div>
</div>
{storeMenuCategories && storeMenuCategories.length > 0 && (
<>
<div className={styles['menu-title']}>MENU</div>
<div className={styles['menu-info']}>
{storeMenuCategories.map((menuCategories: MenuCategory) =>
menuCategories.menus.map((menu: Menu) =>
{storeMenuCategories.map((menuCategories: MenuCategory) => (
menuCategories.menus.map((menu: Menu) => (
menu.option_prices === null ? (
<div className={styles['menu-card']} key={menu.id}>
{menu.name}
<span>
{!!menu.single_price &&
menu.single_price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
{
!!menu.single_price && (
menu.single_price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
)
}
</span>
</div>
) : (
<div className={styles['menu-card']} key={menu.id}>
{menu.name}
<span>
{menu.option_prices[0].price
.toString()
.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
{
menu.option_prices[0].price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
}
</span>
</div>
),
),
)}
)
))))}
</div>
</>
)}
Expand Down
42 changes: 19 additions & 23 deletions src/pages/Store/StorePage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ const searchStorePayCheckBoxFilter = (checked: string | undefined) => {

const checkedStoreSearchQuery = (storeSearchQuery: StoreSearchQueryType) => {
if (
storeSearchQuery.delivery === undefined &&
storeSearchQuery.bank === undefined &&
storeSearchQuery.card === undefined
storeSearchQuery.delivery === undefined && (
storeSearchQuery.bank === undefined) && (
storeSearchQuery.card === undefined)
) {
return true;
}
Expand All @@ -58,16 +58,14 @@ const useStoreList = (params: StoreSearchQueryType) => {
retry: 0,
});
return storeList?.shops.filter(
(store) =>
(params.category === undefined ||
params.category === 'ALL' ||
store.category === params.category) &&
(checkedStoreSearchQuery(params)
? true
: (store.pay_bank && searchStorePayCheckBoxFilter(params.bank)) ||
(store.pay_card && searchStorePayCheckBoxFilter(params.card)) ||
(store.delivery && searchStorePayCheckBoxFilter(params.delivery))) &&
store.name.includes(params.storeName ? params.storeName : ''),
(store) => (params.category === undefined || params.category === 'ALL' || (
store.category === params.category
)) && (
checkedStoreSearchQuery(params)
? true : (store.pay_bank && searchStorePayCheckBoxFilter(params.bank)) || (
store.pay_card && searchStorePayCheckBoxFilter(params.card)) || (
store.delivery && searchStorePayCheckBoxFilter(params.delivery))) && (
store.name.includes(params.storeName ? params.storeName : '')),
);
};

Expand All @@ -85,12 +83,11 @@ const isStoreOpen = (open_time: string | null, close_time: string | null) => {
const closeTimeNum = Number(close_time.replace(':', ''));
const nowTimeNum = date.getHours() * 100 + date.getMinutes();

if (
openTimeNum > closeTimeNum
? openTimeNum >= nowTimeNum || closeTimeNum >= nowTimeNum
: openTimeNum >= nowTimeNum || closeTimeNum <= nowTimeNum
)
return true;
if (openTimeNum > closeTimeNum ? (
openTimeNum >= nowTimeNum || closeTimeNum >= nowTimeNum
) : (
openTimeNum >= nowTimeNum || closeTimeNum <= nowTimeNum
)) return true;
return false;
};

Expand All @@ -115,9 +112,7 @@ function StorePage() {
role="radio"
aria-checked={searchParams.get('category') === value.tag}
type="button"
onClick={() =>
setParams('category', value.tag, { deleteBeforeParam: false, replacePage: true })
}
onClick={() => setParams('category', value.tag, { deleteBeforeParam: false, replacePage: true })}
key={value.tag}
>
<img className={styles.category__image} src={value.image} alt="category_img" />
Expand All @@ -137,11 +132,12 @@ function StorePage() {
name="search"
placeholder="상점명을 입력하세요"
onKeyPress={(e) => {
if (e.key === 'Enter')
if (e.key === 'Enter') {
setParams('storeName', e.target.value, {
deleteBeforeParam: searchParams.get('storeName') === undefined,
replacePage: true,
});
}
}}
/>
<button
Expand Down

0 comments on commit a991f08

Please sign in to comment.