woowacourse-teams · Dahyeeee · Sep 12, 2023 · Sep 8, 2023 · Sep 8, 2023 · Sep 8, 2023
diff --git a/frontend/src/components/common/DayLogItem/DayLogItem.tsx b/frontend/src/components/common/DayLogItem/DayLogItem.tsx
@@ -1,11 +1,15 @@
-import { Box, Flex, Heading } from 'hang-log-design-system';
+import { useEffect } from 'react';
+
+import { Box, Flex, Heading, Toggle, ToggleGroup, useSelect } from 'hang-log-design-system';
 
 import { containerStyling, headerStyling } from '@components/common/DayLogItem/DayLogItem.style';
 import TitleInput from '@components/common/DayLogItem/TitleInput/TitleInput';
 import TripItemList from '@components/common/TripItemList/TripItemList';
 
 import type { DayLogData } from '@type/dayLog';
 
+import { DAY_LOG_ITEM_FILTERS } from '@constants/trip';
+
 interface DayLogItemProps extends DayLogData {
   tripId: number;
   isEditable?: boolean;
@@ -20,6 +24,19 @@ const DayLogItem = ({
   openAddModal,
   ...information
 }: DayLogItemProps) => {
+  const { selected: selectedFilter, handleSelectClick: handleFilterSelectClick } = useSelect(
+    DAY_LOG_ITEM_FILTERS.ALL
+  );
+
+  const selectedTripItemList =
+    selectedFilter === DAY_LOG_ITEM_FILTERS.SPOT
+      ? information.items.filter((item) => item.itemType === true)
+      : information.items;
+
+  useEffect(() => {
+    handleFilterSelectClick(DAY_LOG_ITEM_FILTERS.ALL);
+  }, [handleFilterSelectClick, information.items]);
+
   return (
     <Box tag="section" css={containerStyling}>
       <Flex css={headerStyling} styles={{ justify: 'space-between' }}>
@@ -28,12 +45,26 @@ const DayLogItem = ({
         ) : (
           <Heading size="xSmall">{information.title}</Heading>
         )}
+        {!isEditable && (
+          <ToggleGroup>
+            {[DAY_LOG_ITEM_FILTERS.ALL, DAY_LOG_ITEM_FILTERS.SPOT].map((filter) => (
+              <Toggle
+                key={filter}
+                text={filter}
+                toggleId={filter}
+                selectedId={selectedFilter}
+                changeSelect={handleFilterSelectClick}
+                aria-label={`${filter} 필터`}
+              />
+            ))}
+          </ToggleGroup>
+        )}
       </Flex>
-      {information.items.length > 0 ? (
+      {selectedTripItemList.length > 0 ? (
         <TripItemList
           tripId={tripId}
           dayLogId={information.id}
-          tripItems={information.items}
+          tripItems={selectedTripItemList}
           isEditable={isEditable}
         />
       ) : (

diff --git a/frontend/src/components/common/DayLogItem/DayLogItemSkeleton.tsx b/frontend/src/components/common/DayLogItem/DayLogItemSkeleton.tsx
@@ -14,6 +14,7 @@ const DayLogItemSkeleton = () => {
     <Box css={containerStyling}>
       <Flex css={headerStyling} styles={{ justify: 'space-between' }}>
         <Skeleton width={isMobile ? '180px' : '250px'} height="38px" />
+        <Skeleton width="100px" height="38px" />
       </Flex>
       <TripItemListSkeleton />
     </Box>

diff --git a/frontend/src/components/common/GoogleMapWrapper/GoogleMapWrapper.tsx b/frontend/src/components/common/GoogleMapWrapper/GoogleMapWrapper.tsx
@@ -2,14 +2,25 @@ import { Status, Wrapper } from '@googlemaps/react-wrapper';
 
 import type { PropsWithChildren } from 'react';
 
-import { Spinner } from 'hang-log-design-system';
+import { Flex, Spinner } from 'hang-log-design-system';
 
 type GoogleMapWrapperProps = PropsWithChildren;
 
 const render = (status: Status) => {
   if (status === Status.FAILURE) throw new Error('오류가 발생했습니다.');
 
-  return <Spinner />;
+  return (
+    <Flex
+      styles={{
+        width: '100%',
+        height: '100%',
+        justify: 'center',
+        align: 'center',
+      }}
+    >
+      <Spinner />
+    </Flex>
+  );
 };
 
 const GoogleMapWrapper = ({ children }: GoogleMapWrapperProps) => {

diff --git a/frontend/src/components/common/TripInformation/TripInformation.style.ts b/frontend/src/components/common/TripInformation/TripInformation.style.ts
@@ -51,6 +51,8 @@ export const titleStyling = css({
 
 export const descriptionStyling = css({
   marginTop: Theme.spacer.spacing3,
+
+  whiteSpace: 'pre-wrap',
 });
 
 export const buttonContainerStyling = css({

diff --git a/frontend/src/components/common/TripItem/TripItem.style.ts b/frontend/src/components/common/TripItem/TripItem.style.ts
@@ -57,6 +57,7 @@ export const memoStyling = css({
   marginTop: Theme.spacer.spacing3,
 
   wordBreak: 'break-all',
+  whiteSpace: 'pre-wrap',
 });
 
 export const expenseStyling = css({

diff --git a/frontend/src/components/common/TripItem/TripItem.tsx b/frontend/src/components/common/TripItem/TripItem.tsx
@@ -1,9 +1,9 @@
 import type { ForwardedRef } from 'react';
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 
 import { useRecoilValue } from 'recoil';
 
-import { Box, ImageCarousel, Text } from 'hang-log-design-system';
+import { Box, Heading, ImageCarousel, Modal, Text, useOverlay } from 'hang-log-design-system';
 
 import StarRating from '@components/common/StarRating/StarRating';
 import EditMenu from '@components/common/TripItem/EditMenu/EditMenu';
@@ -19,14 +19,16 @@ import {
 } from '@components/common/TripItem/TripItem.style';
 
 import { useDraggedItem } from '@hooks/common/useDraggedItem';
+import useResizeImage from '@hooks/trip/useResizeImage';
 
-import { mediaQueryMobileState, viewportWidthState } from '@store/mediaQuery';
+import { mediaQueryMobileState } from '@store/mediaQuery';
 
 import { formatNumberToMoney } from '@utils/formatter';
 
 import type { TripItemData } from '@type/tripItem';
 
 import { CURRENCY_ICON } from '@constants/trip';
+import { TRIP_ITEM_IMAGE_HEIGHT, TRIP_ITEM_IMAGE_WIDTH } from '@constants/ui';
 
 interface TripListItemProps extends TripItemData {
   tripId: number;
@@ -51,10 +53,12 @@ const TripItem = ({
   ...information
 }: TripListItemProps) => {
   const isMobile = useRecoilValue(mediaQueryMobileState);
-  const viewportWidth = useRecoilValue(viewportWidthState);
+  const { mobileImageSize, modalImageSize } = useResizeImage({
+    width: TRIP_ITEM_IMAGE_WIDTH,
+    height: TRIP_ITEM_IMAGE_HEIGHT,
+  });
 
-  const imageWidth = useMemo(() => viewportWidth - 48, [viewportWidth]);
-  const imageHeight = useMemo(() => (imageWidth / 4.5) * 3, [imageWidth]);
+  const { isOpen: isImageModalOpen, open: openImageModal, close: closeImageModal } = useOverlay();
 
   const { isDragging, handleDrag, handleDragEnd } = useDraggedItem(onDragEnd);
   const itemRef = useRef<HTMLLIElement>(null);
@@ -66,61 +70,85 @@ const TripItem = ({
   }, [observer]);
 
   return (
-    <li
-      ref={itemRef}
-      css={getContainerStyling({ isEditable, isDragging })}
-      data-id={information.id}
-      draggable={isEditable}
-      onDragStart={onDragStart}
-      onDrag={isEditable ? handleDrag : undefined}
-      onDragEnter={onDragEnter}
-      onDragEnd={isEditable ? handleDragEnd : undefined}
-    >
-      <div ref={scrollRef} css={contentContainerStyling}>
-        {information.imageUrls.length > 0 && (
-          <ImageCarousel
-            width={isMobile ? imageWidth : 250}
-            height={isMobile ? imageHeight : 167}
-            isDraggable={false}
-            showNavigationOnHover={!isMobile}
-            showArrows={information.imageUrls.length > 1}
-            showDots={information.imageUrls.length > 1}
-            images={information.imageUrls}
-          />
-        )}
-        <Box tag="section" css={informationContainerStyling}>
-          <Text size="large" css={titleStyling}>
-            {information.title}
-          </Text>
-          {information.place && (
-            <Text css={subInformationStyling} size="small">
-              {information.place.category.name}
-            </Text>
-          )}
-          {information.rating && <StarRating css={starRatingStyling} rate={information.rating} />}
-          {information.memo && (
-            <Text css={memoStyling} size="small">
-              {information.memo}
-            </Text>
+    <>
+      <li
+        ref={itemRef}
+        css={getContainerStyling({ isEditable, isDragging })}
+        data-id={information.id}
+        draggable={isEditable}
+        onDragStart={onDragStart}
+        onDrag={isEditable ? handleDrag : undefined}
+        onDragEnter={onDragEnter}
+        onDragEnd={isEditable ? handleDragEnd : undefined}
+      >
+        <div ref={scrollRef} css={contentContainerStyling}>
+          {information.imageUrls.length > 0 && (
+            // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+            <div
+              onClick={isMobile ? undefined : openImageModal}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  openImageModal();
+                }
+              }}
+            >
+              <ImageCarousel
+                width={isMobile ? mobileImageSize.width : TRIP_ITEM_IMAGE_WIDTH}
+                height={isMobile ? mobileImageSize.height : TRIP_ITEM_IMAGE_HEIGHT}
+                isDraggable={false}
+                showNavigationOnHover={!isMobile}
+                showArrows={information.imageUrls.length > 1}
+                showDots={information.imageUrls.length > 1}
+                images={information.imageUrls}
+              />
+            </div>
           )}
-          {information.expense && (
-            <Text css={expenseStyling} size="small">
-              {information.expense.category.name} · {CURRENCY_ICON[information.expense.currency]}
-              {formatNumberToMoney(information.expense.amount)}
+          <Box tag="section" css={informationContainerStyling}>
+            <Text size="large" css={titleStyling}>
+              {information.title}
             </Text>
-          )}
-        </Box>
-      </div>
-      {isEditable ? (
-        <EditMenu
-          tripId={tripId}
-          dayLogId={dayLogId}
-          hasImage={information.imageUrls.length > 0}
-          imageHeight={imageHeight}
-          {...information}
+            {information.place && (
+              <Text css={subInformationStyling} size="small">
+                {information.place.category.name}
+              </Text>
+            )}
+            {information.rating && <StarRating css={starRatingStyling} rate={information.rating} />}
+            {information.memo && (
+              <Text css={memoStyling} size="small">
+                {information.memo}
+              </Text>
+            )}
+            {information.expense && (
+              <Text css={expenseStyling} size="small">
+                {information.expense.category.name} · {CURRENCY_ICON[information.expense.currency]}
+                {formatNumberToMoney(information.expense.amount)}
+              </Text>
+            )}
+          </Box>
+        </div>
+        {isEditable ? (
+          <EditMenu
+            tripId={tripId}
+            dayLogId={dayLogId}
+            hasImage={information.imageUrls.length > 0}
+            imageHeight={mobileImageSize.height}
+            {...information}
+          />
+        ) : null}
+      </li>
+      <Modal isOpen={isImageModalOpen} closeModal={closeImageModal}>
+        <Heading size="small">{information.title}</Heading>
+        <ImageCarousel
+          width={modalImageSize.width}
+          height={modalImageSize.height}
+          isDraggable={false}
+          showNavigationOnHover={!isMobile}
+          showArrows={information.imageUrls.length > 1}
+          showDots={information.imageUrls.length > 1}
+          images={information.imageUrls}
         />
-      ) : null}
-    </li>
+      </Modal>
+    </>
   );
 };
 

diff --git a/frontend/src/constants/api.ts b/frontend/src/constants/api.ts
@@ -29,7 +29,7 @@ export const END_POINTS = {
 } as const;
 
 export const NETWORK = {
-  RETRY_COUNT: 3,
+  RETRY_COUNT: 2,
   TIMEOUT: 10000,
 } as const;
 

diff --git a/frontend/src/constants/ui.ts b/frontend/src/constants/ui.ts
@@ -10,13 +10,13 @@ export const EXPENSE_CATEGORY_INFORMATION_SKELETON_LENGTH = 6;
 
 export const EXPENSE_LIST_SKELETON_LENGTH = 5;
 
-export const TRIP_TITLE_MAX_LENGTH = 14;
+export const TRIP_TITLE_MAX_LENGTH = 24;
 
 export const TRIP_DESCRIPTION_MAX_LENGTH = 124;
 
 export const DAYLOG_TITLE_MAX_LENGTH = 24;
 
-export const TRIP_ITEM_TITLE_MAX_LENGTH = 20;
+export const TRIP_ITEM_TITLE_MAX_LENGTH = 24;
 
 export const TRIP_ITEM_MEMO_MAX_LENGTH = 254;
 
@@ -29,3 +29,7 @@ export const AMOUNT_MAX_LIMIT = 100_000_000;
 export const EXPENSE_CATEGORY_CHART_SIZE = 300;
 
 export const EXPENSE_CATEGORY_CHART_STROKE_WIDTH = 60;
+
+export const TRIP_ITEM_IMAGE_WIDTH = 250;
+
+export const TRIP_ITEM_IMAGE_HEIGHT = 167;
diff --git a/frontend/src/hooks/api/queryClient.ts b/frontend/src/hooks/api/queryClient.ts
@@ -0,0 +1,13 @@
+import { QueryClient } from '@tanstack/react-query';
+
+import { NETWORK } from '@constants/api';
+
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: NETWORK.RETRY_COUNT,
+      suspense: true,
+      useErrorBoundary: true,
+    },
+  },
+});
diff --git a/frontend/src/hooks/trip/useResizeImage.ts b/frontend/src/hooks/trip/useResizeImage.ts
@@ -0,0 +1,38 @@
+import { viewportWidthState } from '@/store/mediaQuery';
+
+import { useMemo } from 'react';
+
+import { useRecoilValue } from 'recoil';
+
+interface useResizeImageParam {
+  width?: number;
+  height?: number;
+}
+
+interface mobileImageSizeType {
+  mobileImageSize: { width: number; height: number };
+  modalImageSize: { width: number; height: number };
+}
+
+const useResizeImage = ({ width = 0, height = 0 }: useResizeImageParam): mobileImageSizeType => {
+  const viewportWidth = useRecoilValue(viewportWidthState);
+
+  const mobileImageWidth = useMemo(() => viewportWidth - 48, [viewportWidth]);
+  const mobileImageHeight = useMemo(() => (mobileImageWidth / 4.5) * 3, [mobileImageWidth]);
+
+  const modalImageWidth = useMemo(() => width * 2, [width]);
+  const modalImageHeight = useMemo(() => height * 2, [height]);
+
+  return {
+    mobileImageSize: {
+      height: mobileImageHeight,
+      width: mobileImageWidth,
+    },
+    modalImageSize: {
+      height: modalImageHeight,
+      width: modalImageWidth,
+    },
+  };
+};
+
+export default useResizeImage;