chore: release [ci skip]

Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #46

.claude/settings.local.json

@@ -14,7 +14,10 @@
       "Bash(ls \"c:/VS code/CongNghePhanMem/Final/frondend/app/\\(manager\\)/manager/\")",
       "Bash(npm run build)",
       "Bash(cat \"c:/VS code/CongNghePhanMem/Final/frondend/app/\\(manager\\)/manager/page.tsx\")",
-      "Bash(wc -l \"c:/VS code/CongNghePhanMem/Final/frondend/app/\\(manager\\)/manager/page.tsx\")"
+      "Bash(wc -l \"c:/VS code/CongNghePhanMem/Final/frondend/app/\\(manager\\)/manager/page.tsx\")",
+      "Bash(Get-ChildItem -Path \"C:\\\\VS Code\\\\CongNghePhanMem\\\\Final\\\\backend\" -Recurse -Include \"*.graphqls\", \"*.graphql\")",
+      "Bash(Select-Object FullName)",
+      "Skill(prompt-optimizer)"
     ]
   }
 }

.claude/skills/feature-workflow-tracer/SKILL.md

@@ -0,0 +1,139 @@
+---
+name: feature-workflow-tracer
+description:
+  Trace and explain the end-to-end workflow of any feature or functionality in a
+  codebase. Use this skill whenever the user wants to understand how a feature
+  works, asks "how does X work in the code", "trace the workflow of Y", "where
+  does Z start", "what happens when I click login", or any question about
+  following code flow through a project. Also trigger when the user is
+  onboarding to a new codebase and needs to understand how a specific function,
+  button, route, or user action maps to actual code execution. Trigger even for
+  vague questions like "how is auth handled here?" or "explain the checkout
+  flow".
+---
+
+# Feature Workflow Tracer
+
+You are a **senior software engineer** helping a new team member understand how
+a specific feature works end-to-end in an unfamiliar codebase.
+
+## Your Task
+
+When the user provides a **feature name** (e.g., "login", "checkout", "forgot
+password"), follow these phases:
+
+### Phase 1 — Explore Project Structure
+
+Before tracing anything, run shell commands to understand the codebase:
+
+```bash
+# Get top-level structure
+ls -la
+
+# Identify stack clues
+find . -maxdepth 2 -name "package.json" -o -name "composer.json" -o -name "requirements.txt" | head -10
+
+# Find route files
+find . -type f \( -name "*.route.*" -o -name "routes.js" -o -name "web.php" -o -name "api.php" -o -name "router.js" \) | grep -v node_modules | head -20
+
+# Find entry points
+ls src/ 2>/dev/null || ls app/ 2>/dev/null || ls pages/ 2>/dev/null
+```
+
+Identify:
+
+- **Stack** (React, Laravel, Next.js, Vue, Express, etc.)
+- **Architecture pattern** (MVC, feature-based, domain-driven, etc.)
+- **Entry point** for the requested feature (route file, page component, or
+  controller)
+
+### Phase 2 — Trace the Workflow
+
+Starting from the **UI layer**, follow the execution path step by step:
+
+```
+UI (button/form/link)
+  → Event handler / Route handler
+    → Service / Controller
+      → Repository / Model / API call
+        → Response / Side effect
+```
+
+For each step, find the **exact file and line number** using:
+
+```bash
+# Search for function/component by name
+grep -rn "functionName\|ComponentName" src/ --include="*.js" --include="*.jsx" --include="*.ts" --include="*.tsx" --include="*.php"
+
+# Find where a route is defined
+grep -rn "'/login'\|\"login\"\|login.route\|LoginController" . --include="*.php" --include="*.js" | grep -v node_modules
+```
+
+### Phase 3 — Output
+
+Produce a structured workflow report in this format:
+
+---
+
+## Workflow: [Feature Name]
+
+**Stack detected:** [e.g., React + Laravel REST API]  
+**Entry point:** [e.g., `resources/js/pages/Login.jsx:12`]
+
+### Step-by-step Flow
+
+**1. [Action description]** — `path/to/file.ext:LINE`
+
+> What this step does in plain English
+
+```language
+// 3–7 lines of the most relevant code
+```
+
+**2. [Next step]** — `path/to/file.ext:LINE`
+
+> ...
+
+_(continue until the feature's final outcome: DB write, API response, page
+redirect, etc.)_
+
+### Summary
+
+> One paragraph summarizing the full flow from user action to final outcome.
+
+---
+
+## Tracing Rules
+
+| Rule            | Detail                                                                                    |
+| --------------- | ----------------------------------------------------------------------------------------- |
+| **Max depth**   | 5 layers (UI → handler → service → repo → DB). Stop before third-party library internals. |
+| **Always cite** | Every step must have `file:line`. Never say "somewhere in the codebase."                  |
+| **Skip**        | Config files, `.env`, migrations, boilerplate. Focus on application logic only.           |
+| **Branches**    | If a step has success/error paths, show both as `1a` and `1b`.                            |
+| **Honesty**     | If you cannot find a file or function, say so explicitly — never guess.                   |
+
+## Tips for Common Stacks
+
+### React + REST API
+
+- Start from the component with the button/form
+- Find the `onClick` / `onSubmit` handler
+- Follow the API call (`axios.post`, `fetch`) to the backend route
+- In the backend, trace: route → controller → service → model
+
+### Laravel (MVC)
+
+- Start from `routes/web.php` or `routes/api.php`
+- Follow: route → Controller method → Service (if any) → Model / DB query
+
+### Next.js
+
+- Start from the page in `pages/` or `app/`
+- For server actions: trace `action=` or `use server` functions
+- For API routes: trace `pages/api/` or `app/api/`
+
+### Express.js
+
+- Start from route definition in `routes/` or `app.js`
+- Follow: router → middleware → controller → DB call

.claude/skills/learning-assistant/SKILL.md

@@ -0,0 +1,103 @@
+---
+name: learning-assistant
+description: >
+  A personal learning companion for students and self-learners. Use this skill
+  whenever the user is studying, learning something new, asking about code,
+  trying to understand a concept, or exploring a technical or academic topic.
+  Triggers include: "how does X work", "explain Y to me", "what is Z", "I'm
+  learning about...", "can you help me understand...", "what does this code do",
+  "I don't get X", or any question that sounds like it comes from someone trying
+  to build understanding rather than just get a quick fact. Use this skill
+  proactively — if the user is clearly in learning mode (asking follow-up
+  questions, exploring a topic step by step, studying for a course), stay in
+  this mode for the whole conversation.
+---
+
+# Learning Assistant
+
+Your job is to help the user learn effectively. The key is to **match your
+response depth to what's actually being asked** — some questions need a
+one-liner, others need a structured breakdown. Read the question carefully and
+pick the right mode.
+
+---
+
+## Mode 1: Simple / factual question
+
+If the user asks a direct question with a clear, concise answer, just answer it.
+Don't pad it out.
+
+**Examples of simple questions:**
+
+- "What does `===` mean in JavaScript?"
+- "What's the difference between TCP and UDP?"
+- "What does the `final` keyword do in Java?"
+
+**How to respond:** One to three sentences. Be accurate and direct. If there's a
+one-line example that makes it instantly clear, include it. Don't add sections
+or menus.
+
+---
+
+## Mode 2: Code question
+
+If the user shares code or asks about a specific piece of code (what it does,
+how to use it, why it works a certain way), offer a numbered menu so they can
+choose what kind of help they want.
+
+**Format:**
+
+```
+[Short one-sentence explanation of what the code does]
+
+What would you like to know more about?
+1. How it works step by step
+2. Example usage
+3. Common variations / alternatives
+4. Common mistakes or edge cases
+5. Something else — just ask
+```
+
+Keep the initial explanation brief. The menu is there so the user drives the
+depth, not you.
+
+---
+
+## Mode 3: Complex topic requiring deep explanation
+
+If the user asks about a topic that has multiple meaningful dimensions — a
+concept with theory, practice, tradeoffs, and examples all worth exploring —
+don't try to cover everything at once. Surface the structure first and let them
+pick.
+
+**Format:**
+
+```
+[One or two sentences situating the topic — what it is and why it matters]
+
+Which part do you want to dig into?
+1. Core idea / how it works
+2. Example / walkthrough
+3. When to use it (and when not to)
+4. Common misconceptions
+5. [A specific angle relevant to this topic]
+```
+
+Adjust the menu options to fit the topic. Option 5 (or more) should be something
+specific and interesting about this particular subject — not a generic filler.
+
+---
+
+## General principles
+
+- **Be concise by default.** If you can say it clearly in two sentences, don't
+  write six.
+- **Don't front-load.** Get to the point before adding caveats or context.
+- **When you give examples, make them concrete.** Toy examples are fine; vague
+  pseudocode is not.
+- **Let the user lead the depth.** Your job is to open doors, not walk through
+  all of them at once.
+- **If a follow-up question changes the depth needed, switch modes.** The modes
+  are a guide, not a rigid script.
+- **Use plain language.** Avoid unnecessary jargon. If a technical term is
+  necessary, define it briefly the first time.

.claude/skills/prompt-optimizer/SKILL.md

@@ -1,11 +1,11 @@
 ---
 name: prompt-optimizer
 description:
-  Help users rewrite and improve AI/LLM prompts by adding specificity, context,
+  "Help users rewrite and improve AI/LLM prompts by adding specificity, context,
   and constraints. Trigger this skill whenever users ask to improve, rewrite,
   optimize, or refine prompts for AI models. Focus on making prompts clearer,
   more specific, and more likely to produce better AI results. Present
-  suggestions interactively so users can choose which improvements to apply.
+  suggestions interactively so users can choose which improvements to apply."
 ---
 
 # Prompt Optimizer
@@ -73,9 +73,7 @@ When you use this skill, you'll see:
 - **Preview examples** — What each change would look like with the improvement
   applied
 - **Your choices** — You pick which suggestions help most (you can apply all,
-  some, or none)
-
-Then you get a rewritten prompt combining all your choices.
+  some, or none) Then you get a rewritten prompt combining all your choices.
 
 ### Example Interaction
 
@@ -85,9 +83,8 @@ Then you get a rewritten prompt combining all your choices.
 
 - **Specificity**: Add a topic (e.g., "about sustainable living")
 - **Context**: Explain your goal (e.g., "to build authority on my website")
-- **Constraints**: Set a word count (e.g., "800-1000 words")
-
-**Your choice:** "I want all three — add topic, goal, and word count"
+- **Constraints**: Set a word count (e.g., "800-1000 words") **Your choice:** "I
+  want all three — add topic, goal, and word count"
 
 **Final rewritten prompt:** "Write an 800-1000 word blog post about sustainable
 living for my website. The goal is to establish my authority on eco-friendly
@@ -110,3 +107,65 @@ A prompt becomes "good" when:
 - You've given enough context to explain why ✓
 - You've set boundaries to prevent bad outputs ✓
 - Someone else could read it and understand your intent ✓
+
+---
+
+## Anti-Pattern Detection
+
+Before suggesting improvements, scan the original prompt for these common
+mistakes and report them with a warning:
+
+| Anti-Pattern           | Description                                           | Example                                     |
+| ---------------------- | ----------------------------------------------------- | ------------------------------------------- |
+| Too generic            | No clear subject, action, or goal                     | "Tell me about AI"                          |
+| Ambiguous pronouns     | "it", "that", "this" with no clear referent           | "Fix it so it works better"                 |
+| Internal contradiction | Two requirements that cancel each other out           | "Be concise but cover everything in detail" |
+| Missing context        | Requests an action without explaining why or for whom | "Rewrite this paragraph"                    |
+
+**Output format:** Before showing improvement suggestions, print a "Detected
+Issues" block listing any anti-patterns found. If none are found, skip this
+block silently. Example:
+
+```
+⚠️ Detected Issues:
+- Too generic: No output format specified
+- Missing context: No audience or goal provided
+```
+
+---
+
+## Prompt Classification
+
+Automatically classify the input prompt into one of these types, then tailor
+your improvement suggestions accordingly:
+
+| Type       | Trigger Keywords                              | Extra Suggestions to Offer                                                 |
+| ---------- | --------------------------------------------- | -------------------------------------------------------------------------- |
+| `code`     | write, fix, debug, refactor, implement        | Programming language & version, runtime environment, input/output examples |
+| `content`  | write, blog, email, post, describe, summarize | Target audience, tone (formal/casual), word count, platform                |
+| `analysis` | analyze, compare, evaluate, review, assess    | Criteria for evaluation, output format (table, prose), depth of detail     |
+| `qa`       | explain, what is, how does, why, define       | Knowledge level of audience, analogies allowed?, length of answer          |
+| `task`     | do, create, set up, build, generate, automate | Step-by-step vs one-shot, tools/permissions available, success criteria    |
+
+Show the detected type at the top of your response:
+`📌 Prompt type detected: [type]`
+
+---
+
+## Chain-of-Thought Mode
+
+Offer "Chain-of-Thought Enhancement" as an optional improvement when showing
+suggestions. When the user selects it, add reasoning instructions to the end of
+the optimized prompt based on type:
+
+| Prompt Type     | Chain-of-Thought Addition                                                  |
+| --------------- | -------------------------------------------------------------------------- |
+| General         | `"Think step by step before answering."`                                   |
+| Analysis        | `"Explain your reasoning for each point before giving a conclusion."`      |
+| Code            | `"Outline your approach and data structures before writing any code."`     |
+| Decision-making | `"List pros and cons, then state your recommendation with justification."` |
+
+**Why it works:** Chain-of-Thought forces the AI to externalize its reasoning
+process. This reduces hallucination (the AI catches its own errors
+mid-reasoning), makes outputs easier to verify, and produces more structured
+answers. Studies show CoT improves accuracy on complex tasks by 20–40%.

app/(main)/login/otp/page.tsx

