Merge branch 'main' into ii

.devcontainer/devcontainer.json

@@ -13,10 +13,7 @@
   },
   "customizations": {
     "vscode": {
-      "extensions": [
+      "extensions": ["esbenp.prettier-vscode", "anthropic.claude-code"]
-        "esbenp.prettier-vscode",
-        "anthropic.claude-code"
-      ]
     }
   },
 

app/(manager)/manager/page.tsx

@@ -1,8 +1,6 @@
 "use client";
 
-import {
+import { ProductsTab } from "@/components/organisms/manager";
-  ProductsTab,
-} from "@/components/organisms/manager";
 import { useAuth } from "@/lib/auth-context";
 import { useManager } from "@/lib/manager-context";
 import Link from "next/link";

components/molecules/cards/ShiftCard.tsx

@@ -66,7 +66,7 @@ export default function ShiftCard({
         </span>
       </div>
 
-      {(shift.registeredStaff && shift.registeredStaff.length > 0) && (
+      {shift.registeredStaff && shift.registeredStaff.length > 0 && (
         <div className="mt-2 border-t border-current/10 pt-2">
           <p className="text-[10px] font-medium tracking-wide uppercase opacity-60">
             Nhân viên ({shift.registeredStaff.length}/{shift.maxStaff})

components/organisms/shift-schedule/ShiftDetailModal.tsx

@@ -140,9 +140,7 @@ export default function ShiftDetailModal({
               <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
                 Thời lượng
               </p>
-              <p className="text-foreground mt-1 text-sm font-bold">
+              <p className="text-foreground mt-1 text-sm font-bold">{""} giờ</p>
-                {""} giờ
-              </p>
             </div>
             <div className="rounded-xl bg-gray-50 p-3">
               <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
@@ -160,7 +158,7 @@ export default function ShiftDetailModal({
               Nhân viên đã đăng ký ({shift.registeredStaff!.length}/
               {shift.maxStaff})
             </p>
-            {(shift.registeredStaff && shift.registeredStaff.length === 0) ? (
+            {shift.registeredStaff && shift.registeredStaff.length === 0 ? (
               <p className="text-xs text-(--color-text-muted) italic">
                 Chưa có ai đăng ký
               </p>

k8s.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: frontend-container
-        image: git.demonkernel.io.vn/foodsurf/frontend:1.2.4
+        image: git.demonkernel.io.vn/foodsurf/frontend:1.2.8
         ports:
           - containerPort: 3000
         resources:

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "temp",
-  "version": "1.2.4",
+  "version": "1.2.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "temp",
-      "version": "1.2.4",
+      "version": "1.2.8",
       "dependencies": {
         "@apollo/client": "^4.1.9",
         "@tailwindcss/postcss": "^4.2.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "temp",
-  "version": "1.2.4",
+  "version": "1.2.8",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -12,15 +12,15 @@
   },
   "dependencies": {
     "@apollo/client": "^4.1.9",
-    "@tailwindcss/postcss": "^4.2.4",
+    "@tailwindcss/postcss": "^4.3.0",
-    "@types/node": "^20.19.39",
+    "@types/node": "^20.19.41",
     "@types/react": "^19.2.14",
     "graphql": "^16.14.0",
     "next": "16.1.7",
     "react": "19.2.3",
     "react-dom": "19.2.3",
     "tailwind": "^4.0.0",
-    "tailwindcss": "^4.2.4",
+    "tailwindcss": "^4.3.0",
     "typescript": "^5.9.3"
   },
   "devDependencies": {