Merge pull request #41 from LikeLion-KNU/feature/#7

Feature/#7
LikeLion-KNU · May 20, 2024 · 093e00d · 093e00d
2 parents 1ac41cb + 2db356a
commit 093e00d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/src/components/display/Booth.styled.ts b/src/components/display/Booth.styled.ts
@@ -25,11 +25,12 @@ export const BoothLink = styled(Link)`
 
     span {
         display: flex;
-        align-items: center;
+        flex-direction: column;
 
         width: 100%;
 
-        padding-left: 20px;
+        padding-left: 10px;
+        gap: 1px;
     }
 `;
 

diff --git a/src/components/display/Booth.tsx b/src/components/display/Booth.tsx
@@ -10,6 +10,7 @@ import { Heart } from "./Heart";
 export interface IBooth {
     index: number;
     name: string;
+    host: string;
     num: number;
     likeable: boolean;
     category: string;
@@ -20,7 +21,7 @@ const itemVariants: Variants = {
     visible: { opacity: 1, y: 0 },
 };
 
-export const Booth: React.FC<IBooth> = ({ index, name, num, likeable, category, isNavigatable }) => {
+export const Booth: React.FC<IBooth> = ({ index, host, name, num, likeable, category, isNavigatable }) => {
     const { likeable: likeAble, handleLikeBtnClick } = useLikes(likeable, category, index);
 
     return (
@@ -40,7 +41,14 @@ export const Booth: React.FC<IBooth> = ({ index, name, num, likeable, category,
             <BoothLink to={isNavigatable ? `/booth/${category}/${index}` : ""}>
                 {isNavigatable && <Index category={category}>{category !== "it" ? index : `IT-${index}`}</Index>}
                 <Text size="m" weight="bold" variant="#5D5A88">
-                    {name}
+                    {host && (
+                        <Text size="xs" weight="bold" variant="#5D5A88">
+                            {`[ ${host} ]`}
+                        </Text>
+                    )}
+                    <Text size="m" weight="bold" variant="#5D5A88">
+                        {name}
+                    </Text>
                 </Text>
             </BoothLink>
             <Heart num={likeAble ? num + 1 : num} likable={likeAble} onClick={handleLikeBtnClick} />

diff --git a/src/components/display/BoothInfo.tsx b/src/components/display/BoothInfo.tsx
@@ -62,6 +62,7 @@ const BoothInfo: React.FC<BoothInfoProps> = ({ boothDetail }) => {
                     isNavigatable={false}
                     index={boothDetail.boothnum}
                     name={boothDetail.boothName}
+                    host={boothDetail.host}
                     num={boothDetail.likes}
                     likeable={!boothDetail.likable}
                     category={boothDetail.categori}

diff --git a/src/pages/BoothListPage.tsx b/src/pages/BoothListPage.tsx
@@ -61,14 +61,18 @@ const BoothListPage: React.FC = () => {
                     boothList &&
                     boothList
                         .filter((booth) => {
-                            return booth.boothnum === parseInt(input) || booth.boothName.includes(input);
+                            return (
+                                (booth.boothnum === parseInt(input) || booth.boothName.includes(input)) &&
+                                (!booth.host || booth.host.includes(input))
+                            );
                         })
                         .map((booth) => {
                             return (
                                 <Booth
                                     isNavigatable={true}
                                     index={booth.boothnum}
                                     name={booth.boothName}
+                                    host={booth.host}
                                     num={booth.likes}
                                     likeable={!booth.likable}
                                     category={booth.categori}

diff --git a/src/services/booth/booth.types.ts b/src/services/booth/booth.types.ts
@@ -1,6 +1,7 @@
 export interface IBoothItem {
     id: number;
     boothName: string;
+    host: string;
     likes: number;
     categori: string;
     boothnum: number;
@@ -15,6 +16,7 @@ export interface IReadAllBoothResponse {
 export interface IReadBoothByIdResponse {
     id: number;
     boothName: string;
+    host: string;
     likes: number;
     categori: string;
     boothnum: number;