Merge pull request #224 from TEAM-MONGDOL/develop

[merge] - develop > main
TEAM-MONGDOL · Aug 14, 2024 · 0ac858f · 0ac858f
2 parents 364af68 + 5340d49
commit 0ac858f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 39 deletions.
diff --git a/.github/workflows/nextjs-prod-CD.yml b/.github/workflows/nextjs-prod-CD.yml
@@ -1,10 +1,9 @@
-name: Next.js CD
+name: NextJS CD
 
 on:
-  workflow_run:
-    workflows: ["Node.js CI"]
-    types:
-      - completed
+  release:
+    types: [published]
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -61,4 +60,4 @@ jobs:
           EOF
           
           # Clean up key file
-          rm ssh_key
+          rm ssh_key
diff --git a/.github/workflows/nextjs-prod-CI.yml b/.github/workflows/nextjs-prod-CI.yml
@@ -1,10 +1,9 @@
-name: Node.js CI
+name: NextJs CI
 
 on:
   push:
-    branches: [main]
-  pull_request:
-    branches: [main]
+    branches:
+      - main
   workflow_dispatch:
 
 permissions:

diff --git a/src/app/(route)/(user)/(with-layout)/workation/[id]/apply/page.tsx b/src/app/(route)/(user)/(with-layout)/workation/[id]/apply/page.tsx
@@ -50,7 +50,7 @@ const UserWkApplyPage = ({ params }: Props) => {
     },
   });
 
-  if (isLoading || myPointIsLoading || pointIsLoading) {
+  if (isLoading || myPointIsLoading) {
     return <UserLoading />;
   }
   if (isError || myPointIsError || pointIsError) {
@@ -148,6 +148,7 @@ const UserWkApplyPage = ({ params }: Props) => {
             />
           </div>
         </div>
+        ㄲ
       </div>
     </section>
   );

diff --git a/src/app/(route)/(user)/(with-layout)/workation/[id]/page.tsx b/src/app/(route)/(user)/(with-layout)/workation/[id]/page.tsx
@@ -173,7 +173,9 @@ const UserWkDetailPage = ({ params }: UserWkDetailProps) => {
             latitude={data.latitude}
           />
         </div>
-        <WkResultInfo id={id} />
+        <div ref={resultRef}>
+          <WkResultInfo id={id} />
+        </div>
         <div className="flex flex-col gap-10 pt-16" ref={reviewRef}>
           <UserFilteringSectionContainer
             orderOption={{

diff --git a/src/app/(route)/(user)/(with-layout)/workation/page.tsx b/src/app/(route)/(user)/(with-layout)/workation/page.tsx
@@ -17,6 +17,7 @@ import UserDatePickerContainer from '@/_components/user/common/containers/UserDa
 import { useRouter } from 'next/navigation';
 import UserLoading from '@/_components/user/userLoading';
 import NetworkError from '@/_components/common/networkError';
+import { HeaderPointIcon } from '@/_assets/icons';
 
 const Workation = () => {
   const router = useRouter();
@@ -182,6 +183,7 @@ const Workation = () => {
       <UserHeaderContainers
         title="워케이션"
         content="워케이션(Workation)을 통해 업무의 효율과 재충전의 기회를 놓치지 마세요!"
+        img="bg-header-bg"
       />
       <UserTabBarModule tabs={tabs} />
       <div className="mr-24 mt-8 flex justify-end">

diff --git a/src/app/_components/user/workation/WkResultInfo.tsx b/src/app/_components/user/workation/WkResultInfo.tsx
@@ -31,33 +31,40 @@ const WkResultInfo = ({ id }: { id: number }) => {
       <WkSlider id={id} />
       <div className="flex flex-col">
         <UserSubtitleAtom subtitle="추첨 결과" />
-        <div className="flex w-full justify-between gap-3.5 overflow-x-auto scrollbar-hide">
-          {data?.wktWinningUserInfos.map((winner) => (
-            <div
-              key={winner.accountId}
-              className={`flex h-16 w-48 min-w-48 items-center rounded-full ${winner.applyStatusType === 'CONFIRM' || 'VISITED' ? 'bg-primary' : 'bg-primary/50'}`}
-            >
-              <p className="ml-2.5 mr-4 h-12 w-12 rounded-full bg-white pt-3 text-center">
-                최초
-              </p>
-              <p>
-                {winner.department} {winner.name}
-              </p>
-            </div>
-          ))}
-          {data?.wktWaitingUserInfos.map((waiter) => (
-            <div
-              key={waiter.accountId}
-              className={`flex h-16 w-48 min-w-48 items-center rounded-full ${waiter.applyStatusType === ('CONFIRM' || 'VISITED') ? 'bg-primary' : 'bg-primary/50'}`}
-            >
-              <p className="ml-2.5 mr-3.5 h-12 w-12 rounded-full bg-white pt-2.5 text-center">
-                {waiter.waitingNum}
-              </p>
-              <p>
-                {waiter.department} {waiter.name}
-              </p>
-            </div>
-          ))}
+        <div className="flex w-full gap-3.5 overflow-x-auto scrollbar-hide">
+          {data?.wktWinningUserInfos.map(
+            (winner) =>
+              winner.applyStatusType === 'CANCEL' || (
+                <div
+                  key={winner.accountId}
+                  className={`flex h-16 w-[200px] min-w-[200px] items-center rounded-full ${winner.applyStatusType === 'CONFIRM' || 'VISITED' ? 'bg-primary' : 'bg-primary/50'}`}
+                >
+                  <p className="ml-2.5 mr-4 h-12 w-12 rounded-full bg-white pt-3 text-center">
+                    최초
+                  </p>
+                  <p>
+                    {winner.department} {winner.name}
+                  </p>
+                </div>
+              ),
+          )}
+          <div className="h-13 w-[1px] bg-sub-100" />
+          {data?.wktWaitingUserInfos.map(
+            (waiter, index) =>
+              waiter.waitingNum < 0 || (
+                <div
+                  key={waiter.accountId}
+                  className={`flex h-16 w-[200px] min-w-[200px] items-center rounded-full ${waiter.applyStatusType === ('CONFIRM' || 'VISITED') ? 'bg-primary' : 'bg-primary/50'}`}
+                >
+                  <p className="ml-2.5 mr-3.5 h-12 w-12 rounded-full bg-white pt-2.5 text-center">
+                    {index + 1}
+                  </p>
+                  <p>
+                    {waiter.department} {waiter.name}
+                  </p>
+                </div>
+              ),
+          )}
         </div>
         <div className="mt-16 flex flex-col gap-10">
           <div className="flex flex-col gap-4">