Merge pull request #140 from billilge/develop

[Merge] 1차 스프린트 develop -> main

Author: hyeonjin6530

.github/workflows/autoSync-develop.yml

@@ -0,0 +1,32 @@
+name: (Develop) Synchronize to forked repo
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  sync:
+    name: Sync forked repo
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout develop
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.DEV_AUTO_SYNC_TOKEN }}
+          fetch-depth: 0
+          ref: develop
+
+      - name: Add remote-url
+        run: |
+          git remote add forked-repo https://hyeonjin6530:${{ secrets.DEV_AUTO_SYNC_TOKEN }}@github.com/hyeonjin6530/billilge-frontend
+          git config user.name hyeonjin6530
+          git config user.email ${{ secrets.DEV_EMAIL }}
+
+      - name: Push changes to forked-repo
+        run: |
+          git push -f forked-repo develop
+
+      - name: Clean up
+        run: |
+          git remote remove forked-repo

.github/workflows/autoSync.yml .github/workflows/autoSync-main.yml.github/workflows/autoSync.yml renamed to .github/workflows/autoSync-main.yml

@@ -1,21 +1,21 @@
-name: Synchronize to forked repo
+name: (Main) Synchronize to forked repo
 on:
   push:
     branches:
-      - develop
+      - main
 
 jobs:
   sync:
     name: Sync forked repo
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout develop
+      - name: Checkout main
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.AUTO_SYNC_TOKEN }}
           fetch-depth: 0
-          ref: develop
+          ref: main
 
       - name: Add remote-url
         run: |
@@ -25,7 +25,7 @@ jobs:
 
       - name: Push changes to forked-repo
         run: |
-          git push -f forked-repo develop
+          git push -f forked-repo main
 
       - name: Clean up
         run: |

package.json

@@ -37,6 +37,7 @@
     "dotenv": "^16.4.5",
     "firebase": "^11.3.1",
     "js-base64": "^3.7.7",
+    "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "lucide-react": "^0.475.0",
     "next": "^15.0.3",
@@ -62,6 +63,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@types/jest": "^29.5.12",
+    "@types/js-cookie": "^3.0.6",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",

public/assets/icons/icon-fee-check.svg

@@ -3,6 +3,7 @@
 import { useEffect, Suspense } from 'react';
 import { useSearchParams, useRouter } from 'next/navigation';
 import { handleLoginSuccess } from '@/utils/loginHandler';
+import Cookies from 'js-cookie';
 
 function CallbackContent() {
   const searchParams = useSearchParams();
@@ -13,7 +14,7 @@ function CallbackContent() {
     const email = searchParams.get('email');
     const accessToken = searchParams.get('accessToken');
 
-    localStorage.setItem('email', email || '');
+    Cookies.set('email', email || '');
 
     if (!status) return;
 

public/assets/icons/side-menu/admin-homepage.svg

@@ -9,7 +9,7 @@ export default function DashboardItem({
   renterName,
   studentId,
   status,
-  applicatedAt,
+  rentAt,
   rentedCount,
   handleApproveBtnClick,
   handleCancelBtnClick,
@@ -29,7 +29,7 @@ export default function DashboardItem({
     handleCancelBtnClick();
   };
 
-  const applicatedTime = convertTime(applicatedAt);
+  const applicatedTime = convertTime(rentAt);
 
   return (
     <section className="flex w-full items-center justify-between px-5 py-4">
@@ -59,9 +59,10 @@ export default function DashboardItem({
             </section>
 
             <section className="flex gap-1">
-              <div className="flex w-10">신청 시간</div>
+              <div className="flex w-10">대여 시간</div>
               <div className="">
-                {applicatedTime.formattedDate} {applicatedTime.formattedTime}
+                {applicatedTime.formattedDate}{' '}
+                {applicatedTime.formattedTime.split(':').slice(0, 2).join(':')}
               </div>
             </section>
           </section>

src/app/callback/page.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useState, useEffect } from 'react';
-import MobileLayout from '@/components/mobile/layout';
 import Header from '@/components/mobile/Header';
 import Dropdown from '@/components/mobile/Dropdown';
 import useDropdown from '@/hooks/useDropdown';
@@ -104,7 +103,7 @@ export default function Dashboard() {
   };
 
   return (
-    <MobileLayout>
+    <div>
       <Header title="관리자 대시보드" />
 
       <section className="itmes-center mt-2.5 flex w-full justify-between px-5">
@@ -139,7 +138,7 @@ export default function Dashboard() {
             renterName={item.renterName}
             studentId={item.studentId}
             status={item.status}
-            applicatedAt={item.applicatedAt}
+            rentAt={item.rentAt}
             rentedCount={item.rentedCount}
             handleApproveBtnClick={() => {
               if (item.rentalHistoryId !== undefined) {
@@ -171,6 +170,6 @@ export default function Dashboard() {
         hideDropdown={hideDropdown}
         positionClasses="top-[80px] right-5"
       />
-    </MobileLayout>
+    </div>
   );
 }

src/app/mobile/admin/dashboard/_components/DashboardItem.tsx

@@ -1,14 +1,13 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import MobileLayout from '@/components/mobile/layout';
 import NotificationItem from '@/components/mobile/NotificationItem';
 import Header from '@/components/mobile/Header';
 import { elapsedTime } from '@/utils/elapsedTime';
 import { NotificationProps } from '@/types/notificationType';
 import {
   adminNotificationGet,
-  readNotificationPost,
+  readNotificationPatch,
 } from '@/services/notification';
 
 type AdminNotificationType = NotificationProps;
@@ -28,11 +27,11 @@ export default function Notification() {
   }, []);
 
   const handleReadNotification = async (notificationId: number) => {
-    await readNotificationPost(notificationId);
+    await readNotificationPatch(notificationId);
   };
 
   return (
-    <MobileLayout>
+    <div>
       <Header title="관리자 알림" />
       {notificationDetail?.length === 0 ? (
         <div className="flex h-dvh items-center justify-center text-gray-secondary">
@@ -53,6 +52,6 @@ export default function Notification() {
           />
         ))
       )}
-    </MobileLayout>
+    </div>
   );
 }

src/app/mobile/admin/dashboard/page.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useEffect, useState, useMemo } from 'react';
-import MobileLayout from '@/components/mobile/layout';
 import Header from '@/components/mobile/Header';
 import ReturnItem from '@/app/mobile/history/_components/ReturnItem';
 import RentalItem from '@/app/mobile/history/_components/RentalItem';
@@ -194,7 +193,7 @@ export default function UserRentalList() {
   );
 
   return (
-    <MobileLayout>
+    <div>
       <Header title="대여 기록" menu />
 
       {/* 반납이 필요한 물품 */}
@@ -287,6 +286,6 @@ export default function UserRentalList() {
           <div className="text-body-2-normal_medi">© wink</div>
         </div>
       </div>
-    </MobileLayout>
+    </div>
   );
 }