Merge branch 'develop'

wanasart · wanasart · commit 89784b4b8662 · 2025-09-04T21:35:01.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .env.local
-postgresql.sql
+postgresql.sql
+aods_dev_v2.sql
diff --git a/client/my-app/public/automate-object-detection-system-icon.png b/client/my-app/public/automate-object-detection-system-icon.png
diff --git a/client/my-app/public/automate-object-detection-system.ico b/client/my-app/public/automate-object-detection-system.ico
diff --git a/client/my-app/src/app/(plain)/login/page.tsx b/client/my-app/src/app/(plain)/login/page.tsx
@@ -176,9 +176,9 @@ export default function LoginPage() {
                   </Button>
 
                   {/* credit */}
-                  <p className="mt-3 w-full text-center text-[11px] sm:text-xs text-slate-500/80 dark:text-slate-400/80">
+                  {/* <p className="mt-3 w-full text-center text-[11px] sm:text-xs text-slate-500/80 dark:text-slate-400/80">
                     SynTech-T5 x TTT Brother
-                  </p>
+                  </p> */}
                 </div>
               </CardFooter>
             </form>
diff --git a/client/my-app/src/app/components/Layouts/Header.tsx b/client/my-app/src/app/components/Layouts/Header.tsx
@@ -59,7 +59,7 @@ export default function Header({ userName = "Admin" }: { userName?: string }) {
                     {/* โลโก้/ชื่อระบบ */}
                     <div className="flex items-center gap-2 min-w-0">
                         {/* ไอคอน (ตัวอย่าง) */}
-                        <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-[color:var(--color-primary-bg)]">
+                        <div className="flex h-9 w-9 items-center justify-center">
                             {/* ถ้ามีโลโก้จริงใช้ <Image src="/logo.svg" .../> */}
                             <Image
                                 src="/automate-object-detection-system-icon.png"
diff --git a/client/my-app/src/app/layout.tsx b/client/my-app/src/app/layout.tsx
@@ -1,28 +1,27 @@
 import type { Metadata } from "next";
-import { Geist, Geist_Mono } from "next/font/google";
+import { Poppins } from "next/font/google";
 import "../styles/globals.css";
-import Sidebar from "./components/Layouts/SideBar";
-import Header from "./components/Layouts/Header";
-import { UIProvider } from "./components/Layouts/UI-Provider";
-import UserGreeting from "./components/Utilities/UserGreeting";
 
-const geistSans = Geist({
-  variable: "--font-geist-sans",
-  subsets: ["latin"],
-});
-
-const geistMono = Geist_Mono({
-  variable: "--font-geist-mono",
+const poppins = Poppins({
   subsets: ["latin"],
+  weight: ["100","200","300","400","500","600","700","800","900"],
+  variable: "--font-poppins",
 });
 
 export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
+  title: "Automate Object Detection System",
+  description: "AI Camera Monitoring Platform",
+  icons: {
+    icon: "/automate-object-detection-system.ico",
+  },
 };
-
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
+    // <html lang="th" className={`${poppins.variable}`}>
+    //   <body className="bg-[color:var(--color-bg,#ECF8FF)] font-sans">
+    //   <main>{children}</main>
+    //   </body>
+    // </html>
     <html lang="th">
       <body className="bg-[color:var(--color-bg,#ECF8FF)]">
       <main>{children}</main>
diff --git a/client/my-app/src/app/page.tsx b/client/my-app/src/app/page.tsx
@@ -25,11 +25,11 @@ export default function Home() {
             alt="App logo"
             width={28}
             height={28}
-            className="rounded object-contain mix-blend-multiply dark:mix-blend-darken"
+            className="rounded"
             priority
           />
-          <span className="text-sm font-semibold tracking-tight text-slate-900 dark:text-slate-100">
-            Automate <span className="text-[var(--color-primary,_#0B63FF)]">ODS</span>
+          <span className="text-sm font-semibold tracking-tight text-[var(--color-secondary)]">
+            Automate <span className="text-[var(--color-primary,_#0B63FF)]">Object Detection System</span>
           </span>
         </div>
 
@@ -104,7 +104,7 @@ export default function Home() {
       <footer className="mx-auto w-full max-w-6xl px-6 pb-10">
         <div className="flex flex-col items-center justify-between gap-2 sm:flex-row">
           <p className="text-xs text-slate-500/80 dark:text-slate-400/80">
-            © {new Date().getFullYear()} Automate ODS
+            © {new Date().getFullYear()} Automate Object Detection System
           </p>
           <p className="text-[11px] sm:text-xs text-slate-500/80 dark:text-slate-400/80">
             SynTech-T5 x TTT Brother
diff --git a/client/my-app/src/styles/globals.css b/client/my-app/src/styles/globals.css
@@ -4,6 +4,8 @@
 @custom-variant dark (&:is(.dark *));
 
 :root {
+    --font-sans: var(--font-poppins);
+
     --color-bg: #ECF8FF;
     --color-white: #ffffff;
     --color-black: #000000;
@@ -97,6 +99,11 @@
     --color-sidebar-ring: var(--sidebar-ring);
 }
 
+body {
+  font-family: var(--font-poppins), sans-serif;
+}
+
+
 .dark {
     --background: oklch(0.145 0 0);
     --foreground: oklch(0.985 0 0);
