Merge branch 'dev' of https://github.com/part3-4team-Taskify/Taskify into minji

Author: MINJI121

src/components/input/Input.tsx

@@ -146,7 +146,7 @@ export default function Input(props: InputProps) {
         )}
       </div>
 
-      {isInvalid && invalidMessage && (
+      {(isInvalid || forceInvalid) && invalidMessage && (
         <span className="font-14r block text-[var(--color-red)] mt-1">
           {invalidMessage}
         </span>

src/components/sideMenu/SideMenu.tsx

@@ -188,7 +188,7 @@ export default function SideMenu({
                 className={clsx(
                   "flex w-full justify-center md:justify-start p-3 font-18m text-[var(--color-gray1)] transition-colors duration-200",
                   dashboard.id.toString() === boardId &&
-                    "bg-[var(--color-violet8)] text-[var(--color-black)] font-semibold rounded-l-xl"
+                    "bg-[var(--color-violet8)] text-[var(--color-black)] font-semibold rounded-xl"
                 )}
               >
                 <Link

src/pages/mydashboard.tsx

@@ -57,13 +57,11 @@ export default function MyDashboardPage() {
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const [isConfirmDeleteModalOpen, setIsConfirmDeleteModalOpen] =
     useState(false);
-  const itemsPerPage = 6;
+  const itemsPerPage = 6; // 버튼 포함 6개
 
   const sensors = useSensors(
     useSensor(PointerSensor, {
-      activationConstraint: {
-        distance: 5,
-      },
+      activationConstraint: { distance: 5 },
     })
   );
 
@@ -72,9 +70,13 @@ export default function MyDashboardPage() {
   );
 
   const totalPages = Math.ceil(
-    (filteredDashboardList.length + 1) / itemsPerPage
+    filteredDashboardList.length / (itemsPerPage - 1)
+  );
+  const startIndex = (currentPage - 1) * (itemsPerPage - 1);
+  const paginatedDashboards = filteredDashboardList.slice(
+    startIndex,
+    startIndex + (itemsPerPage - 1)
   );
-  const startIndex = (currentPage - 1) * itemsPerPage;
 
   const fetchDashboards = async () => {
     try {
@@ -183,32 +185,30 @@ export default function MyDashboardPage() {
                 items={dashboardList.map((d) => d.id)}
                 strategy={rectSortingStrategy}
               >
-                <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-[8px] md:gap-[10px] lg:gap-[13px]">
+                <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-[13px]">
                   <div key="add">
                     <DashboardAddButton onClick={() => setIsModalOpen(true)} />
                   </div>
 
-                  {filteredDashboardList
-                    .slice(startIndex, startIndex + (itemsPerPage - 1))
-                    .map((dashboard) => (
-                      <SortableCardButton
-                        key={dashboard.id}
-                        dashboard={dashboard}
-                        isEditMode={isEditMode}
-                        onDeleteClick={(id: number) => {
-                          setSelectedDashboardId(id);
-                          setSelectedCreatedByMe(true);
-                          setSelectedTitle(dashboard.title);
-                          setIsDeleteModalOpen(true);
-                        }}
-                        onLeaveClick={(id: number) => {
-                          setSelectedDashboardId(id);
-                          setSelectedCreatedByMe(false);
-                          setSelectedTitle(dashboard.title);
-                          setIsDeleteModalOpen(true);
-                        }}
-                      />
-                    ))}
+                  {paginatedDashboards.map((dashboard) => (
+                    <SortableCardButton
+                      key={dashboard.id}
+                      dashboard={dashboard}
+                      isEditMode={isEditMode}
+                      onDeleteClick={(id: number) => {
+                        setSelectedDashboardId(id);
+                        setSelectedCreatedByMe(true);
+                        setSelectedTitle(dashboard.title);
+                        setIsDeleteModalOpen(true);
+                      }}
+                      onLeaveClick={(id: number) => {
+                        setSelectedDashboardId(id);
+                        setSelectedCreatedByMe(false);
+                        setSelectedTitle(dashboard.title);
+                        setIsDeleteModalOpen(true);
+                      }}
+                    />
+                  ))}
                 </div>
               </SortableContext>
             </DndContext>

src/pages/signup.tsx

@@ -97,6 +97,8 @@ export default function SignUpPage() {
           placeholder="닉네임을 입력해 주세요"
           onChange={setNickname}
           className="bg-white"
+          forceInvalid={nickName.length > 10}
+          invalidMessage="닉네임은 10자 이하로 입력해 주세요"
         />
 
         <Input