From 8fc81d37eba656ac3335d56e3b8372f9c397ae02 Mon Sep 17 00:00:00 2001
From: Your Name <dbose272@gmail.com>
Date: Sun, 31 May 2026 19:05:08 +0530
Subject: [PATCH 1/2] chore: resolve merge conflicts and integrate upstream
 changes

---
 Server/main.py           | 8 ++++++++
 client/package-lock.json | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/Server/main.py b/Server/main.py
index 665dc67..57c5883 100644
--- a/Server/main.py
+++ b/Server/main.py
@@ -1,4 +1,6 @@
+# pyrefly: ignore [missing-import]
 from fastapi import FastAPI, UploadFile, File, HTTPException, Depends, Header, Request
+# pyrefly: ignore [missing-import]
 from fastapi.middleware.cors import CORSMiddleware
 from security import (
     inspect_archive_limits,
@@ -41,6 +43,7 @@
 MAX_FILE_SIZE = 500 * 1024 * 1024
 
 
+# pyrefly: ignore [parse-error]
 def get_api_user(authorization: str | None = Header(None)):
     if not authorization:
         raise HTTPException(status_code=401, detail="Authorization header missing")
@@ -117,6 +120,7 @@ async def run_forensic_pipeline(
 
         # Record provenance to Supabase so it appears in the Evidence Graph
         try:
+            # pyrefly: ignore [missing-import]
             from supabase import create_client
             url = os.getenv("SUPABASE_URL")
             key = os.getenv("SUPABASE_ANON_KEY")
@@ -178,6 +182,7 @@ async def get_graph_relationships():
     try:
         cases = []
         try:
+            # pyrefly: ignore [missing-import]
             from supabase import create_client
             url = os.getenv("SUPABASE_URL")
             key = os.getenv("SUPABASE_ANON_KEY")
@@ -206,6 +211,7 @@ async def get_evidence_provenance(case_id: str):
     try:
         cases = []
         try:
+            # pyrefly: ignore [missing-import]
             from supabase import create_client
             url = os.getenv("SUPABASE_URL")
             key = os.getenv("SUPABASE_ANON_KEY")
@@ -259,6 +265,7 @@ async def expand_node(node_id: str):
         raise HTTPException(status_code=500, detail="Error expanding node.")
 
 
+# pyrefly: ignore [missing-import]
 from fastapi import BackgroundTasks
 import asyncio
 
@@ -278,5 +285,6 @@ async def trigger_graph_analysis(background_tasks: BackgroundTasks):
 
 
 if __name__ == "__main__":
+    # pyrefly: ignore [missing-import]
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=8000)
diff --git a/client/package-lock.json b/client/package-lock.json
index ec22d54..3960e2b 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -47,6 +47,9 @@
         "eslint-config-next": "16.1.6",
         "tailwindcss": "^4",
         "typescript": "^5"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@alloc/quick-lru": {

From 1eca2d69a2808174110d42b34ef8903866e546c4 Mon Sep 17 00:00:00 2001
From: Your Name <dbose272@gmail.com>
Date: Sun, 31 May 2026 19:17:42 +0530
Subject: [PATCH 2/2] style: enhance loading skeletons with glassmorphism
 backdrops and shimming linear animations

---
 client/components/LoadingSkeleton.tsx | 81 ++++++++++++++-------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/client/components/LoadingSkeleton.tsx b/client/components/LoadingSkeleton.tsx
index 4e56fce..28f1171 100644
--- a/client/components/LoadingSkeleton.tsx
+++ b/client/components/LoadingSkeleton.tsx
@@ -7,21 +7,32 @@ interface SkeletonProps {
 
 function Skeleton({ className = "" }: SkeletonProps) {
   return (
-    <div className={`animate-pulse bg-slate-200 dark:bg-slate-800 rounded-xl ${className}`} />
+    <div className={`relative overflow-hidden bg-slate-200 dark:bg-slate-800 rounded-xl ${className}`}>
+      <motion.div
+        className="absolute inset-0 bg-gradient-to-r from-transparent via-white/20 to-transparent"
+        initial={{ x: "-100%" }}
+        animate={{ x: "100%" }}
+        transition={{
+          repeat: Infinity,
+          duration: 1.5,
+          ease: "linear",
+        }}
+      />
+    </div>
   );
 }
 
 export function DashboardSkeleton() {
   return (
-    <div className="min-h-screen bg-white dark:bg-slate-950 p-4 sm:p-6 space-y-8">
+    <div className="min-h-screen bg-white dark:bg-slate-950 p-4 sm:p-6 space-y-8 selection:bg-emerald-500/30 transition-colors duration-300">
       {/* Header skeleton */}
       <div className="flex flex-col md:flex-row justify-between items-center md:items-start mb-10 border-b border-slate-200 dark:border-slate-800 pb-8 gap-8">
-        <div className="space-y-3">
+        <div className="space-y-3 w-full md:w-auto">
           <Skeleton className="h-8 w-64" />
           <Skeleton className="h-3 w-48" />
         </div>
-        <div className="flex items-center gap-4">
-          <Skeleton className="h-10 w-10" />
+        <div className="flex flex-wrap items-center gap-4 w-full md:w-auto justify-center md:justify-end">
+          <Skeleton className="h-10 w-10 rounded-full" />
           <Skeleton className="h-14 w-20" />
           <Skeleton className="h-14 w-32" />
         </div>
@@ -30,49 +41,41 @@ export function DashboardSkeleton() {
       {/* Stats skeleton */}
       <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
         {[...Array(4)].map((_, i) => (
-          <div key={i} className="bg-slate-50 dark:bg-slate-900 border border-slate-200 dark:border-slate-800 rounded-xl p-4 text-center">
+          <div key={i} className="bg-slate-50 dark:bg-slate-900/50 backdrop-blur-md border border-slate-200 dark:border-slate-800/80 rounded-xl p-4 text-center shadow-sm">
             <Skeleton className="h-3 w-20 mx-auto mb-3" />
             <Skeleton className="h-8 w-12 mx-auto" />
           </div>
         ))}
       </div>
 
-      {/* Tools grid skeleton */}
-      <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-        {[...Array(6)].map((_, i) => (
-          <div key={i} className="bg-slate-50 dark:bg-slate-900 border border-slate-200 dark:border-slate-800 p-4 rounded-xl min-h-[120px]">
-            <Skeleton className="h-6 w-6 mb-3" />
-            <Skeleton className="h-4 w-24 mb-2" />
-            <Skeleton className="h-3 w-32" />
+      {/* Main Grid skeleton */}
+      <div className="grid grid-cols-1 lg:grid-cols-12 gap-8">
+        <div className="lg:col-span-8 space-y-8">
+          {/* Tools grid skeleton */}
+          <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+            {[...Array(6)].map((_, i) => (
+              <div key={i} className="bg-slate-50 dark:bg-slate-900/50 backdrop-blur-md border border-slate-200 dark:border-slate-800/80 p-4 rounded-xl min-h-[120px] shadow-sm">
+                <Skeleton className="h-6 w-6 mb-3" />
+                <Skeleton className="h-4 w-24 mb-2" />
+                <Skeleton className="h-3 w-32" />
+              </div>
+            ))}
           </div>
-        ))}
-      </div>
-
-      {/* Map skeleton */}
-      <div className="bg-slate-50 dark:bg-slate-900 border border-slate-200 dark:border-slate-800 rounded-2xl p-6">
-        <Skeleton className="h-4 w-48 mb-4" />
-        <Skeleton className="h-64 w-full" />
-      </div>
 
-      {/* Records skeleton */}
-      <div className="bg-slate-50 dark:bg-slate-900 border border-slate-200 dark:border-slate-800 rounded-2xl p-6">
-        <div className="flex justify-between items-center mb-6">
-          <Skeleton className="h-4 w-40" />
-          <Skeleton className="h-8 w-28" />
+          {/* Map skeleton */}
+          <div className="bg-slate-50 dark:bg-slate-900/50 backdrop-blur-md border border-slate-200 dark:border-slate-800/80 rounded-2xl p-6 shadow-sm">
+            <Skeleton className="h-4 w-48 mb-4" />
+            <Skeleton className="h-64 w-full" />
+          </div>
         </div>
-        <div className="space-y-4">
-          {[...Array(3)].map((_, i) => (
-            <div key={i} className="flex justify-between items-center p-4 bg-white dark:bg-slate-950 border border-slate-200 dark:border-slate-800 rounded-xl">
-              <div className="space-y-2">
-                <Skeleton className="h-3 w-40" />
-                <Skeleton className="h-3 w-32" />
-              </div>
-              <div className="flex items-center gap-3">
-                <Skeleton className="h-5 w-16" />
-                <Skeleton className="h-6 w-20" />
-              </div>
-            </div>
-          ))}
+
+        {/* Side Panel skeleton */}
+        <div className="lg:col-span-4 space-y-6">
+          <div className="bg-slate-50 dark:bg-slate-900/50 backdrop-blur-md border border-slate-200 dark:border-slate-800/80 rounded-2xl p-6 space-y-4 shadow-sm">
+            <Skeleton className="h-5 w-40 mb-2" />
+            <Skeleton className="h-20 w-full" />
+            <Skeleton className="h-24 w-full" />
+          </div>
         </div>
       </div>
     </div>