@@ -54,6 +54,7 @@ export default function LoginOtpPage() {
 
       if (res.ok) {
         const userData = await res.json();
+        if (userData.role) userData.role = userData.role.toLowerCase();
         setUser(userData);
         localStorage.setItem("coffee-shop-user", JSON.stringify(userData));
         sessionStorage.removeItem("login_phone");

app/(main)/login/password/page.tsx

@@ -13,6 +13,7 @@ export default function LoginPasswordPage() {
   const { setUser } = useAuth();
 
   const [phone, setPhone] = useState("");
+  const [role, setRole] = useState("");
   const [password, setPassword] = useState("");
   const [showPassword, setShowPassword] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -21,11 +22,12 @@ export default function LoginPasswordPage() {
   useEffect(() => {
     const storedPhone = sessionStorage.getItem("login_phone");
     const storedRole = sessionStorage.getItem("login_role");
-    if (!storedPhone || storedRole !== "manager") {
+    if (!storedPhone || (storedRole !== "manager" && storedRole !== "staff")) {
       router.replace("/login");
       return;
     }
     setPhone(storedPhone);
+    setRole(storedRole);
   }, [router]);
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
@@ -48,11 +50,13 @@ export default function LoginPasswordPage() {
 
       if (res.ok) {
         const userData = await res.json();
+        if (userData.role) userData.role = userData.role.toLowerCase();
+        else userData.role = role;
         setUser(userData);
         localStorage.setItem("coffee-shop-user", JSON.stringify(userData));
         sessionStorage.removeItem("login_phone");
         sessionStorage.removeItem("login_role");
-        router.push("/manager");
+        router.push(role === "staff" ? "/staff/schedule" : "/manager");
       } else {
         const STATUS_ERROR_MAP: Record<number, string> = {
           400: "Incorrect login details, please try again",

app/(main)/manager-signup/page.tsx

@@ -19,12 +19,14 @@ export default function ManagerSignupPage() {
     phone: "",
     password: "",
     eateryName: "",
+    bankAccount: "", // 1. Thêm bankAccount vào state
   });
   const [errors, setErrors] = useState({
     name: "",
     phone: "",
     password: "",
     eateryName: "",
+    bankAccount: "", // 2. Thêm bankAccount vào errors state
     submit: "",
   });
 
@@ -32,9 +34,6 @@ export default function ManagerSignupPage() {
     fetch("/api/manager/signup")
       .then((res) => {
         setPageState("available");
-        // if (res.ok) ;
-        // else if (res.status === 403) setPageState("closed");
-        // else setPageState("error");
       })
       .catch(() => setPageState("error"));
   }, []);
@@ -54,6 +53,7 @@ export default function ManagerSignupPage() {
       phone: "",
       password: "",
       eateryName: "",
+      bankAccount: "",
       submit: "",
     };
     if (!form.name.trim()) next.name = "Please enter your full name";
@@ -65,8 +65,18 @@ export default function ManagerSignupPage() {
       next.password = "Password must be at least 6 characters";
     if (!form.eateryName.trim())
       next.eateryName = "Please enter the restaurant name";
+
+    if (!form.bankAccount.trim())
+      next.bankAccount = "Please enter your bank account number";
+
     setErrors(next);
-    return !next.name && !next.phone && !next.password && !next.eateryName;
+    return (
+      !next.name &&
+      !next.phone &&
+      !next.password &&
+      !next.eateryName &&
+      !next.bankAccount
+    );
   };
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
@@ -151,7 +161,7 @@ export default function ManagerSignupPage() {
               href="/login"
               className="flex w-full items-center justify-center rounded-xl border-2 border-(--color-primary) bg-white py-3 font-semibold text-(--color-primary) no-underline transition-all duration-150 hover:bg-(--color-primary) hover:text-white"
             >
-              Quay lại đăng nhập
+              Back to login
             </Link>
           </div>
         )}
@@ -164,10 +174,10 @@ export default function ManagerSignupPage() {
             </div>
             <div className="text-center">
               <h2 className="mb-2 text-lg font-semibold text-(--color-text-primary)">
-                Không thể kết nối
+                Unable to connect
               </h2>
               <p className="text-sm text-(--color-text-muted)">
-                Không thể kiểm tra trạng thái đăng ký. Vui lòng thử lại.
+                Unable to check registration status. Please try again.
               </p>
             </div>
             <Button
@@ -185,13 +195,13 @@ export default function ManagerSignupPage() {
                   .catch(() => setPageState("error"));
               }}
             >
-              Thử lại
+              Retry
             </Button>
             <Link
               href="/login"
               className="text-sm text-(--color-primary) underline"
             >
-              Quay lại đăng nhập
+              Back to login
             </Link>
           </div>
         )}
@@ -202,15 +212,15 @@ export default function ManagerSignupPage() {
             {[
               {
                 id: "name",
-                label: "Họ tên",
+                label: "Full name",
                 icon: "fa-user",
-                placeholder: "Nguyễn Văn A",
+                placeholder: "John Doe",
                 field: "name" as const,
                 type: "text",
               },
               {
                 id: "phone",
-                label: "Số điện thoại",
+                label: "Phone number",
                 icon: "fa-phone",
                 placeholder: "0987654321",
                 field: "phone" as const,
@@ -218,20 +228,28 @@ export default function ManagerSignupPage() {
               },
               {
                 id: "password",
-                label: "Mật khẩu",
+                label: "Password",
                 icon: "fa-lock",
-                placeholder: "Ít nhất 6 ký tự",
+                placeholder: "At least 6 characters",
                 field: "password" as const,
                 type: "password",
               },
               {
                 id: "eateryName",
-                label: "Tên nhà hàng",
+                label: "Restaurant name",
                 icon: "fa-store",
                 placeholder: "Coffee & More",
                 field: "eateryName" as const,
                 type: "text",
               },
+              {
+                id: "bankAccount",
+                label: "Bank account number (example: acb-44359797)",
+                icon: "fa-credit-card",
+                placeholder: "Enter account number (for QR payment)",
+                field: "bankAccount" as const,
+                type: "text",
+              },
             ].map(({ id, label, icon, placeholder, field, type }) => (
               <div key={id}>
                 <label
@@ -251,7 +269,7 @@ export default function ManagerSignupPage() {
                     onChange={handleChange(field)}
                     placeholder={placeholder}
                     disabled={isLoading}
-                    className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-4 py-3 transition-all duration-150 outline-none placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) disabled:opacity-60 lg:pl-11 ${errors[field] ? "border-red-400" : "border-(--color-border)"}`}
+                    className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-4 py-3 pl-10 transition-all duration-150 outline-none placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) disabled:opacity-60 lg:pl-11 ${errors[field] ? "border-red-400" : "border-(--color-border)"}`}
                   />
                 </div>
                 {errors[field] && (
@@ -280,18 +298,18 @@ export default function ManagerSignupPage() {
               >
                 {isLoading ? (
                   <>
-                    <i className="fa-solid fa-spinner fa-spin mr-2"></i>Đang xử
-                    lý...
+                    <i className="fa-solid fa-spinner fa-spin mr-2"></i>
+                    Processing...
                   </>
                 ) : (
-                  "Đăng ký"
+                  "Register"
                 )}
               </Button>
               <Link
                 href="/login"
                 className="flex w-full items-center justify-center rounded-xl border-2 border-(--color-primary) bg-white py-3 font-semibold text-(--color-primary) no-underline transition-all duration-150 hover:bg-(--color-primary) hover:text-white"
               >
-                Đã có tài khoản? Đăng nhập
+                Already have an account? Sign in
               </Link>
             </div>
           </form>

app/(main)/page.tsx

@@ -1,9 +1,9 @@
 "use client";
 
 import { SearchBar } from "@/components/molecules/search-bar";
-import { CategorySidebar } from "@/components/organisms/navigation";
 import { ProductGrid } from "@/components/organisms/product-grid";
 import { eateryClient } from "@/lib/apollo-clients";
+import { useAuth } from "@/lib/auth-context";
 import { allEateriesQuery } from "@/lib/types";
 import { gql } from "@apollo/client";
 import { useQuery } from "@apollo/client/react";
@@ -18,18 +18,41 @@ const GET_EATERY_COUNT = gql`
   }
 `;
 
-/**
- * Main page — sidebar + product grid layout.
- *
- * Layout:
- *   [Sidebar (sticky, collapsible)] | [Main content (scrollable)]
- *
- * Sidebar state:
- *   - Desktop (≥ 1024px): expanded by default
- *   - Mobile  (< 1024px): collapsed by default
- */
+function StaffHomePage() {
+  const [isSidebarOpen, setIsSidebarOpen] = useState(false);
+  const [searchQuery, setSearchQuery] = useState("");
+
+  useEffect(() => {
+    const mq = window.matchMedia("(min-width: 1024px)");
+    // eslint-disable-next-line react-hooks/set-state-in-effect
+    setIsSidebarOpen(mq.matches);
+    const handler = (e: MediaQueryListEvent) => setIsSidebarOpen(e.matches);
+    mq.addEventListener("change", handler);
+    return () => mq.removeEventListener("change", handler);
+  }, []);
+
+  return (
+    <div className="bg-background flex min-h-[calc(100vh-var(--spacing-header-height))] flex-col items-start">
+      {/* ── Body — same as Customer ── */}
+      <main className="w-full min-w-0 flex-1 px-4 py-6 md:px-6 lg:px-8">
+        <div className="mb-5 flex flex-col justify-between gap-3 sm:flex-row sm:items-center">
+          <SearchBar
+            value={searchQuery}
+            onChange={(q) => setSearchQuery(q)}
+            onClear={() => setSearchQuery("")}
+            placeholder="Search items..."
+            className="sm:max-w-xs"
+          />
+        </div>
+        <ProductGrid searchQuery={searchQuery} isSidebarOpen={isSidebarOpen} />
+      </main>
+    </div>
+  );
+}
+
 export default function Home() {
   const router = useRouter();
+  const { user, isInitialized } = useAuth();
 
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
   const [searchQuery, setSearchQuery] = useState("");
@@ -39,6 +62,7 @@ export default function Home() {
     {
       client: eateryClient,
       fetchPolicy: "no-cache",
+      skip: user?.role === "staff",
     },
   );
 
@@ -62,6 +86,10 @@ export default function Home() {
     return () => mq.removeEventListener("change", handler);
   }, []);
 
+  if (!isInitialized) return <div>Loading...</div>;
+
+  if (user?.role === "staff") return <StaffHomePage />;
+
   if (loading) return <div>Loading...</div>;
   if (error) return <div>Error: {error.message}</div>;
 
@@ -71,7 +99,6 @@ export default function Home() {
       <main className="min-w-0 flex-1 px-4 py-6 md:px-6 lg:px-8">
         {/* ── Section heading + search bar ── */}
         <div className="mb-5 flex flex-col justify-between gap-3 sm:flex-row sm:items-center">
-          {/* Search bar */}
           <SearchBar
             value={searchQuery}
             onChange={(q) => {

app/(main)/payment/page.tsx

@@ -2,12 +2,9 @@
 
 import Button from "@/components/atoms/buttons/Button";
 import PaymentSummaryCard from "@/components/molecules/cards/PaymentSummaryCard";
-import ReviewModal from "@/components/organisms/modals/ReviewModal";
-import { useAuth } from "@/lib/auth-context";
 import { useCart } from "@/lib/cart-context";
 import { useManager } from "@/lib/manager-context";
 import { MenuItemEntity } from "@/lib/types";
-import { useState } from "react";
 
 export const formatPrice = (value?: number) =>
   (value ?? 0).toLocaleString("vi-VN", { style: "currency", currency: "VND" });
@@ -16,12 +13,13 @@ export default function PaymentPage() {
   const {
     items,
     totalPrice,
+    eateryId,
     increaseQty,
     decreaseQty,
     removeFromCart,
     setQuantity,
   } = useCart();
-  const { user } = useAuth();
+
   const { products } = useManager();
 
   const findProduct = (id: string): MenuItemEntity =>
@@ -32,9 +30,6 @@ export default function PaymentPage() {
       price: 0,
     } as MenuItemEntity);
 
-  const [isReviewOpen, setIsReviewOpen] = useState(false);
-  const isCustomer = user?.role === "customer";
-
   return (
     <div>
       <div className="mx-auto w-full max-w-screen-2xl px-4 py-6 md:px-6 md:py-8 lg:px-8">
@@ -43,13 +38,13 @@ export default function PaymentPage() {
             <div className="bg-card overflow-hidden rounded-2xl border border-(--color-border-light)">
               <div className="border-b border-(--color-border-light) px-4 py-3">
                 <h1 className="text-foreground text-lg font-bold md:text-xl">
-                  Trang thanh toán
+                  Payment
                 </h1>
               </div>
 
               {items?.length === 0 ? (
                 <div className="px-4 py-10 text-center text-(--color-text-muted)">
-                  Chưa có sản phẩm nào trong giỏ hàng.
+                  Your cart is empty.
                 </div>
               ) : (
                 <div className="overflow-x-auto">
@@ -84,7 +79,6 @@ export default function PaymentPage() {
                           quantity,
                         }) => {
                           const { name, description } = findProduct(id);
-
                           return (
                             <tr
                               key={id}
@@ -104,24 +98,20 @@ export default function PaymentPage() {
                                   <button
                                     onClick={() => decreaseQty(id)}
                                     className="inline-flex h-8 w-8 items-center justify-center rounded-lg border border-(--color-border) hover:bg-(--color-border-light)"
-                                    aria-label={`Giảm số lượng ${name}`}
                                   >
                                     -
                                   </button>
                                   <input
                                     type="number"
-                                    min={1}
                                     value={quantity}
                                     onChange={(e) =>
                                       setQuantity(id, Number(e.target.value))
                                     }
                                     className="h-8 w-16 rounded-lg border border-(--color-border) bg-transparent text-center"
-                                    title="Nhập số lượng"
                                   />
                                   <button
                                     onClick={() => increaseQty(id)}
                                     className="inline-flex h-8 w-8 items-center justify-center rounded-lg border border-(--color-border) hover:bg-(--color-border-light)"
-                                    aria-label={`Tăng số lượng ${name}`}
                                   >
                                     +
                                   </button>
@@ -133,7 +123,6 @@ export default function PaymentPage() {
                                   variant="danger"
                                   size="md"
                                   style="payment"
-                                  aria-label={`Xóa ${name} khỏi giỏ hàng`}
                                 >
                                   Delete product
                                 </Button>
@@ -151,16 +140,12 @@ export default function PaymentPage() {
 
           <PaymentSummaryCard
             totalPrice={totalPrice}
-            isCustomer={isCustomer}
+            isCustomer={true}
             backHref="/"
+            eateryId={eateryId}
           />
         </div>
       </div>
-
-      <ReviewModal
-        isOpen={isReviewOpen}
-        onClose={() => setIsReviewOpen(false)}
-      />
     </div>
   );
 }

app/(manager)/manager/create-staff/page.tsx

@@ -0,0 +1,181 @@
+"use client";
+
+import Button from "@/components/atoms/buttons/Button";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { FormEvent, useState } from "react";
+
+export default function CreateStaffPage() {
+  const router = useRouter();
+  const [isLoading, setIsLoading] = useState(false);
+  const [form, setForm] = useState({ name: "", phone: "", password: "" });
+  const [errors, setErrors] = useState({
+    name: "",
+    phone: "",
+    password: "",
+    submit: "",
+  });
+
+  const validatePhone = (phone: string) =>
+    /^(0[3|5|7|8|9])[0-9]{8}$/.test(phone);
+
+  const handleChange =
+    (field: keyof typeof form) => (e: React.ChangeEvent<HTMLInputElement>) => {
+      setForm({ ...form, [field]: e.target.value });
+      setErrors({ ...errors, [field]: "", submit: "" });
+    };
+
+  const validate = () => {
+    const next = { name: "", phone: "", password: "", submit: "" };
+    if (!form.name.trim()) next.name = "Please enter full name";
+    if (!form.phone.trim()) next.phone = "Please enter phone number";
+    else if (!validatePhone(form.phone))
+      next.phone = "Invalid phone number (e.g. 0987654321)";
+    if (!form.password.trim()) next.password = "Please enter password";
+    else if (form.password.length < 6)
+      next.password = "Password must be at least 6 characters";
+    setErrors(next);
+    return !next.name && !next.phone && !next.password;
+  };
+
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    if (!validate()) return;
+
+    setIsLoading(true);
+    try {
+      const res = await fetch("/api/Staff/signup", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(form),
+      });
+
+      if (res.ok || res.status === 201) {
+        router.push("/manager");
+      } else {
+        const errorCode = (await res.text().catch(() => "")).trim();
+        const errorMap: Record<string, string> = {
+          ExistedUser: "Phone number already registered",
+          InvalidPhoneNumber: "Invalid phone number",
+          InvalidManager: "Manager account not found",
+        };
+        setErrors({
+          ...errors,
+          submit: errorMap[errorCode] ?? "An error occurred, please try again",
+        });
+      }
+    } catch {
+      setErrors({ ...errors, submit: "Unable to connect, please try again" });
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <div className="bg-background flex min-h-screen items-center justify-center px-4 py-8">
+      <div className="w-full max-w-md rounded-2xl bg-white p-8 shadow-lg">
+        <div className="mb-8 flex flex-col items-center">
+          <div className="mb-4 flex h-16 w-16 items-center justify-center rounded-full bg-(--color-accent-light)">
+            <i className="fa-solid fa-user-plus text-2xl text-(--color-primary)"></i>
+          </div>
+          <h1 className="mb-1 text-2xl font-bold text-(--color-primary-dark)">
+            Create Staff Account
+          </h1>
+          <p className="text-sm text-(--color-text-muted)">
+            Add a new staff member to the restaurant
+          </p>
+        </div>
+
+        <form onSubmit={handleSubmit} className="space-y-4">
+          {[
+            {
+              id: "name",
+              label: "Full name",
+              icon: "fa-user",
+              placeholder: "John Doe",
+              field: "name" as const,
+              type: "text",
+            },
+            {
+              id: "phone",
+              label: "Phone number",
+              icon: "fa-phone",
+              placeholder: "0987654321",
+              field: "phone" as const,
+              type: "tel",
+            },
+            {
+              id: "password",
+              label: "Password",
+              icon: "fa-lock",
+              placeholder: "At least 6 characters",
+              field: "password" as const,
+              type: "password",
+            },
+          ].map(({ id, label, icon, placeholder, field, type }) => (
+            <div key={id}>
+              <label
+                htmlFor={id}
+                className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
+              >
+                {label}
+              </label>
+              <div className="relative">
+                <i
+                  className={`fa-solid ${icon} absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block`}
+                ></i>
+                <input
+                  id={id}
+                  type={type}
+                  value={form[field]}
+                  onChange={handleChange(field)}
+                  placeholder={placeholder}
+                  disabled={isLoading}
+                  className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-4 py-3 pl-10 transition-all duration-150 outline-none placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) disabled:opacity-60 lg:pl-11 ${errors[field] ? "border-red-400" : "border-(--color-border)"}`}
+                />
+              </div>
+              {errors[field] && (
+                <p className="mt-1.5 flex items-center gap-1 text-xs text-red-500">
+                  <i className="fa-solid fa-circle-exclamation"></i>
+                  {errors[field]}
+                </p>
+              )}
+            </div>
+          ))}
+
+          {errors.submit && (
+            <div className="rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">
+              <i className="fa-solid fa-circle-exclamation mr-2"></i>
+              {errors.submit}
+            </div>
+          )}
+
+          <div className="space-y-3 pt-2">
+            <Button
+              variant="primaryNoBorder"
+              type="submit"
+              style="login"
+              size="lg"
+              disabled={isLoading}
+            >
+              {isLoading ? (
+                <>
+                  <i className="fa-solid fa-spinner fa-spin mr-2"></i>
+                  Processing...
+                </>
+              ) : (
+                "Create account"
+              )}
+            </Button>
+            <Link
+              href="/manager"
+              className="flex w-full items-center justify-center rounded-xl border-2 border-(--color-primary) bg-white py-3 font-semibold text-(--color-primary) no-underline transition-all duration-150 hover:bg-(--color-primary) hover:text-white"
+            >
+              Back to Dashboard
+            </Link>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

app/(manager)/manager/page.tsx

@@ -1,13 +1,16 @@
 "use client";
 
-import { ProductsTab } from "@/components/organisms/manager";
+import { ProductsTab, ReviewsTab } from "@/components/organisms/manager";
 import { useAuth } from "@/lib/auth-context";
 import { useManager } from "@/lib/manager-context";
 import Link from "next/link";
+import { useEffect, useRef, useState } from "react";
 
 export default function ManagerPage() {
   const { user, logout } = useAuth();
   const { activeTab, setActiveTab, products } = useManager();
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const dropdownRef = useRef<HTMLDivElement>(null);
 
   const tabs = [
     {
@@ -16,11 +19,30 @@ export default function ManagerPage() {
       icon: "fa-solid fa-utensils",
       count: products.length,
     },
+    {
+      id: "reviews" as const,
+      label: "Reviews",
+      icon: "fa-solid fa-star",
+      count: null,
+    },
   ];
 
+  useEffect(() => {
+    function handleOutsideClick(e: MouseEvent) {
+      if (
+        dropdownRef.current &&
+        !dropdownRef.current.contains(e.target as Node)
+      ) {
+        setDropdownOpen(false);
+      }
+    }
+    document.addEventListener("mousedown", handleOutsideClick);
+    return () => document.removeEventListener("mousedown", handleOutsideClick);
+  }, []);
+
   return (
     <div className="flex min-h-screen">
-      {/* ── Sidebar ── */}
+      {/* ── Sidebar (lg+) ── */}
       <aside className="hidden w-64 shrink-0 flex-col border-r border-(--color-border-light) bg-white shadow-sm lg:flex">
         <div className="flex items-center gap-3 border-b border-(--color-border-light) px-5 py-5">
           <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-(--color-primary)">
@@ -86,6 +108,18 @@ export default function ManagerPage() {
               </span>
             </Link>
           </div>
+          <div className="mt-3 border-t border-(--color-border-light) pt-3">
+            <p className="mb-2 px-3 text-[11px] font-semibold tracking-wider text-(--color-text-muted) uppercase">
+              Staff
+            </p>
+            <Link
+              href="/manager/create-staff"
+              className="hover:bg-background flex w-full items-center gap-3 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) no-underline transition-all hover:text-(--color-primary-dark)"
+            >
+              <i className="fa-solid fa-user-plus w-4 text-center"></i>
+              <span className="flex-1 text-left">Create Staff</span>
+            </Link>
+          </div>
         </nav>
 
         <div className="border-t border-(--color-border-light) p-3">
@@ -121,50 +155,176 @@ export default function ManagerPage() {
 
       {/* ── Main content ── */}
       <div className="flex min-w-0 flex-1 flex-col">
-        <header className="sticky top-0 z-40 flex items-center justify-between border-b border-(--color-border-light) bg-white px-5 py-4 shadow-sm">
-          <div>
-            <h1 className="text-foreground text-lg font-bold">
+        <header className="sticky top-0 z-40 flex items-center justify-between gap-3 border-b border-(--color-border-light) bg-white px-5 py-4 shadow-sm">
+          {/* Title */}
+          <div className="min-w-0 shrink">
+            <h1 className="text-foreground truncate text-lg font-bold">
               {tabs.find((t) => t.id === activeTab)?.label ?? "Manager"}
             </h1>
-            <p className="text-xs text-(--color-text-muted)">
-              Manage{" "}
+            <p className="truncate text-xs text-(--color-text-muted)">
               {activeTab === "products"
-                ? "menu items"
-                : activeTab === "combos"
-                  ? "combos"
-                  : activeTab === "categories"
-                    ? "categories"
-                    : "menu"}{" "}
-              for your store
+                ? "Manage menu items for your store"
+                : "Customer reviews for your eatery"}
             </p>
           </div>
 
-          {/* Mobile tabs */}
-          <div className="flex items-center gap-1 lg:hidden">
-            {tabs.map((tab) => (
-              <button
-                key={tab.id}
-                onClick={() => setActiveTab(tab.id)}
-                className={`flex cursor-pointer items-center gap-1.5 rounded-xl border-none px-3 py-2 text-xs font-medium transition ${
-                  activeTab === tab.id
-                    ? "bg-(--color-primary) text-white"
-                    : "bg-background text-(--color-text-secondary) hover:text-(--color-primary)"
-                }`}
+          {/* ── Actions: hidden on lg+ (sidebar handles nav there) ── */}
+          <div className="flex shrink-0 items-center gap-1.5 lg:hidden">
+            {/* sm–lg: inline icon+label buttons */}
+            <div className="hidden items-center gap-1.5 sm:flex">
+              {tabs.map((tab) => (
+                <button
+                  key={tab.id}
+                  onClick={() => setActiveTab(tab.id)}
+                  className={`flex cursor-pointer items-center gap-1.5 rounded-xl border-none px-3 py-2 text-xs font-medium transition ${
+                    activeTab === tab.id
+                      ? "bg-(--color-primary) text-white"
+                      : "bg-background text-(--color-text-secondary) hover:text-(--color-primary)"
+                  }`}
+                >
+                  <i className={tab.icon}></i>
+                  <span>{tab.label}</span>
+                </button>
+              ))}
+              <Link
+                href="/manager/analytics"
+                className="flex items-center gap-1.5 rounded-xl border-none bg-(--color-accent-light) px-3 py-2 text-xs font-medium text-(--color-primary) no-underline transition hover:opacity-80"
               >
-                <i className={tab.icon}></i>
-                <span className="hidden sm:inline">{tab.label}</span>
+                <i className="fa-solid fa-chart-line"></i>
+                <span>Finance</span>
+              </Link>
+              <Link
+                href="/staff/schedule"
+                className="hover:bg-background flex items-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent px-3 py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition hover:text-(--color-primary-dark)"
+              >
+                <i className="fa-solid fa-calendar-days"></i>
+                <span>Shifts</span>
+              </Link>
+              <Link
+                href="/manager/create-staff"
+                className="hover:bg-background flex items-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent px-3 py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition hover:text-(--color-primary-dark)"
+              >
+                <i className="fa-solid fa-user-plus"></i>
+                <span>Create Staff</span>
+              </Link>
+              <Link
+                href="/"
+                className="hover:bg-background flex items-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent px-3 py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition"
+              >
+                <i className="fa-solid fa-house"></i>
+                <span>Home</span>
+              </Link>
+              <button
+                onClick={logout}
+                className="flex cursor-pointer items-center gap-1.5 rounded-xl border border-red-200 bg-transparent px-3 py-2 text-xs font-medium text-red-500 transition hover:bg-red-50"
+              >
+                <i className="fa-solid fa-right-from-bracket"></i>
+                <span>Logout</span>
               </button>
-            ))}
-            <Link
-              href="/manager/analytics"
-              className="flex items-center gap-1.5 rounded-xl border-none bg-(--color-accent-light) px-3 py-2 text-xs font-medium text-(--color-primary) no-underline transition hover:bg-(--color-accent-light)/70"
-            >
-              <i className="fa-solid fa-chart-line"></i>
-              <span className="hidden sm:inline">Finance</span>
-            </Link>
+            </div>
+
+            {/* < sm: hamburger → dropdown */}
+            <div className="relative sm:hidden" ref={dropdownRef}>
+              <button
+                onClick={() => setDropdownOpen((prev) => !prev)}
+                aria-label="Open menu"
+                className="flex cursor-pointer items-center justify-center rounded-xl border border-(--color-border-light) bg-transparent p-2 text-sm text-(--color-text-secondary) transition hover:bg-(--color-border-light)"
+              >
+                <i
+                  className={
+                    dropdownOpen ? "fa-solid fa-xmark" : "fa-solid fa-bars"
+                  }
+                ></i>
+              </button>
+
+              {dropdownOpen && (
+                <div className="absolute top-full right-0 z-50 mt-2 w-52 overflow-hidden rounded-2xl border border-(--color-border-light) bg-white shadow-xl">
+                  <div className="p-1.5">
+                    {/* Tab buttons */}
+                    {tabs.map((tab) => (
+                      <button
+                        key={tab.id}
+                        onClick={() => {
+                          setActiveTab(tab.id);
+                          setDropdownOpen(false);
+                        }}
+                        className={`flex w-full cursor-pointer items-center gap-2.5 rounded-xl border-none px-3 py-2.5 text-sm font-medium transition ${
+                          activeTab === tab.id
+                            ? "bg-(--color-primary) text-white"
+                            : "bg-transparent text-(--color-text-secondary) hover:bg-(--color-border-light)"
+                        }`}
+                      >
+                        <i className={`${tab.icon} w-4 text-center`}></i>
+                        <span className="flex-1 text-left">{tab.label}</span>
+                        {tab.count !== null && (
+                          <span
+                            className={`rounded-full px-2 py-0.5 text-xs font-semibold ${
+                              activeTab === tab.id
+                                ? "bg-white/20 text-white"
+                                : "bg-(--color-border-light) text-(--color-text-muted)"
+                            }`}
+                          >
+                            {tab.count}
+                          </span>
+                        )}
+                      </button>
+                    ))}
+
+                    <div className="my-1.5 border-t border-(--color-border-light)"></div>
+
+                    {/* Navigation links */}
+                    <Link
+                      href="/manager/analytics"
+                      onClick={() => setDropdownOpen(false)}
+                      className="flex items-center gap-2.5 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-primary) no-underline transition hover:bg-(--color-accent-light)"
+                    >
+                      <i className="fa-solid fa-chart-line w-4 text-center"></i>
+                      <span>Finance</span>
+                    </Link>
+                    <Link
+                      href="/staff/schedule"
+                      onClick={() => setDropdownOpen(false)}
+                      className="flex items-center gap-2.5 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) no-underline transition hover:bg-(--color-border-light)"
+                    >
+                      <i className="fa-solid fa-calendar-days w-4 text-center"></i>
+                      <span>Shifts</span>
+                    </Link>
+                    <Link
+                      href="/manager/create-staff"
+                      onClick={() => setDropdownOpen(false)}
+                      className="flex items-center gap-2.5 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) no-underline transition hover:bg-(--color-border-light)"
+                    >
+                      <i className="fa-solid fa-user-plus w-4 text-center"></i>
+                      <span>Create Staff</span>
+                    </Link>
+                    <Link
+                      href="/"
+                      onClick={() => setDropdownOpen(false)}
+                      className="flex items-center gap-2.5 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) no-underline transition hover:bg-(--color-border-light)"
+                    >
+                      <i className="fa-solid fa-house w-4 text-center"></i>
+                      <span>Home</span>
+                    </Link>
+
+                    <div className="my-1.5 border-t border-(--color-border-light)"></div>
+
+                    <button
+                      onClick={() => {
+                        setDropdownOpen(false);
+                        logout();
+                      }}
+                      className="flex w-full cursor-pointer items-center gap-2.5 rounded-xl border-none bg-transparent px-3 py-2.5 text-sm font-medium text-red-500 transition hover:bg-red-50"
+                    >
+                      <i className="fa-solid fa-right-from-bracket w-4 text-center"></i>
+                      <span>Logout</span>
+                    </button>
+                  </div>
+                </div>
+              )}
+            </div>
           </div>
 
-          {/* Desktop actions */}
+          {/* ── Desktop actions (lg+): sidebar handles nav, just show shortcut ── */}
           <div className="hidden items-center gap-2 lg:flex">
             <Link
               href="/manager/analytics"
@@ -173,6 +333,13 @@ export default function ManagerPage() {
               <i className="fa-solid fa-chart-line"></i>
               Financial Analytics
             </Link>
+            <Link
+              href="/manager/create-staff"
+              className="hover:bg-background flex items-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent px-3 py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition hover:text-(--color-primary-dark)"
+            >
+              <i className="fa-solid fa-user-plus"></i>
+              Create Staff
+            </Link>
             <Link
               href="/"
               className="hover:bg-background flex items-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent px-3 py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition"
@@ -185,6 +352,7 @@ export default function ManagerPage() {
 
         <main className="flex-1 p-5 md:p-8">
           {activeTab === "products" && <ProductsTab />}
+          {activeTab === "reviews" && <ReviewsTab />}
         </main>
       </div>
     </div>

app/(staff)/staff/schedule/page.tsx

@@ -50,6 +50,7 @@ export default function StaffSchedulePage() {
     goToPrevMonth,
     goToToday,
     getWeeklyBudget,
+    shifts,
   } = useShift();
 
   const [selectedShift, setSelectedShift] = useState<ShiftEntity | null>(null);
@@ -70,41 +71,48 @@ export default function StaffSchedulePage() {
   };
 
   const handleDateSelect = (date: Date) => {
-    // In month view on desktop, clicking a date could open create modal for managers
     if (isManager) {
       setCreateDate(date);
       setCreateOpen(true);
     }
   };
 
-  // Week range label
   const monday = getMonday(currentDate);
   const sunday = new Date(monday);
   sunday.setDate(monday.getDate() + 6);
   const weekLabel = `${formatDateShort(monday)} – ${formatDateShort(sunday)}`;
-
   const weeklyBudget = getWeeklyBudget();
 
+  // Count shifts this week for stats
+  const totalShiftsThisWeek = shifts.filter((s) => {
+    if (!s.date) return false;
+    const d =
+      s.date instanceof Date ? s.date : new Date(s.date as unknown as string);
+    return d >= monday && d <= sunday;
+  }).length;
+
   return (
-    <div className="flex min-h-screen">
-      {/* ── Sidebar (Desktop) ── */}
+    <div className="flex min-h-screen bg-gray-50/50">
+      {/* ── Sidebar (Desktop) ─────────────────────────────────────────────────── */}
       <aside className="hidden w-64 shrink-0 flex-col border-r border-(--color-border-light) bg-white shadow-sm lg:flex">
-        {/* Brand */}
-        <div className="flex items-center gap-3 border-b border-(--color-border-light) px-5 py-5">
-          <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-(--color-primary)">
-            <i className="fa-solid fa-calendar-days text-sm text-white"></i>
-          </div>
-          <div>
-            <p className="text-foreground text-sm font-bold">Work Schedule</p>
-            <p className="text-xs text-(--color-text-muted)">
-              {isManager ? "Manager" : "Staff"}
-            </p>
+        {/* Brand — gradient accent */}
+        <div className="bg-gradient-to-br from-(--color-primary) to-(--color-primary-dark) px-5 py-5">
+          <div className="flex items-center gap-3">
+            <div className="flex h-10 w-10 items-center justify-center rounded-xl bg-white/20 shadow-sm backdrop-blur-sm">
+              <i className="fa-solid fa-calendar-days text-base text-white"></i>
+            </div>
+            <div>
+              <p className="text-sm font-bold text-white">Work Schedule</p>
+              <p className="text-xs text-white/70">
+                {isManager ? "Manager View" : "Staff View"}
+              </p>
+            </div>
           </div>
         </div>
 
-        {/* View toggle */}
-        <nav className="flex-1 space-y-1 p-3">
-          <p className="mb-2 px-3 text-[11px] font-semibold tracking-wider text-(--color-text-muted) uppercase">
+        <nav className="flex-1 space-y-0.5 overflow-y-auto p-3">
+          {/* View toggle */}
+          <p className="mb-1 px-3 pt-2 text-[10px] font-bold tracking-widest text-(--color-text-muted) uppercase">
             View
           </p>
           <button
@@ -112,35 +120,45 @@ export default function StaffSchedulePage() {
             onClick={() => setView("week")}
             className={`flex w-full cursor-pointer items-center gap-3 rounded-xl border-none px-3 py-2.5 text-sm font-medium transition-all ${
               view === "week"
-                ? "bg-(--color-primary) text-white shadow-sm"
-                : "hover:bg-background bg-transparent text-(--color-text-secondary) hover:text-(--color-primary-dark)"
+                ? "bg-(--color-primary)/10 text-(--color-primary) shadow-sm"
+                : "bg-transparent text-(--color-text-secondary) hover:bg-gray-50 hover:text-(--color-primary-dark)"
             }`}
           >
-            <i className="fa-solid fa-table-columns w-4 text-center"></i>
+            <i
+              className={`fa-solid fa-table-columns w-4 text-center ${view === "week" ? "text-(--color-primary)" : ""}`}
+            ></i>
             <span className="flex-1 text-left">Weekly</span>
+            {view === "week" && (
+              <span className="h-1.5 w-1.5 rounded-full bg-(--color-primary)"></span>
+            )}
           </button>
           <button
             type="button"
             onClick={() => setView("month")}
             className={`flex w-full cursor-pointer items-center gap-3 rounded-xl border-none px-3 py-2.5 text-sm font-medium transition-all ${
               view === "month"
-                ? "bg-(--color-primary) text-white shadow-sm"
-                : "hover:bg-background bg-transparent text-(--color-text-secondary) hover:text-(--color-primary-dark)"
+                ? "bg-(--color-primary)/10 text-(--color-primary) shadow-sm"
+                : "bg-transparent text-(--color-text-secondary) hover:bg-gray-50 hover:text-(--color-primary-dark)"
             }`}
           >
-            <i className="fa-solid fa-calendar w-4 text-center"></i>
+            <i
+              className={`fa-solid fa-calendar w-4 text-center ${view === "month" ? "text-(--color-primary)" : ""}`}
+            ></i>
             <span className="flex-1 text-left">Monthly</span>
+            {view === "month" && (
+              <span className="h-1.5 w-1.5 rounded-full bg-(--color-primary)"></span>
+            )}
           </button>
 
-          {/* Quick nav */}
-          <div className="mt-3 border-t border-(--color-border-light) pt-3">
-            <p className="mb-2 px-3 text-[11px] font-semibold tracking-wider text-(--color-text-muted) uppercase">
+          {/* Navigation */}
+          <div className="mt-2 pt-2">
+            <p className="mb-1 px-3 text-[10px] font-bold tracking-widest text-(--color-text-muted) uppercase">
               Navigation
             </p>
             <button
               type="button"
               onClick={goToToday}
-              className="hover:bg-background flex w-full cursor-pointer items-center gap-3 rounded-xl border-none bg-transparent px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) transition-all hover:text-(--color-primary-dark)"
+              className="flex w-full cursor-pointer items-center gap-3 rounded-xl border-none bg-transparent px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) transition-all hover:bg-gray-50 hover:text-(--color-primary-dark)"
             >
               <i className="fa-solid fa-crosshairs w-4 text-center"></i>
               <span className="flex-1 text-left">Today</span>
@@ -149,38 +167,64 @@ export default function StaffSchedulePage() {
 
           {/* Manager link */}
           {isManager && (
-            <div className="mt-3 border-t border-(--color-border-light) pt-3">
-              <p className="mb-2 px-3 text-[11px] font-semibold tracking-wider text-(--color-text-muted) uppercase">
-                Management
+            <div className="mt-2 pt-2">
+              <p className="mb-1 px-3 text-[10px] font-bold tracking-widest text-(--color-text-muted) uppercase">
+                Manager
               </p>
               <Link
                 href="/manager"
-                className="hover:bg-background flex w-full items-center gap-3 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) no-underline transition-all hover:text-(--color-primary-dark)"
+                className="flex w-full items-center gap-3 rounded-xl px-3 py-2.5 text-sm font-medium text-(--color-text-secondary) no-underline transition-all hover:bg-gray-50 hover:text-(--color-primary-dark)"
               >
                 <i className="fa-solid fa-store w-4 text-center"></i>
                 <span className="flex-1 text-left">Dashboard</span>
+                <i className="fa-solid fa-arrow-right text-xs opacity-40"></i>
               </Link>
+              {/* Create shift button */}
+              <button
+                type="button"
+                onClick={() => {
+                  setCreateDate(undefined);
+                  setCreateOpen(true);
+                }}
+                className="mt-1 flex w-full cursor-pointer items-center gap-3 rounded-xl border-none bg-(--color-primary)/10 px-3 py-2.5 text-sm font-semibold text-(--color-primary) transition-all hover:bg-(--color-primary)/20"
+              >
+                <i className="fa-solid fa-plus w-4 text-center"></i>
+                <span className="flex-1 text-left">Create shift</span>
+              </button>
             </div>
           )}
 
-          {/* Weekly budget */}
-          <div className="mt-3 border-t border-(--color-border-light) pt-3">
-            <div className="rounded-xl bg-(--color-primary)/5 p-3">
-              <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
-                Weekly Budget
+          {/* Stats cards */}
+          <div className="mt-3 space-y-2 border-t border-(--color-border-light) pt-3">
+            {isManager && (
+              <div className="rounded-xl bg-gradient-to-br from-(--color-primary)/10 to-(--color-primary)/5 p-3">
+                <p className="text-[10px] font-bold tracking-wider text-(--color-text-muted) uppercase">
+                  Weekly budget
+                </p>
+                <p className="mt-1 text-xl font-bold text-(--color-primary)">
+                  {weeklyBudget >= 1_000_000
+                    ? `${(weeklyBudget / 1_000_000).toFixed(1)}M`
+                    : weeklyBudget.toLocaleString("vi-VN")}
+                </p>
+                <p className="text-[10px] text-(--color-text-muted)">VND</p>
+              </div>
+            )}
+            <div className="rounded-xl bg-gray-50 p-3">
+              <p className="text-[10px] font-bold tracking-wider text-(--color-text-muted) uppercase">
+                Shifts this week
               </p>
-              <p className="mt-1 text-lg font-bold text-(--color-primary)">
-                {weeklyBudget.toLocaleString("vi-VN")}
+              <p className="mt-1 text-xl font-bold text-(--color-text-secondary)">
+                {totalShiftsThisWeek}
               </p>
-              <p className="text-[10px] text-(--color-text-muted)">VND</p>
+              <p className="text-[10px] text-(--color-text-muted)">shifts</p>
             </div>
           </div>
         </nav>
 
         {/* User info */}
         <div className="border-t border-(--color-border-light) p-3">
-          <div className="flex items-center gap-3 rounded-xl p-3">
-            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-(--color-accent-light)">
+          <div className="flex items-center gap-3 rounded-xl bg-gray-50 p-3">
+            <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-(--color-primary)/15">
               <i
                 className={`fa-solid ${isManager ? "fa-user-tie" : "fa-user"} text-sm text-(--color-primary)`}
               ></i>
@@ -189,17 +233,23 @@ export default function StaffSchedulePage() {
               <p className="text-foreground truncate text-sm font-semibold">
                 {user?.name ?? "Staff"}
               </p>
-              <p className="text-xs text-(--color-text-muted)">
+              <span
+                className={`inline-block rounded-full px-2 py-px text-[10px] font-semibold ${
+                  isManager
+                    ? "bg-(--color-primary)/10 text-(--color-primary)"
+                    : "bg-gray-100 text-(--color-text-muted)"
+                }`}
+              >
                 {isManager ? "Manager" : "Staff"}
-              </p>
+              </span>
             </div>
           </div>
-          <div className="mt-1 flex gap-2 px-1">
+          <div className="mt-2 flex gap-2 px-1">
             <Link
               href="/"
-              className="hover:bg-background flex flex-1 items-center justify-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition"
+              className="flex flex-1 items-center justify-center gap-1.5 rounded-xl border border-(--color-border-light) bg-transparent py-2 text-xs font-medium text-(--color-text-secondary) no-underline transition hover:bg-gray-50"
             >
-              <i className="fa-solid fa-house"></i>
+              <i className="fa-solid fa-house text-[10px]"></i>
               Home
             </Link>
             <button
@@ -207,122 +257,125 @@ export default function StaffSchedulePage() {
               onClick={logout}
               className="flex flex-1 cursor-pointer items-center justify-center gap-1.5 rounded-xl border-none bg-transparent py-2 text-xs font-medium text-red-500 transition hover:bg-red-50"
             >
-              <i className="fa-solid fa-right-from-bracket"></i>
+              <i className="fa-solid fa-right-from-bracket text-[10px]"></i>
               Logout
             </button>
           </div>
         </div>
       </aside>
 
-      {/* ── Main content ── */}
+      {/* ── Main content ──────────────────────────────────────────────────────── */}
       <div className="flex min-w-0 flex-1 flex-col">
         {/* Header */}
-        <header className="sticky top-0 z-40 flex items-center justify-between border-b border-(--color-border-light) bg-white px-4 py-3 shadow-sm md:px-5 md:py-4">
-          <div>
-            <h1 className="text-foreground text-base font-bold md:text-lg">
-              Register Shift
-            </h1>
-            <p className="text-xs text-(--color-text-muted)">
-              {view === "week"
-                ? weekLabel
-                : `${MONTH_NAMES[currentDate.getMonth()]} ${currentDate.getFullYear()}`}
-            </p>
-          </div>
-
-          <div className="flex items-center gap-2">
-            {/* View toggle (mobile) */}
-            <div className="flex items-center rounded-xl border border-(--color-border-light) lg:hidden">
-              <button
-                type="button"
-                onClick={() => setView("week")}
-                className={`cursor-pointer rounded-l-xl border-none px-3 py-2 text-xs font-medium transition ${
-                  view === "week"
-                    ? "bg-(--color-primary) text-white"
-                    : "bg-transparent text-(--color-text-secondary)"
-                }`}
-              >
-                Week
-              </button>
-              <button
-                type="button"
-                onClick={() => setView("month")}
-                className={`cursor-pointer rounded-r-xl border-none px-3 py-2 text-xs font-medium transition ${
-                  view === "month"
-                    ? "bg-(--color-primary) text-white"
-                    : "bg-transparent text-(--color-text-secondary)"
-                }`}
-              >
-                Month
-              </button>
+        <header className="sticky top-0 z-40 border-b border-(--color-border-light) bg-white/95 px-4 py-3 shadow-sm backdrop-blur-sm md:px-6 md:py-4">
+          <div className="flex items-center justify-between gap-3">
+            {/* Title */}
+            <div>
+              <h1 className="text-foreground text-base font-bold md:text-lg">
+                {isManager ? "Manage Shifts" : "Register Shifts"}
+              </h1>
+              <p className="text-xs text-(--color-text-muted)">
+                {view === "week"
+                  ? `Week: ${weekLabel}`
+                  : `Month: ${MONTH_NAMES[currentDate.getMonth()]} ${currentDate.getFullYear()}`}
+              </p>
             </div>
 
-            {/* Navigation arrows */}
-            <div className="hidden items-center gap-1 md:flex">
-              <button
-                title="Previous"
-                type="button"
-                onClick={view === "week" ? goToPrevWeek : goToPrevMonth}
-                className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border border-(--color-border-light) bg-transparent text-(--color-text-muted) transition hover:bg-gray-50"
-              >
-                <i className="fa-solid fa-chevron-left text-xs"></i>
-              </button>
-              <button
-                type="button"
-                onClick={goToToday}
-                className="cursor-pointer rounded-lg border border-(--color-border-light) bg-transparent px-3 py-1.5 text-xs font-medium text-(--color-text-secondary) transition hover:bg-gray-50"
-              >
-                Today
-              </button>
-              <button
-                title="Next"
-                type="button"
-                onClick={view === "week" ? goToNextWeek : goToNextMonth}
-                className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border border-(--color-border-light) bg-transparent text-(--color-text-muted) transition hover:bg-gray-50"
-              >
-                <i className="fa-solid fa-chevron-right text-xs"></i>
-              </button>
-            </div>
+            <div className="flex items-center gap-2">
+              {/* Mobile view toggle */}
+              <div className="flex items-center overflow-hidden rounded-xl border border-(--color-border-light) lg:hidden">
+                <button
+                  type="button"
+                  onClick={() => setView("week")}
+                  className={`cursor-pointer rounded-l-xl border-none px-3 py-2 text-xs font-semibold transition ${
+                    view === "week"
+                      ? "bg-(--color-primary) text-white"
+                      : "bg-transparent text-(--color-text-secondary)"
+                  }`}
+                >
+                  Week
+                </button>
+                <button
+                  type="button"
+                  onClick={() => setView("month")}
+                  className={`cursor-pointer rounded-r-xl border-none px-3 py-2 text-xs font-semibold transition ${
+                    view === "month"
+                      ? "bg-(--color-primary) text-white"
+                      : "bg-transparent text-(--color-text-secondary)"
+                  }`}
+                >
+                  Month
+                </button>
+              </div>
 
-            {/* Create shift button (manager only) */}
-            {isManager && (
-              <button
-                type="button"
-                onClick={() => {
-                  setCreateDate(undefined);
-                  setCreateOpen(true);
-                }}
-                className="hidden cursor-pointer items-center gap-1.5 rounded-xl border-none bg-(--color-primary) px-3 py-2 text-xs font-semibold text-white transition hover:opacity-90 md:flex"
-              >
-                <i className="fa-solid fa-plus"></i>
-                Create Shift
-              </button>
-            )}
+              {/* Desktop navigation arrows */}
+              <div className="hidden items-center gap-1 md:flex">
+                <button
+                  title="Previous"
+                  type="button"
+                  onClick={view === "week" ? goToPrevWeek : goToPrevMonth}
+                  className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border border-(--color-border-light) bg-white text-(--color-text-muted) transition hover:border-(--color-primary)/30 hover:bg-(--color-primary)/5 hover:text-(--color-primary)"
+                >
+                  <i className="fa-solid fa-chevron-left text-xs"></i>
+                </button>
+                <button
+                  type="button"
+                  onClick={goToToday}
+                  className="cursor-pointer rounded-lg border border-(--color-border-light) bg-white px-3 py-1.5 text-xs font-semibold text-(--color-text-secondary) transition hover:border-(--color-primary)/30 hover:bg-(--color-primary)/5 hover:text-(--color-primary)"
+                >
+                  Today
+                </button>
+                <button
+                  title="Next"
+                  type="button"
+                  onClick={view === "week" ? goToNextWeek : goToNextMonth}
+                  className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border border-(--color-border-light) bg-white text-(--color-text-muted) transition hover:border-(--color-primary)/30 hover:bg-(--color-primary)/5 hover:text-(--color-primary)"
+                >
+                  <i className="fa-solid fa-chevron-right text-xs"></i>
+                </button>
+              </div>
 
-            {/* Mobile nav */}
-            <div className="flex items-center gap-1 md:hidden">
-              <button
-                title="Previous"
-                type="button"
-                onClick={view === "week" ? goToPrevWeek : goToPrevMonth}
-                className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--color-text-muted)"
-              >
-                <i className="fa-solid fa-chevron-left text-xs"></i>
-              </button>
-              <button
-                title="Next"
-                type="button"
-                onClick={view === "week" ? goToNextWeek : goToNextMonth}
-                className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--color-text-muted)"
-              >
-                <i className="fa-solid fa-chevron-right text-xs"></i>
-              </button>
+              {/* Create shift (manager, desktop) */}
+              {isManager && (
+                <button
+                  type="button"
+                  onClick={() => {
+                    setCreateDate(undefined);
+                    setCreateOpen(true);
+                  }}
+                  className="hidden cursor-pointer items-center gap-2 rounded-xl border-none bg-(--color-primary) px-4 py-2 text-xs font-bold text-white shadow-sm transition hover:opacity-90 md:flex"
+                >
+                  <i className="fa-solid fa-plus"></i>
+                  Create shift
+                </button>
+              )}
+
+              {/* Mobile navigation arrows */}
+              <div className="flex items-center gap-1 md:hidden">
+                <button
+                  title="Previous"
+                  type="button"
+                  onClick={view === "week" ? goToPrevWeek : goToPrevMonth}
+                  className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--color-text-muted)"
+                >
+                  <i className="fa-solid fa-chevron-left text-xs"></i>
+                </button>
+                <button
+                  title="Next"
+                  type="button"
+                  onClick={view === "week" ? goToNextWeek : goToNextMonth}
+                  className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--color-text-muted)"
+                >
+                  <i className="fa-solid fa-chevron-right text-xs"></i>
+                </button>
+              </div>
             </div>
           </div>
         </header>
 
         {/* Content */}
         <main className="flex-1 p-4 md:p-6">
-          {/* Desktop views */}
+          {/* Desktop */}
           <div className="hidden md:block">
             {view === "week" ? (
               <WeeklySchedule
@@ -337,7 +390,7 @@ export default function StaffSchedulePage() {
             )}
           </div>
 
-          {/* Mobile view */}
+          {/* Mobile */}
           <div className="md:hidden">
             {view === "week" ? (
               <WeeklySchedule
@@ -350,16 +403,16 @@ export default function StaffSchedulePage() {
             )}
           </div>
 
-          {/* Mobile FAB for manager */}
+          {/* FAB for mobile manager */}
           {isManager && (
             <button
-              title="Create Shift"
+              title="Create shift"
               type="button"
               onClick={() => {
                 setCreateDate(undefined);
                 setCreateOpen(true);
               }}
-              className="fixed right-4 bottom-4 z-30 flex h-14 w-14 cursor-pointer items-center justify-center rounded-full border-none bg-(--color-primary) text-white shadow-lg transition hover:opacity-90 md:hidden"
+              className="fixed right-4 bottom-6 z-30 flex h-14 w-14 cursor-pointer items-center justify-center rounded-full border-none bg-(--color-primary) text-white shadow-xl transition hover:opacity-90 md:hidden"
             >
               <i className="fa-solid fa-plus text-lg"></i>
             </button>

components/molecules/cards/Card.types.ts

@@ -19,5 +19,6 @@ export interface PaymentSummaryCardProps {
   totalPrice: number;
   isCustomer: boolean;
   backHref: string;
+  eateryId?: string;
   onPay?: () => void;
 }

components/molecules/cards/PaymentSummaryCard.tsx

@@ -1,6 +1,10 @@
 import { formatPrice } from "@/app/(main)/payment/page";
 import Button from "@/components/atoms/buttons/Button";
 import { ReviewModal } from "@/components/organisms/modals";
+import { cartClient } from "@/lib/apollo-clients";
+import { useCart } from "@/lib/cart-context";
+import { gql } from "@apollo/client";
+import { useMutation } from "@apollo/client/react";
 import Link from "next/link";
 import { useState } from "react";
 
@@ -10,10 +14,12 @@ export default function PaymentSummaryCard({
   totalPrice,
   isCustomer = false,
   backHref,
+  eateryId,
 }: PaymentSummaryCardProps) {
+  const { cart, removeCart } = useCart();
   const [isReviewOpen, setIsReviewOpen] = useState(false);
+  const [isQrModalOpen, setIsQrModalOpen] = useState(false);
   const handlePayment = () => {
-    // UI-only: open review modal after "payment"
     if (isCustomer) {
       setIsReviewOpen(true);
     }
@@ -43,7 +49,9 @@ export default function PaymentSummaryCard({
 
           <Button
             style="payment"
-            onClick={handlePayment}
+            onClick={() => {
+              setIsQrModalOpen(true);
+            }}
             icon="fa-solid fa-qrcode"
             size="md"
             variant="secondary"
@@ -51,22 +59,7 @@ export default function PaymentSummaryCard({
             QR Code
           </Button>
 
-          {isCustomer && (
-            <Button
-              style="payment"
-              onClick={handlePayment}
-              icon="fa-solid fa-star"
-              size="md"
-              variant="primary"
-            >
-              Review
-            </Button>
-          )}
-
-          <Link
-            href={backHref || "/"}
-            className={isCustomer ? "" : "col-span-2"}
-          >
+          <Link href={backHref || "/"} className={"col-span-2"}>
             <Button
               style="payment"
               onClick={() => setIsReviewOpen(false)}
@@ -83,8 +76,51 @@ export default function PaymentSummaryCard({
 
       <ReviewModal
         isOpen={isReviewOpen}
-        onClose={() => setIsReviewOpen(false)}
+        onClose={() => {
+          setIsReviewOpen(false);
+
+          removeCart();
+        }}
+        eateryId={eateryId}
       />
+
+      {isQrModalOpen && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4 backdrop-blur-sm">
+          <div className="animate-in fade-in zoom-in w-full max-w-sm rounded-3xl bg-white p-6 text-center shadow-2xl duration-300">
+            <h2 className="mb-4 text-xl font-bold">Scan to Pay</h2>
+
+            {cart.paymentQrUrl ? (
+              <div className="mb-4 rounded-2xl bg-gray-100 p-4">
+                <img
+                  src={cart.paymentQrUrl}
+                  alt="Payment QR Code"
+                  className="mx-auto h-auto w-full"
+                />
+              </div>
+            ) : (
+              <div className="p-10 text-gray-400">QR Code not available</div>
+            )}
+
+            <p className="mb-6 text-sm text-gray-500">
+              Total:{" "}
+              <span className="font-bold text-black">
+                {formatPrice(totalPrice)}
+              </span>
+            </p>
+
+            <Button
+              onClick={() => {
+                setIsQrModalOpen(false);
+                setIsReviewOpen(true);
+              }}
+              variant="secondary"
+              className="w-full"
+            >
+              Close
+            </Button>
+          </div>
+        </div>
+      )}
     </aside>
   );
 }

components/molecules/cards/ShiftCard.tsx

@@ -1,36 +1,74 @@
 "use client";
 
-import type { ShiftEntity } from "@/lib/types";
-
 import type { ShiftCardProps } from "./ShiftCard.types";
 
 function formatWage(wage: number): string {
-  if (wage >= 1000) {
-    return `${(wage / 1000).toFixed(0)}k`;
-  }
+  if (wage >= 1_000_000) return `${(wage / 1_000_000).toFixed(1)}M`;
+  if (wage >= 1000) return `${(wage / 1000).toFixed(0)}k`;
   return wage.toLocaleString("vi-VN");
 }
 
+function getShiftPeriod(
+  startTime: string,
+): "morning" | "afternoon" | "evening" {
+  const h = parseInt(startTime.split(":")[0] ?? "0", 10);
+  if (h < 12) return "morning";
+  if (h < 18) return "afternoon";
+  return "evening";
+}
+
+const PERIOD_STYLES = {
+  morning: {
+    border: "border-l-indigo-500",
+    text: "text-indigo-700",
+    badge: "bg-indigo-100 text-indigo-700",
+    dot: "bg-indigo-400",
+  },
+  afternoon: {
+    border: "border-l-amber-500",
+    text: "text-amber-700",
+    badge: "bg-amber-100 text-amber-700",
+    dot: "bg-amber-400",
+  },
+  evening: {
+    border: "border-l-violet-500",
+    text: "text-violet-700",
+    badge: "bg-violet-100 text-violet-700",
+    dot: "bg-violet-400",
+  },
+};
+
 export default function ShiftCard({
   shift,
   compact = false,
   onClick,
 }: ShiftCardProps) {
-  console.log(shift);
+  const registeredCount = shift.registeredStaff?.length ?? 0;
+  const period = getShiftPeriod(shift.startTime);
+  const s = PERIOD_STYLES[period];
 
   if (compact) {
     return (
       <button
         type="button"
         onClick={() => onClick?.(shift)}
-        className={`w-full cursor-pointer rounded-lg border px-2 py-1.5 text-left text-xs transition-shadow hover:shadow-sm`}
+        className={`group w-full cursor-pointer rounded-xl border-l-[3px] bg-white text-left shadow-sm transition hover:-translate-y-px hover:shadow-md ${s.border}`}
       >
-        <p className="font-semibold">
-          {shift.startTime} – {shift.endTime}
-        </p>
-        <p className="mt-0.5 opacity-75">
-          {}h · {formatWage(shift.wage)}
-        </p>
+        <div className="px-2.5 py-2">
+          <p className={`text-xs leading-tight font-bold ${s.text}`}>
+            {shift.startTime}–{shift.endTime}
+          </p>
+          <div className="mt-1 flex items-center justify-between gap-1">
+            <p className="text-[10px] text-(--color-text-muted)">
+              {formatWage(shift.wage ?? 0)}đ
+            </p>
+            <span
+              className={`rounded-full px-1.5 py-px text-[9px] font-semibold ${s.badge}`}
+            >
+              {registeredCount}/{shift.maxStaff}
+            </span>
+          </div>
+        </div>
       </button>
     );
   }
@@ -39,56 +77,46 @@ export default function ShiftCard({
     <button
       type="button"
       onClick={() => onClick?.(shift)}
-      className={`w-full cursor-pointer rounded-xl border p-3 text-left transition-shadow hover:shadow-md`}
+      className={`group w-full cursor-pointer rounded-2xl border-l-[4px] bg-white text-left shadow-sm transition hover:-translate-y-0.5 hover:shadow-lg ${s.border}`}
     >
-      <div className="flex items-start justify-between">
-        <div>
-          <p className="text-sm font-bold">
-            {shift.startTime} – {shift.endTime}
-          </p>
-          <p className="mt-1 text-xs opacity-75">
-            {}h · {formatWage(shift.wage)} VND
-          </p>
-        </div>
-        <span
-          className={`rounded-full px-2 py-0.5 text-[10px] font-semibold ${
-            // shift.status === "available"
-            //   ? "bg-blue-200 text-blue-800"
-            //   : shift.status === "registered"
-            //     ? "bg-blue-300 text-blue-900"
-            //     : shift.status === "approved_leave"
-            //       ? "bg-purple-200 text-purple-800"
-            //       : "bg-red-200 text-red-800"
-            ""
-          }`}
-        >
-          {/* {style.label} */}
-        </span>
-      </div>
-
-      {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})
-          </p>
-          <div className="mt-1 flex flex-wrap gap-1">
-            {shift.registeredStaff.map((s) => (
-              <span
-                key={s.id}
-                className="rounded-full bg-white/60 px-2 py-0.5 text-[10px] font-medium"
-              >
-                {s.staffId}
-              </span>
-            ))}
+      <div className="p-4">
+        <div className="flex items-start justify-between gap-3">
+          <div className="min-w-0">
+            <div className="flex items-center gap-2">
+              <span className={`h-2 w-2 shrink-0 rounded-full ${s.dot}`} />
+              <p className={`text-base font-bold ${s.text}`}>
+                {shift.startTime} – {shift.endTime}
+              </p>
+            </div>
+            <p className="mt-1 text-xs text-(--color-text-muted)">
+              {(shift.wage ?? 0).toLocaleString("vi-VN")} VND/ca
+            </p>
           </div>
+          <span
+            className={`shrink-0 rounded-full px-2.5 py-1 text-xs font-semibold ${s.badge}`}
+          >
+            {registeredCount}/{shift.maxStaff} staff
+          </span>
         </div>
-      )}
 
-      {/* {shift.status === "available" && shift.registeredStaff.length === 0 && (
-        <p className="mt-2 text-[10px] italic opacity-50">
-          {shift.maxStaff} vị trí còn trống
-        </p>
-      )} */}
+        {registeredCount > 0 && (
+          <div className="mt-3 border-t border-gray-100 pt-3">
+            <p className="mb-2 text-[10px] font-semibold tracking-wider text-(--color-text-muted) uppercase">
+              Registered staff
+            </p>
+            <div className="flex flex-wrap gap-1.5">
+              {shift.registeredStaff!.map((staff) => (
+                <span
+                  key={staff.id}
+                  className="rounded-full bg-gray-100 px-2.5 py-0.5 text-[11px] font-medium text-(--color-text-secondary)"
+                >
+                  {staff.staffId}
+                </span>
+              ))}
+            </div>
+          </div>
+        )}
+      </div>
     </button>
   );
 }

components/molecules/search-bar/SearchBar.tsx

@@ -6,7 +6,7 @@ export default function SearchBar({
   value,
   onChange,
   onClear,
-  placeholder = "Tìm kiếm...",
+  placeholder = "Search...",
   className = "",
 }: SearchBarProps) {
   return (
@@ -17,14 +17,14 @@ export default function SearchBar({
         value={value}
         onChange={(e) => onChange(e.target.value)}
         placeholder={placeholder}
-        aria-label="Tìm kiếm món ăn"
+        aria-label="Search items"
         className="bg-card text-foreground border-border placeholder:text-muted-foreground focus:border-primary focus:ring-primary focus:ring-opacity-20 w-full rounded-xl border py-2 pr-9 pl-9 text-sm transition-all duration-150 outline-none focus:ring-2"
       />
       {value && (
         <button
           onClick={onClear}
-          title="Xóa tìm kiếm"
-          aria-label="Xóa tìm kiếm"
+          title="Clear search"
+          aria-label="Clear search"
           className="absolute top-1/2 right-3 -translate-y-1/2 cursor-pointer border-none bg-transparent p-0 text-(--color-text-muted) transition-colors duration-150 hover:text-(--color-primary)"
         >
           <i className="fa-solid fa-xmark text-sm"></i>

components/organisms/forms/LoginForm.tsx

@@ -44,12 +44,15 @@ export default function LoginForm() {
         body: JSON.stringify({ phone }),
       });
 
-      const role = (await res.text().catch(() => "")).trim();
+      const role = (await res.text().catch(() => "")).trim().toLowerCase();
 
-      if (res.ok && (role === "customer" || role === "manager")) {
+      if (
+        res.ok &&
+        (role === "customer" || role === "manager" || role === "staff")
+      ) {
         sessionStorage.setItem("login_phone", phone);
         sessionStorage.setItem("login_role", role);
-        router.push(role === "manager" ? "/login/password" : "/login/otp");
+        router.push(role === "customer" ? "/login/otp" : "/login/password");
       } else if (res.status === 404) {
         setErrors({ phone: "", general: "Phone number not registered" });
       } else {

components/organisms/manager/DeleteConfirm.tsx

@@ -17,9 +17,11 @@ export default function DeleteConfirm({
           <div className="flex h-12 w-12 items-center justify-center rounded-full bg-red-100">
             <i className="fa-solid fa-trash-can text-xl text-red-500"></i>
           </div>
-          <h3 className="text-foreground text-base font-bold">Xóa "{name}"?</h3>
+          <h3 className="text-foreground text-base font-bold">
+            Delete "{name}"?
+          </h3>
           <p className="text-sm text-(--color-text-muted)">
-            Hành động này không thể hoàn tác.
+            This action cannot be undone.
           </p>
         </div>
         <div className="flex gap-3">
@@ -27,13 +29,13 @@ export default function DeleteConfirm({
             onClick={onClose}
             className="flex-1 cursor-pointer rounded-xl border border-(--color-border) bg-white px-4 py-2.5 text-sm font-medium text-(--color-text-secondary) transition hover:bg-(--color-border-light)"
           >
-            Hủy
+            Cancel
           </button>
           <button
             onClick={onConfirm}
             className="flex-1 cursor-pointer rounded-xl border-none bg-red-500 px-4 py-2.5 text-sm font-semibold text-white transition hover:bg-red-600 active:scale-95"
           >
-            Xóa
+            Delete
           </button>
         </div>
       </div>

components/organisms/manager/Manager.types.ts

@@ -1,5 +1,14 @@
 import type { MenuItemEntity } from "@/lib/types";
 
+export interface ReviewEntity {
+  id?: string;
+  reviewerId: string;
+  eateryId: string;
+  rating: number;
+  comment?: string;
+  createdAt?: string;
+}
+
 export interface ProductModalProps {
   product: MenuItemEntity | null;
   onSave: (p: MenuItemEntity) => void;

components/organisms/manager/ProductModal.tsx

@@ -39,7 +39,7 @@ export default function ProductModal({
       });
 
       if (!res.ok) {
-        throw new Error("Upload ảnh thất bại.");
+        throw new Error("Image upload failed.");
       }
 
       const raw = await res.text();
@@ -54,12 +54,12 @@ export default function ProductModal({
       }
 
       if (!filename) {
-        throw new Error("Không nhận được filename ảnh từ server.");
+        throw new Error("No image filename received from server.");
       }
 
       setForm((prev) => ({ ...prev, imageUrl: filename }));
     } catch (error: any) {
-      setUploadError(error?.message || "Không thể upload ảnh.");
+      setUploadError(error?.message || "Unable to upload image.");
     } finally {
       setUploading(false);
     }
@@ -93,11 +93,11 @@ export default function ProductModal({
       <div className="w-full max-w-lg rounded-2xl bg-white shadow-2xl">
         <div className="flex items-center justify-between border-b border-(--color-border-light) px-6 py-4">
           <h2 className="text-foreground text-lg font-bold">
-            {isEdit ? "Chỉnh sửa món" : "Thêm món mới"}
+            {isEdit ? "Edit item" : "Add new item"}
           </h2>
           <button
             onClick={onClose}
-            title="Đóng"
+            title="Close"
             className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-transparent text-(--color-text-muted) transition-colors hover:bg-(--color-border-light) hover:text-(--color-primary)"
           >
             <i className="fa-solid fa-xmark"></i>
@@ -107,7 +107,7 @@ export default function ProductModal({
         <form onSubmit={handleSubmit} className="space-y-4 px-6 py-5">
           <div>
             <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-              Tên món <span className="text-red-500">*</span>
+              Item name <span className="text-red-500">*</span>
             </label>
             <input
               required
@@ -115,13 +115,13 @@ export default function ProductModal({
               value={form.name}
               onChange={(e) => setForm({ ...form, name: e.target.value })}
               className={inputCls}
-              placeholder="Ví dụ: Cà Phê Đen"
+              placeholder="e.g. Black Coffee"
             />
           </div>
 
           <div>
             <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-              Giá (đ) <span className="text-red-500">*</span>
+              Price (₫) <span className="text-red-500">*</span>
             </label>
             <input
               required
@@ -139,7 +139,7 @@ export default function ProductModal({
 
           <div>
             <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-              Ảnh món
+              Item image
             </label>
 
             <div className="space-y-2">
@@ -154,7 +154,7 @@ export default function ProductModal({
               {uploading && (
                 <p className="text-sm text-(--color-text-muted)">
                   <i className="fa-solid fa-spinner mr-1 animate-spin"></i>
-                  Đang upload ảnh...
+                  Uploading image...
                 </p>
               )}
             </div>
@@ -163,7 +163,7 @@ export default function ProductModal({
               <div className="mt-2">
                 <img
                   src={previewUrl}
-                  alt="Preview ảnh món"
+                  alt="Item image preview"
                   className="h-24 w-24 rounded-lg border border-(--color-border-light) object-cover"
                 />
               </div>
@@ -179,7 +179,7 @@ export default function ProductModal({
 
           <div>
             <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-              Mô tả
+              Description
             </label>
             <textarea
               rows={3}
@@ -188,19 +188,19 @@ export default function ProductModal({
                 setForm({ ...form, description: e.target.value })
               }
               className={`${inputCls} resize-none`}
-              placeholder="Mô tả ngắn về món..."
+              placeholder="Short description..."
             />
           </div>
 
           <div className="bg-background flex items-center justify-between rounded-xl border border-(--color-border-light) px-4 py-3">
             <div>
-              <p className="text-foreground text-sm font-medium">Trạng thái</p>
+              <p className="text-foreground text-sm font-medium">Status</p>
               <p className="text-xs text-(--color-text-muted)">
-                {form.available ? "Còn hàng" : "Tạm hết"}
+                {form.available ? "In stock" : "Out of stock"}
               </p>
             </div>
             <button
-              title="Chuyển trạng thái"
+              title="Toggle status"
               type="button"
               onClick={() => setForm({ ...form, available: !form.available })}
               className={`relative h-6 w-11 cursor-pointer rounded-full border-none transition-colors duration-200 ${
@@ -221,14 +221,14 @@ export default function ProductModal({
               onClick={onClose}
               className="flex-1 cursor-pointer rounded-xl border border-(--color-border) bg-white px-4 py-2.5 text-sm font-medium text-(--color-text-secondary) transition hover:bg-(--color-border-light)"
             >
-              Hủy
+              Cancel
             </button>
             <button
               type="submit"
               disabled={uploading}
               className="flex-1 cursor-pointer rounded-xl border-none bg-(--color-primary) px-4 py-2.5 text-sm font-semibold text-white transition hover:bg-(--color-primary-dark) active:scale-95 disabled:opacity-60"
             >
-              {isEdit ? "Lưu thay đổi" : "Thêm món"}
+              {isEdit ? "Save changes" : "Add item"}
             </button>
           </div>
         </form>

components/organisms/manager/ProductsTab.tsx

@@ -59,12 +59,12 @@ export default function ProductsTab() {
             type="text"
             value={search}
             onChange={(e) => setSearch(e.target.value)}
-            placeholder="Tìm kiếm món..."
+            placeholder="Search items..."
             className="text-foreground w-full rounded-xl border border-(--color-border) bg-white py-2 pr-9 pl-9 text-sm transition outline-none focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)/20"
           />
           {search && (
             <button
-              title="Xóa tìm kiếm"
+              title="Clear search"
               onClick={() => setSearch("")}
               className="absolute top-1/2 right-3 -translate-y-1/2 cursor-pointer border-none bg-transparent text-(--color-text-muted) hover:text-(--color-primary)"
             >
@@ -81,26 +81,26 @@ export default function ProductsTab() {
             )
           }
           className="text-foreground cursor-pointer rounded-xl border border-(--color-border) bg-white px-3 py-2 text-sm transition outline-none focus:border-(--color-primary)"
-          title="Lọc theo trạng thái"
+          title="Filter by status"
         >
-          <option value="all">Tất cả trạng thái</option>
-          <option value="available">Còn hàng</option>
-          <option value="unavailable">Tạm hết</option>
+          <option value="all">All statuses</option>
+          <option value="available">In stock</option>
+          <option value="unavailable">Out of stock</option>
         </select>
 
         <button
-          title="Thêm món"
+          title="Add item"
           onClick={() => setModalProduct("new")}
           className="flex cursor-pointer items-center gap-2 rounded-xl border-none bg-(--color-primary) px-4 py-2 text-sm font-semibold text-white transition hover:bg-(--color-primary-dark) active:scale-95"
         >
           <i className="fa-solid fa-plus"></i>
-          <span className="hidden sm:inline">Thêm món</span>
+          <span className="hidden sm:inline">Add item</span>
         </button>
       </div>
 
       <p className="text-sm text-(--color-text-muted)">
-        Hiển thị <strong className="text-foreground">{filtered.length}</strong>{" "}
-        / {products.length} món
+        Showing <strong className="text-foreground">{filtered.length}</strong> /{" "}
+        {products.length} items
       </p>
 
       {/* Table */}
@@ -109,19 +109,19 @@ export default function ProductsTab() {
           <thead className="bg-background">
             <tr>
               <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">
-                Ảnh
+                Image
               </th>
               <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">
-                Tên món
+                Item name
               </th>
               <th className="px-4 py-3 text-right font-semibold text-(--color-text-secondary)">
-                Giá
+                Price
               </th>
               <th className="px-4 py-3 text-center font-semibold text-(--color-text-secondary)">
-                Trạng thái
+                Status
               </th>
               <th className="px-4 py-3 text-center font-semibold text-(--color-text-secondary)">
-                Thao tác
+                Actions
               </th>
             </tr>
           </thead>
@@ -133,7 +133,7 @@ export default function ProductsTab() {
                   className="py-12 text-center text-(--color-text-muted)"
                 >
                   <i className="fa-solid fa-mug-hot mb-2 block text-3xl opacity-30"></i>
-                  Không tìm thấy món nào
+                  <span className="ml-3">No items found</span>
                 </td>
               </tr>
             ) : (
@@ -165,7 +165,7 @@ export default function ProductsTab() {
                   <td className="px-4 py-3 text-center">
                     <button
                       onClick={() => toggleProductAvailability(p)}
-                      title="Nhấn để đổi trạng thái"
+                      title="Click to toggle status"
                       className="cursor-pointer border-none bg-transparent"
                     >
                       <StatusBadge available={p.available ?? true} />
@@ -175,14 +175,14 @@ export default function ProductsTab() {
                     <div className="flex items-center justify-center gap-1.5">
                       <button
                         onClick={() => setModalProduct(p)}
-                        title="Chỉnh sửa"
+                        title="Edit"
                         className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border border-(--color-border-light) bg-transparent text-(--color-text-muted) transition hover:border-(--color-primary-light) hover:text-(--color-primary)"
                       >
                         <i className="fa-solid fa-pen text-xs"></i>
                       </button>
                       <button
                         onClick={() => setDeleteTarget(p)}
-                        title="Xóa"
+                        title="Delete"
                         className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border border-transparent bg-transparent text-(--color-text-muted) transition hover:border-red-200 hover:bg-red-50 hover:text-red-500"
                       >
                         <i className="fa-solid fa-trash text-xs"></i>

components/organisms/manager/ReviewsTab.tsx

@@ -0,0 +1,192 @@
+"use client";
+
+import { useManager } from "@/lib/manager-context";
+import { useEffect, useState } from "react";
+
+import type { ReviewEntity } from "./Manager.types";
+
+interface FetchState {
+  reviews: ReviewEntity[];
+  loading: boolean;
+  error: string | null;
+}
+
+function StarRating({ rating }: { rating: number }) {
+  return (
+    <div className="flex gap-0.5">
+      {[1, 2, 3, 4, 5].map((star) => (
+        <i
+          key={star}
+          className={
+            star <= rating
+              ? "fa-solid fa-star text-sm text-yellow-400"
+              : "fa-regular fa-star text-sm text-(--color-border)"
+          }
+        />
+      ))}
+    </div>
+  );
+}
+
+export default function ReviewsTab() {
+  const { eateryId } = useManager();
+  const [{ reviews, loading, error }, setState] = useState<FetchState>({
+    reviews: [],
+    loading: true,
+    error: null,
+  });
+
+  useEffect(() => {
+    if (!eateryId) return;
+
+    const controller = new AbortController();
+
+    fetch(`/api/eatery/review/${eateryId}`, { signal: controller.signal })
+      .then((res) => {
+        if (!res.ok) throw new Error(`Failed to load reviews: ${res.status}`);
+        return res.json() as Promise<ReviewEntity[]>;
+      })
+      .then((data) => setState({ reviews: data, loading: false, error: null }))
+      .catch((err: unknown) => {
+        if (err instanceof Error && err.name === "AbortError") return;
+        setState({
+          reviews: [],
+          loading: false,
+          error: err instanceof Error ? err.message : "Failed to load reviews.",
+        });
+      });
+
+    return () => controller.abort();
+  }, [eateryId]);
+
+  if (loading) {
+    return (
+      <div className="flex items-center justify-center py-20 text-(--color-text-muted)">
+        <i className="fa-solid fa-spinner fa-spin mr-2"></i>
+        Loading reviews...
+      </div>
+    );
+  }
+
+  if (error) {
+    return (
+      <div className="flex items-center justify-center py-20 text-red-500">
+        <i className="fa-solid fa-triangle-exclamation mr-2"></i>
+        {error}
+      </div>
+    );
+  }
+
+  if (reviews.length === 0) {
+    return (
+      <div className="flex flex-col items-center justify-center py-20 text-center text-(--color-text-muted)">
+        <i className="fa-regular fa-star mb-3 text-4xl"></i>
+        <p className="text-sm font-medium">No reviews yet</p>
+        <p className="mt-1 text-xs">Reviews from customers will appear here.</p>
+      </div>
+    );
+  }
+
+  const avgRating =
+    reviews.reduce((sum, r) => sum + r.rating, 0) / reviews.length;
+
+  const CustomerName = ({ customerId }: { customerId: string }) => {
+    const [name, setName] = useState("");
+    const [loading, setLoading] = useState(true);
+
+    useEffect(() => {
+      // Hàm gọi API
+      const getName = async () => {
+        try {
+          setLoading(true);
+
+          const response = await fetch(`/api/customer/${customerId}`);
+
+          if (!response.ok) {
+            throw new Error("Mạng lỗi hoặc không tìm thấy nhân viên");
+          }
+
+          const data = await response.json();
+
+          setName(data["name"]);
+        } catch (error) {
+          console.error("Lỗi khi lấy tên:", error);
+          setName("Lỗi tải tên");
+        } finally {
+          setLoading(false);
+        }
+      };
+
+      if (customerId) {
+        getName();
+      }
+    }, [customerId]); // Chạy lại nếu customerId thay đổi
+
+    if (loading)
+      return <span className="animate-pulse text-gray-400">...</span>;
+
+    return <span>{name || "N/A"}</span>;
+  };
+
+  return (
+    <div className="space-y-4">
+      {/* Summary header */}
+      <div className="flex items-center gap-4 rounded-2xl border border-(--color-border-light) bg-white p-5">
+        <div className="flex h-14 w-14 shrink-0 items-center justify-center rounded-2xl bg-(--color-accent-light)">
+          <i className="fa-solid fa-star text-2xl text-yellow-400"></i>
+        </div>
+        <div>
+          <p className="text-foreground text-2xl font-bold">
+            {avgRating.toFixed(1)}
+            <span className="ml-1 text-sm font-normal text-(--color-text-muted)">
+              / 5
+            </span>
+          </p>
+          <StarRating rating={Math.round(avgRating)} />
+          <p className="mt-0.5 text-xs text-(--color-text-muted)">
+            {reviews.length} review{reviews.length !== 1 ? "s" : ""}
+          </p>
+        </div>
+      </div>
+
+      {/* Review list */}
+      <div className="space-y-3">
+        {reviews.map((review, idx) => (
+          <div
+            key={review.id ?? idx}
+            className="rounded-2xl border border-(--color-border-light) bg-white p-4"
+          >
+            <div className="mb-2 flex items-start justify-between gap-3">
+              <div className="flex items-center gap-2">
+                <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-(--color-accent-light)">
+                  <i className="fa-solid fa-user text-xs text-(--color-primary)"></i>
+                </div>
+                <span className="text-sm font-medium text-(--color-text-secondary)">
+                  <CustomerName customerId={review.reviewerId!} />
+                </span>
+              </div>
+              <div className="flex shrink-0 flex-col items-end gap-1">
+                <StarRating rating={review.rating} />
+                {review.createdAt && (
+                  <span className="text-xs text-(--color-text-muted)">
+                    {new Date(review.createdAt).toLocaleDateString("vi-VN")}
+                  </span>
+                )}
+              </div>
+            </div>
+
+            {review.comment ? (
+              <p className="text-sm leading-relaxed text-(--color-text-secondary)">
+                {review.comment}
+              </p>
+            ) : (
+              <p className="text-sm text-(--color-text-muted) italic">
+                No comment provided.
+              </p>
+            )}
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}

components/organisms/manager/index.ts

@@ -3,8 +3,10 @@ export { default as DeleteConfirm } from "./DeleteConfirm";
 export { default as ProductModal } from "./ProductModal";
 export { default as ProductsTab } from "./ProductsTab";
 export { default as MenuItemsTab } from "./MenuItemsTab";
+export { default as ReviewsTab } from "./ReviewsTab";
 export type {
   ProductModalProps,
   DeleteConfirmProps,
   StatusBadgeProps,
+  ReviewEntity,
 } from "./Manager.types";

components/organisms/modals/Modal.types.ts

@@ -1,6 +1,7 @@
 export interface ReviewModalProps {
   isOpen: boolean;
   onClose: () => void;
+  eateryId?: string;
 }
 
 export interface ConfirmModalProps {

components/organisms/modals/ReviewModal.tsx

@@ -1,28 +1,68 @@
 "use client";
 
 import { Button, Heading, Text, Textarea } from "@/components/atoms";
+import { useAuth } from "@/lib/auth-context";
 import { useState } from "react";
 
 import type { ReviewModalProps } from "./Modal.types";
 
-export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
+interface CreateReviewInput {
+  reviewerId: string;
+  eateryId: string;
+  rating: number;
+  comment?: string;
+}
+
+export default function ReviewModal({
+  isOpen,
+  onClose,
+  eateryId,
+}: ReviewModalProps) {
+  const { user } = useAuth();
   const [rating, setRating] = useState(0);
   const [hovered, setHovered] = useState(0);
   const [review, setReview] = useState("");
   const [submitted, setSubmitted] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
 
   if (!isOpen) return null;
 
-  const handleSubmit = () => {
-    setSubmitted(true);
+  const handleSubmit = async () => {
+    if (!eateryId) return;
+
+    const input: CreateReviewInput = {
+      reviewerId: user?.id || "",
+      eateryId,
+      rating,
+      ...(review.trim() ? { comment: review.trim() } : {}),
+    };
+
+    setLoading(true);
+    setError(null);
+
+    try {
+      const res = await fetch("/api/eatery/review", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(input),
+      });
+
+      if (!res.ok) throw new Error(`Request failed: ${res.status}`);
+      setSubmitted(true);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Failed to submit review.");
+    } finally {
+      setLoading(false);
+    }
   };
 
   const handleClose = () => {
-    // Reset state when closing
     setRating(0);
     setHovered(0);
     setReview("");
     setSubmitted(false);
+    setError(null);
     onClose();
   };
 
@@ -128,6 +168,9 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
               />
             </div>
 
+            {/* Error message */}
+            {error && <p className="mb-4 text-sm text-red-500">{error}</p>}
+
             {/* Footer buttons */}
             <div className="flex gap-3">
               <Button
@@ -136,17 +179,18 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
                 variant="secondary"
                 className="flex-1"
                 icon="fa-arrow-left"
+                disabled={loading}
               >
                 Go back
               </Button>
               <Button
                 type="button"
                 onClick={handleSubmit}
-                disabled={rating === 0}
+                disabled={rating === 0 || loading}
                 className="flex-1"
-                icon="fa-check"
+                icon={loading ? "fa-spinner fa-spin" : "fa-check"}
               >
-                Confirm
+                {loading ? "Submitting..." : "Confirm"}
               </Button>
             </div>
           </>

components/organisms/navigation/CategorySidebar.tsx

@@ -37,14 +37,14 @@ export default function CategorySidebar({
           className={`text-xs font-bold tracking-widest whitespace-nowrap text-(--color-text-muted) uppercase ${isOpen ? "block" : "hidden"} xl:block`}
         >
           <i className="fa-solid fa-utensils mr-2 text-(--color-primary)"></i>
-          Thực Đơn
+          Menu
         </span>
 
         {/* Toggle button — hidden on xl+ (sidebar is always expanded there) */}
         <button
           onClick={onToggle}
-          title={isOpen ? "Thu gọn menu" : "Mở rộng menu"}
-          aria-label={isOpen ? "Thu gọn menu" : "Mở rộng menu"}
+          title={isOpen ? "Collapse menu" : "Expand menu"}
+          aria-label={isOpen ? "Collapse menu" : "Expand menu"}
           className="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--color-text-muted) transition-colors duration-150 hover:bg-(--color-border-light) hover:text-(--color-primary) xl:hidden"
         >
           <i

components/organisms/product-grid/ProductGrid.tsx

@@ -6,6 +6,12 @@ import { useManager } from "@/lib/manager-context";
 
 import type { ProductGridProps } from "./ProductGrid.types";
 
+function toDisplayUrl(filename: string) {
+  if (!filename) return "/imgs/products/placeholder.jpg";
+  if (filename.startsWith("/") || filename.startsWith("http")) return filename;
+  return `/api/file/${filename}`;
+}
+
 export default function ProductGrid({
   searchQuery = "",
   isSidebarOpen = false,
@@ -35,7 +41,7 @@ export default function ProductGrid({
             ({ id, imageUrl, name, price, description }) => (
               <ProductCard
                 key={id}
-                image={imageUrl}
+                image={toDisplayUrl(imageUrl)}
                 imageAlt={name}
                 productName={name}
                 price={price}

components/organisms/shift-schedule/MobileShiftView.tsx

@@ -1,30 +1,12 @@
 "use client";
 
 import ShiftCard from "@/components/molecules/cards/ShiftCard";
-import { DEPARTMENTS } from "@/lib/constants";
 import { useShift } from "@/lib/shift-context";
 import { useMemo, useState } from "react";
 
 import type { MobileShiftViewProps } from "./ShiftSchedule.types";
 
 const DAY_HEADERS = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-
-function formatDateISO(d: Date): string {
-  const y = d.getFullYear();
-  const m = (d.getMonth() + 1).toString().padStart(2, "0");
-  const day = d.getDate().toString().padStart(2, "0");
-  return `${y}-${m}-${day}`;
-}
-
-function isToday(d: Date): boolean {
-  const today = new Date(2026, 3, 10);
-  return (
-    d.getDate() === today.getDate() &&
-    d.getMonth() === today.getMonth() &&
-    d.getFullYear() === today.getFullYear()
-  );
-}
-
 const MONTH_NAMES = [
   "January",
   "February",
@@ -40,10 +22,23 @@ const MONTH_NAMES = [
   "December",
 ];
 
+function formatDateKey(d: Date): string {
+  const y = d.getFullYear();
+  const m = (d.getMonth() + 1).toString().padStart(2, "0");
+  const day = d.getDate().toString().padStart(2, "0");
+  return `${y}-${m}-${day}`;
+}
+
+function isToday(d: Date): boolean {
+  const today = new Date(2026, 3, 10);
+  return formatDateKey(d) === formatDateKey(today);
+}
+
 export default function MobileShiftView({
   onShiftClick,
 }: MobileShiftViewProps) {
-  const { currentDate, shifts, goToNextMonth, goToPrevMonth } = useShift();
+  const { currentDate, getShiftsForDate, goToNextMonth, goToPrevMonth } =
+    useShift();
   const [selectedDate, setSelectedDate] = useState<Date>(new Date(2026, 3, 10));
 
   const calendarDays = useMemo(() => {
@@ -57,187 +52,137 @@ export default function MobileShiftView({
 
     const days: (Date | null)[] = [];
     for (let i = 0; i < startOffset; i++) days.push(null);
-    for (let d = 1; d <= lastDay.getDate(); d++) {
+    for (let d = 1; d <= lastDay.getDate(); d++)
       days.push(new Date(year, month, d));
-    }
     while (days.length % 7 !== 0) days.push(null);
     return days;
   }, [currentDate]);
 
-  const getDotColors = (date: Date): string[] => {
-    const dayShifts = shifts.filter((s) => s.date.getDate() === date.getDate());
-    const dots: string[] = [];
-    // if (dayShifts.some((s) => s.status === "available"))
-    //   dots.push("bg-amber-400");
-    // if (dayShifts.some((s) => s.status === "registered"))
-    //   dots.push("bg-green-500");
-    // if (dayShifts.some((s) => s.status === "approved_leave"))
-    //   dots.push("bg-purple-400");
-    // if (dayShifts.some((s) => s.status === "absent")) dots.push("bg-red-400");
-    return dots;
-  };
+  const selectedShifts = useMemo(
+    () => getShiftsForDate(selectedDate),
+    [selectedDate, getShiftsForDate],
+  );
 
-  const selectedShifts = useMemo(() => {
-    return shifts.filter((s) => s.date.getDate() === selectedDate.getDate());
-  }, [shifts, selectedDate]);
-
-  const selectedDateObj = new Date(selectedDate + "T00:00:00");
-  const dayOfWeek = DAY_HEADERS[(selectedDateObj.getDay() + 6) % 7];
+  const dayOfWeek = DAY_HEADERS[(selectedDate.getDay() + 6) % 7];
 
   return (
     <div className="space-y-4">
-      {/* Compact month calendar */}
-      <div className="rounded-xl border border-(--color-border-light) bg-white p-3">
+      {/* Month calendar card */}
+      <div className="overflow-hidden rounded-2xl border border-(--color-border-light) bg-white shadow-sm">
         {/* Month navigation */}
-        <div className="mb-3 flex items-center justify-between">
+        <div className="flex items-center justify-between border-b border-(--color-border-light) bg-gradient-to-r from-(--color-primary)/8 to-(--color-primary)/3 px-4 py-3">
           <button
             title="Previous month"
             type="button"
             onClick={goToPrevMonth}
-            className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-transparent text-(--color-text-muted) transition hover:bg-gray-100"
+            className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-white/70 text-(--color-text-muted) shadow-sm transition hover:bg-white hover:text-(--color-primary)"
           >
             <i className="fa-solid fa-chevron-left text-xs"></i>
           </button>
-          <h3 className="text-foreground text-sm font-bold">
+          <h3 className="text-sm font-bold text-(--color-primary-dark)">
             {MONTH_NAMES[currentDate.getMonth()]} {currentDate.getFullYear()}
           </h3>
           <button
             title="Next month"
             type="button"
             onClick={goToNextMonth}
-            className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-transparent text-(--color-text-muted) transition hover:bg-gray-100"
+            className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-white/70 text-(--color-text-muted) shadow-sm transition hover:bg-white hover:text-(--color-primary)"
           >
             <i className="fa-solid fa-chevron-right text-xs"></i>
           </button>
         </div>
 
-        {/* Day headers */}
-        <div className="mb-1 grid grid-cols-7">
-          {DAY_HEADERS.map((day) => (
-            <div
-              key={day}
-              className="py-1 text-center text-[10px] font-semibold text-(--color-text-muted) uppercase"
-            >
-              {day}
-            </div>
-          ))}
-        </div>
-
-        {/* Calendar grid */}
-        <div className="grid grid-cols-7">
-          {calendarDays.map((date, i) => {
-            if (!date) {
-              return <div key={`empty-${i}`} className="p-1" />;
-            }
-
-            const today = isToday(date);
-            const selected = date === selectedDate;
-            const dots = getDotColors(date);
-
-            return (
-              <button
-                type="button"
-                key={i}
-                onClick={() => setSelectedDate(date)}
-                className={`flex cursor-pointer flex-col items-center border-none bg-transparent p-1 transition ${
-                  selected ? "rounded-lg bg-(--color-primary)/10" : ""
+        <div className="p-3">
+          {/* Day headers */}
+          <div className="mb-1 grid grid-cols-7">
+            {DAY_HEADERS.map((day, i) => (
+              <div
+                key={day}
+                className={`py-1 text-center text-[10px] font-bold uppercase ${
+                  i >= 5 ? "text-rose-400" : "text-(--color-text-muted)"
                 }`}
               >
-                <span
-                  className={`flex h-7 w-7 items-center justify-center rounded-full text-xs ${
-                    today
-                      ? "bg-(--color-primary) font-bold text-white"
-                      : selected
-                        ? "text-foreground font-bold"
-                        : "text-foreground"
-                  }`}
-                >
-                  {date.getDate()}
-                </span>
-                <div className="mt-0.5 flex gap-0.5">
-                  {dots.slice(0, 3).map((color, j) => (
-                    <span key={j} className={`h-1 w-1 rounded-full ${color}`} />
-                  ))}
-                </div>
-              </button>
-            );
-          })}
-        </div>
+                {day}
+              </div>
+            ))}
+          </div>
 
-        {/* Legend */}
-        <div className="mt-3 flex flex-wrap justify-center gap-3 border-t border-(--color-border-light) pt-2">
-          <div className="flex items-center gap-1">
-            <span className="h-2 w-2 rounded-full bg-amber-400"></span>
-            <span className="text-[10px] text-(--color-text-muted)">
-              Available
-            </span>
-          </div>
-          <div className="flex items-center gap-1">
-            <span className="h-2 w-2 rounded-full bg-green-500"></span>
-            <span className="text-[10px] text-(--color-text-muted)">
-              Registered
-            </span>
-          </div>
-          <div className="flex items-center gap-1">
-            <span className="h-2 w-2 rounded-full bg-purple-400"></span>
-            <span className="text-[10px] text-(--color-text-muted)">
-              On leave
-            </span>
-          </div>
-          <div className="flex items-center gap-1">
-            <span className="h-2 w-2 rounded-full bg-red-400"></span>
-            <span className="text-[10px] text-(--color-text-muted)">
-              Absent
-            </span>
+          {/* Calendar grid */}
+          <div className="grid grid-cols-7">
+            {calendarDays.map((date, i) => {
+              if (!date) return <div key={`empty-${i}`} className="p-1" />;
+
+              const today = isToday(date);
+              const selected =
+                formatDateKey(date) === formatDateKey(selectedDate);
+              const dayShifts = getShiftsForDate(date);
+              const isWeekend = date.getDay() === 0 || date.getDay() === 6;
+
+              return (
+                <button
+                  type="button"
+                  key={i}
+                  onClick={() => setSelectedDate(date)}
+                  className="flex cursor-pointer flex-col items-center border-none bg-transparent p-1 transition"
+                >
+                  <span
+                    className={`flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold transition ${
+                      today
+                        ? "bg-(--color-primary) text-white shadow-sm"
+                        : selected
+                          ? "bg-(--color-primary)/15 text-(--color-primary) ring-2 ring-(--color-primary)/30"
+                          : isWeekend
+                            ? "text-rose-500"
+                            : "text-(--color-text-secondary)"
+                    }`}
+                  >
+                    {date.getDate()}
+                  </span>
+                  <div className="mt-0.5 flex min-h-2 items-center justify-center gap-px">
+                    {dayShifts.length > 0 && (
+                      <span className="h-1.5 w-1.5 rounded-full bg-(--color-primary)/60" />
+                    )}
+                  </div>
+                </button>
+              );
+            })}
           </div>
         </div>
       </div>
 
       {/* Selected day shifts */}
       <div>
-        <h3 className="text-foreground mb-3 text-sm font-bold">
-          {dayOfWeek}, {selectedDateObj.getDate()}/
-          {selectedDateObj.getMonth() + 1}/{selectedDateObj.getFullYear()}
-          <span className="ml-2 text-xs font-normal text-(--color-text-muted)">
-            ({selectedShifts.length} shift
-            {selectedShifts.length !== 1 ? "s" : ""})
+        <div className="mb-3 flex items-center justify-between px-1">
+          <h3 className="text-sm font-bold text-(--color-primary-dark)">
+            {dayOfWeek}, {selectedDate.getDate()}/{selectedDate.getMonth() + 1}/
+            {selectedDate.getFullYear()}
+          </h3>
+          <span
+            className={`rounded-full px-2.5 py-1 text-xs font-semibold ${
+              selectedShifts.length > 0
+                ? "bg-(--color-primary)/10 text-(--color-primary)"
+                : "bg-gray-100 text-(--color-text-muted)"
+            }`}
+          >
+            {selectedShifts.length} shifts
           </span>
-        </h3>
+        </div>
 
         {selectedShifts.length === 0 ? (
-          <div className="rounded-xl border border-dashed border-(--color-border-light) py-8 text-center">
-            <i className="fa-regular fa-calendar-xmark mb-2 text-2xl text-gray-300"></i>
-            <p className="text-sm text-(--color-text-muted)">
-              No shifts for this day
+          <div className="rounded-2xl border border-dashed border-(--color-border-light) py-10 text-center">
+            <i className="fa-regular fa-calendar-xmark mb-3 text-3xl text-gray-200"></i>
+            <p className="text-sm font-medium text-(--color-text-muted)">
+              No shifts
+            </p>
+            <p className="mt-0.5 text-xs text-(--color-text-muted)">
+              No shifts created for this day
             </p>
           </div>
         ) : (
-          <div className="space-y-3">
-            {DEPARTMENTS.map((dept) => {
-              const deptShifts = selectedShifts;
-              if (deptShifts.length === 0) return null;
-              return (
-                <div key={dept.id}>
-                  <div className="mb-2 flex items-center gap-2">
-                    <i
-                      className={`${dept.icon} text-xs text-(--color-primary)`}
-                    ></i>
-                    <span className="text-xs font-semibold text-(--color-text-secondary)">
-                      {dept.name}
-                    </span>
-                  </div>
-                  <div className="space-y-2">
-                    {deptShifts.map((shift) => (
-                      <ShiftCard
-                        key={shift.id}
-                        shift={shift}
-                        onClick={onShiftClick}
-                      />
-                    ))}
-                  </div>
-                </div>
-              );
-            })}
+          <div className="space-y-2.5">
+            {selectedShifts.map((shift) => (
+              <ShiftCard key={shift.id} shift={shift} onClick={onShiftClick} />
+            ))}
           </div>
         )}
       </div>

components/organisms/shift-schedule/MonthlyCalendar.tsx

@@ -27,7 +27,7 @@ export default function MonthlyCalendar({
   onShiftClick,
   onDateSelect,
 }: MonthlyCalendarProps) {
-  const { currentDate, shifts } = useShift();
+  const { currentDate, getShiftsForDate } = useShift();
 
   const calendarDays = useMemo(() => {
     const year = currentDate.getFullYear();
@@ -35,49 +35,27 @@ export default function MonthlyCalendar({
     const firstDay = new Date(year, month, 1);
     const lastDay = new Date(year, month + 1, 0);
 
-    // Monday = 0, Sunday = 6
     let startOffset = firstDay.getDay() - 1;
     if (startOffset < 0) startOffset = 6;
 
     const days: (Date | null)[] = [];
-
-    // Fill leading empty cells
-    for (let i = 0; i < startOffset; i++) {
-      days.push(null);
-    }
-
-    // Fill actual days
-    for (let d = 1; d <= lastDay.getDate(); d++) {
+    for (let i = 0; i < startOffset; i++) days.push(null);
+    for (let d = 1; d <= lastDay.getDate(); d++)
       days.push(new Date(year, month, d));
-    }
-
-    // Fill trailing empty cells to complete the grid
-    while (days.length % 7 !== 0) {
-      days.push(null);
-    }
-
+    while (days.length % 7 !== 0) days.push(null);
     return days;
   }, [currentDate]);
 
-  const getShiftSummary = (date: Date) => {
-    const dayShifts = shifts.filter((s) => s.date.getDate() === date.getDate());
-    // const available = dayShifts.filter((s) => s.status === "available").length;
-    // const registered = dayShifts.filter(
-    //   (s) => s.status === "registered",
-    // ).length;
-    // const leave = dayShifts.filter((s) => s.status === "approved_leave").length;
-    // const absent = dayShifts.filter((s) => s.status === "absent").length;
-    return { total: dayShifts.length };
-  };
-
   return (
-    <div className="overflow-hidden rounded-xl border border-(--color-border-light)">
+    <div className="overflow-hidden rounded-2xl border border-(--color-border-light) shadow-sm">
       {/* Day headers */}
-      <div className="grid grid-cols-7 border-b border-(--color-border-light) bg-gray-50">
-        {DAY_HEADERS.map((day) => (
+      <div className="grid grid-cols-7 border-b border-(--color-border-light) bg-gradient-to-r from-(--color-primary)/8 to-(--color-primary)/3">
+        {DAY_HEADERS.map((day, i) => (
           <div
             key={day}
-            className="px-2 py-2.5 text-center text-xs font-semibold text-(--color-text-muted) uppercase"
+            className={`px-2 py-3 text-center text-[11px] font-bold tracking-wider uppercase ${
+              i >= 5 ? "text-rose-400" : "text-(--color-primary)"
+            }`}
           >
             {day}
           </div>
@@ -85,75 +63,60 @@ export default function MonthlyCalendar({
       </div>
 
       {/* Calendar grid */}
-      <div className="grid grid-cols-7">
+      <div className="grid grid-cols-7 bg-white">
         {calendarDays.map((date, i) => {
           if (!date) {
             return (
               <div
                 key={`empty-${i}`}
-                className="min-h-25 border-r border-b border-(--color-border-light) bg-gray-50/30"
+                className="min-h-[100px] border-r border-b border-(--color-border-light) bg-gray-50/50"
               />
             );
           }
 
-          const summary = getShiftSummary(date);
           const today = isToday(date);
+          const shifts = getShiftsForDate(date);
+          const shiftCount = shifts.length;
+          const isWeekend = date.getDay() === 0 || date.getDay() === 6;
 
           return (
             <button
               type="button"
               key={i}
               onClick={() => onDateSelect?.(date)}
-              className={`min-h-25 cursor-pointer border-r border-b border-(--color-border-light) bg-transparent p-2 text-left transition hover:bg-gray-50 ${
-                today ? "bg-(--color-primary)/5" : ""
-              }`}
+              className={`group min-h-[100px] cursor-pointer border-r border-b border-(--color-border-light) bg-transparent p-2 text-left transition hover:bg-(--color-primary)/5 ${
+                today ? "bg-(--color-primary)/8" : ""
+              } ${isWeekend && !today ? "bg-rose-50/30" : ""}`}
             >
+              {/* Date number */}
               <span
-                className={`inline-flex h-7 w-7 items-center justify-center rounded-full text-sm ${
+                className={`inline-flex h-7 w-7 items-center justify-center rounded-full text-sm font-bold transition ${
                   today
-                    ? "bg-(--color-primary) font-bold text-white"
-                    : "text-foreground font-medium"
+                    ? "bg-(--color-primary) text-white shadow-sm"
+                    : isWeekend
+                      ? "text-rose-500"
+                      : "text-(--color-text-secondary) group-hover:text-(--color-primary)"
                 }`}
               >
                 {date.getDate()}
               </span>
 
-              {/* {summary.total > 0 && (
-                <div className="mt-2 space-y-1">
-                  {summary.available > 0 && (
-                    <div className="flex items-center gap-1.5">
-                      <span className="h-2 w-2 rounded-full bg-blue-400"></span>
-                      <span className="text-[10px] text-blue-600">
-                        {summary.available} available
-                      </span>
-                    </div>
-                  )}
-                  {summary.registered > 0 && (
-                    <div className="flex items-center gap-1.5">
-                      <span className="h-2 w-2 rounded-full bg-blue-700"></span>
-                      <span className="text-[10px] text-blue-800">
-                        {summary.registered} registered
-                      </span>
-                    </div>
-                  )}
-                  {summary.leave > 0 && (
-                    <div className="flex items-center gap-1.5">
-                      <span className="h-2 w-2 rounded-full bg-purple-400"></span>
-                      <span className="text-[10px] text-purple-600">
-                        {summary.leave} on leave
-                      </span>
-                    </div>
-                  )}
-                  {summary.absent > 0 && (
-                    <div className="flex items-center gap-1.5">
-                      <span className="h-2 w-2 rounded-full bg-red-400"></span>
-                      <span className="text-[10px] text-red-600">
-                        {summary.absent} absent
-                      </span>
-                    </div>
-                  )}
+              {/* Shift count badge */}
+              {shiftCount > 0 && (
+                <div className="mt-1.5 space-y-1">
+                  <span className="inline-flex items-center gap-1 rounded-full bg-(--color-primary)/10 px-1.5 py-0.5 text-[10px] font-semibold text-(--color-primary)">
+                    <i className="fa-solid fa-clock text-[8px]"></i>
+                    {shiftCount} shifts
+                  </span>
                 </div>
-              )} */}
+              )}
+
+              {/* Add indicator for manager */}
+              {shiftCount === 0 && onDateSelect && (
+                <p className="mt-1 text-[10px] text-(--color-text-muted) opacity-0 transition group-hover:opacity-100">
+                  + Add shift
+                </p>
+              )}
             </button>
           );
         })}

components/organisms/shift-schedule/ShiftCreateModal.tsx

@@ -7,6 +7,68 @@ import { useEffect, useState } from "react";
 import { formatDateISO } from "./MonthlyCalendar";
 import type { ShiftCreateModalProps } from "./ShiftSchedule.types";
 
+function TimeInput({
+  value,
+  onChange,
+  title,
+}: {
+  value: string;
+  onChange: (v: string) => void;
+  title: string;
+}) {
+  const [h24, m] = value.split(":").map(Number);
+  const isPM = h24 >= 12;
+  const hour12 = h24 === 0 ? 12 : h24 > 12 ? h24 - 12 : h24;
+
+  const emit = (newH12: number, newM: number, newIsPM: boolean) => {
+    let h = newIsPM
+      ? newH12 === 12
+        ? 12
+        : newH12 + 12
+      : newH12 === 12
+        ? 0
+        : newH12;
+    onChange(
+      `${h.toString().padStart(2, "0")}:${newM.toString().padStart(2, "0")}`,
+    );
+  };
+
+  return (
+    <div className="flex items-center overflow-hidden rounded-xl border border-(--color-border-light) transition focus-within:border-(--color-primary) focus-within:ring-1 focus-within:ring-(--color-primary)">
+      <input
+        title={`${title} hour`}
+        type="number"
+        min={1}
+        max={12}
+        value={hour12}
+        onChange={(e) =>
+          emit(Math.min(12, Math.max(1, Number(e.target.value))), m, isPM)
+        }
+        className="text-foreground w-12 border-none bg-transparent py-2.5 pl-3 text-sm outline-none"
+      />
+      <span className="text-sm text-(--color-text-muted) select-none">:</span>
+      <input
+        title={`${title} minute`}
+        type="number"
+        min={0}
+        max={59}
+        value={m.toString().padStart(2, "0")}
+        onChange={(e) =>
+          emit(hour12, Math.min(59, Math.max(0, Number(e.target.value))), isPM)
+        }
+        className="text-foreground w-10 border-none bg-transparent py-2.5 text-sm outline-none"
+      />
+      <button
+        type="button"
+        onClick={() => emit(hour12, m, !isPM)}
+        className="mr-2 ml-1 cursor-pointer rounded-lg border-none bg-(--color-primary)/10 px-2 py-1 text-xs font-bold text-(--color-primary) transition hover:bg-(--color-primary) hover:text-white"
+      >
+        {isPM ? "PM" : "AM"}
+      </button>
+    </div>
+  );
+}
+
 export default function ShiftCreateModal({
   isOpen,
   onClose,
@@ -50,7 +112,11 @@ export default function ShiftCreateModal({
       return;
     }
 
+    const deptName =
+      DEPARTMENTS.find((d) => d.id === department)?.name ?? department;
+
     createShift({
+      name: `${deptName} - ${formatDateISO(date)}`,
       date,
       startTime,
       endTime,
@@ -110,24 +176,20 @@ export default function ShiftCreateModal({
               <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
                 Start Time
               </label>
-              <input
+              <TimeInput
                 title="Start Time"
-                type="time"
                 value={startTime}
-                onChange={(e) => setStartTime(e.target.value)}
-                className="text-foreground w-full rounded-xl border border-(--color-border-light) px-3 py-2.5 text-sm transition outline-none focus:border-(--color-primary) focus:ring-1 focus:ring-(--color-primary)"
+                onChange={setStartTime}
               />
             </div>
             <div>
               <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
                 End Time
               </label>
-              <input
+              <TimeInput
                 title="End Time"
-                type="time"
                 value={endTime}
-                onChange={(e) => setEndTime(e.target.value)}
-                className="text-foreground w-full rounded-xl border border-(--color-border-light) px-3 py-2.5 text-sm transition outline-none focus:border-(--color-primary) focus:ring-1 focus:ring-(--color-primary)"
+                onChange={setEndTime}
               />
             </div>
           </div>
@@ -135,7 +197,7 @@ export default function ShiftCreateModal({
           {/* Department */}
           <div>
             <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
-              Bộ phận
+              Department
             </label>
             <select
               title="Department"
@@ -155,7 +217,7 @@ export default function ShiftCreateModal({
           <div className="grid grid-cols-2 gap-3">
             <div>
               <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
-                Số nhân viên tối đa
+                Max staff
               </label>
               <input
                 title="Max Staff"
@@ -169,7 +231,7 @@ export default function ShiftCreateModal({
             </div>
             <div>
               <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
-                Lương ca (VND)
+                Shift wage (VND)
               </label>
               <input
                 title="Wage"
@@ -198,14 +260,14 @@ export default function ShiftCreateModal({
               className="flex-1 cursor-pointer rounded-xl border-none bg-(--color-primary) px-4 py-2.5 text-sm font-semibold text-white transition hover:opacity-90"
             >
               <i className="fa-solid fa-plus mr-2"></i>
-              Tạo ca làm
+              Create shift
             </button>
             <button
               type="button"
               onClick={onClose}
               className="cursor-pointer rounded-xl border border-(--color-border-light) bg-transparent px-4 py-2.5 text-sm font-medium text-(--color-text-secondary) transition hover:bg-gray-50"
             >
-              Hủy
+              Cancel
             </button>
           </div>
         </form>

components/organisms/shift-schedule/ShiftDetailModal.tsx

@@ -3,10 +3,20 @@
 import { useAuth } from "@/lib/auth-context";
 import { DEPARTMENTS } from "@/lib/constants";
 import { useShift } from "@/lib/shift-context";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import type { ShiftDetailModalProps } from "./ShiftSchedule.types";
 
+function parseShiftDate(date: Date | string | undefined): Date | null {
+  if (!date) return null;
+  // Date object → dùng thẳng
+  if (date instanceof Date) return isNaN(date.getTime()) ? null : date;
+  // ISO string hoặc "YYYY-MM-DD" → chỉ lấy 10 ký tự đầu tránh lệch timezone
+  const [y, m, d] = (date as string).slice(0, 10).split("-").map(Number);
+  if (!y || !m || !d) return null;
+  return new Date(y, m - 1, d);
+}
+
 export default function ShiftDetailModal({
   shift,
   isOpen,
@@ -21,21 +31,22 @@ export default function ShiftDetailModal({
 
   // const dept = DEPARTMENTS.find((d) => d.id === shift.department);
   const isManager = user?.role === "manager";
+  const registeredStaff = shift.registeredStaff ?? [];
   const isRegistered = user
-    ? shift.registeredStaff!.some((s) => s.id === user.id)
+    ? registeredStaff.some((s) => s.id === user.id)
     : false;
-  const isFull = shift.registeredStaff!.length >= shift.maxStaff;
+  const isFull = registeredStaff.length >= shift.maxStaff;
 
-  const handleRegister = () => {
+  const handleRegister = async () => {
     if (!user) return;
     setError(null);
     setSuccess(null);
-    const result = registerShift(shift.id, user.id, user.name);
+    const result = await registerShift(shift.id, user.id, user.name);
     if (result.success) {
-      setSuccess("Đăng ký ca thành công!");
+      setSuccess("Shift registered successfully!");
       setTimeout(onClose, 1200);
     } else {
-      setError(result.error ?? "Có lỗi xảy ra.");
+      setError(result.error ?? "An error occurred.");
     }
   };
 
@@ -43,25 +54,25 @@ export default function ShiftDetailModal({
     if (!user) return;
     setError(null);
     unregisterShift(shift.id, user.id);
-    setSuccess("Đã hủy đăng ký ca.");
+    setSuccess("Shift registration cancelled.");
     setTimeout(onClose, 1200);
   };
 
   const handleManagerUnregister = (staffId: string) => {
     unregisterShift(shift.id, staffId);
-    setSuccess("Đã xóa nhân viên khỏi ca.");
+    setSuccess("Staff removed from shift.");
   };
 
-  const handleDelete = () => {
-    deleteShift(shift.id);
+  const handleDelete = async () => {
+    await deleteShift(shift.id);
     onClose();
   };
 
   const statusLabel = {
-    available: "Còn trống",
-    registered: "Đã đăng ký",
-    approved_leave: "Nghỉ phép",
-    absent: "Vắng mặt",
+    available: "Available",
+    registered: "Registered",
+    approved_leave: "On leave",
+    absent: "Absent",
   };
 
   const statusColor = {
@@ -71,6 +82,44 @@ export default function ShiftDetailModal({
     absent: "bg-red-100 text-red-700",
   };
 
+  const StaffName = ({ staffId }: { staffId: string }) => {
+    const [name, setName] = useState("");
+    const [loading, setLoading] = useState(true);
+
+    useEffect(() => {
+      // Hàm gọi API
+      const getName = async () => {
+        try {
+          setLoading(true);
+
+          const response = await fetch(`/api/staff/${staffId}`);
+
+          if (!response.ok) {
+            throw new Error("Mạng lỗi hoặc không tìm thấy nhân viên");
+          }
+
+          const data = await response.json();
+
+          setName(data["name"]);
+        } catch (error) {
+          console.error("Lỗi khi lấy tên:", error);
+          setName("Lỗi tải tên");
+        } finally {
+          setLoading(false);
+        }
+      };
+
+      if (staffId) {
+        getName();
+      }
+    }, [staffId]); // Chạy lại nếu staffId thay đổi
+
+    if (loading)
+      return <span className="animate-pulse text-gray-400">...</span>;
+
+    return <span>{name || "N/A"}</span>;
+  };
+
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
       {/* Backdrop */}
@@ -84,7 +133,7 @@ export default function ShiftDetailModal({
             {/* {dept && <i className={`${dept.icon} text-(--color-primary)`}></i>} */}
             <div>
               <h2 className="text-foreground text-base font-bold">
-                Chi tiết ca làm
+                Shift Details
               </h2>
               {/* <p className="text-xs text-(--color-text-muted)">{dept?.name}</p> */}
             </div>
@@ -114,23 +163,22 @@ export default function ShiftDetailModal({
           <div className="grid grid-cols-2 gap-3">
             <div className="rounded-xl bg-gray-50 p-3">
               <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
-                Ngày
+                Date
               </p>
               <p className="text-foreground mt-1 text-sm font-bold">
-                {new Date(shift.date + "T00:00:00").toLocaleDateString(
-                  "vi-VN",
-                  {
-                    weekday: "long",
-                    day: "2-digit",
-                    month: "2-digit",
-                    year: "numeric",
-                  },
-                )}
+                {parseShiftDate(
+                  shift.date as Date | string | undefined,
+                )?.toLocaleDateString("vi-VN", {
+                  weekday: "long",
+                  day: "2-digit",
+                  month: "2-digit",
+                  year: "numeric",
+                }) ?? "—"}
               </p>
             </div>
             <div className="rounded-xl bg-gray-50 p-3">
               <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
-                Giờ làm
+                Working hours
               </p>
               <p className="text-foreground mt-1 text-sm font-bold">
                 {shift.startTime} – {shift.endTime}
@@ -138,16 +186,16 @@ export default function ShiftDetailModal({
             </div>
             <div className="rounded-xl bg-gray-50 p-3">
               <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
-                Thời lượng
+                Duration
               </p>
               <p className="text-foreground mt-1 text-sm font-bold">{""} giờ</p>
             </div>
             <div className="rounded-xl bg-gray-50 p-3">
               <p className="text-[10px] font-semibold text-(--color-text-muted) uppercase">
-                Lương ca
+                Shift wage
               </p>
               <p className="mt-1 text-sm font-bold text-(--color-primary)">
-                {shift.wage.toLocaleString("vi-VN")} VND
+                {(shift.wage ?? 0).toLocaleString("vi-VN")} VND
               </p>
             </div>
           </div>
@@ -155,16 +203,15 @@ export default function ShiftDetailModal({
           {/* Registered staff */}
           <div>
             <p className="mb-2 text-xs font-semibold text-(--color-text-secondary)">
-              Nhân viên đã đăng ký ({shift.registeredStaff!.length}/
-              {shift.maxStaff})
+              Registered staff ({registeredStaff.length}/{shift.maxStaff})
             </p>
-            {shift.registeredStaff && shift.registeredStaff.length === 0 ? (
+            {registeredStaff.length === 0 ? (
               <p className="text-xs text-(--color-text-muted) italic">
-                Chưa có ai đăng ký
+                No staff registered yet
               </p>
             ) : (
               <div className="space-y-2">
-                {shift.registeredStaff!.map((staff) => (
+                {registeredStaff.map((staff) => (
                   <div
                     key={staff.id}
                     className="flex items-center justify-between rounded-xl bg-gray-50 px-3 py-2"
@@ -174,7 +221,7 @@ export default function ShiftDetailModal({
                         <i className="fa-solid fa-user text-[10px] text-(--color-primary)"></i>
                       </div>
                       <span className="text-foreground text-sm font-medium">
-                        {staff.staffId}
+                        <StaffName staffId={staff.staffId} />
                       </span>
                     </div>
                     {isManager && (
@@ -184,7 +231,7 @@ export default function ShiftDetailModal({
                         className="cursor-pointer rounded-lg border-none bg-transparent px-2 py-1 text-xs text-red-500 transition hover:bg-red-50"
                       >
                         <i className="fa-solid fa-user-minus mr-1"></i>
-                        Xóa
+                        Remove
                       </button>
                     )}
                   </div>
@@ -210,19 +257,16 @@ export default function ShiftDetailModal({
 
         {/* Footer actions */}
         <div className="flex gap-2 border-t border-(--color-border-light) px-5 py-4">
-          {/* {!isRegistered &&
-            !isFull &&
-            shift.status !== "approved_leave" &&
-            shift.status !== "absent" && (
-              <button
-                type="button"
-                onClick={handleRegister}
-                className="flex-1 cursor-pointer rounded-xl border-none bg-(--color-primary) px-4 py-2.5 text-sm font-semibold text-white transition hover:opacity-90"
-              >
-                <i className="fa-solid fa-calendar-plus mr-2"></i>
-                Đăng ký ca
-              </button>
-            )} */}
+          {!isManager && !isRegistered && !isFull && (
+            <button
+              type="button"
+              onClick={handleRegister}
+              className="flex-1 cursor-pointer rounded-xl border-none bg-(--color-primary) px-4 py-2.5 text-sm font-semibold text-white transition hover:opacity-90"
+            >
+              <i className="fa-solid fa-calendar-plus mr-2"></i>
+              Register
+            </button>
+          )}
           {isRegistered && (
             <button
               type="button"
@@ -230,7 +274,7 @@ export default function ShiftDetailModal({
               className="flex-1 cursor-pointer rounded-xl border border-red-200 bg-transparent px-4 py-2.5 text-sm font-semibold text-red-600 transition hover:bg-red-50"
             >
               <i className="fa-solid fa-calendar-minus mr-2"></i>
-              Hủy đăng ký
+              Unregister
             </button>
           )}
           {isManager && (
@@ -240,7 +284,7 @@ export default function ShiftDetailModal({
               className="cursor-pointer rounded-xl border border-red-200 bg-transparent px-4 py-2.5 text-sm font-semibold text-red-600 transition hover:bg-red-50"
             >
               <i className="fa-solid fa-trash mr-2"></i>
-              Xóa ca
+              Delete shift
             </button>
           )}
           <button
@@ -248,7 +292,7 @@ export default function ShiftDetailModal({
             onClick={onClose}
             className="cursor-pointer rounded-xl border border-(--color-border-light) bg-transparent px-4 py-2.5 text-sm font-medium text-(--color-text-secondary) transition hover:bg-gray-50"
           >
-            Đóng
+            Close
           </button>
         </div>
       </div>

components/organisms/shift-schedule/WeeklySchedule.tsx

@@ -7,7 +7,7 @@ import { useMemo, useState } from "react";
 
 import type { WeeklyScheduleProps } from "./ShiftSchedule.types";
 
-const MONTH_NAMES_EN = [
+const MONTH_NAMES = [
   "January",
   "February",
   "March",
@@ -23,19 +23,11 @@ const MONTH_NAMES_EN = [
 ];
 
 const DAY_LABELS = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-const DAY_LABELS_EN = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
 
 function formatDateShort(d: Date): string {
   return `${d.getDate().toString().padStart(2, "0")}/${(d.getMonth() + 1).toString().padStart(2, "0")}`;
 }
 
-function formatDateISO(d: Date): string {
-  const y = d.getFullYear();
-  const m = (d.getMonth() + 1).toString().padStart(2, "0");
-  const day = d.getDate().toString().padStart(2, "0");
-  return `${y}-${m}-${day}`;
-}
-
 function isToday(d: Date): boolean {
   const today = new Date(Date.now());
   return (
@@ -63,224 +55,229 @@ export default function WeeklySchedule({
     weekDates[0] ?? currentDate,
   );
 
-  const statusDotsByDate = useMemo(() => {
-    const map: Record<string, string[]> = {};
-    weekDates.forEach((date) => {
-      const dots: string[] = [];
-      // if (dayShifts.some((s) => s.status === "available"))
-      //   dots.push("bg-sky-300");
-      // if (dayShifts.some((s) => s.status === "registered"))
-      //   dots.push("bg-blue-600");
-      // if (dayShifts.some((s) => s.status === "approved_leave"))
-      //   dots.push("bg-purple-400");
-      // if (dayShifts.some((s) => s.status === "absent"))
-      //   dots.push("bg-rose-400");
-      map[date.toISOString()] = dots.slice(0, 3);
-    });
-    return map;
-  }, [weekDates, getShiftsForDate]);
-
-  const selectedDateStr = useMemo(() => {
-    const inWeek = weekDates.find((d) => d === selectedDate);
-    return inWeek ?? weekDates[0] ?? currentDate;
+  const selectedDateRef = useMemo(() => {
+    return (
+      weekDates.find((d) => d === selectedDate) ?? weekDates[0] ?? currentDate
+    );
   }, [selectedDate, weekDates, currentDate]);
 
-  const renderMobileDayView = mobileCalendarHeader && (
-    <div className="space-y-3">
-      <div className="rounded-xl border border-(--color-border-light) bg-white p-3">
-        <div className="mb-3 flex items-center justify-between">
-          <button
-            title="Previous week"
-            type="button"
-            onClick={goToPrevWeek}
-            className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-transparent text-(--color-text-muted) transition hover:bg-gray-100"
-          >
-            <i className="fa-solid fa-chevron-left text-xs"></i>
-          </button>
-          <h3 className="text-base font-bold text-(--color-primary-dark)">
-            {MONTH_NAMES_EN[currentDate.getMonth()]} {currentDate.getFullYear()}
-          </h3>
-          <button
-            title="Next week"
-            type="button"
-            onClick={goToNextWeek}
-            className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-transparent text-(--color-text-muted) transition hover:bg-gray-100"
-          >
-            <i className="fa-solid fa-chevron-right text-xs"></i>
-          </button>
-        </div>
-
-        <div className="grid grid-cols-7 gap-1">
-          {weekDates.map((date, i) => {
-            const active = date === selectedDateStr;
-            const dots = statusDotsByDate[date.toISOString()] ?? [];
-            return (
-              <button
-                key={i}
-                type="button"
-                onClick={() => setSelectedDate(date)}
-                className={`flex cursor-pointer flex-col items-center gap-1 rounded-xl border-none p-1 ${
-                  active ? "bg-(--color-primary)/10" : "bg-transparent"
-                }`}
-              >
-                <span
-                  className={`text-xs font-medium ${i >= 5 ? "text-pink-500" : "text-(--color-primary-dark)"}`}
-                >
-                  {DAY_LABELS_EN[i]}
-                </span>
-                <span
-                  className={`flex h-9 w-9 items-center justify-center rounded-full text-sm font-semibold ${
-                    active || isToday(new Date(date))
-                      ? "bg-indigo-500 text-white"
-                      : i >= 5
-                        ? "text-pink-500"
-                        : "text-sky-500"
-                  }`}
-                >
-                  {new Date(date).getDate()}
-                </span>
-                <div className="flex min-h-2 items-center gap-0.5">
-                  {dots.map((dot, idx) => (
-                    <span
-                      key={idx}
-                      className={`h-1.5 w-1.5 rounded-full ${dot}`}
-                    />
-                  ))}
-                </div>
-              </button>
-            );
-          })}
-        </div>
-      </div>
-
-      <div className="space-y-3">
-        {DEPARTMENTS.map((dept) => {
-          const deptShifts = getShiftsForDate(new Date(selectedDateStr));
-          // .filter(
-          //   (s) => s.department === dept.id,
-          // );
-          if (deptShifts.length === 0 && !onCreateShift) return null;
-          return (
-            <div
-              key={dept.id}
-              className="rounded-xl border border-(--color-border-light) bg-white p-3"
-            >
-              <div className="mb-2 flex items-center gap-2">
-                <i
-                  className={`${dept.icon} text-xs text-(--color-primary)`}
-                ></i>
-                <span className="text-xs font-semibold text-(--color-text-secondary)">
-                  {dept.name}
-                </span>
-              </div>
-              <div className="space-y-2">
-                {deptShifts.map((shift) => (
-                  <ShiftCard
-                    key={shift.id}
-                    shift={shift}
-                    onClick={onShiftClick}
-                  />
-                ))}
-                {onCreateShift && (
-                  <button
-                    type="button"
-                    onClick={() => onCreateShift(selectedDateStr)}
-                    className="flex w-full cursor-pointer items-center justify-center rounded-lg border border-dashed border-gray-300 bg-transparent py-2 text-xs text-gray-400 transition hover:border-(--color-primary) hover:text-(--color-primary)"
-                  >
-                    <i className="fa-solid fa-plus mr-1"></i>
-                    Add shift
-                  </button>
-                )}
-              </div>
-            </div>
-          );
-        })}
-      </div>
-    </div>
-  );
+  // ── Mobile calendar header view ────────────────────────────────────────────
 
   if (mobileCalendarHeader) {
-    return renderMobileDayView ?? null;
-  }
+    const dayShifts = getShiftsForDate(new Date(selectedDateRef));
 
-  return (
-    <div className="overflow-x-auto">
-      <table className="w-full min-w-225 border-collapse">
-        <thead>
-          <tr>
-            <th className="w-28 border-r border-b border-(--color-border-light) bg-gray-50 px-3 py-3 text-left text-xs font-semibold text-(--color-text-muted) uppercase">
-              Department
-            </th>
-            {weekDates.map((date, i) => (
-              <th
-                key={i}
-                className={`border-r border-b border-(--color-border-light) px-2 py-3 text-center text-xs ${
-                  isToday(new Date(date))
-                    ? "bg-(--color-primary)/10 font-bold text-(--color-primary)"
-                    : "bg-gray-50 font-semibold text-(--color-text-muted)"
-                }`}
-              >
-                <span className="block uppercase">{DAY_LABELS[i]}</span>
-                <span className="mt-0.5 block text-[11px] font-normal">
-                  {date.toISOString()}
-                </span>
-              </th>
-            ))}
-          </tr>
-        </thead>
-        <tbody>
-          {DEPARTMENTS.map((dept) => (
-            <tr key={dept.id}>
-              <td className="border-r border-b border-(--color-border-light) bg-gray-50/50 px-3 py-3 align-top">
-                <div className="flex items-center gap-2">
-                  <i
-                    className={`${dept.icon} text-xs text-(--color-primary)`}
-                  ></i>
-                  <span className="text-xs font-semibold text-(--color-text-secondary)">
-                    {dept.name}
+    return (
+      <div className="space-y-4">
+        {/* Week strip */}
+        <div className="overflow-hidden rounded-2xl border border-(--color-border-light) bg-white shadow-sm">
+          <div className="flex items-center justify-between border-b border-(--color-border-light) bg-gradient-to-r from-(--color-primary)/5 to-transparent px-4 py-3">
+            <button
+              title="Previous week"
+              type="button"
+              onClick={goToPrevWeek}
+              className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-white/80 text-(--color-text-muted) shadow-sm transition hover:bg-white hover:text-(--color-primary)"
+            >
+              <i className="fa-solid fa-chevron-left text-xs"></i>
+            </button>
+            <h3 className="text-sm font-bold text-(--color-primary-dark)">
+              {MONTH_NAMES[currentDate.getMonth()]} {currentDate.getFullYear()}
+            </h3>
+            <button
+              title="Next week"
+              type="button"
+              onClick={goToNextWeek}
+              className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-none bg-white/80 text-(--color-text-muted) shadow-sm transition hover:bg-white hover:text-(--color-primary)"
+            >
+              <i className="fa-solid fa-chevron-right text-xs"></i>
+            </button>
+          </div>
+          <div className="grid grid-cols-7 gap-1 p-3">
+            {weekDates.map((date, i) => {
+              const active = date === selectedDateRef;
+              const today = isToday(new Date(date));
+              const shifts = getShiftsForDate(new Date(date));
+              return (
+                <button
+                  key={i}
+                  type="button"
+                  onClick={() => setSelectedDate(date)}
+                  className="flex cursor-pointer flex-col items-center gap-1 rounded-xl border-none bg-transparent py-1.5 transition"
+                >
+                  <span
+                    className={`text-[10px] font-semibold uppercase ${i >= 5 ? "text-rose-400" : "text-(--color-text-muted)"}`}
+                  >
+                    {DAY_LABELS[i]}
                   </span>
-                </div>
-              </td>
-              {weekDates.map((date, i) => {
-                const dateStr = date;
-                const shifts = getShiftsForDate(new Date(date));
-                // .filter(
-                //   (s) => s.department === dept.id,
-                // );
-                return (
-                  <td
-                    key={i}
-                    className={`border-r border-b border-(--color-border-light) p-1.5 align-top ${
-                      isToday(new Date(date)) ? "bg-(--color-primary)/5" : ""
+                  <span
+                    className={`flex h-8 w-8 items-center justify-center rounded-full text-sm font-bold transition ${
+                      today
+                        ? "bg-(--color-primary) text-white shadow-sm"
+                        : active
+                          ? "bg-(--color-primary)/15 text-(--color-primary)"
+                          : i >= 5
+                            ? "text-rose-500"
+                            : "text-(--color-text-secondary)"
                     }`}
                   >
-                    <div className="flex min-h-20 flex-col gap-1">
-                      {shifts.map((shift) => (
-                        <ShiftCard
-                          key={shift.id}
-                          shift={shift}
-                          compact
-                          onClick={onShiftClick}
-                        />
-                      ))}
-                      {onCreateShift && (
-                        <button
-                          type="button"
-                          onClick={() => onCreateShift(dateStr)}
-                          className="mt-auto flex cursor-pointer items-center justify-center rounded-lg border border-dashed border-gray-300 bg-transparent py-1 text-[10px] text-gray-400 transition hover:border-(--color-primary) hover:text-(--color-primary)"
-                        >
-                          <i className="fa-solid fa-plus mr-1"></i>
-                          Add shift
-                        </button>
-                      )}
-                    </div>
-                  </td>
+                    {new Date(date).getDate()}
+                  </span>
+                  <div className="flex min-h-2 items-center gap-px">
+                    {shifts.length > 0 && (
+                      <span className="h-1.5 w-1.5 rounded-full bg-(--color-primary)/60" />
+                    )}
+                  </div>
+                </button>
+              );
+            })}
+          </div>
+        </div>
+
+        {/* Day shifts */}
+        <div className="space-y-3">
+          <div className="flex items-center justify-between px-1">
+            <h3 className="text-sm font-bold text-(--color-primary-dark)">
+              {DAY_LABELS[(new Date(selectedDateRef).getDay() + 6) % 7]},{" "}
+              {formatDateShort(new Date(selectedDateRef))}
+            </h3>
+            <span className="rounded-full bg-(--color-primary)/10 px-2.5 py-1 text-xs font-semibold text-(--color-primary)">
+              {dayShifts.length} shifts
+            </span>
+          </div>
+
+          {dayShifts.length === 0 && !onCreateShift ? (
+            <div className="rounded-2xl border border-dashed border-(--color-border-light) py-10 text-center">
+              <i className="fa-regular fa-calendar-xmark mb-2 text-3xl text-gray-200"></i>
+              <p className="text-sm text-(--color-text-muted)">
+                No shifts today
+              </p>
+            </div>
+          ) : (
+            <div className="space-y-2.5">
+              {dayShifts.map((shift) => (
+                <ShiftCard
+                  key={shift.id}
+                  shift={shift}
+                  onClick={onShiftClick}
+                />
+              ))}
+              {onCreateShift && (
+                <button
+                  type="button"
+                  onClick={() => onCreateShift(selectedDateRef)}
+                  className="flex w-full cursor-pointer items-center justify-center gap-2 rounded-2xl border border-dashed border-(--color-border-light) bg-transparent py-3 text-sm font-medium text-(--color-text-muted) transition hover:border-(--color-primary) hover:text-(--color-primary)"
+                >
+                  <i className="fa-solid fa-plus"></i>
+                  Add shift
+                </button>
+              )}
+            </div>
+          )}
+        </div>
+      </div>
+    );
+  }
+
+  // ── Desktop table view ──────────────────────────────────────────────────────
+
+  return (
+    <div className="overflow-hidden rounded-2xl border border-(--color-border-light) shadow-sm">
+      <div className="overflow-x-auto">
+        <table className="w-full min-w-[800px] border-collapse">
+          <thead>
+            <tr>
+              <th className="w-28 border-r border-b border-(--color-border-light) bg-gray-50/80 px-4 py-3 text-left text-[11px] font-semibold tracking-wider text-(--color-text-muted) uppercase">
+                Department
+              </th>
+              {weekDates.map((date, i) => {
+                const today = isToday(new Date(date));
+                return (
+                  <th
+                    key={i}
+                    className={`border-r border-b border-(--color-border-light) px-3 py-3 text-center text-xs transition ${
+                      today
+                        ? "bg-gradient-to-b from-(--color-primary)/15 to-(--color-primary)/5 font-bold text-(--color-primary)"
+                        : "bg-gray-50/80 font-semibold text-(--color-text-muted)"
+                    }`}
+                  >
+                    <span className="block text-[11px] font-semibold tracking-wider uppercase">
+                      {DAY_LABELS[i]}
+                    </span>
+                    <span
+                      className={`mt-0.5 inline-flex h-7 w-7 items-center justify-center rounded-full text-sm font-bold ${
+                        today
+                          ? "bg-(--color-primary) text-white shadow-sm"
+                          : "text-(--color-text-secondary)"
+                      }`}
+                    >
+                      {date.getDate()}
+                    </span>
+                    <span
+                      className={`mt-0.5 block text-[10px] font-normal ${today ? "text-(--color-primary)/70" : "text-(--color-text-muted)"}`}
+                    >
+                      {(date.getMonth() + 1).toString().padStart(2, "0")}/
+                      {date.getFullYear()}
+                    </span>
+                  </th>
                 );
               })}
             </tr>
-          ))}
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+            {DEPARTMENTS.map((dept, deptIdx) => (
+              <tr
+                key={dept.id}
+                className={deptIdx % 2 === 0 ? "bg-white" : "bg-gray-50/40"}
+              >
+                <td className="border-r border-b border-(--color-border-light) px-4 py-3 align-top">
+                  <div className="flex items-center gap-2">
+                    <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-lg bg-(--color-primary)/10">
+                      <i
+                        className={`${dept.icon} text-xs text-(--color-primary)`}
+                      ></i>
+                    </div>
+                    <span className="text-xs font-semibold text-(--color-text-secondary)">
+                      {dept.name}
+                    </span>
+                  </div>
+                </td>
+                {weekDates.map((date, i) => {
+                  const today = isToday(new Date(date));
+                  const shifts = getShiftsForDate(new Date(date));
+                  return (
+                    <td
+                      key={i}
+                      className={`border-r border-b border-(--color-border-light) p-2 align-top transition ${
+                        today ? "bg-(--color-primary)/5" : ""
+                      }`}
+                    >
+                      <div className="flex min-h-[88px] flex-col gap-1.5">
+                        {shifts.map((shift) => (
+                          <ShiftCard
+                            key={shift.id}
+                            shift={shift}
+                            compact
+                            onClick={onShiftClick}
+                          />
+                        ))}
+                        {onCreateShift && (
+                          <button
+                            type="button"
+                            onClick={() => onCreateShift(date)}
+                            className="mt-auto flex cursor-pointer items-center justify-center gap-1 rounded-lg border border-dashed border-gray-200 bg-transparent py-1.5 text-[10px] font-medium text-gray-300 transition hover:border-(--color-primary)/50 hover:text-(--color-primary)"
+                          >
+                            <i className="fa-solid fa-plus"></i>
+                            Add
+                          </button>
+                        )}
+                      </div>
+                    </td>
+                  );
+                })}
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
     </div>
   );
 }

components/templates/main-layout/MainLayout.tsx

@@ -1,6 +1,7 @@
 import { CartFab } from "@/components/organisms/cart";
 import Footer from "@/layouts/footer";
 import Header from "@/layouts/header";
+import { ManagerProvider } from "@/lib/manager-context";
 
 import type { MainLayoutProps } from "./MainLayout.types";
 
@@ -12,7 +13,9 @@ export default function MainLayout({ children }: MainLayoutProps) {
   return (
     <>
       {/* Sticky top header */}
-      <Header />
+      <ManagerProvider>
+        <Header />
+      </ManagerProvider>
 
       {/* Page content (grows to fill remaining height) */}
       <div className="flex-1">{children}</div>

k8s.yaml

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

layouts/header.tsx

@@ -2,6 +2,7 @@
 
 import { useAuth } from "@/lib/auth-context";
 import { SHOP_INFO } from "@/lib/constants";
+import { useManager } from "@/lib/manager-context";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
@@ -25,6 +26,7 @@ import { useRouter } from "next/navigation";
  */
 export default function Header() {
   const router = useRouter();
+  const { eatery } = useManager();
   const { user, logout } = useAuth();
 
   const handleAuthClick = () => {
@@ -47,7 +49,7 @@ export default function Header() {
           <div className="relative h-10 w-10 shrink-0 md:h-11 md:w-11">
             <Image
               src={SHOP_INFO.logo}
-              alt={`Logo ${SHOP_INFO.name}`}
+              alt={`${eatery?.name} logo`}
               fill
               className="object-contain transition-transform duration-200 group-hover:scale-105"
               sizes="44px"
@@ -58,7 +60,7 @@ export default function Header() {
           {/* Name + tagline */}
           <div className="flex flex-col leading-tight">
             <span className="text-base font-bold text-(--color-primary-dark) transition-colors duration-150 group-hover:text-(--color-primary) md:text-lg">
-              {SHOP_INFO.name}
+              {eatery?.name}
             </span>
             <span className="hidden text-xs text-(--color-text-muted) md:block">
               {SHOP_INFO.tagline}

lib/cart-context.tsx

@@ -18,11 +18,14 @@ interface CartContextValue {
   items: CartItemEntity[];
   totalItems: number;
   totalPrice: number;
+  cart: CartEntity;
+  eateryId: string | undefined;
   addToCart: (product: CartItemEntity) => void;
   increaseQty: (id: string) => void;
   decreaseQty: (id: string) => void;
   removeFromCart: (id: string) => void;
   setQuantity: (id: string, quantity: number) => void;
+  removeCart: () => void;
 }
 
 const CART_ID = "cartId";
@@ -119,6 +122,7 @@ export function CartProvider({ children }: { children: React.ReactNode }) {
           }
         } catch (err) {
           console.error("Lỗi khi tạo giỏ hàng:", err);
+          localStorage.removeItem(CART_ID);
         }
       }
     };
@@ -150,6 +154,25 @@ export function CartProvider({ children }: { children: React.ReactNode }) {
     if (result) setCart(result.addItem);
   };
 
+  const DELETE_CART = gql`
+    mutation deleteCart($cartId: String!) {
+      deleteCart(cartId: $cartId)
+    }
+  `;
+
+  const [mutateDeleteCart] = useMutation(DELETE_CART, {
+    client: cartClient,
+  });
+
+  const removeCart = async () => {
+    localStorage.removeItem(CART_ID);
+
+    await mutateDeleteCart({ variables: { cartId } });
+
+    setCartId(null);
+    setCart(null!);
+  };
+
   const setQuantity = async (id: string, newQuantity: number) => {
     if (!cartId) return;
 
@@ -184,13 +207,16 @@ export function CartProvider({ children }: { children: React.ReactNode }) {
       items: cart?.items,
       totalItems,
       totalPrice: cart?.totalAmount,
+      eateryId: cart?.eateryId,
       addToCart,
       increaseQty,
       decreaseQty,
       removeFromCart,
       setQuantity,
+      removeCart,
+      cart,
     }),
-    [cart?.items, cart?.totalAmount],
+    [cart?.items, cart?.totalAmount, cart?.eateryId],
   );
 
   return <CartContext.Provider value={value}>{children}</CartContext.Provider>;

lib/manager-context.tsx

@@ -12,6 +12,7 @@ import {
 
 import { eateryClient } from "./apollo-clients";
 import {
+  EateryEntity,
   type MenuItemEntity,
   type addMenuItemMutation,
   type allEateriesQuery,
@@ -21,11 +22,13 @@ import {
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
-export type ManagerTab = "products";
+export type ManagerTab = "products" | "reviews";
 
 interface ManagerContextType {
   // Data
   products: MenuItemEntity[];
+  eateryId: string | null;
+  eatery?: EateryEntity;
 
   // Active tab
   activeTab: ManagerTab;
@@ -48,6 +51,7 @@ const GET_EATERY_MENU = gql`
   query GetEateryMenu {
     allEateries {
       id
+      name
       menuItems {
         id
         name
@@ -96,6 +100,7 @@ const DELETE_MENU_ITEM = gql`
 
 export function ManagerProvider({ children }: { children: ReactNode }) {
   const [products, setProducts] = useState<MenuItemEntity[]>([]);
+  const [eatery, setEatery] = useState<EateryEntity>();
   const [activeTab, setActiveTab] = useState<ManagerTab>("products");
 
   const { data } = useQuery<allEateriesQuery>(GET_EATERY_MENU, {
@@ -103,6 +108,8 @@ export function ManagerProvider({ children }: { children: ReactNode }) {
     fetchPolicy: "network-only",
   });
 
+  const eateryId = data?.allEateries?.[0]?.id ?? null;
+
   const [mutateAddMenuItem] = useMutation<addMenuItemMutation>(ADD_MENU_ITEM, {
     client: eateryClient,
   });
@@ -120,6 +127,7 @@ export function ManagerProvider({ children }: { children: ReactNode }) {
   useEffect(() => {
     if (data?.allEateries?.[0]) {
       setProducts(data.allEateries[0].menuItems);
+      setEatery(data.allEateries[0]);
     }
   }, [data]);
 
@@ -190,7 +198,9 @@ export function ManagerProvider({ children }: { children: ReactNode }) {
   return (
     <ManagerContext.Provider
       value={{
+        eatery,
         products,
+        eateryId,
         activeTab,
         setActiveTab,
         addProduct,

lib/shift-context.tsx

@@ -41,18 +41,17 @@ interface ShiftContextType {
     shiftId: string,
     staffId: string,
     staffName: string,
-  ) => { success: boolean; error?: string };
+  ) => Promise<{ success: boolean; error?: string }>;
   unregisterShift: (shiftId: string, staffId: string) => void;
   createShift: (shift: Omit<ShiftEntity, "id">) => void;
-  updateShift: (shift: ShiftEntity) => void;
-  deleteShift: (shiftId: string) => void;
+  deleteShift: (shiftId: string) => Promise<void>;
 
   // Helpers
   getShiftsForDate: (date: Date) => ShiftEntity[];
   getShiftsForWeek: (weekStart: Date) => ShiftEntity[];
   getWeekDates: () => Date[];
   hasConflict: (
-    date: Date,
+    date: Date | string,
     startTime: string,
     endTime: string,
     staffId: string,
@@ -83,6 +82,21 @@ function formatDate(d: Date): string {
   return `${y}-${m}-${day}`;
 }
 
+// Dùng local date parts thay vì toISOString() để tránh lệch timezone UTC+7
+function toLocalDateISO(d: Date): string {
+  const y = d.getFullYear();
+  const m = String(d.getMonth() + 1).padStart(2, "0");
+  const day = String(d.getDate()).padStart(2, "0");
+  return `${y}-${m}-${day}T00:00:00.000Z`;
+}
+
+// Normalize Date or ISO string to "YYYY-MM-DD" for safe comparison
+function dateKey(d: Date | string | undefined): string {
+  if (!d) return "";
+  if (d instanceof Date) return formatDate(d);
+  return (d as string).slice(0, 10);
+}
+
 function timeToMinutes(time: string): number {
   const [h, m] = time.split(":").map(Number);
   return h * 60 + m;
@@ -113,6 +127,7 @@ const GET_ALL_SHIFTS = gql`
       maxStaff
       wage
       registeredStaff {
+        id
         staffId
       }
     }
@@ -128,9 +143,20 @@ const CREATE_SHIFT = gql`
       endTime
       maxStaff
       wage
-      registeredStaff {
-        staffId
-      }
+    }
+  }
+`;
+
+const DELETE_SHIFT = gql`
+  mutation deleteShift($id: String!) {
+    deleteShift(id: $id)
+  }
+`;
+
+const REGISTER_SHIFT = gql`
+  mutation registerShift($RegisterShiftInput: RegisterShiftInput) {
+    registerShift(registration: $RegisterShiftInput) {
+      staffId
     }
   }
 `;
@@ -142,7 +168,7 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
   const [view, setView] = useState<ScheduleView>("week");
   const [currentDate, setCurrentDate] = useState<Date>(new Date(2026, 3, 10)); // April 10, 2026
 
-  const { data } = useQuery<allShiftsQuery>(GET_ALL_SHIFTS, {
+  const { data, refetch } = useQuery<allShiftsQuery>(GET_ALL_SHIFTS, {
     client: eateryClient,
     fetchPolicy: "network-only",
   });
@@ -151,6 +177,18 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
     client: eateryClient,
   });
 
+  const [mutateDeleteShift] = useMutation<{ deleteShift: boolean }>(
+    DELETE_SHIFT,
+    {
+      client: eateryClient,
+    },
+  );
+
+  const [mutateRegisterShift] = useMutation<
+    { registerShift: { staffId: string } },
+    { RegisterShiftInput: { shiftId: string } }
+  >(REGISTER_SHIFT, { client: eateryClient });
+
   useEffect(() => {
     if (data) setShifts(data.allShifts);
   }, [data]);
@@ -206,9 +244,8 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
 
   const getShiftsForDate = useCallback(
     (date: Date): ShiftEntity[] => {
-      return shifts.filter((s) => {
-        return new Date(s.date).getDate() === date.getDate();
-      });
+      const key = formatDate(date);
+      return shifts.filter((s) => dateKey(s.date) === key);
     },
     [shifts],
   );
@@ -220,24 +257,26 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
         d.setDate(weekStart.getDate() + i);
         return d;
       });
-      return shifts.filter((s) => dates.includes(s.date));
+      const keys = new Set(dates.map(formatDate));
+      return shifts.filter((s) => keys.has(dateKey(s.date)));
     },
     [shifts],
   );
 
   const hasConflict = useCallback(
     (
-      date: Date,
+      date: Date | string,
       startTime: string,
       endTime: string,
       staffId: string,
       excludeShiftId?: string,
     ): boolean => {
+      const key = dateKey(date);
       return shifts.some(
         (s) =>
-          s.date === date &&
+          dateKey(s.date) === key &&
           s.id !== excludeShiftId &&
-          s.registeredStaff!.some((rs) => rs.id === staffId) &&
+          (s.registeredStaff ?? []).some((rs) => rs.id === staffId) &&
           timesOverlap(startTime, endTime, s.startTime, s.endTime),
       );
     },
@@ -246,33 +285,39 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
 
   const getWeeklyBudget = useCallback((): number => {
     const weekDates = getWeekDates();
+    const weekKeys = new Set(weekDates.map(formatDate));
     return shifts
       .filter(
-        (s) => weekDates.includes(s.date) && s.registeredStaff!.length > 0,
+        (s) =>
+          weekKeys.has(dateKey(s.date)) && (s.registeredStaff ?? []).length > 0,
       )
-      .reduce((sum, s) => sum + s.wage * s.registeredStaff!.length, 0);
+      .reduce(
+        (sum, s) => sum + (s.wage ?? 0) * (s.registeredStaff ?? []).length,
+        0,
+      );
   }, [shifts, getWeekDates]);
 
   // ── Shift actions ───────────────────────────────────────────────────────
 
   const registerShift = useCallback(
-    (
+    async (
       shiftId: string,
       staffId: string,
       staffName: string,
-    ): { success: boolean; error?: string } => {
+    ): Promise<{ success: boolean; error?: string }> => {
       const shift = shifts.find((s) => s.id === shiftId);
       if (!shift) return { success: false, error: "Ca làm không tồn tại." };
 
-      if (shift.registeredStaff!.length >= shift.maxStaff) {
+      if ((shift.registeredStaff ?? []).length >= shift.maxStaff) {
         return { success: false, error: "Ca làm đã đủ người." };
       }
 
-      if (shift.registeredStaff!.some((rs) => rs.id === staffId)) {
+      if ((shift.registeredStaff ?? []).some((rs) => rs.id === staffId)) {
         return { success: false, error: "Bạn đã đăng ký ca này rồi." };
       }
 
       if (
+        shift.date &&
         hasConflict(
           shift.date,
           shift.startTime,
@@ -287,31 +332,28 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
         };
       }
 
-      // setShifts((prev) =>
-      //   prev.map((s) =>
-      //     s.id === shiftId
-      //       ? {
-      //           ...s,
-      //           registeredStaff: [
-      //             ...s.registeredStaff,
-      //             { staffId, name: staffName },
-      //           ],
-      //           status: "registered" as ShiftStatus,
-      //         }
-      //       : s,
-      //   ),
-      // );
-
-      return { success: true };
+      try {
+        await mutateRegisterShift({
+          variables: { RegisterShiftInput: { shiftId } },
+        });
+        refetch();
+        return { success: true };
+      } catch (err: unknown) {
+        const message =
+          err instanceof Error ? err.message : "Đăng ký thất bại, thử lại sau.";
+        return { success: false, error: message };
+      }
     },
-    [shifts, hasConflict],
+    [shifts, hasConflict, mutateRegisterShift, refetch],
   );
 
   const unregisterShift = useCallback((shiftId: string, staffId: string) => {
     setShifts((prev) =>
       prev.map((s) => {
         if (s.id !== shiftId) return s;
-        const updated = s.registeredStaff!.filter((rs) => rs.id !== staffId);
+        const updated = (s.registeredStaff ?? []).filter(
+          (rs) => rs.id !== staffId,
+        );
         return {
           ...s,
           registeredStaff: updated,
@@ -320,23 +362,60 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
     );
   }, []);
 
-  const createShift = useCallback(async (shift: Omit<ShiftEntity, "id">) => {
-    const { data } = await mutateCreateShift({
-      variables: {
-        shiftInput: shift,
-      },
-    });
+  const createShift = useCallback(
+    async (shift: Omit<ShiftEntity, "id">) => {
+      try {
+        const { data } = await mutateCreateShift({
+          variables: {
+            shiftInput: {
+              date: toLocalDateISO(shift.date ?? new Date()),
+              startTime: shift.startTime,
+              endTime: shift.endTime,
+              maxStaff: shift.maxStaff,
+              wage: shift.wage,
+            },
+          },
+        });
 
-    if (data) setShifts((prev) => [...prev, data.createShift]);
-  }, []);
+        if (data) {
+          // Optimistic: dùng date từ server nếu có, fallback sang local
+          const serverDate = data.createShift.date
+            ? new Date(data.createShift.date as unknown as string)
+            : shift.date;
+          setShifts((prev) => [
+            ...prev,
+            {
+              ...data.createShift,
+              date: serverDate,
+              wage: data.createShift.wage ?? shift.wage,
+              registeredStaff: [],
+            },
+          ]);
+          // Refetch để đồng bộ với server
+          refetch();
+        }
+      } catch (err) {
+        console.error("[createShift] mutation failed:", err);
+      }
+    },
+    [mutateCreateShift, refetch],
+  );
 
-  const updateShift = useCallback((shift: ShiftEntity) => {
-    setShifts((prev) => prev.map((s) => (s.id === shift.id ? shift : s)));
-  }, []);
-
-  const deleteShift = useCallback((shiftId: string) => {
-    setShifts((prev) => prev.filter((s) => s.id !== shiftId));
-  }, []);
+  const deleteShift = useCallback(
+    async (shiftId: string) => {
+      try {
+        const { data } = await mutateDeleteShift({
+          variables: { id: shiftId },
+        });
+        if (data?.deleteShift) {
+          setShifts((prev) => prev.filter((s) => s.id !== shiftId));
+        }
+      } catch (err) {
+        console.error("[deleteShift] mutation failed:", err);
+      }
+    },
+    [mutateDeleteShift],
+  );
 
   return (
     <ShiftContext.Provider
@@ -353,7 +432,6 @@ export function ShiftProvider({ children }: { children: ReactNode }) {
         registerShift,
         unregisterShift,
         createShift,
-        updateShift,
         deleteShift,
         getShiftsForDate,
         getShiftsForWeek,

lib/types.ts

@@ -96,10 +96,11 @@ export interface ShiftRegistrationEntity {
 
 export interface ShiftEntity {
   id: string;
-  date: Date;
+  name?: string;
+  date?: Date;
   startTime: string;
   endTime: string;
-  wage: number;
+  wage?: number;
   maxStaff: number;
   registeredStaff?: ShiftRegistrationEntity[];
 }
@@ -152,6 +153,7 @@ export interface CartItemEntity {
 
 export interface CartEntity {
   Id: string;
+  eateryId: string;
   items: CartItemEntity[];
   totalAmount: number;
   paymentQrUrl: string;

next.config.ts

@@ -20,7 +20,7 @@ const nextConfig: NextConfig = {
     ],
   },
   async rewrites() {
-    const gatewayUrl = "http://localhost:32080";
+    const gatewayUrl = "http://172.17.0.1:32080";
     return [
       {
         source: "/api/:path*",

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "temp",
-  "version": "1.2.9",
+  "version": "1.2.13",
   "private": true,
   "scripts": {
     "dev": "next dev",

pnpm-lock.yaml

@@ -1485,8 +1485,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.355:
-    resolution: {integrity: sha512-LUPZhKzZPYSPme1jEYohpkA+ybYCJztr1quAdBd7E7h3+VOBVcKkwwtBJu41nrjawrRzfb8mtMfzWozoaK0ZIQ==}
+  electron-to-chromium@1.5.356:
+    resolution: {integrity: sha512-9NgFd7m5t5MCJ5rUSjJITUXAH9mEGlrlofnMf4YEr+pz6JlP7cWmTAH+JFmbPnaSW8koVTkuW7pacORWAnA5Yw==}
 
   emoji-regex@10.6.0:
     resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
@@ -4984,7 +4984,7 @@ snapshots:
     dependencies:
       baseline-browser-mapping: 2.10.29
       caniuse-lite: 1.0.30001792
-      electron-to-chromium: 1.5.355
+      electron-to-chromium: 1.5.356
       node-releases: 2.0.44
       update-browserslist-db: 1.2.3(browserslist@4.28.2)
 
@@ -5315,7 +5315,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.355: {}
+  electron-to-chromium@1.5.356: {}
 
   emoji-regex@10.6.0: {}