Merge branch 'main' of github.com:techdiary-dev/techdiary.dev into shoaibsharif/tags

Author: shoaibsharif

…pp/dashboard/_components/ArticleList.tsx …ard/_components/DashboardArticleList.tsxsrc/app/dashboard/_components/ArticleList.tsx renamed to src/app/dashboard/_components/DashboardArticleList.tsx src/app/dashboard/_components/ArticleList.tsx renamed to src/app/dashboard/_components/DashboardArticleList.tsx

@@ -30,7 +30,7 @@ import { addDays, differenceInHours } from "date-fns";
 import { TrashIcon } from "lucide-react";
 import Link from "next/link";
 
-const ArticleList = () => {
+const DashboardArticleList = () => {
   const { _t } = useTranslation();
   const queryClient = useQueryClient();
   const appConfirm = useAppConfirm();
@@ -299,4 +299,4 @@ const ArticleList = () => {
   );
 };
 
-export default ArticleList;
+export default DashboardArticleList;

src/app/dashboard/layout.tsx

@@ -19,14 +19,19 @@ const layout: React.FC<PropsWithChildren> = async ({ children }) => {
   const session = await sessionActions.getSession();
 
   const cookieStore = await cookies();
-  const defaultOpen = cookieStore.get("sidebar_state")?.value === "true";
+
+  const getSidebarOpenState = () => {
+    const isOpen = cookieStore.get("sidebar_state")?.value;
+    if (!isOpen) return true;
+    return cookieStore.get("sidebar_state")?.value === "true";
+  };
 
   if (!session?.user) {
     redirect(`/login?next=${currentPath}`);
   }
 
   return (
-    <SidebarProvider defaultOpen={defaultOpen}>
+    <SidebarProvider defaultOpen={getSidebarOpenState()}>
       <DashboardScaffold>{children}</DashboardScaffold>
     </SidebarProvider>
   );

src/app/dashboard/page.tsx

@@ -1,4 +1,4 @@
-import ArticleList from "./_components/ArticleList";
+import DashboardArticleList from "./_components/DashboardArticleList";
 import MatrixReport from "./_components/MatrixReport";
 // import ViewsChart from "./_components/ViewsChart";
 
@@ -7,7 +7,7 @@ const page = () => {
     <>
       {/* <ViewsChart /> */}
       <MatrixReport />
-      <ArticleList />
+      <DashboardArticleList />
     </>
   );
 };

src/backend/services/article.actions.ts

@@ -501,6 +501,7 @@ export async function myArticles(
         "handle",
         "created_at",
         "is_published",
+        "delete_scheduled_at",
         "approved_at",
       ],
       limit: input.limit,

src/components/ui/sidebar.tsx

@@ -1,10 +1,12 @@
 "use client";
 
+import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
-import { VariantProps, cva } from "class-variance-authority";
+import { cva, VariantProps } from "class-variance-authority";
 import { PanelLeftIcon } from "lucide-react";
-import * as React from "react";
 
+import { useIsMobile } from "@/hooks/use-mobile";
+import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
@@ -22,8 +24,6 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
-import { useIsMobile } from "@/hooks/use-mobile";
-import { cn } from "@/lib/utils";
 
 const SIDEBAR_COOKIE_NAME = "sidebar_state";
 const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;