develop 최신화 (#198)

* 🚑 fix: 문구수정 * 🚑 fix: min-h 수정 * Hotfix/design : 리드미 수정 (#197) * 💄 Design: 메인 버튼 크기 통일 * 💄 Design: z-index 수정 * 💄 Design: 버튼 사이즈 조정, 안쓰는 클래스 삭제 * Merge branch 'main' into hotfix/Design * 🍱 Chore: 메타 이미지 변경 * 🍱 Chore : 메타 이미지 교체 * 📝 Chore: 리드미 수정 --------- Co-authored-by: HaeJungg <[email protected]> Co-authored-by: HaeJungg <[email protected]>
CodeitFESI4-Team1 · Nov 25, 2024 · c8b2870 · c8b2870
1 parent 91f6e40
commit c8b2870
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@
 
 중간 발표용 영상입니다.
 
-[![시연영상](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2F17f20972-3913-4486-b10a-b9a0d8333940%2Faed7c2b7-65f6-4ed3-b566-c1137d2c8bf1.png?table=block&id=ba60434d-0d2f-4b89-9edc-84396cdbedaf&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2)](https://youtu.be/8qhzx36ljDM?si=WG9IUu63eUXf63Hz)
+[![시연영상](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2Fda717920-1ee3-4fa5-b4eb-1b20b2df8358%2Fimage.png?table=block&id=279153bc-9cf1-4f91-934f-7624127d1cf6&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2)](https://www.youtube.com/watch?v=GRH7m7tC78Q)
 
 ## 4. 기능
 
@@ -60,11 +60,11 @@
 
 | 사진 | 이름 | 역할 |
 | --- | --- | --- |
-| ![팀원1 사진](https://via.placeholder.com/100) | 김민호 | Design |
-| ![팀원2 사진](https://via.placeholder.com/100) | 조예은 | Front |
-| ![팀원3 사진](https://via.placeholder.com/100) | 김민경 | Front |
-| ![팀원4 사진](https://via.placeholder.com/100) | 김혜중 | Front |
-| ![팀원5 사진](https://via.placeholder.com/100) | 이 율 | Front |
-| ![팀원6 사진](https://via.placeholder.com/100) | 최수형 | Front |
-| ![팀원7 사진](https://via.placeholder.com/100) | 이우현 | Back |
-| ![팀원8 사진](https://via.placeholder.com/100) | 이정우 | Back |
+| ![팀원1 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2Fff7d1819-9452-4c81-b092-8c8344cae90a%2F18ddaf9945a4f108-sticker_2.png?table=block&id=29b8dc59-f698-40db-aa67-ae4754288d4b&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1000&userId=&cache=v2) | 김민호 | Design |
+| ![팀원2 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2Fd6d244d8-1908-44af-b56b-a5ea590cf769%2FKakaoTalk_20241120_173848138.png?table=block&id=8dfb8ab9-db22-4a82-b902-608a9b867126&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2) | 조예은 | Front |
+| ![팀원3 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2Fbeb19156-5888-4e36-a390-3c8533951527%2FKakaoTalk_20241120_173442483.png?table=block&id=54d8abeb-c56f-4956-9fbe-c6e5b9ff8d6f&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2) | 김민경 | Front |
+| ![팀원4 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2F0a1b2c0b-6607-43a0-9c26-79644a35ab24%2FKakaoTalk_20241120_173442858.png?table=block&id=53bd4a9c-c5a2-4735-b637-7a3541ca782f&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2) | 김혜중 | Front |
+| ![팀원5 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2F12dc31b4-2ba3-4a74-a5a3-b9ab8c2e4258%2FKakaoTalk_20241122_212704765.png?table=block&id=9f5243c0-6bbb-4190-a11a-237af336763e&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2) | 이 율 | Front |
+| ![팀원6 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2Fe8ce8b95-07d6-47e3-9a4e-431d7a6259d6%2FKakaoTalk_20241120_174036131.png?table=block&id=df18880b-4ae1-4d4b-9213-8a7ef31ed6e1&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2) | 최수형 | Front |
+| ![팀원7 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2F07c5131c-b450-482e-af49-861f7cf39abe%2FIMG_3882.jpg?table=block&id=01b4b865-07c1-4f64-9c55-13efab48148e&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=840&userId=&cache=v2) | 이우현 | Back |
+| ![팀원8 사진](https://clover-cub-62d.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F82cafa30-a400-4112-a79e-fcb2cdcfcca7%2F478e2fc2-0073-4045-9dea-d8e770d38b58%2FIMG_0256.png?table=block&id=be503692-6ecb-4ffb-a6aa-050ba61d38e3&spaceId=82cafa30-a400-4112-a79e-fcb2cdcfcca7&width=1420&userId=&cache=v2) | 이정우 | Back |
diff --git a/src/app/(crew)/layout.tsx b/src/app/(crew)/layout.tsx
@@ -9,9 +9,9 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <div className="min-h-screen">
+    <div className="min-h-screen bg-gray-50">
       <Header />
-      <div className="flex flex-col items-center bg-gray-50">
+      <div className="flex min-h-[calc(100vh-50px)] flex-col items-center bg-gray-50">
         <main className="container flex max-w-pc flex-1 flex-col md:shadow-bg">{children}</main>
       </div>
     </div>

diff --git a/src/components/common/crew-list/crew-card.tsx b/src/components/common/crew-list/crew-card.tsx
@@ -70,7 +70,9 @@ export default function CrewCard({
             </span>
           </div>
           <span className="text-sm font-semibold text-blue-600">
-            {`현재 ${totalGatheringCount}개의 약속이 개설되어 있습니다.`}
+            {inWhere === 'main-crew'
+              ? `현재 ${totalGatheringCount}개의 약속이 개설되어 있습니다.`
+              : `총 ${totalGatheringCount}개의 약속이 만들어졌어요!`}
           </span>
         </div>
         <div className="flex w-full gap-8 md:pt-[31px]">