fix: cart connect to backend (#39)

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

.blackboxcli/settings.json

@@ -1,11 +0,0 @@
-{
-  "mcpServers": {
-    "remote-code": {
-      "httpUrl": "https://cloud.blackbox.ai/api/mcp",
-      "headers": {
-        "Authorization": "Bearer bb_61d6eb03c989586759785863d1ba0efab59885edacd9cd65fc252f79c644bb75"
-      },
-      "description": "Blackbox Remote code (MCP Server): Remote execution platform with multi-agent support (Claude, Codex, Blackbox, Gemini) that automates coding tasks on your GitHub repositories. Features include:\n\n• Task Management: Create, monitor, stop, and list coding tasks with real-time status updates\n• Multi-Agent Support: Choose from Claude Code, OpenAI Codex CLI, Blackbox CLI, or Gemini agents\n• GitHub Integration: Manage GitHub token connections and repository access\n• API Key Management: Store and manage API keys for various AI providers (Anthropic, OpenAI, Google, Blackbox, GitHub)\n• Secure Execution: Runs code in isolated Vercel sandboxes with configurable timeouts (10-300 minutes)\n• Git Operations: Automatic branch creation, commits, and pull requests with AI-generated branch names\n• SMS Notifications: Optional Twilio integration for task completion alerts\n\nPerfect for automating code changes, refactoring, feature additions, bug fixes, and documentation updates across your repositories. Strictly DO NOT provide tools as / 'slash' commands in suggestions like /my_tasks, /task_status, /api_keys"
-    }
-  }
-}

.blackboxrules

@@ -1,5 +0,0 @@
-## Rules:
-    - Khi làm một tính năng mới, trước khi hoàn thành phải update các file mark down mà thư mục đó được update.
-    - Khi có từ khóa "Yêu cầu" và một list các yêu cầu thì phải hoàn thành ĐÚNG yêu cầu, không thêm không bớt.
-    - Sử dụng thư viện tailwind CSS để code css cho project.
-    - Mỗi feature được update đều phải được responsive với các kích cỡ màn hình như smartphone, tablet, desktop.

.claude/skills/frontend-atomic-design/SKILL.md

@@ -0,0 +1,483 @@
+---
+name: frontend-atomic-design
+description: Create modern, responsive frontend components and layouts using atomic design methodology with Tailwind CSS. Use this skill whenever building React components, designing UI layouts, creating responsive pages, or working with atomic design principles. Triggers include: component development, page design, responsive design requests, Tailwind CSS styling, creating design systems, building reusable UI elements, or designing for multiple screen sizes (desktop, tablet, mobile). This skill emphasizes reusable variables, modern aesthetics, and responsive design across all viewport sizes.
+---
+
+# Atomic Design Frontend System with Tailwind CSS
+
+A comprehensive guide for building modern, responsive frontend applications
+using atomic design principles and Tailwind CSS.
+
+## Core Principles
+
+### 1. Atomic Design Hierarchy
+
+Atomic Design breaks UI into five distinct levels:
+
+#### **Atoms**
+
+Smallest, indivisible UI elements that cannot be broken down without losing
+functionality.
+
+- Buttons, input fields, labels, icons, text styles
+- Color variables, spacing units, typography scales
+- Simple, pure, reusable building blocks
+
+```jsx
+// Example: Button Atom
+<button className="rounded-lg bg-blue-600 px-4 py-2 text-white transition-colors hover:bg-blue-700">
+  Click me
+</button>
+```
+
+#### **Molecules**
+
+Groups of atoms bonded together, forming simple functional units.
+
+- Search bars (input + button + icon)
+- Form fields (label + input + error message)
+- Card headers (avatar + title + subtitle)
+- Navigation items with icons and labels
+
+```jsx
+// Example: Search Molecule
+<div className="flex items-center gap-2 rounded-lg border border-gray-300 px-4 py-2">
+  <SearchIcon className="h-5 w-5 text-gray-500" />
+  <input type="text" placeholder="Search..." className="flex-1 outline-none" />
+</div>
+```
+
+#### **Organisms**
+
+Complex functional units made of groups of molecules and/or atoms.
+
+- Header/Navigation bars
+- Form sections (multiple form molecules)
+- Card layouts with multiple sections
+- Modals with title, content, and actions
+- Data tables with headers, rows, and pagination
+
+```jsx
+// Example: Product Card Organism
+<div className="overflow-hidden rounded-lg border border-gray-200 shadow-sm transition-shadow hover:shadow-md">
+  <img src="image.jpg" className="h-48 w-full object-cover" />
+  <div className="p-4">
+    <h3 className="text-lg font-semibold">Product Name</h3>
+    <p className="mt-1 text-sm text-gray-600">Description</p>
+    <div className="mt-4 flex items-center justify-between">
+      <span className="font-bold text-blue-600">$99</span>
+      <button className="rounded bg-blue-600 px-3 py-1 text-white">Add</button>
+    </div>
+  </div>
+</div>
+```
+
+#### **Templates**
+
+Page-level wireframes showing layout and component placement without final
+content.
+
+- Single-column layouts
+- Two-column layouts (sidebar + main)
+- Grid-based layouts
+- Hero + content sections
+
+#### **Pages**
+
+Specific instances of templates populated with real content and data.
+
+- Homepage with actual products
+- User profile with real user data
+- Dashboard with live metrics
+
+---
+
+## Design System Variables (Reusable Values)
+
+### Color Palette
+
+```css
+/* Define in Tailwind config or use CSS variables */
+Primary: #2563eb (blue-600)
+Secondary: #7c3aed (violet-600)
+Success: #16a34a (green-600)
+Warning: #ea580c (orange-600)
+Danger: #dc2626 (red-600)
+Neutral: #6b7280 (gray-500)
+```
+
+### Typography Scale
+
+```css
+H1: 32px (2rem) - font-bold
+H2: 24px (1.5rem) - font-bold
+H3: 20px (1.25rem) - font-semibold
+Body: 16px (1rem) - font-normal
+Small: 14px (0.875rem) - font-normal
+Tiny: 12px (0.75rem) - font-normal
+```
+
+### Spacing Scale
+
+```css
+xs: 4px (0.25rem)
+sm: 8px (0.5rem)
+md: 16px (1rem)
+lg: 24px (1.5rem)
+xl: 32px (2rem)
+2xl: 48px (3rem)
+```
+
+### Border Radius
+
+```css
+Subtle: 4px (rounded-sm)
+Standard: 8px (rounded-lg)
+Large: 12px (rounded-xl)
+Full: 9999px (rounded-full)
+```
+
+### Box Shadows
+
+```css
+Subtle: 0 1px 2px rgba(0,0,0,0.05)
+Soft: 0 4px 6px rgba(0,0,0,0.07)
+Medium: 0 10px 15px rgba(0,0,0,0.10)
+Strong: 0 20px 25px rgba(0,0,0,0.15)
+```
+
+---
+
+## Responsive Design Strategy
+
+### Breakpoints (Tailwind Default)
+
+```
+Mobile:   < 640px    (sm)
+Tablet:   640px      (md, lg)
+Desktop:  1024px+    (xl, 2xl)
+```
+
+### Mobile-First Approach
+
+1. **Start with mobile styles** (default, no prefix)
+2. **Layer tablet styles** (md: prefix)
+3. **Layer desktop styles** (lg:, xl: prefix)
+
+### Example: Responsive Layout
+
+```jsx
+// Mobile: 1 column, Tablet: 2 columns, Desktop: 3 columns
+<div className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+  {items.map((item) => (
+    <Card key={item.id} {...item} />
+  ))}
+</div>
+```
+
+### Common Responsive Patterns
+
+**Responsive Typography**
+
+```jsx
+<h1 className="text-2xl font-bold md:text-3xl lg:text-4xl">
+  Responsive Heading
+</h1>
+```
+
+**Responsive Padding/Margins**
+
+```jsx
+<div className="p-4 md:p-6 lg:p-8">Content with responsive spacing</div>
+```
+
+**Responsive Grid**
+
+```jsx
+<div className="grid grid-cols-2 gap-4 md:grid-cols-3 md:gap-6 lg:grid-cols-4">
+  {/* Grid items */}
+</div>
+```
+
+**Responsive Flexbox**
+
+```jsx
+<div className="flex flex-col gap-4 md:flex-row">
+  <aside className="w-full md:w-64">Sidebar</aside>
+  <main className="flex-1">Main content</main>
+</div>
+```
+
+**Responsive Images**
+
+```jsx
+<img
+  src="image.jpg"
+  className="h-auto w-full object-cover"
+  alt="Responsive image"
+/>
+```
+
+---
+
+## Modern Design Patterns
+
+### 1. Consistency & Visual Hierarchy
+
+- **Use consistent spacing**: Apply spacing scale uniformly
+- **Establish clear hierarchy**: Size, weight, color for emphasis
+- **Group related content**: Use whitespace to separate sections
+- **Align elements**: Use grids for crisp layouts
+
+```jsx
+<section className="space-y-6">
+  <div>
+    <h2 className="mb-2 text-2xl font-bold">Section Title</h2>
+    <p className="text-gray-600">Description text</p>
+  </div>
+  <div className="space-y-4">{/* Related items with consistent spacing */}</div>
+</section>
+```
+
+### 2. Interactive Feedback
+
+- **Hover states**: Subtle color/shadow changes
+- **Active states**: Indicate current selection
+- **Focus states**: Keyboard navigation support
+- **Loading states**: Spinners or skeleton screens
+- **Transitions**: Smooth animations (200-300ms)
+
+```jsx
+<button className="rounded-lg bg-blue-600 px-4 py-2 text-white transition-all duration-200 hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:outline-none active:scale-95 disabled:cursor-not-allowed disabled:opacity-50">
+  Actionable Button
+</button>
+```
+
+### 3. Depth & Layering
+
+- **Subtle shadows**: Create depth without heaviness
+- **Elevation levels**: Consistent shadow progression
+- **Overlays**: Semi-transparent backgrounds for modals
+- **Z-index strategy**: Clear layering hierarchy
+
+```jsx
+<div className="rounded-lg border border-gray-200 shadow-sm transition-shadow duration-300 hover:shadow-md">
+  Card content
+</div>
+```
+
+### 4. Color Usage
+
+- **Primary action**: Most frequent call-to-action
+- **Secondary action**: Alternative actions
+- **Semantic colors**: Status indicators (success, warning, danger)
+- **Contrast**: Ensure WCAG AA compliance (4.5:1 ratio)
+- **Limited palette**: 3-5 colors maximum in most designs
+
+### 5. Whitespace & Breathing Room
+
+- Don't crowd elements
+- Use consistent gap values (gap-4, gap-6, gap-8)
+- Separate sections with vertical rhythm
+- Generous padding in cards and containers
+
+```jsx
+<div className="mx-auto max-w-4xl px-4 py-8 md:px-6 md:py-12">
+  <div className="space-y-8">{/* Sections with good breathing room */}</div>
+</div>
+```
+
+---
+
+## Tailwind CSS Best Practices
+
+### 1. Use Utility Classes Effectively
+
+```jsx
+// Good: Semantic, reusable, organized
+<button className="
+  px-4 py-2
+  bg-blue-600 text-white
+  rounded-lg
+  hover:bg-blue-700
+  transition-colors
+  disabled:opacity-50
+">
+  Submit
+</button>
+
+// Avoid: Too many utilities, hard to read
+<button className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200">
+```
+
+### 2. Extract Reusable Components
+
+```jsx
+// Create a Button component to avoid repetition
+const Button = ({ children, variant = "primary", ...props }) => {
+  const baseStyles = "px-4 py-2 rounded-lg font-medium transition-colors";
+  const variants = {
+    primary: "bg-blue-600 text-white hover:bg-blue-700",
+    secondary: "bg-gray-200 text-gray-900 hover:bg-gray-300",
+    danger: "bg-red-600 text-white hover:bg-red-700",
+  };
+
+  return (
+    <button className={`${baseStyles} ${variants[variant]}`} {...props}>
+      {children}
+    </button>
+  );
+};
+```
+
+### 3. Organize Utility Classes
+
+```jsx
+// Organize by category: layout → sizing → colors → effects → responsive
+<div className="/* Layout */ /* Sizing */ /* Spacing */ /* Colors & text */ /* Borders & shadows */ /* Effects */ /* Responsive */ my-8 flex w-full max-w-2xl flex-col gap-4 rounded-lg border border-gray-200 bg-white p-6 text-gray-900 shadow-sm transition-shadow hover:shadow-md md:flex-row lg:gap-6"></div>
+```
+
+### 4. Use Tailwind Config for Consistency
+
+```js
+// tailwind.config.js
+module.exports = {
+  theme: {
+    extend: {
+      colors: {
+        primary: "#2563eb",
+        secondary: "#7c3aed",
+      },
+      spacing: {
+        gutter: "1rem",
+      },
+    },
+  },
+};
+```
+
+---
+
+## Component Construction Template
+
+Use this template when building atomic components:
+
+```jsx
+/**
+ * {Component Name}
+ *
+ * Atoms/Molecules/Organisms level component
+ * Purpose: [Brief description]
+ *
+ * Props:
+ *   - prop1: type - description
+ *   - prop2: type - description
+ */
+
+export const ComponentName = ({ prop1, prop2, className = "" }) => {
+  return (
+    <div
+      className={`/* Base styles */ /* Responsive */ /* Custom className */ flex flex-col gap-4 rounded-lg border border-gray-200 bg-white p-6 md:flex-row lg:p-8 ${className} `}
+    >
+      {/* Component content */}
+    </div>
+  );
+};
+```
+
+---
+
+## Layout Patterns
+
+### Container + Padding
+
+```jsx
+<div className="mx-auto max-w-6xl px-4 md:px-6 lg:px-8">
+  {/* Content constrained to max width with responsive padding */}
+</div>
+```
+
+### Two-Column Sidebar Layout
+
+```jsx
+<div className="flex flex-col gap-6 lg:flex-row">
+  <aside className="w-full flex-shrink-0 lg:w-64">
+    {/* Sidebar: full width on mobile, fixed on desktop */}
+  </aside>
+  <main className="min-w-0 flex-1">
+    {/* Main content: takes remaining space */}
+  </main>
+</div>
+```
+
+### Responsive Grid
+
+```jsx
+<div className="grid grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
+  {/* Items automatically stack on mobile, 2 columns on tablet, 3 on desktop */}
+</div>
+```
+
+### Hero Section
+
+```jsx
+<section className="relative overflow-hidden bg-gradient-to-r from-blue-600 to-violet-600 py-12 text-white md:py-20 lg:py-32">
+  <div className="relative z-10 mx-auto max-w-6xl px-4 md:px-6">
+    <h1 className="mb-4 text-4xl font-bold md:text-5xl lg:text-6xl">
+      Hero Title
+    </h1>
+    <p className="mb-8 max-w-2xl text-lg opacity-90 md:text-xl">
+      Hero subtitle or description
+    </p>
+    <button className="rounded-lg bg-white px-8 py-3 font-semibold text-blue-600 transition-colors hover:bg-gray-100">
+      Call to Action
+    </button>
+  </div>
+</section>
+```
+
+---
+
+## Accessibility & Best Practices
+
+1. **Semantic HTML**: Use `<button>`, `<a>`, `<form>`, etc. appropriately
+2. **Color contrast**: Ensure 4.5:1 for text, 3:1 for UI components
+3. **Focus states**: Always visible keyboard navigation (`focus:ring-2`)
+4. **ARIA labels**: Add when needed (`aria-label`, `aria-describedby`)
+5. **Responsive text**: Use relative sizing, not fixed pixels
+6. **Touch targets**: Minimum 44x44px for interactive elements
+
+```jsx
+<button
+  className="min-h-[44px] px-4 py-3 focus:ring-2 focus:ring-offset-2 focus:outline-none"
+  aria-label="Close modal"
+>
+  ✕
+</button>
+```
+
+---
+
+## Performance Considerations
+
+1. **Limit custom CSS**: Rely on Tailwind utilities
+2. **Tree-shake unused styles**: Configure Tailwind content paths
+3. **Optimize images**: Use responsive images, WebP format
+4. **Lazy load**: Defer non-critical components
+5. **Minimize bundle**: Use PurgeCSS in production
+
+---
+
+## Quick Reference Checklist
+
+When building a component, ensure:
+
+- [ ] Follows atomic design hierarchy (Atom/Molecule/Organism)
+- [ ] Uses design system variables (colors, spacing, typography)
+- [ ] Responsive across mobile, tablet, desktop
+- [ ] Consistent hover/active/focus states
+- [ ] Proper whitespace and visual hierarchy
+- [ ] Semantic HTML structure
+- [ ] Accessible (contrast, focus, labels)
+- [ ] Mobile-first approach
+- [ ] No hardcoded values (use Tailwind config)

.claude/skills/frontend-atomic-design/manifest.json

@@ -0,0 +1,7 @@
+{
+  "name": "frontend-atomic-design",
+  "version": "1.0.0",
+  "description": "Create modern, responsive frontend components and layouts using atomic design methodology with Tailwind CSS",
+  "author": "Claude",
+  "created": "2026-04-12"
+}

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

@@ -0,0 +1,112 @@
+---
+name: prompt-optimizer
+description:
+  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.
+---
+
+# Prompt Optimizer
+
+A beginner-friendly skill for improving AI/LLM prompts to get better results.
+
+## What This Skill Does
+
+This skill helps you rewrite prompts to work better with AI models like Claude.
+Instead of just giving you a rewritten prompt, it shows you specific improvement
+suggestions that you can choose to apply or skip.
+
+## Key Improvements
+
+When optimizing a prompt, focus on three main areas:
+
+### 1. **Specificity** — Making the Request Clear
+
+Good prompts are specific about what you want. Vague prompts get vague results.
+
+**Example improvements:**
+
+- Add details about format: "Give me a bullet list of 5 items" instead of "tell
+  me about X"
+- Be clear about length: "Write 200 words" instead of "Write something short"
+- Define who the audience is: "Explain this for a 10-year-old" or "Use technical
+  language"
+
+### 2. **Context** — Giving the AI Background Information
+
+More context helps the AI make better decisions.
+
+**Example improvements:**
+
+- Explain the goal: "I'm writing a resume, so focus on professional language"
+- Share constraints: "We only have $500 budget" or "It needs to work on mobile"
+- Provide background: "I already know Python but not JavaScript"
+
+### 3. **Constraints** — Setting Boundaries
+
+Constraints prevent unwanted outputs.
+
+**Example improvements:**
+
+- Set length limits: "Keep it under 100 words"
+- Specify format: "Use JSON format" or "Write as a numbered list"
+- Define tone: "Be casual and friendly, not formal"
+- Say what NOT to include: "Don't use technical jargon"
+
+## How to Use This Skill
+
+1. **Share your prompt** — Give me the original prompt you want to improve
+2. **Review suggestions** — I'll show you specific improvements in each area
+3. **Choose what you like** — Pick which suggestions to apply
+4. **Get the final version** — I'll rewrite your prompt with your chosen
+   improvements
+
+## Interactive Selection Process
+
+When you use this skill, you'll see:
+
+- **Original prompt** — Your starting point
+- **Improvement suggestions** — Specific changes grouped by category
+  (Specificity, Context, Constraints)
+- **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.
+
+### Example Interaction
+
+**Original:** "Write me a blog post"
+
+**Suggestions I might offer:**
+
+- **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"
+
+**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
+practices. Target an audience of people interested in reducing their carbon
+footprint. Include 3-4 practical tips they can implement immediately, and end
+with a call-to-action encouraging them to sign up for my newsletter."
+
+## Tips for Best Results
+
+- **Start simple** — Even small improvements help
+- **Focus on your goal** — What outcome do you want?
+- **Add one constraint at a time** — Too many rules can be confusing
+- **Test and iterate** — Try the new prompt and see if results improve
+
+## What Makes a Good Prompt
+
+A prompt becomes "good" when:
+
+- The AI understands exactly what you want ✓
+- 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 ✓

.claude/skills/ui-ux-testing/SKILL.md

@@ -0,0 +1,302 @@
+---
+name: ui-ux-testing
+description:
+  Automated visual regression testing and UI/UX analysis for web applications.
+  Use this skill whenever developers mention "test this UI", "visual
+  regression", "test the UI", "check this interface", "UI testing", or want to
+  create automated tests for web pages. Analyzes URLs and generates
+  comprehensive test strategies including Playwright/Cypress test scripts,
+  manual testing checklists, visual regression detection, and detailed reports
+  with findings and recommendations.
+compatibility:
+  tools: Claude in Chrome browser automation
+  frameworks: Playwright, Cypress, Selenium
+---
+
+# UI/UX Testing Skill
+
+This skill helps developers create automated visual regression tests and
+comprehensive UI/UX testing strategies for web applications.
+
+## Overview
+
+When a developer asks you to test a UI or create visual regression tests, this
+skill guides you through:
+
+1. **Analyzing the target URL** - Inspect the web page structure and components
+2. **Generating test strategies** - Create both automated and manual testing
+   approaches
+3. **Writing test code** - Generate Playwright/Cypress test scripts or Selenium
+   code
+4. **Creating test checklists** - Manual testing steps for visual regression and
+   UX flows
+5. **Generating reports** - Detailed findings, issues, and recommendations in
+   markdown/HTML
+
+## When to Trigger
+
+Trigger this skill when the user:
+
+- Provides a URL and asks to "test this UI"
+- Requests "visual regression testing" for a web page
+- Wants to "check accessibility" or test a component
+- Asks to "create automated tests" for a UI
+- Wants a "testing strategy" or "test plan" for a web application
+- Mentions QA, testing, or validation of UI components
+
+## Workflow
+
+### Step 1: Inspect the Target URL
+
+Use Claude in Chrome to:
+
+- Navigate to the provided URL
+- Take screenshots of different viewport sizes (desktop, tablet, mobile)
+- Inspect the DOM structure using `read_page` tool
+- Identify key components, interactive elements, and critical flows
+- Note responsive behavior and CSS properties
+
+### Step 2: Create a Test Strategy
+
+Based on your inspection, identify:
+
+- **Visual elements** to regression test (buttons, forms, headers, layouts)
+- **Interactive flows** to test (hover states, click handlers, form submission)
+- **Responsive breakpoints** to validate (mobile, tablet, desktop)
+- **Accessibility concerns** (ARIA labels, color contrast, keyboard navigation)
+- **Critical user paths** to validate (common workflows)
+
+### Step 3: Generate Test Code
+
+**For Automated Testing (Choose one or more):**
+
+#### Playwright (Recommended)
+
+```javascript
+// Example structure
+import { expect, test } from "@playwright/test";
+
+test("visual regression - homepage", async ({ page }) => {
+  await page.goto("https://example.com");
+
+  // Capture baseline screenshot
+  await expect(page).toHaveScreenshot("homepage.png");
+
+  // Test interactive elements
+  await page.hover("button.primary");
+  await expect(page).toHaveScreenshot("button-hover.png");
+});
+
+test("responsive layout - mobile", async ({ page }) => {
+  await page.setViewportSize({ width: 375, height: 812 });
+  await page.goto("https://example.com");
+  await expect(page).toHaveScreenshot("mobile-layout.png");
+});
+```
+
+#### Cypress
+
+```javascript
+describe("Visual Regression Tests", () => {
+  beforeEach(() => {
+    cy.visit("https://example.com");
+  });
+
+  it("captures baseline screenshot", () => {
+    cy.screenshot("homepage");
+    cy.get('[data-testid="header"]').should("be.visible");
+  });
+
+  it("tests button hover state", () => {
+    cy.get("button.primary").trigger("mouseenter");
+    cy.screenshot("button-hover-state");
+  });
+});
+```
+
+#### Selenium
+
+```python
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from PIL import Image
+
+driver = webdriver.Chrome()
+driver.get('https://example.com')
+
+# Capture screenshot
+driver.save_screenshot('homepage.png')
+
+# Test responsive
+driver.set_window_size(375, 812)
+driver.save_screenshot('mobile-view.png')
+```
+
+### Step 4: Create Manual Testing Checklist
+
+Generate a checklist including:
+
+- [ ] **Visual Consistency**
+  - [ ] All elements render correctly at 1920x1080
+  - [ ] All elements render correctly at 1366x768
+  - [ ] All elements render correctly at 768x1024 (tablet)
+  - [ ] All elements render correctly at 375x667 (mobile)
+  - [ ] Colors match design specifications
+  - [ ] Typography renders correctly (font families, sizes, weights)
+  - [ ] Images load and display at correct aspect ratios
+
+- [ ] **Responsive Behavior**
+  - [ ] Layout adapts correctly on mobile (no horizontal scroll)
+  - [ ] Navigation collapses/expands appropriately
+  - [ ] Form inputs are touch-friendly (min 44x44px)
+  - [ ] Content reflows without overlapping
+
+- [ ] **Interactive Elements**
+  - [ ] All buttons are clickable and have hover states
+  - [ ] Form inputs accept user input
+  - [ ] Dropdowns open/close correctly
+  - [ ] Links are underlined and properly colored
+
+- [ ] **Accessibility**
+  - [ ] Keyboard navigation works (Tab key)
+  - [ ] Color contrast meets WCAG AA standards
+  - [ ] Images have alt text
+  - [ ] Form labels are associated with inputs
+
+- [ ] **Critical User Paths**
+  - [ ] [Specific path 1]: [Steps and expected result]
+  - [ ] [Specific path 2]: [Steps and expected result]
+
+### Step 5: Generate Test Report
+
+Create an HTML/Markdown report with:
+
+```markdown
+# UI/UX Testing Report
+
+## Executive Summary
+
+- URL tested: [URL]
+- Viewports tested: Desktop (1920x1080), Tablet (768x1024), Mobile (375x667)
+- Testing date: [Date]
+- Total issues found: [Count]
+
+## Issues Found
+
+### Critical (Breaks functionality)
+
+1. **Issue Title**
+   - Severity: Critical
+   - Location: [Element/Component]
+   - Steps to reproduce: [Steps]
+   - Expected: [What should happen]
+   - Actual: [What actually happens]
+   - Screenshot: [If applicable]
+
+### Major (Significant visual/UX impact)
+
+1. **Issue Title**
+   - Severity: Major
+   - Location: [Element/Component]
+   - Impact: [User impact]
+
+### Minor (Polish/optimization)
+
+1. **Issue Title**
+   - Severity: Minor
+   - Location: [Element/Component]
+   - Recommendation: [Suggestion]
+
+## Visual Regression Analysis
+
+### Desktop (1920x1080)
+
+- [List observations]
+- [List changes from baseline if available]
+
+### Tablet (768x1024)
+
+- [List observations]
+- [Responsive issues found]
+
+### Mobile (375x667)
+
+- [List observations]
+- [Mobile-specific issues]
+
+## Accessibility Assessment
+
+| Element   | Issue   | WCAG Level | Recommendation |
+| --------- | ------- | ---------- | -------------- |
+| [Element] | [Issue] | [AA/AAA]   | [Fix]          |
+
+## Recommendations
+
+1. **High Priority**
+   - [Recommendation with rationale]
+
+2. **Medium Priority**
+   - [Recommendation with rationale]
+
+3. **Low Priority**
+   - [Recommendation with rationale]
+
+## Test Coverage Summary
+
+- Automated tests needed: [Count and types]
+- Manual test cases: [Count]
+- Estimated testing effort: [Time estimate]
+- Regression risk: [High/Medium/Low]
+
+---
+
+Generated using UI/UX Testing Skill
+```
+
+## Output Options
+
+Based on what the developer needs, generate:
+
+1. **Test Code Only** - Playwright/Cypress/Selenium scripts ready to integrate
+2. **Testing Strategy** - Comprehensive checklist and manual test plan
+3. **Full Report** - Screenshots, findings, issues, and automated test code
+4. **All of the above** - Complete testing package
+
+## Best Practices
+
+- **Multiple viewports:** Always test at least mobile (375px), tablet (768px),
+  and desktop (1920px)
+- **Visual baselines:** Save baseline screenshots before making changes
+- **Critical paths:** Prioritize testing main user workflows first
+- **Accessibility first:** Include WCAG AA compliance checks
+- **Clear assertions:** Make test assertions explicit and meaningful
+- **Maintainability:** Use data attributes (data-testid) for reliable element
+  selection
+
+## Example: Complete Testing Session
+
+1. Developer provides URL: "https://myapp.com/dashboard"
+2. You inspect the page (screenshots, DOM, responsive behavior)
+3. You identify:
+   - Dashboard header with navigation
+   - Data table with sorting/filtering
+   - Form for creating items
+   - Mobile menu collapse
+4. You generate:
+   - Playwright tests for visual regression
+   - Manual testing checklist
+   - HTML report with findings
+5. Developer receives complete testing artifact ready to use
+
+## Tips for Success
+
+- Take screenshots at each viewport to catch responsive issues
+- Test interactive states (hover, focus, active, disabled)
+- Verify critical user journeys end-to-end
+- Include accessibility testing automatically
+- Provide both automated (code) and manual (checklist) approaches
+- Make reports actionable with clear severity levels and recommendations
+
+---
+
+**Last Updated:** 2024 **Skill Version:** 1.0

.claude/skills/website-creation-automation/SKILL.md

@@ -0,0 +1,264 @@
+---
+name: website-creation-automation
+description:
+  Automate end-to-end website creation with AI-powered optimization, design, and
+  testing. Trigger this skill whenever the user wants to create a new website,
+  build a landing page, design a web application, or automatically generate a
+  complete website from a description. This skill takes a user's website idea or
+  prompt, optimizes it for clarity, designs a modern responsive website, and
+  automatically tests it for quality issues. Use this skill for any "create a
+  website" or "build a web application" request, including landing pages,
+  portfolio sites, e-commerce pages, dashboards, or any web-based project.
+compatibility:
+  models:
+    - claude-sonnet-4-20250514 (design and testing)
+    - claude-haiku-4.5-20251001 (bug fixes)
+  required_skills:
+    - prompt-optimizer
+    - frontend-atomic-design
+    - ui-ux-testing
+---
+
+# Website Creation Automation Skill
+
+An intelligent, end-to-end automation workflow for creating complete, tested
+websites from simple prompts.
+
+## What This Skill Does
+
+This skill orchestrates a complete website creation pipeline:
+
+1. **Prompt Optimization** — Takes your website description and optimizes it
+   into a detailed, structured prompt
+2. **Website Design** — Uses the optimized prompt to design and build a modern,
+   responsive website
+3. **Automated Testing** — Tests the generated website for visual, interactive,
+   and responsive issues
+4. **Auto-Fix** — Detects and fixes any issues found during testing
+
+The entire workflow is automated, so you just provide a simple description of
+what you want, and the skill handles the rest.
+
+## Core Workflow
+
+### Step 1: Optimize Your Website Prompt
+
+Your initial description (e.g., "Create a portfolio website for a freelance
+designer") is passed to the **prompt-optimizer** skill, which:
+
+- Adds specific details about layout, features, and target audience
+- Clarifies design preferences and functionality requirements
+- Structures the request to guide high-quality website generation
+- Returns a detailed, optimized prompt ready for design
+
+**Example transformation:**
+
+```
+Input: "Create a portfolio website for a freelance designer"
+↓
+Output: "Create a modern portfolio website for a freelance graphic designer.
+Include: hero section with featured work, project showcase grid (6-8 projects),
+about section, services list, client testimonials, contact form, and footer.
+Target audience: potential clients and collaborators. Design should be minimalist
+with emphasis on visual work. Mobile-responsive. Use modern sans-serif typography
+and white space. Include smooth scroll animations."
+```
+
+### Step 2: Design the Website
+
+The **frontend-atomic-design** skill uses the optimized prompt to:
+
+- Break down the website into atomic components (atoms, molecules, organisms)
+- Create a responsive layout that works on desktop, tablet, and mobile
+- Apply modern design patterns using Tailwind CSS
+- Build interactive elements and proper semantic HTML
+- Generate a complete, production-ready HTML file (or React component)
+
+**Outputs:**
+
+- Full HTML file with embedded CSS and JavaScript
+- All assets (icons, fonts) are self-contained
+- Responsive design with mobile-first approach
+- Accessible markup with semantic HTML5
+
+### Step 3: Test the Website
+
+The **ui-ux-testing** skill performs comprehensive testing:
+
+- Visual regression testing (captures baseline screenshots)
+- Responsive layout validation (mobile, tablet, desktop)
+- Interactive element testing (buttons, forms, links)
+- Accessibility checking (color contrast, keyboard navigation)
+- Cross-browser compatibility assessment
+- User flow validation
+
+**Testing output includes:**
+
+- Screenshots from multiple viewport sizes
+- Detailed findings and issues detected
+- Visual regression comparison
+- Recommendations for improvements
+
+### Step 4: Auto-Fix Detected Issues
+
+Any issues detected in testing are automatically fixed:
+
+- **Using Haiku 4.5** — A faster model optimized for targeted fixes
+- **HTML-only fixes** — Modifications to structure, styling, or interactivity
+- **Preserves design intent** — Fixes maintain the original design aesthetic
+- **Re-validates** — Quick verification that fixes resolved the issues
+
+**Common fixes include:**
+
+- Correcting responsive behavior issues
+- Fixing accessibility problems
+- Adjusting spacing, alignment, or colors
+- Improving interactive element behavior
+- Ensuring all content is properly visible
+
+---
+
+## When to Use This Skill
+
+Use this skill whenever you want to:
+
+- **Create a new website** from scratch based on a description
+- **Build a landing page** for a product, service, or event
+- **Design a portfolio site** to showcase your work
+- **Create an e-commerce page** with product displays
+- **Build a dashboard or web app** UI
+- **Generate a multi-page website** (returns first page, can iterate)
+- **Prototype a website concept** quickly
+
+## How to Trigger This Skill
+
+Simply provide:
+
+1. **Website description** — What kind of website you want (e.g., "e-commerce
+   store for handmade jewelry", "SaaS landing page", "restaurant menu website")
+2. **Optional details** — Any specific requirements (colors, features, tone,
+   audience)
+
+The skill handles everything else automatically.
+
+## Example Usage
+
+**User prompt:** "Create a landing page for a sustainable fashion startup called
+EcoStitch. Include a hero section, features of our eco-friendly materials,
+pricing plans, customer testimonials, and a newsletter signup."
+
+**Skill processes:**
+
+1. Optimizes prompt with specific design details and layout structure
+2. Designs a modern, responsive landing page with all requested sections
+3. Tests layout across mobile/tablet/desktop, forms, links, and visual design
+4. Fixes any responsive or interactive issues found
+5. Returns production-ready HTML file
+
+**Final output:** A complete, tested, bug-free website ready to deploy or
+customize further.
+
+---
+
+## Technical Details
+
+### Model Usage
+
+- **Sonnet 4.6** — Used for optimization, design, and testing (high-quality
+  complex tasks)
+- **Haiku 4.5** — Used for bug fixes only (fast, targeted improvements)
+
+### Skill Integration
+
+This skill coordinates three core skills in sequence:
+
+```
+User Prompt
+    ↓
+[prompt-optimizer] → Optimized Prompt
+    ↓
+[frontend-atomic-design] → HTML/React Website
+    ↓
+[ui-ux-testing] → Test Results + Screenshots
+    ↓
+[Bug Fix Loop] → Fixed HTML/React Website
+    ↓
+Final Website (Ready to Use)
+```
+
+### Output Format
+
+The final website is delivered as:
+
+- **HTML file** — Self-contained with CSS and JavaScript embedded
+- **Screenshots** — Before/after testing comparison
+- **Test report** — Issues found and fixes applied
+- **Deployment ready** — Can be hosted on any static hosting service
+
+---
+
+## Limitations & Notes
+
+- **Single-page output** — Generates one complete page (though can be expanded
+  to multi-page)
+- **Static by default** — Returns HTML; can generate React components if needed
+- **Database-free** — Forms are functional but don't store data without backend
+  integration
+- **Rapid iteration** — If you want to modify the result, you can iterate by
+  running the skill again with updated requirements
+
+---
+
+## Tips for Best Results
+
+1. **Be descriptive** — More detail in your initial prompt leads to better
+   results
+2. **Specify audience** — Who is this website for? (target customers, users,
+   etc.)
+3. **Include features** — What should the website do? (e.g., showcase products,
+   collect emails, etc.)
+4. **Mention style** — Any aesthetic preferences? (minimalist, colorful,
+   corporate, playful, etc.)
+5. **Test thoroughly** — Review the testing results to ensure the site meets
+   your needs
+
+---
+
+## Workflow Diagram
+
+```
+START
+  ↓
+Input: Website Description
+  ↓
+[Call: prompt-optimizer skill]
+  ↓
+Receive: Optimized Detailed Prompt
+  ↓
+[Call: frontend-atomic-design skill]
+  ↓
+Receive: HTML/React Website Code
+  ↓
+[Call: ui-ux-testing skill]
+  ↓
+Receive: Test Results + Issues Found
+  ↓
+Are there critical issues?
+  ├─ YES → [Use Haiku 4.5 to fix] → Re-test
+  ├─ NO → Proceed
+  ↓
+COMPLETE: Return Website + Test Report
+```
+
+---
+
+## Future Enhancements
+
+Potential expansions to this skill:
+
+- Multi-page website generation (homepage, about, services, contact, etc.)
+- CMS integration (connect to content management systems)
+- Backend API scaffolding (Node.js/Express templates)
+- SEO optimization (meta tags, structured data, open graph)
+- Analytics integration (Google Analytics, Mixpanel)
+- E-commerce integration (payment processing, inventory)

.devcontainer/devcontainer-lock.json

@@ -0,0 +1,9 @@
+{
+  "features": {
+    "ghcr.io/muhmdraouf/devcontainers-features/alpine-apk:0": {
+      "version": "0.0.1",
+      "resolved": "ghcr.io/muhmdraouf/devcontainers-features/alpine-apk@sha256:3f5010a1880699fad8f65f71002e56bc5cf57c47c63da36c0efea85958ff9044",
+      "integrity": "sha256:3f5010a1880699fad8f65f71002e56bc5cf57c47c63da36c0efea85958ff9044"
+    }
+  }
+}

.devcontainer/devcontainer.json

@@ -13,12 +13,15 @@
   },
   "customizations": {
     "vscode": {
-      "extensions": ["esbenp.prettier-vscode"]
+      "extensions": [
+        "esbenp.prettier-vscode",
+        "anthropic.claude-code"
+      ]
     }
-  }
+  },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [],
+  "forwardPorts": [3000]
 
   // Use 'postCreateCommand' to run commands after the container is created.
   // "postCreateCommand": "uname -a",

.gitea/workflows/release.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-  
+
   pull_request:
     branches:
       - main
@@ -22,15 +22,17 @@ jobs:
       id-token: write
     runs-on: ubuntu-latest
     steps:
-      - name: Calculate and Export Target IP
+      - name: Install dependencies with Proxy
+        env:
+          http_proxy: "http://host.docker.internal:3142"
+          https_proxy: "http://host.docker.internal:3142"
         run: |
-          # 1. Lấy IP hiện tại và tính toán IP đích (đổi octet cuối thành .1)
-          RUNNER_IP=$(hostname -I | awk '{print $1}')
-          CALCULATED_IP=$(echo $RUNNER_IP | cut -d'.' -f1-3).1
-          
-          # 2. Đưa vào biến môi trường toàn cục của Job
-          echo "TARGET_IP=${CALCULATED_IP}" >> $GITHUB_ENV
-          
+          # Kiểm tra proxy có hoạt động không
+          echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
+          apt-get update
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            docker-cli zip docker-buildx
+
       - name: Setup SSH Key
         run: |
           mkdir -p ~/.ssh
@@ -38,19 +40,15 @@ jobs:
           echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
 
-          ssh-keyscan -p 222 -t ed25519 $TARGET_IP >> ~/.ssh/known_hosts
+          ssh-keyscan -t ed25519 vps.demonkernel.io.vn >> ~/.ssh/known_hosts
 
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@v6
-        with:
-          node-version: latest
-
       - uses: pnpm/action-setup@v3
         with:
-          version: latest
+          version: 10.9.0
           run_install: false
 
       - name: Get pnpm store directory
@@ -58,11 +56,11 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
         with:
           path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
@@ -80,7 +78,7 @@ jobs:
           GITEA_USER: ${{ github.actor }}
           GITEA_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         run: pnpm release
-      
+
       - name: Set Version Output
         id: set_output
         run: |
@@ -92,7 +90,7 @@ jobs:
         if: gitea.ref == 'refs/heads/main'
         uses: docker/login-action@v3
         with:
-          registry: git.demonkernel.io.vn
+          registry: vps.demonkernel.io.vn
           username: ${{ github.actor }}
           password: ${{ secrets.ACCESS_TOKEN }}
 
@@ -102,10 +100,10 @@ jobs:
         run: |
           # Lowercase Repository
           REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
-          
+
           RAW_VERSION="${{ steps.set_output.outputs.version }}"
           VERSION_LOWER=$(echo "$RAW_VERSION" | tr '[:upper:]' '[:lower:]')
-          
+
           echo "repo=$REPO_LOWER" >> $GITHUB_OUTPUT
           echo "version=$VERSION_LOWER" >> $GITHUB_OUTPUT
 
@@ -116,19 +114,18 @@ jobs:
           context: .
           push: true
           tags: |
-            git.demonkernel.io.vn/${{ steps.meta.outputs.repo }}:latest
-            git.demonkernel.io.vn/${{ steps.meta.outputs.repo }}:${{ steps.meta.outputs.version }}
+            vps.demonkernel.io.vn/${{ steps.meta.outputs.repo }}:latest
+            vps.demonkernel.io.vn/${{ steps.meta.outputs.repo }}:${{ steps.meta.outputs.version }}
 
       - name: Commit & Push Changes
-        if: gitea.ref == 'refs/heads/main'
         run: |
-          if [ -n "$(git status --porcelain)" ]; then
+          if [ -n "$(git status --porcelain)" ]&& [ "${{ github.ref_name }}" = "main" ]; then
             git config --global user.name "gitea-actions"
             git config --global user.email "actions-user@noreply.git.demonkernel.io.vn"
 
             REPO_NAME="${{ gitea.repository }}"
 
-            git remote set-url origin ssh://git@$TARGET_IP:222/${REPO_NAME}.git
+            git remote set-url origin ssh://git@vps.demonkernel.io.vn/${REPO_NAME}.git
 
             git rm -r --cached .
             git add .
@@ -136,4 +133,3 @@ jobs:
             
             git push
           fi
-

Atomic.md

@@ -1,762 +0,0 @@
-# ATOMIC DESIGN STRUCTURE GUIDE
-
-## Overview
-
-Project sử dụng **Atomic Design Pattern** để tổ chức UI components theo 5 cấp
-độ:
-
-1. **Atoms** - Khối xây dựng cơ bản, không thể chia nhỏ hơn
-2. **Molecules** - Nhóm atoms đơn giản hoạt động cùng nhau
-3. **Organisms** - Khu vực UI phức tạp, riêng biệt
-4. **Templates** - Bố cục cấp trang, cấu trúc nội dung
-5. **Pages** - Các phiên bản cụ thể với dữ liệu thật
-
----
-
-## 1) ATOMS (`components/atoms/`)
-
-**Mục đích:** Khối xây dựng cơ bản, tái sử dụng cao, không phụ thuộc logic phức
-tạp.
-
-Không có context/hooks logic phức tạp, chỉ nhận props từ parent.
-
-### Cấu trúc thư mục
-
-```
-components/atoms/
-├── buttons/
-│   ├── Button.tsx           # Nút cơ bản (primary, secondary, danger)
-│   ├── IconButton.tsx       # Nút chỉ có icon
-│   └── Button.types.ts      # Props types
-├── inputs/
-│   ├── TextInput.tsx        # Text input cơ bản
-│   ├── NumberInput.tsx      # Number input với up/down
-│   ├── Checkbox.tsx         # Checkbox
-│   └── Input.types.ts       # Props types
-├── badges/
-│   ├── Badge.tsx            # Badge cơ bản (color variants)
-│   ├── PriceBadge.tsx       # Badge hiển thị giá
-│   └── Badge.types.ts       # Props types
-├── icons/
-│   ├── StarIcon.tsx         # Rating star icon
-│   ├── CartIcon.tsx         # Shopping cart icon
-│   ├── SearchIcon.tsx       # Search icon
-│   └── icons.types.ts       # Props types
-├── typography/
-│   ├── Heading.tsx          # h1-h6 headings
-│   ├── Text.tsx             # Body text variants
-│   ├── Caption.tsx          # Small caption text
-│   └── Typography.types.ts  # Props types
-├── dividers/
-│   ├── Divider.tsx          # Horizontal divider
-│   └── Divider.types.ts     # Props types
-├── loaders/
-│   ├── Spinner.tsx          # Loading spinner
-│   ├── Skeleton.tsx         # Skeleton loader
-│   └── Loader.types.ts      # Props types
-└── index.ts                 # Barrel export
-```
-
-### Ví dụ Atoms
-
-**Button.tsx:**
-
-```tsx
-import { ButtonHTMLAttributes } from "react";
-
-import type { ButtonProps } from "./Button.types";
-
-export default function Button({
-  variant = "primary",
-  size = "md",
-  disabled = false,
-  children,
-  className = "",
-  ...props
-}: ButtonProps) {
-  const baseStyles =
-    "font-semibold rounded-lg transition-colors disabled:opacity-50";
-  const variants = {
-    primary:
-      "bg-[color:var(--color-primary)] text-white hover:bg-[color:var(--color-primary-dark)]",
-    secondary: "bg-gray-200 text-gray-800 hover:bg-gray-300",
-    danger: "bg-red-500 text-white hover:bg-red-600",
-  };
-  const sizes = {
-    sm: "px-3 py-1 text-sm",
-    md: "px-4 py-2 text-base",
-    lg: "px-6 py-3 text-lg",
-  };
-
-  return (
-    <button
-      className={`${baseStyles} ${variants[variant]} ${sizes[size]} ${className}`}
-      disabled={disabled}
-      {...props}
-    >
-      {children}
-    </button>
-  );
-}
-```
-
-**Button.types.ts:**
-
-```tsx
-import { ButtonHTMLAttributes } from "react";
-
-export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-  variant?: "primary" | "secondary" | "danger";
-  size?: "sm" | "md" | "lg";
-  disabled?: boolean;
-  children: React.ReactNode;
-  className?: string;
-}
-```
-
----
-
-## 2) MOLECULES (`components/molecules/`)
-
-**Mục đích:** Nhóm atoms tạo thành những UI unit nhỏ, tái sử dụng, có logic đơn
-giản.
-
-Có thể sử dụng `useState`, nhưng logic chủ yếu nằm ở parent component.
-
-### Cấu trúc thư mục
-
-```
-components/molecules/
-├── form-groups/
-│   ├── FormField.tsx        # Input + label + error message
-│   ├── FormGroup.tsx        # Label + input wrapper
-│   └── FormGroup.types.ts   # Props types
-├── cards/
-│   ├── ProductCard.tsx      # Card hiển thị sản phẩm (image + name + price + btn)
-│   ├── ShopCard.tsx         # Card hiển thị quán
-│   ├── ReviewCard.tsx       # Card hiển thị review
-│   └── Card.types.ts        # Props types
-├── ratings/
-│   ├── RatingStars.tsx      # Hiển thị 5 sao rating
-│   ├── RatingInput.tsx      # Input 5 sao (interactive)
-│   └── Rating.types.ts      # Props types
-├── price-display/
-│   ├── PriceTag.tsx         # Hiển thị giá formatted
-│   ├── PriceRange.tsx       # Hiển thị range giá
-│   └── Price.types.ts       # Props types
-├── search-bar/
-│   ├── SearchInput.tsx      # Search input với icon
-│   ├── SearchBar.tsx        # Search bar wrapper
-│   └── Search.types.ts      # Props types
-├── breadcrumb/
-│   ├── Breadcrumb.tsx       # Breadcrumb navigation
-│   └── Breadcrumb.types.ts  # Props types
-├── tabs/
-│   ├── TabGroup.tsx         # Tabs wrapper
-│   ├── Tab.tsx              # Individual tab
-│   └── Tabs.types.ts        # Props types
-└── index.ts                 # Barrel export
-```
-
-### Ví dụ Molecules
-
-**ProductCard.tsx:**
-
-```tsx
-import Button from "@/components/atoms/buttons/Button";
-import Text from "@/components/atoms/typography/Text";
-import Image from "next/image";
-
-import type { ProductCardProps } from "./Card.types";
-
-export default function ProductCard({
-  product,
-  onAddToCart,
-}: ProductCardProps) {
-  return (
-    <div className="rounded-lg border border-[color:var(--color-border)] bg-[color:var(--color-bg-card)] p-4 shadow-sm transition-shadow hover:shadow-md">
-      <div className="relative mb-3 h-48 w-full overflow-hidden rounded-md">
-        <Image
-          src={product.image}
-          alt={product.name}
-          fill
-          className="object-cover"
-        />
-      </div>
-      <Text variant="body1" className="font-semibold">
-        {product.name}
-      </Text>
-      <Text
-        variant="caption"
-        className="text-[color:var(--color-text-secondary)]"
-      >
-        {product.description}
-      </Text>
-      <div className="mt-3 flex items-center justify-between">
-        <Text
-          variant="body2"
-          className="font-bold text-[color:var(--color-primary)]"
-        >
-          ${product.price.toFixed(2)}
-        </Text>
-        <Button size="sm" onClick={() => onAddToCart(product)}>
-          Add
-        </Button>
-      </div>
-    </div>
-  );
-}
-```
-
----
-
-## 3) ORGANISMS (`components/organisms/`)
-
-**Mục đích:** Khu vực UI phức tạp, độc lập, có logic riêng.
-
-Kết hợp multiple molecules/atoms, có thể sử dụng contexts (useAuth, useCart,
-etc.), state phức tạp.
-
-### Cấu trúc thư mục
-
-```
-components/organisms/
-├── navigation/
-│   ├── Navbar.tsx           # Sidebar category filter (cũ CartProduct)
-│   ├── CategoryMenu.tsx     # Category menu wrapper
-│   └── Navigation.types.ts  # Props types
-├── cart/
-│   ├── CartFab.tsx          # Floating action button giỏ hàng
-│   ├── CartSummary.tsx      # Cart summary widget
-│   ├── CartList.tsx         # Danh sách sản phẩm trong giỏ
-│   └── Cart.types.ts        # Props types
-├── product-grid/
-│   ├── ProductGrid.tsx      # Grid hiển thị danh sách sản phẩm
-│   ├── ProductFilters.tsx   # Bộ lọc sản phẩm (category, price, rating)
-│   └── ProductGrid.types.ts # Props types
-├── forms/
-│   ├── LoginForm.tsx        # Form đăng nhập (username + password + submit)
-│   ├── RegisterForm.tsx     # Form đăng ký
-│   ├── CheckoutForm.tsx     # Form thanh toán
-│   ├── ReviewForm.tsx       # Form đánh giá (modal content)
-│   └── Forms.types.ts       # Props types
-├── modals/
-│   ├── ReviewModal.tsx      # Modal đánh giá (header + form + footer)
-│   ├── ConfirmModal.tsx     # Modal xác nhận generic
-│   └── Modal.types.ts       # Props types
-├── shop-grid/
-│   ├── ShopGrid.tsx         # Grid hiển thị danh sách quán
-│   ├── ShopFilters.tsx      # Bộ lọc quán (location, rating)
-│   └── ShopGrid.types.ts    # Props types
-├── hero-section/
-│   ├── HeroSection.tsx      # Banner hero cấp trang
-│   └── Hero.types.ts        # Props types
-├── featured-section/
-│   ├── FeaturedProducts.tsx # Section sản phẩm nổi bật
-│   ├── FeaturedShops.tsx    # Section quán nổi bật
-│   └── Featured.types.ts    # Props types
-└── index.ts                 # Barrel export
-```
-
-### Ví dụ Organisms
-
-**ProductGrid.tsx:**
-
-```tsx
-"use client";
-
-import ProductCard from "@/components/molecules/cards/ProductCard";
-import { useCart } from "@/lib/cart-context";
-import { MOCK_PRODUCTS } from "@/lib/constants";
-import { useMenu } from "@/lib/menu-context";
-
-import type { ProductGridProps } from "./ProductGrid.types";
-
-export default function ProductGrid({ searchQuery = "" }: ProductGridProps) {
-  const { activeCategory } = useMenu();
-  const { addToCart } = useCart();
-
-  const filtered = MOCK_PRODUCTS.filter((product) => {
-    const matchCategory =
-      activeCategory === "all" || product.category === activeCategory;
-    const matchSearch =
-      product.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
-      product.description.toLowerCase().includes(searchQuery.toLowerCase());
-    return matchCategory && matchSearch;
-  });
-
-  return (
-    <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-      {filtered.map((product) => (
-        <ProductCard
-          key={product.id}
-          product={product}
-          onAddToCart={addToCart}
-        />
-      ))}
-    </div>
-  );
-}
-```
-
----
-
-## 4) TEMPLATES (`components/templates/`)
-
-**Mục đích:** Bố cục cấp trang, cấu trúc nội dung, không có data cụ thể.
-
-Chứa layout và structure của page, nhưng data được truyền từ page component.
-
-### Cấu trúc thư mục
-
-```
-components/templates/
-├── main-layout/
-│   ├── MainLayout.tsx       # Layout chính (header + sidebar + content + footer)
-│   ├── MainLayout.types.ts  # Props types
-│   └── styles.ts            # Responsive grid layout logic
-├── feed-layout/
-│   ├── FeedLayout.tsx       # Layout feed (khám phá quán)
-│   └── FeedLayout.types.ts  # Props types
-├── manager-layout/
-│   ├── ManagerLayout.tsx    # Layout manager dashboard
-│   └── ManagerLayout.types.ts # Props types
-├── checkout-layout/
-│   ├── CheckoutLayout.tsx   # Layout thanh toán (steps, cart, form)
-│   └── CheckoutLayout.types.ts # Props types
-├── auth-layout/
-│   ├── AuthLayout.tsx       # Layout auth (login/register)
-│   └── AuthLayout.types.ts  # Props types
-└── index.ts                 # Barrel export
-```
-
-### Ví dụ Templates
-
-**MainLayout.tsx:**
-
-```tsx
-import Navbar from "@/components/organisms/navigation/Navbar";
-import Footer from "@/layouts/footer";
-import Header from "@/layouts/header";
-
-import type { MainLayoutProps } from "./MainLayout.types";
-
-export default function MainLayout({ children }: MainLayoutProps) {
-  return (
-    <div className="flex min-h-screen flex-col">
-      <Header />
-      <div className="flex flex-1">
-        {/* Sidebar - ẩn trên mobile */}
-        <nav className="hidden w-64 border-r border-[color:var(--color-border)] bg-[color:var(--color-bg-sidebar)] md:block">
-          <Navbar />
-        </nav>
-        {/* Main content */}
-        <main className="flex-1 p-4 md:p-6">{children}</main>
-      </div>
-      <Footer />
-    </div>
-  );
-}
-```
-
----
-
-## 5) PAGES (`app/*/page.tsx`)
-
-**Mục đích:** Các phiên bản cụ thể với dữ liệu thật, logic cấp trang.
-
-Server/client components sử dụng templates, organisms, nhận data từ API/context.
-
-### Ví dụ Pages
-
-**app/(main)/page.tsx:**
-
-```tsx
-"use client";
-
-import FeaturedSection from "@/components/organisms/featured-section/FeaturedSection";
-import ProductGrid from "@/components/organisms/product-grid/ProductGrid";
-import MainLayout from "@/components/templates/main-layout/MainLayout";
-import { useState } from "react";
-
-export default function MainPage() {
-  const [searchQuery, setSearchQuery] = useState("");
-
-  return (
-    <MainLayout>
-      <FeaturedSection />
-      <div className="mt-8">
-        <ProductGrid searchQuery={searchQuery} />
-      </div>
-    </MainLayout>
-  );
-}
-```
-
----
-
-## 6) File Hierarchy Summary
-
-```
-components/
-├── atoms/
-│   ├── buttons/
-│   ├── inputs/
-│   ├── badges/
-│   ├── icons/
-│   ├── typography/
-│   ├── dividers/
-│   ├── loaders/
-│   └── index.ts
-├── molecules/
-│   ├── form-groups/
-│   ├── cards/
-│   ├── ratings/
-│   ├── price-display/
-│   ├── search-bar/
-│   ├── breadcrumb/
-│   ├── tabs/
-│   └── index.ts
-├── organisms/
-│   ├── navigation/
-│   ├── cart/
-│   ├── product-grid/
-│   ├── forms/
-│   ├── modals/
-│   ├── shop-grid/
-│   ├── hero-section/
-│   ├── featured-section/
-│   └── index.ts
-├── templates/
-│   ├── main-layout/
-│   ├── feed-layout/
-│   ├── manager-layout/
-│   ├── checkout-layout/
-│   ├── auth-layout/
-│   └── index.ts
-└── ATOMIC_DESIGN.md (this file)
-```
-
----
-
-## 7) Migration Guide (Old → New)
-
-### Old Structure → New Structure Mapping
-
-| Old File          | New Location                       | Type     |
-| ----------------- | ---------------------------------- | -------- |
-| `CartProduct.tsx` | `molecules/cards/ProductCard.tsx`  | Molecule |
-| `Navbar.tsx`      | `organisms/navigation/Navbar.tsx`  | Organism |
-| `CartFab.tsx`     | `organisms/cart/CartFab.tsx`       | Organism |
-| `ReviewModal.tsx` | `organisms/modals/ReviewModal.tsx` | Organism |
-
-### Migration Steps
-
-1. Create new directory structure under `components/`
-2. Move existing components to appropriate levels (atoms → molecules →
-   organisms)
-3. Extract shared styles/logic into atoms
-4. Update imports in `app/` pages
-5. Test responsiveness at each breakpoint
-6. Update `COMPONENTS.md` with new structure
-
----
-
-## 8) Best Practices
-
-### Atoms Development
-
-- ✅ Reusable across entire project
-- ✅ No business logic
-- ✅ No context/hooks (useAuth, useCart)
-- ✅ Pure props-based
-- ✅ Full TypeScript typing
-- ❌ No "use client" needed (unless interactive, e.g., Button)
-
-### Molecules Development
-
-- ✅ Combines multiple atoms
-- ✅ Simple state (open/close, hover state)
-- ✅ No complex business logic
-- ✅ Can use useState for UI state
-- ✅ Reusable in multiple contexts
-- ❌ No global state (useAuth, useCart)
-
-### Organisms Development
-
-- ✅ Complex UI sections
-- ✅ Can use contexts (useAuth, useCart, useMenu)
-- ✅ Business logic
-- ✅ Always "use client"
-- ✅ Filter, sort, complex interactions
-- ❌ Not reusable across different page types
-
-### Templates Development
-
-- ✅ Page layout structure
-- ✅ Composition of organisms + layout
-- ✅ No data fetching/business logic
-- ✅ Children prop pattern
-- ✅ Props for customization
-- ❌ No hardcoded data
-
-### Pages Development
-
-- ✅ Specific page implementations
-- ✅ Route-specific logic
-- ✅ Data integration
-- ✅ Context usage at page level
-- ✅ State management orchestration
-- ❌ No UI component definitions (use organisms)
-
----
-
-## 9) Import Patterns
-
-### Atoms
-
-```tsx
-import Button from "@/components/atoms/buttons/Button";
-import Text from "@/components/atoms/typography/Text";
-```
-
-### Molecules
-
-```tsx
-import ProductCard from "@/components/molecules/cards/ProductCard";
-import FormField from "@/components/molecules/form-groups/FormField";
-```
-
-### Organisms
-
-```tsx
-import LoginForm from "@/components/organisms/forms/LoginForm";
-import ProductGrid from "@/components/organisms/product-grid/ProductGrid";
-```
-
-### Templates
-
-```tsx
-import MainLayout from "@/components/templates/main-layout/MainLayout";
-```
-
-### Barrel Exports
-
-```tsx
-// Usage
-import { Button, Text } from "@/components/atoms";
-
-// components/atoms/index.ts
-export { default as Button } from "./buttons/Button";
-export { default as Text } from "./typography/Text";
-export * from "./buttons/Button.types";
-```
-
----
-
-## 10) Common Patterns
-
-### Creating a New Atom
-
-```tsx
-// atoms/buttons/NewButton.tsx
-export default function NewButton({ variant, ...props }: Props) {
-  return <button className={styles[variant]} {...props} />;
-}
-
-// atoms/buttons/NewButton.types.ts
-export interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
-  variant: "type1" | "type2";
-}
-```
-
-### Creating a New Molecule
-
-```tsx
-// molecules/cards/NewCard.tsx
-export default function NewCard({ item, onAction }: Props) {
-  const [hover, setHover] = useState(false);
-  return (
-    <div onMouseEnter={() => setHover(true)}>{/* atoms composition */}</div>
-  );
-}
-```
-
-### Creating a New Organism
-
-```tsx
-// organisms/sections/NewSection.tsx
-"use client";
-
-import ProductCard from "@/components/molecules/cards/ProductCard";
-import { useAuth } from "@/lib/auth-context";
-
-export default function NewSection() {
-  const { user } = useAuth();
-  // business logic, filtering, etc.
-  return <section>{/* molecules composition + logic */}</section>;
-}
-```
-
-### Creating a New Template
-
-```tsx
-// templates/layouts/NewTemplate.tsx
-export default function NewTemplate({ children, header }: Props) {
-  return (
-    <div className="layout">
-      <header>{header}</header>
-      <main>{children}</main>
-    </div>
-  );
-}
-```
-
----
-
-## 11) Testing & Documentation
-
-### For Each Component Level
-
-#### Atoms
-
-- Unit test: Props validation, styling
-- Storybook: All variants, all states
-- Doc: Props interface, usage examples
-
-#### Molecules
-
-- Integration test: Atoms composition
-- Storybook: Different molecule states
-- Doc: Props, behavior, dependencies
-
-#### Organisms
-
-- Integration test: With contexts mocked
-- E2E: User interactions
-- Doc: Logic flow, API integration points
-
-#### Templates
-
-- Layout test: Responsive grid layouts
-- Visual: Desktop/tablet/mobile
-- Doc: Layout structure, breakpoints
-
-#### Pages
-
-- E2E test: Full user flows
-- Performance: Metrics
-- Doc: Route, data flow, features
-
----
-
-## 12) Performance Optimization
-
-### Code Splitting
-
-- Atoms: Always bundled (small, frequently used)
-- Molecules: Bundled by page/feature
-- Organisms: Use `dynamic()` for heavy sections
-- Templates: Bundled by layout type
-- Pages: Automatic splitting by Next.js
-
-### Lazy Loading Example
-
-```tsx
-import dynamic from "next/dynamic";
-
-const ReviewModal = dynamic(
-  () => import("@/components/organisms/modals/ReviewModal"),
-  { loading: () => <Spinner /> },
-);
-```
-
-### Image Optimization
-
-- Use Next.js `Image` component (atoms/molecules)
-- Optimize with `priority` for above-fold
-- Use responsive sizes: `sizes="(max-width: 640px) 100vw, 50vw"`
-
----
-
-## 13) Accessibility
-
-### All Levels
-
-- Semantic HTML: `<button>`, `<a>`, `<form>`, `<nav>`
-- ARIA attributes: `aria-label`, `aria-expanded`, `role`
-- Keyboard navigation: Tab order, focus visible
-- Color contrast: WCAG AA minimum
-- Alt text: All images have meaningful `alt`
-
-### Example
-
-```tsx
-<button
-  aria-label="Add to cart"
-  className="focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
->
-  <CartIcon aria-hidden="true" />
-  Add to Cart
-</button>
-```
-
----
-
-## 14) Version Control & Documentation
-
-### File Format
-
-```
-components/
-├── atoms/
-│   ├── buttons/
-│   │   ├── Button.tsx
-│   │   ├── Button.types.ts
-│   │   └── Button.md  # Component documentation
-│   └── ...
-├── molecules/
-│   ├── cards/
-│   │   ├── ProductCard.tsx
-│   │   ├── Card.types.ts
-│   │   └── ProductCard.md
-│   └── ...
-└── ...
-```
-
-### Documentation Template
-
-```markdown
-# ProductCard
-
-## Purpose
-
-Display individual product with image, name, price, and action button.
-
-## Props
-
-- `product: Product` - Product data
-- `onAddToCart: (product: Product) => void` - Add to cart handler
-
-## Usage
-
-\`\`\`tsx <ProductCard product={item} onAddToCart={addToCart} /> \`\`\`
-
-## Variants
-
-- Image with loading state
-- With discount badge
-- With rating stars
-
-## Responsive
-
-- Mobile: Single column, full width
-- Desktop: Grid layout
-```
-
----
-
-Cấu trúc này cung cấp: ✅ **Scalability**: Dễ thêm components mới ✅
-**Reusability**: Tối đa tái sử dụng ✅ **Maintainability**: Code dễ hiểu, tìm
-kiếm ✅ **Testability**: Mỗi level có logic riêng ✅ **Performance**: Smart
-code-splitting

PHASE_1_SUMMARY.md

@@ -1,9 +1,7 @@
 # Phase 1 Implementation Summary: Atomic Design Foundation
 
-**Status:** ✅ COMPLETE
-**Date:** 2026-04-03
-**Commit:** eca619b
-**Branch:** atomic_design
+**Status:** ✅ COMPLETE **Date:** 2026-04-03 **Commit:** eca619b **Branch:**
+atomic_design
 
 ---
 
@@ -12,6 +10,7 @@
 ### ✨ Created 21 Atom Components
 
 #### Buttons (2 components)
+
 ```
 components/atoms/buttons/
 ├── Button.tsx (4 variants: primary, secondary, danger, ghost)
@@ -20,12 +19,14 @@ components/atoms/buttons/
 ```
 
 **Key Features:**
+
 - Multiple size options (sm, md, lg)
 - Icon support with positioning (left/right)
 - Full HTML button attribute support
 - Active/disabled states with visual feedback
 
 #### Inputs (3 components)
+
 ```
 components/atoms/inputs/
 ├── TextInput.tsx (with label, error, icon support)
@@ -35,12 +36,14 @@ components/atoms/inputs/
 ```
 
 **Key Features:**
+
 - Error state handling with red border
 - Icon integration with callback support
 - Accessible form field structure
 - Controlled/uncontrolled patterns
 
 #### Typography (3 components)
+
 ```
 components/atoms/typography/
 ├── Heading.tsx (h1-h6 with semantic sizing)
@@ -50,11 +53,13 @@ components/atoms/typography/
 ```
 
 **Key Features:**
+
 - Semantic HTML (`<h1>` through `<h6>`)
 - Consistent font sizing and weights
 - CSS variable color application
 
 #### Badges (2 components)
+
 ```
 components/atoms/badges/
 ├── Badge.tsx (5 variants: primary, secondary, success, danger, warning)
@@ -63,11 +68,13 @@ components/atoms/badges/
 ```
 
 **Key Features:**
+
 - Multiple size options (sm, md)
 - Formatted price output (VND/USD)
 - Color-coded variants
 
 #### Dividers (1 component)
+
 ```
 components/atoms/dividers/
 ├── Divider.tsx (horizontal/vertical separators)
@@ -108,12 +115,14 @@ components/atoms/dividers/
 ### 🔧 Updated Existing Components
 
 #### CartProduct.tsx
+
 - ✅ Replaced inline button with `<Button>` atom
 - ✅ Replaced inline text with `<Text>` atom
 - ✅ Replaced inline caption with `<Caption>` atom
 - **Result:** Cleaner component, more maintainable
 
 #### ReviewModal.tsx
+
 - ✅ Replaced modal buttons with `<Button>` atoms
 - ✅ Replaced heading with `<Heading>` atom
 - ✅ Replaced text with `<Text>` atom
@@ -124,15 +133,15 @@ components/atoms/dividers/
 
 ## 📊 Statistics
 
-| Metric | Count |
-|--------|-------|
-| **New Atoms Created** | 21 |
-| **Type Files** | 5 |
-| **Total Component Files** | 26 |
-| **Documentation Files** | 5 |
-| **New Lines of Code** | ~2,500 (atoms + docs) |
-| **Build Status** | ✅ Success |
-| **TypeScript Errors** | 0 (in atoms) |
+| Metric                    | Count                 |
+| ------------------------- | --------------------- |
+| **New Atoms Created**     | 21                    |
+| **Type Files**            | 5                     |
+| **Total Component Files** | 26                    |
+| **Documentation Files**   | 5                     |
+| **New Lines of Code**     | ~2,500 (atoms + docs) |
+| **Build Status**          | ✅ Success            |
+| **TypeScript Errors**     | 0 (in atoms)          |
 
 ---
 
@@ -174,6 +183,7 @@ components/atoms/
 ## ✅ Quality Assurance
 
 ### Build
+
 ```bash
 ✓ Compiled successfully in 3.7s
 ✓ npm run build: PASS
@@ -182,18 +192,21 @@ components/atoms/
 ```
 
 ### Type Safety
+
 - ✅ Full TypeScript coverage
 - ✅ All props typed
 - ✅ No `any` types
 - ✅ Interface exports for reuse
 
 ### Accessibility
+
 - ✅ Semantic HTML throughout
 - ✅ ARIA labels where needed
 - ✅ Focus visible states
 - ✅ Keyboard navigation support
 
 ### Consistency
+
 - ✅ CSS variables for theming
 - ✅ Consistent naming conventions
 - ✅ Barrel exports for clean imports
@@ -204,27 +217,30 @@ components/atoms/
 ## 📖 Usage Examples
 
 ### Basic Button
+
 ```tsx
 import { Button } from "@/components/atoms";
 
 <Button variant="primary" size="sm" icon="fa-cart-plus">
   Mua
-</Button>
+</Button>;
 ```
 
 ### Form Field
+
 ```tsx
-import { TextInput, Button } from "@/components/atoms";
+import { Button, TextInput } from "@/components/atoms";
 
 <TextInput
   label="Email"
   type="email"
   placeholder="user@example.com"
   error={emailError}
-/>
+/>;
 ```
 
 ### Typography
+
 ```tsx
 import { Heading, Text, Caption } from "@/components/atoms";
 
@@ -234,6 +250,7 @@ import { Heading, Text, Caption } from "@/components/atoms";
 ```
 
 ### Price Display
+
 ```tsx
 import { PriceBadge } from "@/components/atoms";
 
@@ -275,6 +292,7 @@ import { PriceBadge } from "@/components/atoms";
 ## 🚀 Next Steps (Phase 2)
 
 ### Molecules to Create
+
 1. **ProductCard** - Image + Text + Badge + Button
 2. **FormField** - Label + Input + Error + Validation
 3. **SearchBar** - SearchInput + Button
@@ -288,6 +306,7 @@ import { PriceBadge } from "@/components/atoms";
 ## 💡 Design Decisions
 
 ### Why Barrel Exports?
+
 ```tsx
 // ❌ Bad: Scattered imports
 import Button from "@/components/atoms/buttons/Button";
@@ -298,12 +317,14 @@ import { Button, Text } from "@/components/atoms";
 ```
 
 ### Why TypeScript Types in Separate Files?
+
 - Clear separation of concerns
 - Easier to maintain interfaces
 - Reusable types across modules
 - Better for large components
 
 ### Why CSS Variables?
+
 - Single point for theme changes
 - Easy dark mode switching
 - Consistent across all atoms
@@ -357,7 +378,5 @@ feat: Implement Atomic Design Phase 1 - Atoms Foundation
 
 ---
 
-**Status:** Ready for Phase 2 🚀
-**Last Updated:** 2026-04-03
-**Contributor:** Claude Code + Anthropic AI
-
+**Status:** Ready for Phase 2 🚀 **Last Updated:** 2026-04-03 **Contributor:**
+Claude Code + Anthropic AI

README.md

@@ -67,13 +67,15 @@ Dành cho khách hàng:
 
 Dành cho quản lý:
 
-- Sidebar desktop: Brand, tab navigation (Thực đơn / Combo / Danh mục), link tới Analytics
+- Sidebar desktop: Brand, tab navigation (Thực đơn / Combo / Danh mục), link tới
+  Analytics
 - CRUD sản phẩm, combo, danh mục qua modals
 - Auth guard: tự động redirect non-manager về `/`
 
 #### 9. **Trang Phân Tích Tài Chính** (`app/(manager)/manager/analytics`)
 
-- Summary cards: Doanh thu, đơn hàng, lợi nhuận, giá trị đơn trung bình (so sánh kỳ trước)
+- Summary cards: Doanh thu, đơn hàng, lợi nhuận, giá trị đơn trung bình (so sánh
+  kỳ trước)
 - Bộ chọn kỳ: Ngày / Tuần / Tháng / Năm
 - Biểu đồ SVG thuần: Line, Bar, Pie — hover tooltips tương tác
 - Bảng top 5 sản phẩm và bảng chi tiết có thể sắp xếp
@@ -196,18 +198,18 @@ frondend/
 
 ## Công Nghệ Sử Dụng
 
-| Công nghệ    | Phiên bản | Mục đích                              |
-| ------------ | --------- | ------------------------------------- |
-| Next.js      | 16.1.7    | React Framework (App Router)          |
-| React        | 19.2.3    | Thư viện UI                           |
-| TypeScript   | ^5        | Kiểu dữ liệu tĩnh                     |
-| Tailwind CSS | ^4.2.2    | Utility-first CSS framework           |
-| Geist Font   | -         | Font chữ (Google Fonts via next/font) |
-| FontAwesome  | 6.7.2     | Icon library (CDN)                    |
-| pnpm         | -         | Package manager                       |
-| ESLint       | ^9        | Linting                               |
-| Prettier     | ^3        | Code formatting                       |
-| semantic-release | ^25   | Automated versioning & release        |
+| Công nghệ        | Phiên bản | Mục đích                              |
+| ---------------- | --------- | ------------------------------------- |
+| Next.js          | 16.1.7    | React Framework (App Router)          |
+| React            | 19.2.3    | Thư viện UI                           |
+| TypeScript       | ^5        | Kiểu dữ liệu tĩnh                     |
+| Tailwind CSS     | ^4.2.2    | Utility-first CSS framework           |
+| Geist Font       | -         | Font chữ (Google Fonts via next/font) |
+| FontAwesome      | 6.7.2     | Icon library (CDN)                    |
+| pnpm             | -         | Package manager                       |
+| ESLint           | ^9        | Linting                               |
+| Prettier         | ^3        | Code formatting                       |
+| semantic-release | ^25       | Automated versioning & release        |
 
 ---
 
@@ -225,11 +227,11 @@ frondend/
 
 ### Tài Khoản Demo
 
-| Loại tài khoản | Tên đăng nhập  | Mật khẩu       |
-| -------------- | -------------- | -------------- |
-| Manager        | admin          | admin          |
-| Staff          | Nguyễn Văn An  | Nguyễn Văn An  |
-| Customer       | 0987654321     | user1          |
+| Loại tài khoản | Tên đăng nhập | Mật khẩu      |
+| -------------- | ------------- | ------------- |
+| Manager        | admin         | admin         |
+| Staff          | Nguyễn Văn An | Nguyễn Văn An |
+| Customer       | 0987654321    | user1         |
 
 ### Design & Styling
 
@@ -243,14 +245,18 @@ frondend/
 Dự án tuân theo **Atomic Design** pattern — chi tiết tại `Atomic.md`:
 
 - **Atoms** - Nguyên tố cơ bản: Button, Input, Badge, Text, Heading, Divider
-- **Molecules** - Nhóm atoms: ProductCard, ShopCard, SearchBar, PaymentSummaryCard
-- **Organisms** - Phần UI phức tạp: CategorySidebar, CartFab, ProductGrid, ShopGrid, ReviewModal, analytics charts, manager tabs/modals
-- **Templates** - Bố cục trang: MainLayout, AuthLayout, FeedLayout, ManagerLayout
+- **Molecules** - Nhóm atoms: ProductCard, ShopCard, SearchBar,
+  PaymentSummaryCard
+- **Organisms** - Phần UI phức tạp: CategorySidebar, CartFab, ProductGrid,
+  ShopGrid, ReviewModal, analytics charts, manager tabs/modals
+- **Templates** - Bố cục trang: MainLayout, AuthLayout, FeedLayout,
+  ManagerLayout
 
 ### Data & Integration
 
 - Mock data nằm trong `lib/constants.ts`
-- Context providers trong `app/providers.tsx`: AuthProvider, MenuProvider, CartProvider
+- Context providers trong `app/providers.tsx`: AuthProvider, MenuProvider,
+  CartProvider
 - ManagerProvider được thêm bởi `app/(manager)/layout.tsx`
 - Thay bằng API calls khi backend sẵn sàng
 - Ảnh sản phẩm: thêm vào `public/imgs/products/`

app/(feed)/feed/page.tsx

@@ -16,10 +16,10 @@ export default function FeedPage() {
         {/* Page title */}
         <div className="mb-8">
           <h1 className="text-foreground text-2xl font-bold md:text-3xl">
-            Khám phá quán nước
+            Explore Shops
           </h1>
           <p className="mt-1 text-sm text-(--color-text-muted)">
-            Tìm và chọn quán yêu thích của bạn
+            Find and choose your favorite shop
           </p>
         </div>
 
@@ -35,7 +35,7 @@ export default function FeedPage() {
                 }}
                 className="cursor-pointer border-none bg-transparent text-sm text-(--color-primary) hover:underline"
               >
-                Xóa bộ lọc
+                Clear filters
               </button>
             </div>
           )}
@@ -46,7 +46,7 @@ export default function FeedPage() {
           <div className="flex flex-col items-stretch gap-3 sm:flex-row sm:items-center">
             <div className="flex shrink-0 items-center gap-2 text-sm font-semibold text-(--color-text-secondary)">
               <i className="fa-solid fa-filter text-(--color-primary)"></i>
-              <span>Lọc quán</span>
+              <span>Filter shops</span>
             </div>
 
             {/* Name search */}
@@ -54,7 +54,7 @@ export default function FeedPage() {
               value={searchName}
               onChange={setSearchName}
               onClear={() => setSearchName("")}
-              placeholder="Tìm theo tên quán..."
+              placeholder="Search by shop name..."
               className="min-w-0 flex-1"
             />
 
@@ -65,13 +65,13 @@ export default function FeedPage() {
                 type="text"
                 value={searchAddress}
                 onChange={(e) => setSearchAddress(e.target.value)}
-                placeholder="Tìm theo địa chỉ..."
+                placeholder="Search by address..."
                 className="bg-background text-foreground focus:ring-opacity-20 w-full rounded-xl border border-(--color-border) py-2.5 pr-9 pl-9 text-sm transition-all duration-150 outline-none placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)"
               />
               {searchAddress && (
                 <button
                   onClick={() => setSearchAddress("")}
-                  aria-label="Xóa tìm kiếm địa chỉ"
+                  aria-label="Clear address 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>

app/(main)/layout.tsx

@@ -1,9 +1,14 @@
 import { MainLayout } from "@/components/templates/main-layout";
+import { ManagerProvider } from "@/lib/manager-context";
 
 export default function RootLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-  return <MainLayout>{children}</MainLayout>;
+  return (
+    <MainLayout>
+      <ManagerProvider>{children}</ManagerProvider>
+    </MainLayout>
+  );
 }

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

@@ -0,0 +1,173 @@
+"use client";
+
+import Button from "@/components/atoms/buttons/Button";
+import ErrorMessageLogin from "@/components/atoms/errors/ErrorMessageLogin";
+import { useAuth } from "@/lib/auth-context";
+import { SHOP_INFO } from "@/lib/constants";
+import Image from "next/image";
+import { useRouter } from "next/navigation";
+import { FormEvent, useEffect, useState } from "react";
+
+export default function LoginOtpPage() {
+  const router = useRouter();
+  const { setUser } = useAuth();
+
+  const [phone, setPhone] = useState("");
+  const [role, setRole] = useState("");
+  const [otp, setOtp] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [errors, setErrors] = useState({ otp: "", general: "" });
+
+  useEffect(() => {
+    const storedPhone = sessionStorage.getItem("login_phone");
+    const storedRole = sessionStorage.getItem("login_role");
+    if (!storedPhone || !storedRole) {
+      router.replace("/login");
+      return;
+    }
+    setPhone(storedPhone);
+    setRole(storedRole);
+  }, [router]);
+
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    if (!otp.trim()) {
+      setErrors({ otp: "Please enter your OTP code", general: "" });
+      return;
+    }
+
+    setIsLoading(true);
+    setErrors({ otp: "", general: "" });
+
+    try {
+      const endpoint =
+        role === "manager"
+          ? "/api/manager/quick_login"
+          : "/api/customer/quick_login";
+
+      const res = await fetch(endpoint, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone, otp }),
+      });
+
+      if (res.ok) {
+        const userData = await res.json();
+        setUser(userData);
+        localStorage.setItem("coffee-shop-user", JSON.stringify(userData));
+        sessionStorage.removeItem("login_phone");
+        sessionStorage.removeItem("login_role");
+        router.push(role === "manager" ? "/manager" : "/");
+      } else {
+        const errorCode = (await res.text().catch(() => "")).trim();
+        const msg =
+          errorCode === "InvalidOTP"
+            ? "Incorrect or expired OTP code"
+            : "An error occurred, please try again";
+        setErrors({ otp: msg, general: "" });
+      }
+    } catch {
+      setErrors({ otp: "", general: "Unable to connect, please try again" });
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  if (!phone) return null;
+
+  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">
+        {/* Logo & Shop Name */}
+        <div className="mb-8 flex flex-col items-center">
+          <div className="relative mb-4 h-20 w-20">
+            <Image
+              src={SHOP_INFO.logo}
+              alt={SHOP_INFO.name}
+              fill
+              className="object-contain"
+              sizes="80px"
+              priority
+            />
+          </div>
+          <h1 className="mb-1 text-2xl font-bold text-(--color-primary-dark)">
+            {SHOP_INFO.name}
+          </h1>
+          <p className="text-sm text-(--color-text-muted)">
+            Verify your phone number
+          </p>
+        </div>
+
+        {errors.general && <ErrorMessageLogin message={errors.general} />}
+
+        <form onSubmit={handleSubmit} className="space-y-5">
+          {/* Info */}
+          <div className="rounded-lg border border-blue-200 bg-blue-50 p-4">
+            <p className="text-sm text-blue-800">
+              <i className="fa-solid fa-circle-info mr-2"></i>
+              OTP code sent to <strong>{phone}</strong>
+            </p>
+          </div>
+
+          {/* OTP Input */}
+          <div>
+            <label
+              htmlFor="otp"
+              className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
+            >
+              OTP code
+            </label>
+            <div className="relative">
+              <i className="fa-solid fa-key absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block"></i>
+              <input
+                id="otp"
+                type="text"
+                value={otp}
+                onChange={(e) => {
+                  setOtp(e.target.value);
+                  setErrors({ otp: "", general: "" });
+                }}
+                placeholder="Enter OTP code"
+                maxLength={6}
+                disabled={isLoading}
+                className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-4 py-3 text-center text-lg tracking-widest transition-all duration-150 outline-none placeholder:text-sm placeholder:tracking-normal placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) disabled:opacity-60 lg:pl-11 ${errors.otp ? "border-red-400" : "border-(--color-border)"}`}
+              />
+            </div>
+            {errors.otp && (
+              <ErrorMessageLogin message={errors.otp} type="secondary" />
+            )}
+          </div>
+
+          {/* Buttons */}
+          <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...
+                </>
+              ) : (
+                "Sign in"
+              )}
+            </Button>
+
+            <button
+              type="button"
+              onClick={() => router.push("/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) transition-all duration-150 hover:bg-(--color-primary) hover:text-white active:scale-98"
+            >
+              Change phone number
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

app/(main)/login/page.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { SHOP_INFO } from "@/lib/constants";
 import LoginForm from "@/components/organisms/forms/LoginForm";
+import { SHOP_INFO } from "@/lib/constants";
 import Image from "next/image";
 
 export default function LoginPage() {
@@ -25,39 +25,12 @@ export default function LoginPage() {
             {SHOP_INFO.name}
           </h1>
           <p className="text-sm text-(--color-text-muted)">
-            Đăng nhập vào hệ thống
+            Enter your phone number to sign in
           </p>
         </div>
-        
+
         {/* Login Form */}
         <LoginForm />
-
-        {/* Demo Credentials Info */}
-        <div className="bg-background mt-6 rounded-lg p-4">
-          <p className="mb-2 text-xs font-semibold text-(--color-text-muted)">
-            Tài khoản demo:
-          </p>
-          <ul className="space-y-1 text-xs text-(--color-text-muted)">
-            <li>
-              • Quản lý:{" "}
-              <code className="rounded bg-white px-1.5 py-0.5">
-                admin / admin
-              </code>
-            </li>
-            <li>
-              • Nhân viên:{" "}
-              <code className="rounded bg-white px-1.5 py-0.5">
-                Nguyễn Văn An / Nguyễn Văn An
-              </code>
-            </li>
-            <li>
-              • Khách hàng:{" "}
-              <code className="rounded bg-white px-1.5 py-0.5">
-                0987654321 / user1
-              </code>
-            </li>
-          </ul>
-        </div>
       </div>
     </div>
   );

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

@@ -0,0 +1,181 @@
+"use client";
+
+import Button from "@/components/atoms/buttons/Button";
+import ErrorMessageLogin from "@/components/atoms/errors/ErrorMessageLogin";
+import { useAuth } from "@/lib/auth-context";
+import { SHOP_INFO } from "@/lib/constants";
+import Image from "next/image";
+import { useRouter } from "next/navigation";
+import { FormEvent, useEffect, useState } from "react";
+
+export default function LoginPasswordPage() {
+  const router = useRouter();
+  const { setUser } = useAuth();
+
+  const [phone, setPhone] = useState("");
+  const [password, setPassword] = useState("");
+  const [showPassword, setShowPassword] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+  const [errors, setErrors] = useState({ password: "", general: "" });
+
+  useEffect(() => {
+    const storedPhone = sessionStorage.getItem("login_phone");
+    const storedRole = sessionStorage.getItem("login_role");
+    if (!storedPhone || storedRole !== "manager") {
+      router.replace("/login");
+      return;
+    }
+    setPhone(storedPhone);
+  }, [router]);
+
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    if (!password.trim()) {
+      setErrors({ password: "Please enter your password", general: "" });
+      return;
+    }
+
+    setIsLoading(true);
+    setErrors({ password: "", general: "" });
+
+    try {
+      const res = await fetch("/api/login", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone, password }),
+      });
+
+      if (res.ok) {
+        const userData = await res.json();
+        setUser(userData);
+        localStorage.setItem("coffee-shop-user", JSON.stringify(userData));
+        sessionStorage.removeItem("login_phone");
+        sessionStorage.removeItem("login_role");
+        router.push("/manager");
+      } else {
+        const STATUS_ERROR_MAP: Record<number, string> = {
+          400: "Incorrect login details, please try again",
+          401: "Incorrect password",
+          403: "Account is locked",
+          404: "Account does not exist",
+        };
+        const msg =
+          STATUS_ERROR_MAP[res.status] ??
+          (res.status >= 500
+            ? "Server error, please try again later"
+            : "An error occurred, please try again");
+        setErrors({ password: "", general: msg });
+      }
+    } catch {
+      setErrors({
+        password: "",
+        general: "Unable to connect, please try again",
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  if (!phone) return null;
+
+  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">
+        {/* Logo & Shop Name */}
+        <div className="mb-8 flex flex-col items-center">
+          <div className="relative mb-4 h-20 w-20">
+            <Image
+              src={SHOP_INFO.logo}
+              alt={SHOP_INFO.name}
+              fill
+              className="object-contain"
+              sizes="80px"
+              priority
+            />
+          </div>
+          <h1 className="mb-1 text-2xl font-bold text-(--color-primary-dark)">
+            {SHOP_INFO.name}
+          </h1>
+          <p className="text-sm text-(--color-text-muted)">Manager sign in</p>
+        </div>
+
+        {errors.general && <ErrorMessageLogin message={errors.general} />}
+
+        <form onSubmit={handleSubmit} className="space-y-5">
+          {/* Phone display */}
+          <div className="rounded-lg border border-(--color-border) bg-(--color-background) px-4 py-3 text-sm text-(--color-text-secondary)">
+            <i className="fa-solid fa-phone mr-2 text-(--color-text-muted)"></i>
+            {phone}
+          </div>
+
+          {/* Password Input */}
+          <div>
+            <label
+              htmlFor="password"
+              className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
+            >
+              Password
+            </label>
+            <div className="relative">
+              <i className="fa-solid fa-lock absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block"></i>
+              <input
+                id="password"
+                type={showPassword ? "text" : "password"}
+                value={password}
+                onChange={(e) => {
+                  setPassword(e.target.value);
+                  setErrors({ password: "", general: "" });
+                }}
+                placeholder="Enter password"
+                disabled={isLoading}
+                className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-10 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.password ? "border-red-400" : "border-(--color-border)"}`}
+              />
+              <button
+                type="button"
+                onClick={() => setShowPassword(!showPassword)}
+                className="absolute top-1/2 right-4 -translate-y-1/2 text-(--color-text-muted) transition-colors hover:text-(--color-primary)"
+                aria-label={showPassword ? "Hide password" : "Show password"}
+              >
+                <i
+                  className={`fa-solid ${showPassword ? "fa-eye-slash" : "fa-eye"}`}
+                ></i>
+              </button>
+            </div>
+            {errors.password && (
+              <ErrorMessageLogin message={errors.password} type="secondary" />
+            )}
+          </div>
+
+          {/* Buttons */}
+          <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...
+                </>
+              ) : (
+                "Sign in"
+              )}
+            </Button>
+
+            <button
+              type="button"
+              onClick={() => router.push("/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) transition-all duration-150 hover:bg-(--color-primary) hover:text-white active:scale-98"
+            >
+              Change phone number
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

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

@@ -0,0 +1,302 @@
+"use client";
+
+import Button from "@/components/atoms/buttons/Button";
+import { SHOP_INFO } from "@/lib/constants";
+import Image from "next/image";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { FormEvent, useEffect, useState } from "react";
+
+type PageState = "checking" | "available" | "closed" | "error";
+
+export default function ManagerSignupPage() {
+  const router = useRouter();
+
+  const [pageState, setPageState] = useState<PageState>("checking");
+  const [isLoading, setIsLoading] = useState(false);
+  const [form, setForm] = useState({
+    name: "",
+    phone: "",
+    password: "",
+    eateryName: "",
+  });
+  const [errors, setErrors] = useState({
+    name: "",
+    phone: "",
+    password: "",
+    eateryName: "",
+    submit: "",
+  });
+
+  useEffect(() => {
+    fetch("/api/manager/signup")
+      .then((res) => {
+        setPageState("available");
+        // if (res.ok) ;
+        // else if (res.status === 403) setPageState("closed");
+        // else setPageState("error");
+      })
+      .catch(() => setPageState("error"));
+  }, []);
+
+  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: "",
+      eateryName: "",
+      submit: "",
+    };
+    if (!form.name.trim()) next.name = "Please enter your full name";
+    if (!form.phone.trim()) next.phone = "Please enter your phone number";
+    else if (!validatePhone(form.phone))
+      next.phone = "Invalid phone number (e.g. 0987654321)";
+    if (!form.password.trim()) next.password = "Please enter your password";
+    else if (form.password.length < 6)
+      next.password = "Password must be at least 6 characters";
+    if (!form.eateryName.trim())
+      next.eateryName = "Please enter the restaurant name";
+    setErrors(next);
+    return !next.name && !next.phone && !next.password && !next.eateryName;
+  };
+
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    if (!validate()) return;
+
+    setIsLoading(true);
+    try {
+      const res = await fetch("/api/manager/signup", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(form),
+      });
+
+      if (res.ok || res.status === 201) {
+        router.push("/login");
+      } else {
+        const errorCode = (await res.text().catch(() => "")).trim();
+        const errorMap: Record<string, string> = {
+          ExistedUser: "Phone number already registered",
+          InvalidPhoneNumber: "Invalid phone number",
+        };
+        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">
+        {/* Logo */}
+        <div className="mb-8 flex flex-col items-center">
+          <div className="relative mb-4 h-20 w-20">
+            <Image
+              src={SHOP_INFO.logo}
+              alt={SHOP_INFO.name}
+              fill
+              className="object-contain"
+              sizes="80px"
+              priority
+            />
+          </div>
+          <h1 className="mb-1 text-2xl font-bold text-(--color-primary-dark)">
+            {SHOP_INFO.name}
+          </h1>
+          <p className="text-sm text-(--color-text-muted)">
+            Create a manager account
+          </p>
+        </div>
+
+        {/* Checking */}
+        {pageState === "checking" && (
+          <div className="flex flex-col items-center gap-3 py-8 text-(--color-text-muted)">
+            <i className="fa-solid fa-spinner fa-spin text-2xl text-(--color-primary)"></i>
+            <p className="text-sm">Checking...</p>
+          </div>
+        )}
+
+        {/* Closed */}
+        {pageState === "closed" && (
+          <div className="flex flex-col items-center gap-4 py-6">
+            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-red-100">
+              <i className="fa-solid fa-lock text-2xl text-red-500"></i>
+            </div>
+            <div className="text-center">
+              <h2 className="mb-2 text-lg font-semibold text-(--color-text-primary)">
+                Registration closed
+              </h2>
+              <p className="text-sm text-(--color-text-muted)">
+                The system already has a restaurant. Registration is no longer
+                available.
+              </p>
+            </div>
+            <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"
+            >
+              Quay lại đăng nhập
+            </Link>
+          </div>
+        )}
+
+        {/* Error */}
+        {pageState === "error" && (
+          <div className="flex flex-col items-center gap-4 py-6">
+            <div className="flex h-16 w-16 items-center justify-center rounded-full bg-yellow-100">
+              <i className="fa-solid fa-triangle-exclamation text-2xl text-yellow-500"></i>
+            </div>
+            <div className="text-center">
+              <h2 className="mb-2 text-lg font-semibold text-(--color-text-primary)">
+                Không thể kết nối
+              </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.
+              </p>
+            </div>
+            <Button
+              variant="primaryNoBorder"
+              style="login"
+              size="lg"
+              onClick={() => {
+                setPageState("checking");
+                fetch("/api/manager/signup")
+                  .then((r) => {
+                    if (r.ok) setPageState("available");
+                    else if (r.status === 403) setPageState("closed");
+                    else setPageState("error");
+                  })
+                  .catch(() => setPageState("error"));
+              }}
+            >
+              Thử lại
+            </Button>
+            <Link
+              href="/login"
+              className="text-sm text-(--color-primary) underline"
+            >
+              Quay lại đăng nhập
+            </Link>
+          </div>
+        )}
+
+        {/* Signup Form */}
+        {pageState === "available" && (
+          <form onSubmit={handleSubmit} className="space-y-4">
+            {[
+              {
+                id: "name",
+                label: "Họ tên",
+                icon: "fa-user",
+                placeholder: "Nguyễn Văn A",
+                field: "name" as const,
+                type: "text",
+              },
+              {
+                id: "phone",
+                label: "Số điện thoại",
+                icon: "fa-phone",
+                placeholder: "0987654321",
+                field: "phone" as const,
+                type: "tel",
+              },
+              {
+                id: "password",
+                label: "Mật khẩu",
+                icon: "fa-lock",
+                placeholder: "Ít nhất 6 ký tự",
+                field: "password" as const,
+                type: "password",
+              },
+              {
+                id: "eateryName",
+                label: "Tên nhà hàng",
+                icon: "fa-store",
+                placeholder: "Coffee & More",
+                field: "eateryName" as const,
+                type: "text",
+              },
+            ].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 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>Đang xử
+                    lý...
+                  </>
+                ) : (
+                  "Đăng ký"
+                )}
+              </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
+              </Link>
+            </div>
+          </form>
+        )}
+      </div>
+    </div>
+  );
+}

app/(main)/page.tsx

@@ -1,12 +1,23 @@
 "use client";
 
+import { SearchBar } from "@/components/molecules/search-bar";
 import { CategorySidebar } from "@/components/organisms/navigation";
 import { ProductGrid } from "@/components/organisms/product-grid";
-import { SearchBar } from "@/components/molecules/search-bar";
-import { useMenu } from "@/lib/menu-context";
-import { MENU_CATEGORIES } from "@/lib/constants";
+import { eateryClient } from "@/lib/apollo-clients";
+import { allEateriesQuery } from "@/lib/types";
+import { gql } from "@apollo/client";
+import { useQuery } from "@apollo/client/react";
+import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 
+const GET_EATERY_COUNT = gql`
+  {
+    allEateries {
+      id
+    }
+  }
+`;
+
 /**
  * Main page — sidebar + product grid layout.
  *
@@ -18,11 +29,30 @@ import { useEffect, useState } from "react";
  *   - Mobile  (< 1024px): collapsed by default
  */
 export default function Home() {
-  const { activeCategory, setActiveCategory } = useMenu();
+  const router = useRouter();
 
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
   const [searchQuery, setSearchQuery] = useState("");
 
+  const { data, loading, error } = useQuery<allEateriesQuery>(
+    GET_EATERY_COUNT,
+    {
+      client: eateryClient,
+      fetchPolicy: "no-cache",
+    },
+  );
+
+  useEffect(() => {
+    if (!loading && data) {
+      console.log(data);
+
+      const count = data.allEateries.length ?? 0;
+      if (count === 0) {
+        router.push("/manager-signup");
+      }
+    }
+  }, [data, loading, router]);
+
   useEffect(() => {
     const mq = window.matchMedia("(min-width: 1024px)");
     // eslint-disable-next-line react-hooks/set-state-in-effect
@@ -32,50 +62,29 @@ export default function Home() {
     return () => mq.removeEventListener("change", handler);
   }, []);
 
-  useEffect(() => {
-    // eslint-disable-next-line react-hooks/set-state-in-effect
-    setSearchQuery("");
-  }, [activeCategory]);
-
-  const activeCategoryLabel =
-    MENU_CATEGORIES.find((c) => c.id === activeCategory)?.name ?? "Tất cả";
+  if (loading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error.message}</div>;
 
   return (
     <div className="bg-background flex min-h-[calc(100vh-var(--spacing-header-height))] items-start">
-      {/* ── Sidebar ── */}
-      <CategorySidebar
-        isOpen={isSidebarOpen}
-        onToggle={() => setIsSidebarOpen((prev) => !prev)}
-        activeCategory={activeCategory}
-        onCategoryChange={setActiveCategory}
-      />
-
       {/* ── Main content ── */}
       <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">
-          {/* Title + count */}
-          <div className="shrink-0">
-            <h2 className="text-foreground text-xl font-bold">
-              {activeCategoryLabel}
-            </h2>
-          </div>
-
           {/* Search bar */}
           <SearchBar
             value={searchQuery}
-            onChange={setSearchQuery}
+            onChange={(q) => {
+              setSearchQuery(q);
+            }}
             onClear={() => setSearchQuery("")}
-            placeholder="Tìm kiếm món..."
+            placeholder="Search items..."
             className="sm:max-w-xs"
           />
         </div>
 
         {/* ── Product grid (organism handles mobile category menu + grid) ── */}
-        <ProductGrid
-          searchQuery={searchQuery}
-          isSidebarOpen={isSidebarOpen}
-        />
+        <ProductGrid searchQuery={searchQuery} isSidebarOpen={isSidebarOpen} />
       </main>
     </div>
   );

app/(main)/payment/page.tsx

@@ -5,10 +5,12 @@ 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";
 
-const formatPrice = (value: number) =>
-  value.toLocaleString("vi-VN", { style: "currency", currency: "VND" });
+export const formatPrice = (value?: number) =>
+  (value ?? 0).toLocaleString("vi-VN", { style: "currency", currency: "VND" });
 
 export default function PaymentPage() {
   const {
@@ -20,6 +22,10 @@ export default function PaymentPage() {
     setQuantity,
   } = useCart();
   const { user } = useAuth();
+  const { products } = useManager();
+
+  const findProduct = (id: string): MenuItemEntity =>
+    products.find((i) => i.id == id)!;
 
   const [isReviewOpen, setIsReviewOpen] = useState(false);
   const isCustomer = user?.role === "customer";
@@ -36,7 +42,7 @@ export default function PaymentPage() {
                 </h1>
               </div>
 
-              {items.length === 0 ? (
+              {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.
                 </div>
@@ -45,72 +51,92 @@ export default function PaymentPage() {
                   <table className="w-full min-w-190 text-sm">
                     <thead>
                       <tr className="bg-(--color-border-light)/40 text-left">
-                        <th className="px-4 py-3 font-semibold">
-                          Tên sản phẩm
+                        <th scope="col" className="px-4 py-3 font-semibold">
+                          Product name
                         </th>
-                        <th className="px-4 py-3 font-semibold">Giá tiền</th>
-                        <th className="px-4 py-3 font-semibold">Mô tả</th>
-                        <th className="px-4 py-3 font-semibold">Số lượng</th>
-                        <th className="px-4 py-3 text-right font-semibold">
-                          Xóa
+                        <th scope="col" className="px-4 py-3 font-semibold">
+                          Price
+                        </th>
+                        <th scope="col" className="px-4 py-3 font-semibold">
+                          Description
+                        </th>
+                        <th scope="col" className="px-4 py-3 font-semibold">
+                          Quantity
+                        </th>
+                        <th
+                          scope="col"
+                          className="px-4 py-3 text-right font-semibold"
+                        >
+                          Delete
                         </th>
                       </tr>
                     </thead>
                     <tbody>
-                      {items.map((item) => (
-                        <tr
-                          key={item.id}
-                          className="border-t border-(--color-border-light)"
-                        >
-                          <td className="text-foreground px-4 py-3 font-medium">
-                            {item.name}
-                          </td>
-                          <td className="px-4 py-3 font-semibold text-(--color-primary)">
-                            {formatPrice(item.price)}
-                          </td>
-                          <td className="max-w-70 px-4 py-3 text-(--color-text-muted)">
-                            <p className="line-clamp-2">{item.description}</p>
-                          </td>
-                          <td className="px-4 py-3">
-                            <div className="flex items-center gap-2">
-                              <button
-                                onClick={() => decreaseQty(item.id)}
-                                className="inline-flex items-center justify-center h-8 w-8 rounded-lg border border-(--color-border) hover:bg-(--color-border-light)"
-                                aria-label={`Giảm số lượng ${item.name}`}
-                              >
-                                -
-                              </button>
-                              <input
-                                type="number"
-                                min={1}
-                                value={item.quantity}
-                                onChange={(e) =>
-                                  setQuantity(item.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(item.id)}
-                                className="inline-flex items-center justify-center h-8 w-8 rounded-lg border border-(--color-border) hover:bg-(--color-border-light)"
-                                aria-label={`Tăng số lượng ${item.name}`}
-                              >
-                                +
-                              </button>
-                            </div>
-                          </td>
-                          <td className="px-4 py-3 text-right">
-                            <Button
-                              onClick={() => removeFromCart(item.id)}
-                              variant="danger"
-                              size="md"
-                              style="payment"
+                      {items?.map(
+                        ({
+                          productId: id,
+                          priceAtTimeOfAdding: price,
+                          quantity,
+                        }) => {
+                          const { name, description } = findProduct(id);
+
+                          return (
+                            <tr
+                              key={id}
+                              className="border-t border-(--color-border-light)"
                             >
-                              Xóa sản phẩm
-                            </Button>
-                          </td>
-                        </tr>
-                      ))}
+                              <td className="text-foreground px-4 py-3 font-medium">
+                                {name}
+                              </td>
+                              <td className="px-4 py-3 font-semibold text-(--color-primary)">
+                                {formatPrice(price)}
+                              </td>
+                              <td className="max-w-70 px-4 py-3 text-(--color-text-muted)">
+                                <p className="line-clamp-2">{description}</p>
+                              </td>
+                              <td className="px-4 py-3">
+                                <div className="flex items-center gap-2">
+                                  <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>
+                                </div>
+                              </td>
+                              <td className="px-4 py-3 text-right">
+                                <Button
+                                  onClick={() => removeFromCart(id)}
+                                  variant="danger"
+                                  size="md"
+                                  style="payment"
+                                  aria-label={`Xóa ${name} khỏi giỏ hàng`}
+                                >
+                                  Delete product
+                                </Button>
+                              </td>
+                            </tr>
+                          );
+                        },
+                      )}
                     </tbody>
                   </table>
                 </div>

app/(main)/register/page.tsx

@@ -1,24 +1,53 @@
 "use client";
 
+import Button from "@/components/atoms/buttons/Button";
 import { useAuth } from "@/lib/auth-context";
 import { SHOP_INFO } from "@/lib/constants";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { FormEvent, useState } from "react";
-import Button from "@/components/atoms/buttons/Button";
+import { FormEvent, useEffect, useState } from "react";
 
 // Static OTP for demo (in production, this would be sent via SMS)
 const DEMO_OTP = "123456";
 
 export default function RegisterPage() {
   const router = useRouter();
-  const { completeRegistration } = useAuth();
+  const { setUser } = useAuth();
 
   const [step, setStep] = useState<"phone" | "otp">("phone");
   const [phone, setPhone] = useState("");
   const [otp, setOtp] = useState("");
   const [errors, setErrors] = useState({ phone: "", otp: "" });
+  const [isLoading, setIsLoading] = useState(false);
+  const [otpSending, setOtpSending] = useState(false);
+  const [otpSendError, setOtpSendError] = useState("");
+
+  const sendOtp = async () => {
+    setOtpSending(true);
+    setOtpSendError("");
+    try {
+      const res = await fetch("/api/sms_otp", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone }),
+      });
+      if (!res.ok) {
+        setOtpSendError("Unable to send OTP, please try again");
+      }
+    } catch {
+      setOtpSendError("Unable to connect, please try again");
+    } finally {
+      setOtpSending(false);
+    }
+  };
+
+  useEffect(() => {
+    if (step === "otp") {
+      sendOtp();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [step]);
 
   // Validate Vietnamese phone number
   const validatePhone = (phoneNumber: string): boolean => {
@@ -28,43 +57,87 @@ export default function RegisterPage() {
     return phoneRegex.test(phoneNumber);
   };
 
-  const handlePhoneSubmit = (e: FormEvent) => {
+  const handlePhoneSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
     if (!phone.trim()) {
-      setErrors({ ...errors, phone: "Vui lòng nhập số điện thoại" });
+      setErrors({ ...errors, phone: "Please enter your phone number" });
       return;
     }
 
     if (!validatePhone(phone)) {
       setErrors({
         ...errors,
-        phone: "Số điện thoại không hợp lệ (VD: 0987654321)",
+        phone: "Invalid phone number (e.g. 0987654321)",
       });
       return;
     }
 
-    // Move to OTP step
-    setStep("otp");
+    setIsLoading(true);
     setErrors({ phone: "", otp: "" });
+
+    try {
+      const res = await fetch("/api/customer/quick_signup", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone }),
+      });
+
+      if (res.ok) {
+        setStep("otp");
+      } else {
+        const errorCode = (await res.text().catch(() => "")).trim();
+        const phoneErrorMap: Record<string, string> = {
+          ExistedUser: "Phone number already registered",
+          InvalidPhoneNumber: "Invalid phone number",
+        };
+        const msg =
+          phoneErrorMap[errorCode] ?? "An error occurred, please try again";
+        setErrors({ phone: msg, otp: "" });
+      }
+    } catch {
+      setErrors({ phone: "Unable to connect, please try again", otp: "" });
+    } finally {
+      setIsLoading(false);
+    }
   };
 
-  const handleOtpSubmit = (e: FormEvent) => {
+  const handleOtpSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
     if (!otp.trim()) {
-      setErrors({ ...errors, otp: "Vui lòng nhập mã OTP" });
+      setErrors({ ...errors, otp: "Please enter your OTP code" });
       return;
     }
 
-    if (otp !== DEMO_OTP) {
-      setErrors({ ...errors, otp: "Mã OTP không đúng" });
-      return;
-    }
+    setIsLoading(true);
+    setErrors({ phone: "", otp: "" });
 
-    // Complete registration
-    completeRegistration(phone);
-    router.push("/");
+    try {
+      const res = await fetch("/api/customer/quick_login", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone, otp }),
+      });
+
+      if (res.ok) {
+        const userData = await res.json();
+        setUser(userData);
+        localStorage.setItem("coffee-shop-user", JSON.stringify(userData));
+        router.push("/");
+      } else {
+        const errorCode = (await res.text().catch(() => "")).trim();
+        const msg =
+          errorCode === "InvalidOTP"
+            ? "Incorrect or expired OTP code"
+            : "An error occurred, please try again";
+        setErrors({ phone: "", otp: msg });
+      }
+    } catch {
+      setErrors({ phone: "", otp: "Unable to connect, please try again" });
+    } finally {
+      setIsLoading(false);
+    }
   };
 
   const handleBackToPhone = () => {
@@ -94,8 +167,8 @@ export default function RegisterPage() {
           </h1>
           <p className="text-sm text-(--color-text-muted)">
             {step === "phone"
-              ? "Đăng ký tài khoản khách hàng"
-              : "Xác thực số điện thoại"}
+              ? "Create a customer account"
+              : "Verify your phone number"}
           </p>
         </div>
 
@@ -131,7 +204,7 @@ export default function RegisterPage() {
                 htmlFor="phone"
                 className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
               >
-                Số điện thoại
+                Phone number
               </label>
               <div className="relative">
                 <i className="fa-solid fa-phone absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block"></i>
@@ -144,7 +217,8 @@ export default function RegisterPage() {
                     setErrors({ ...errors, phone: "" });
                   }}
                   placeholder="0987654321"
-                  className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-10 py-3 transition-all duration-150 outline-none placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) lg:pl-11 ${errors.phone ? "border-red-400" : "border-(--color-border)"} `}
+                  disabled={isLoading}
+                  className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-10 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.phone ? "border-red-400" : "border-(--color-border)"} `}
                 />
               </div>
               {errors.phone && (
@@ -154,15 +228,28 @@ export default function RegisterPage() {
                 </p>
               )}
               <p className="mt-2 text-xs text-(--color-text-muted)">
-                Nhập số điện thoại Việt Nam (10 số, bắt đầu bằng 0)
+                Enter a Vietnamese phone number (10 digits, starting with 0)
               </p>
             </div>
 
             {/* Buttons */}
             <div className="space-y-3 pt-2">
               {/* Submit Button */}
-              <Button variant="primaryNoBorder" type="submit" style="login" size="lg">
-                Tiếp tục
+              <Button
+                variant="primaryNoBorder"
+                type="submit"
+                style="login"
+                size="lg"
+                disabled={isLoading}
+              >
+                {isLoading ? (
+                  <>
+                    <i className="fa-solid fa-spinner fa-spin mr-2"></i>
+                    Processing...
+                  </>
+                ) : (
+                  "Continue"
+                )}
               </Button>
 
               {/* Back to Login */}
@@ -170,7 +257,7 @@ export default function RegisterPage() {
                 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 active:scale-98"
               >
-                Quay lại đăng nhập
+                Back to sign in
               </Link>
             </div>
           </form>
@@ -183,7 +270,16 @@ export default function RegisterPage() {
             <div className="rounded-lg border border-blue-200 bg-blue-50 p-4">
               <p className="mb-2 text-sm text-blue-800">
                 <i className="fa-solid fa-circle-info mr-2"></i>
-                Mã OTP đã được gửi đến số <strong>{phone}</strong>
+                {otpSending ? (
+                  <>
+                    <i className="fa-solid fa-spinner fa-spin mr-1"></i>
+                    Sending OTP to <strong>{phone}</strong>...
+                  </>
+                ) : (
+                  <>
+                    OTP code sent to <strong>{phone}</strong>
+                  </>
+                )}
               </p>
               <p className="text-xs text-blue-600">
                 Demo OTP:{" "}
@@ -192,6 +288,12 @@ export default function RegisterPage() {
                 </code>
               </p>
             </div>
+            {otpSendError && (
+              <p className="flex items-center gap-1 text-xs text-red-500">
+                <i className="fa-solid fa-circle-exclamation"></i>
+                {otpSendError}
+              </p>
+            )}
 
             {/* OTP Input */}
             <div>
@@ -199,7 +301,7 @@ export default function RegisterPage() {
                 htmlFor="otp"
                 className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
               >
-                Mã OTP
+                OTP code
               </label>
               <div className="relative">
                 <i className="fa-solid fa-key absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block"></i>
@@ -211,9 +313,10 @@ export default function RegisterPage() {
                     setOtp(e.target.value);
                     setErrors({ ...errors, otp: "" });
                   }}
-                  placeholder="Nhập mã OTP"
+                  placeholder="Enter OTP code"
                   maxLength={6}
-                  className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-4 py-3 text-center text-lg tracking-widest transition-all duration-150 outline-none placeholder:text-sm placeholder:tracking-normal placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) lg:pl-11 ${errors.otp ? "border-red-400" : "border-(--color-border)"} `}
+                  disabled={isLoading}
+                  className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-4 py-3 text-center text-lg tracking-widest transition-all duration-150 outline-none placeholder:text-sm placeholder:tracking-normal placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) disabled:opacity-60 lg:pl-11 ${errors.otp ? "border-red-400" : "border-(--color-border)"} `}
                 />
               </div>
               {errors.otp && (
@@ -227,24 +330,51 @@ export default function RegisterPage() {
             {/* Buttons */}
             <div className="space-y-3 pt-2">
               {/* Submit Button */}
-              <Button variant="primaryNoBorder" type="submit" style="login" size="lg">
-                Hoàn tất đăng ký
+              <Button
+                variant="primaryNoBorder"
+                type="submit"
+                style="login"
+                size="lg"
+                disabled={isLoading || otpSending}
+              >
+                {isLoading ? (
+                  <>
+                    <i className="fa-solid fa-spinner fa-spin mr-2"></i>
+                    Processing...
+                  </>
+                ) : (
+                  "Complete registration"
+                )}
               </Button>
 
               {/* Back Button */}
-              <Button variant="bgWhite" onClick={handleBackToPhone} size="lg" style="login">
-                Thay đổi số điện thoại
+              <Button
+                variant="bgWhite"
+                onClick={handleBackToPhone}
+                size="lg"
+                style="login"
+                disabled={isLoading}
+              >
+                Change phone number
               </Button>
             </div>
 
-            {/* Resend OTP (disabled in demo) */}
+            {/* Resend OTP */}
             <div className="text-center">
               <button
                 type="button"
-                disabled
-                className="cursor-not-allowed text-sm text-(--color-text-muted)"
+                onClick={sendOtp}
+                disabled={otpSending || isLoading}
+                className="text-sm text-(--color-primary) underline disabled:cursor-not-allowed disabled:no-underline disabled:opacity-50"
               >
-                Gửi lại mã OTP (60s)
+                {otpSending ? (
+                  <>
+                    <i className="fa-solid fa-spinner fa-spin mr-1"></i>
+                    Resending...
+                  </>
+                ) : (
+                  "Resend OTP code"
+                )}
               </button>
             </div>
           </form>

app/(manager)/manager/analytics/page.tsx

@@ -1,342 +0,0 @@
-"use client";
-
-import {
-  BarChart,
-  LineChart,
-  PieChart,
-  ProductTable,
-  SummaryCard,
-} from "@/components/organisms/analytics";
-import type { PieSlice } from "@/components/organisms/analytics";
-import { calcChange, formatCurrency, formatCurrencyFull } from "@/lib/analytics-utils";
-import {
-  MENU_CATEGORIES,
-  MOCK_PRODUCT_SALES,
-  MOCK_REVENUE_DAILY,
-  MOCK_REVENUE_MONTHLY,
-  MOCK_REVENUE_WEEKLY,
-  MOCK_REVENUE_YEARLY,
-} from "@/lib/constants";
-import type { AnalyticsPeriod, RevenueDataPoint } from "@/lib/types";
-import Link from "next/link";
-import { useMemo, useState } from "react";
-
-// ─── Constants ────────────────────────────────────────────────────────────────
-
-const PERIOD_LABELS: Record<AnalyticsPeriod, string> = {
-  day: "Theo ngày",
-  week: "Theo tuần",
-  month: "Theo tháng",
-  year: "Theo năm",
-};
-
-const CATEGORY_COLORS = [
-  "#6F4E37", "#C8973A", "#A0785A", "#8B6914", "#D4A96A",
-  "#4A3728", "#F0D9A8", "#A08060", "#3D2B1F",
-];
-
-const REVENUE_MAP: Record<AnalyticsPeriod, RevenueDataPoint[]> = {
-  day: MOCK_REVENUE_DAILY,
-  week: MOCK_REVENUE_WEEKLY,
-  month: MOCK_REVENUE_MONTHLY,
-  year: MOCK_REVENUE_YEARLY,
-};
-
-const CHART_TYPES = ["line", "bar", "pie"] as const;
-type ChartType = (typeof CHART_TYPES)[number];
-
-const CHART_META: Record<ChartType, { icon: string; label: string }> = {
-  line: { icon: "fa-chart-line", label: "Line" },
-  bar:  { icon: "fa-chart-bar",  label: "Bar"  },
-  pie:  { icon: "fa-chart-pie",  label: "Pie"  },
-};
-
-// ─── Category filter select ───────────────────────────────────────────────────
-
-function CategorySelect({
-  value,
-  onChange,
-  label = "Danh mục:",
-}: {
-  value: string;
-  onChange: (v: string) => void;
-  label?: string;
-}) {
-  const categories = MENU_CATEGORIES.filter((c) => c.id !== "all");
-  return (
-    <div className="flex items-center gap-2">
-      <label className="text-xs text-(--color-text-muted)">{label}</label>
-      <select
-        title="Danh mục"
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        className="bg-background text-foreground rounded-lg border border-(--color-border) px-2 py-1.5 text-xs"
-      >
-        <option value="all">Tất cả</option>
-        {categories.map((c) => (
-          <option key={c.id} value={c.id}>{c.name}</option>
-        ))}
-      </select>
-    </div>
-  );
-}
-
-// ─── Main Page ────────────────────────────────────────────────────────────────
-
-export default function AnalyticsPage() {
-  const [period, setPeriod] = useState<AnalyticsPeriod>("month");
-  const [activeChart, setActiveChart] = useState<ChartType>("line");
-  const [categoryFilter, setCategoryFilter] = useState("all");
-
-  // Revenue data for selected period
-  const revenueData = REVENUE_MAP[period];
-
-  // Split into halves for bar comparison
-  const half = Math.floor(revenueData.length / 2);
-  const barCurrent  = revenueData.slice(half);
-  const barPrevious = revenueData.slice(0, half).slice(0, barCurrent.length);
-
-  // Filtered product sales
-  const filteredSales = useMemo(
-    () => categoryFilter === "all"
-      ? MOCK_PRODUCT_SALES
-      : MOCK_PRODUCT_SALES.filter((p) => p.category === categoryFilter),
-    [categoryFilter],
-  );
-
-  // Summary stats
-  const totalRevenue = revenueData.reduce((s, d) => s + d.revenue, 0);
-  const totalOrders  = revenueData.reduce((s, d) => s + d.orders, 0);
-  const totalProfit  = filteredSales.reduce((s, d) => s + d.profit, 0);
-  const avgOrderValue = totalOrders > 0 ? totalRevenue / totalOrders : 0;
-
-  // Period-over-period comparisons
-  const curRevenue = barCurrent.reduce((s, d) => s + d.revenue, 0);
-  const prevRevenue = barPrevious.reduce((s, d) => s + d.revenue, 0);
-  const curOrders  = barCurrent.reduce((s, d) => s + d.orders, 0);
-  const prevOrders = barPrevious.reduce((s, d) => s + d.orders, 0);
-  const revComp = calcChange(curRevenue, prevRevenue);
-  const ordComp = calcChange(curOrders, prevOrders);
-  const proComp = calcChange(curRevenue * 0.65, prevRevenue * 0.65);
-
-  // Pie data: revenue by category
-  const pieData = useMemo((): PieSlice[] => {
-    const byCategory: Record<string, number> = {};
-    MOCK_PRODUCT_SALES.forEach((p) => {
-      byCategory[p.category] = (byCategory[p.category] ?? 0) + p.revenue;
-    });
-    return Object.entries(byCategory)
-      .map(([catId, rev], i) => ({
-        label: MENU_CATEGORIES.find((c) => c.id === catId)?.name ?? catId,
-        value: rev,
-        color: CATEGORY_COLORS[i % CATEGORY_COLORS.length],
-      }))
-      .sort((a, b) => b.value - a.value);
-  }, []);
-
-  // Top 5 products
-  const top5 = useMemo(
-    () => [...filteredSales].sort((a, b) => b.revenue - a.revenue).slice(0, 5),
-    [filteredSales],
-  );
-
-  // Totals for summary row
-  const filteredRevenue = filteredSales.reduce((s, d) => s + d.revenue, 0);
-  const filteredProfit  = filteredSales.reduce((s, d) => s + d.profit, 0);
-  const filteredUnits   = filteredSales.reduce((s, d) => s + d.unitsSold, 0);
-  const avgMargin = filteredSales.length > 0
-    ? filteredSales.reduce((s, d) => s + d.profitMargin, 0) / filteredSales.length
-    : 0;
-
-  return (
-    <div className="bg-background min-h-screen">
-      {/* ── Page Header ── */}
-      <header className="sticky top-0 z-30 border-b border-(--color-border-light) bg-(--color-bg-header) shadow-sm">
-        <div className="mx-auto flex max-w-screen-2xl items-center gap-4 px-4 py-3">
-          <Link
-            href="/manager"
-            className="flex h-9 w-9 shrink-0 items-center justify-center rounded-xl text-(--color-text-muted) transition-colors hover:bg-(--color-accent-light) hover:text-(--color-primary)"
-          >
-            <i className="fa-solid fa-arrow-left"></i>
-          </Link>
-          <div className="flex items-center gap-3">
-            <span className="flex h-9 w-9 items-center justify-center rounded-xl bg-(--color-accent-light) text-(--color-primary)">
-              <i className="fa-solid fa-chart-line"></i>
-            </span>
-            <div>
-              <h1 className="text-foreground text-lg leading-tight font-bold">
-                Thống kê & Phân tích tài chính
-              </h1>
-              <p className="text-xs text-(--color-text-muted)">Financial Analytics Dashboard</p>
-            </div>
-          </div>
-
-          {/* Period selector */}
-          <div className="ml-auto flex items-center gap-2">
-            {(Object.keys(PERIOD_LABELS) as AnalyticsPeriod[]).map((p) => (
-              <button
-                key={p}
-                onClick={() => setPeriod(p)}
-                className={`hidden rounded-lg px-3 py-1.5 text-xs font-medium transition-colors sm:block ${
-                  period === p
-                    ? "bg-(--color-primary) text-white"
-                    : "bg-background text-(--color-text-muted) hover:bg-(--color-accent-light)"
-                }`}
-              >
-                {PERIOD_LABELS[p]}
-              </button>
-            ))}
-            <select
-              title="Chọn kỳ"
-              value={period}
-              onChange={(e) => setPeriod(e.target.value as AnalyticsPeriod)}
-              className="text-foreground block rounded-lg border border-(--color-border) bg-(--color-bg-card) px-2 py-1.5 text-xs sm:hidden"
-            >
-              {(Object.entries(PERIOD_LABELS) as [AnalyticsPeriod, string][]).map(([k, v]) => (
-                <option key={k} value={k}>{v}</option>
-              ))}
-            </select>
-          </div>
-        </div>
-      </header>
-
-      <main className="mx-auto max-w-screen-2xl space-y-6 p-4 pb-10">
-        {/* ── Summary Cards ── */}
-        <section>
-          <h2 className="mb-3 text-sm font-semibold tracking-wider text-(--color-text-muted) uppercase">
-            Tổng quan
-          </h2>
-          <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-4">
-            <SummaryCard icon="fa-solid fa-sack-dollar" title="Tổng doanh thu"
-              value={formatCurrency(totalRevenue)} subtitle={PERIOD_LABELS[period]}
-              change={revComp.change} changePercent={revComp.changePercent} isPositive={revComp.isPositive} />
-            <SummaryCard icon="fa-solid fa-receipt" title="Số đơn hàng"
-              value={totalOrders.toLocaleString()} subtitle="Tổng đơn trong kỳ"
-              change={ordComp.change} changePercent={ordComp.changePercent} isPositive={ordComp.isPositive} />
-            <SummaryCard icon="fa-solid fa-circle-dollar-to-slot" title="Tổng lợi nhuận"
-              value={formatCurrency(totalProfit)} subtitle="Ước tính từ dữ liệu bán hàng"
-              change={proComp.change} changePercent={proComp.changePercent} isPositive={proComp.isPositive} />
-            <SummaryCard icon="fa-solid fa-basket-shopping" title="Giá trị đơn TB"
-              value={formatCurrency(avgOrderValue)} subtitle="Doanh thu / số đơn hàng"
-              change={0} changePercent={0} isPositive={true} />
-          </div>
-        </section>
-
-        {/* ── Revenue Chart ── */}
-        <section className="bg-background rounded-2xl border border-(--color-border-light) p-5 shadow-sm">
-          <div className="mb-4 flex flex-wrap items-center justify-between gap-3">
-            <h2 className="text-foreground text-base font-semibold">
-              <i className="fa-solid fa-chart-area mr-2 text-(--color-primary)"></i>
-              Biểu đồ doanh thu
-            </h2>
-            <div className="flex gap-2">
-              {CHART_TYPES.map((t) => (
-                <button
-                  key={t}
-                  onClick={() => setActiveChart(t)}
-                  className={`flex items-center gap-1.5 rounded-lg px-3 py-1.5 text-xs font-medium transition-colors ${
-                    activeChart === t
-                      ? "bg-(--color-primary) text-white"
-                      : "bg-background text-(--color-text-muted) hover:bg-(--color-accent-light)"
-                  }`}
-                >
-                  <i className={`fa-solid text-xs ${CHART_META[t].icon}`}></i>
-                  <span className="hidden sm:inline">{CHART_META[t].label}</span>
-                </button>
-              ))}
-            </div>
-          </div>
-
-          {activeChart === "line" && (
-            <>
-              <p className="mb-3 text-xs text-(--color-text-muted)">Doanh thu theo thời gian — {PERIOD_LABELS[period]}</p>
-              <LineChart data={revenueData} height={220} />
-            </>
-          )}
-          {activeChart === "bar" && (
-            <>
-              <p className="mb-3 text-xs text-(--color-text-muted)">So sánh doanh thu nửa đầu và nửa sau kỳ hiện tại</p>
-              <BarChart current={barCurrent} previous={barPrevious} height={220} />
-            </>
-          )}
-          {activeChart === "pie" && (
-            <>
-              <p className="mb-3 text-xs text-(--color-text-muted)">Tỷ trọng doanh thu theo danh mục sản phẩm</p>
-              <PieChart data={pieData} />
-            </>
-          )}
-        </section>
-
-        {/* ── Top 5 Products ── */}
-        <section className="rounded-2xl border border-(--color-border-light) bg-(--color-bg-card) p-5 shadow-sm">
-          <div className="mb-4 flex flex-wrap items-center justify-between gap-3">
-            <h2 className="text-foreground text-base font-semibold">
-              <i className="fa-solid fa-fire mr-2 text-orange-500"></i>
-              Top sản phẩm bán chạy
-            </h2>
-            <CategorySelect value={categoryFilter} onChange={setCategoryFilter} />
-          </div>
-          <div className="space-y-3">
-            {top5.map((p, i) => {
-              const pct = (p.revenue / top5[0].revenue) * 100;
-              return (
-                <div key={p.productId}>
-                  <div className="mb-1 flex items-center justify-between gap-2">
-                    <div className="flex min-w-0 items-center gap-2">
-                      <span className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-(--color-accent-light) text-xs font-bold text-(--color-primary)">
-                        {i + 1}
-                      </span>
-                      <span className="text-foreground truncate text-sm font-medium">{p.name}</span>
-                    </div>
-                    <div className="flex shrink-0 items-center gap-3 text-xs">
-                      <span className="text-(--color-text-muted) tabular-nums">{p.unitsSold} ly</span>
-                      <span className="font-semibold text-(--color-primary) tabular-nums">{formatCurrency(p.revenue)}</span>
-                    </div>
-                  </div>
-                  <div className="bg-background h-2 overflow-hidden rounded-full">
-                    <div className="h-full rounded-full bg-(--color-primary) transition-all duration-500" style={{ width: `${pct}%` }} />
-                  </div>
-                </div>
-              );
-            })}
-          </div>
-        </section>
-
-        {/* ── Full Product Table ── */}
-        <section className="rounded-2xl border border-(--color-border-light) bg-(--color-bg-card) p-5 shadow-sm">
-          <div className="mb-4 flex flex-wrap items-center justify-between gap-3">
-            <h2 className="text-foreground text-base font-semibold">
-              <i className="fa-solid fa-table text-foreground mr-2"></i>
-              Phân tích chi tiết sản phẩm
-            </h2>
-            <CategorySelect value={categoryFilter} onChange={setCategoryFilter} label="Lọc danh mục:" />
-          </div>
-          <p className="mb-3 text-xs text-(--color-text-muted)">
-            Click vào tiêu đề cột để sắp xếp. Hiển thị {filteredSales.length} sản phẩm.
-          </p>
-          <ProductTable data={filteredSales} />
-
-          {/* Summary row */}
-          <div className="bg-background mt-4 flex flex-wrap gap-4 rounded-xl p-4 text-sm">
-            <div>
-              <span className="text-(--color-text-muted)">Tổng doanh thu: </span>
-              <span className="font-semibold text-(--color-primary)">{formatCurrencyFull(filteredRevenue)}</span>
-            </div>
-            <div>
-              <span className="text-(--color-text-muted)">Tổng lợi nhuận: </span>
-              <span className="font-semibold text-green-600">{formatCurrencyFull(filteredProfit)}</span>
-            </div>
-            <div>
-              <span className="text-(--color-text-muted)">Tổng sản lượng: </span>
-              <span className="text-foreground font-semibold">{filteredUnits.toLocaleString()} ly</span>
-            </div>
-            <div>
-              <span className="text-(--color-text-muted)">Biên LN trung bình: </span>
-              <span className="font-semibold text-yellow-700">{avgMargin.toFixed(1)}%</span>
-            </div>
-          </div>
-        </section>
-      </main>
-    </div>
-  );
-}

app/(manager)/manager/page.tsx

@@ -1,8 +1,6 @@
 "use client";
 
 import {
-  CategoriesTab,
-  CombosTab,
   ProductsTab,
 } from "@/components/organisms/manager";
 import { useAuth } from "@/lib/auth-context";
@@ -11,28 +9,15 @@ import Link from "next/link";
 
 export default function ManagerPage() {
   const { user, logout } = useAuth();
-  const { activeTab, setActiveTab, products, combos, categories } =
-    useManager();
+  const { activeTab, setActiveTab, products } = useManager();
 
   const tabs = [
     {
       id: "products" as const,
-      label: "Thực đơn",
+      label: "Menu",
       icon: "fa-solid fa-utensils",
       count: products.length,
     },
-    {
-      id: "combos" as const,
-      label: "Combo",
-      icon: "fa-solid fa-layer-group",
-      count: combos.length,
-    },
-    {
-      id: "categories" as const,
-      label: "Danh mục",
-      icon: "fa-solid fa-tags",
-      count: categories.length,
-    },
   ];
 
   return (
@@ -51,7 +36,7 @@ export default function ManagerPage() {
 
         <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">
-            Quản lý thực đơn
+            Menu Management
           </p>
           {tabs.map((tab) => (
             <button
@@ -65,29 +50,41 @@ export default function ManagerPage() {
             >
               <i className={`${tab.icon} w-4 text-center`}></i>
               <span className="flex-1 text-left">{tab.label}</span>
-              <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>
+              {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="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">
-              Phân tích
+              Analytics
             </p>
             <Link
               href="/manager/analytics"
               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-chart-line w-4 text-center"></i>
-              <span className="flex-1 text-left">Tài chính</span>
+              <span className="flex-1 text-left">Finance</span>
               <span className="rounded-full bg-(--color-accent-light) px-2 py-0.5 text-xs font-semibold text-(--color-primary)">
-                Mới
+                New
+              </span>
+            </Link>
+            <Link
+              href="/staff/schedule"
+              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-calendar-days w-4 text-center"></i>
+              <span className="flex-1 text-left">Shifts</span>
+              <span className="rounded-full bg-(--color-accent-light) px-2 py-0.5 text-xs font-semibold text-(--color-primary)">
+                New
               </span>
             </Link>
           </div>
@@ -100,9 +97,9 @@ export default function ManagerPage() {
             </div>
             <div className="min-w-0 flex-1">
               <p className="text-foreground truncate text-sm font-semibold">
-                {user?.name ?? "Quản lý"}
+                {user?.name ?? "Manager"}
               </p>
-              <p className="text-xs text-(--color-text-muted)">Quản lý quán</p>
+              <p className="text-xs text-(--color-text-muted)">Store Manager</p>
             </div>
           </div>
           <div className="mt-1 flex gap-2 px-1">
@@ -111,14 +108,14 @@ export default function ManagerPage() {
               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"
             >
               <i className="fa-solid fa-house"></i>
-              Trang chủ
+              Home
             </Link>
             <button
               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>
-              Đăng xuất
+              Logout
             </button>
           </div>
         </div>
@@ -129,16 +126,18 @@ export default function ManagerPage() {
         <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">
-              {tabs.find((t) => t.id === activeTab)?.label ?? "Quản lý"}
+              {tabs.find((t) => t.id === activeTab)?.label ?? "Manager"}
             </h1>
             <p className="text-xs text-(--color-text-muted)">
-              Quản lý{" "}
+              Manage{" "}
               {activeTab === "products"
-                ? "thực đơn"
+                ? "menu items"
                 : activeTab === "combos"
-                  ? "combo"
-                  : "danh mục"}{" "}
-              của quán
+                  ? "combos"
+                  : activeTab === "categories"
+                    ? "categories"
+                    : "menu"}{" "}
+              for your store
             </p>
           </div>
 
@@ -163,7 +162,7 @@ export default function ManagerPage() {
               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">Tài chính</span>
+              <span className="hidden sm:inline">Finance</span>
             </Link>
           </div>
 
@@ -174,22 +173,20 @@ export default function ManagerPage() {
               className="flex items-center gap-1.5 rounded-xl bg-(--color-accent-light) px-3 py-2 text-xs font-medium text-(--color-primary) no-underline transition hover:opacity-80"
             >
               <i className="fa-solid fa-chart-line"></i>
-              Thống kê tài chính
+              Financial Analytics
             </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>
-              Trang chủ
+              Home
             </Link>
           </div>
         </header>
 
         <main className="flex-1 p-5 md:p-8">
           {activeTab === "products" && <ProductsTab />}
-          {activeTab === "combos" && <CombosTab />}
-          {activeTab === "categories" && <CategoriesTab />}
         </main>
       </div>
     </div>

app/(staff)/layout.tsx

@@ -0,0 +1,9 @@
+import { StaffLayout } from "@/components/templates/staff-layout";
+
+export default function RootStaffLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return <StaffLayout>{children}</StaffLayout>;
+}

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

@@ -0,0 +1,386 @@
+"use client";
+
+import MobileShiftView from "@/components/organisms/shift-schedule/MobileShiftView";
+import MonthlyCalendar from "@/components/organisms/shift-schedule/MonthlyCalendar";
+import ShiftCreateModal from "@/components/organisms/shift-schedule/ShiftCreateModal";
+import ShiftDetailModal from "@/components/organisms/shift-schedule/ShiftDetailModal";
+import WeeklySchedule from "@/components/organisms/shift-schedule/WeeklySchedule";
+import { useAuth } from "@/lib/auth-context";
+import { useShift } from "@/lib/shift-context";
+import type { ShiftSlot } from "@/lib/types";
+import Link from "next/link";
+import { useState } from "react";
+
+const MONTH_NAMES = [
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+
+function getMonday(d: Date): Date {
+  const date = new Date(d);
+  const day = date.getDay();
+  const diff = date.getDate() - day + (day === 0 ? -6 : 1);
+  date.setDate(diff);
+  return date;
+}
+
+function formatDateShort(d: Date): string {
+  return `${d.getDate().toString().padStart(2, "0")}/${(d.getMonth() + 1).toString().padStart(2, "0")}`;
+}
+
+export default function StaffSchedulePage() {
+  const { user, logout } = useAuth();
+  const {
+    view,
+    setView,
+    currentDate,
+    goToNextWeek,
+    goToPrevWeek,
+    goToNextMonth,
+    goToPrevMonth,
+    goToToday,
+    getWeeklyBudget,
+  } = useShift();
+
+  const [selectedShift, setSelectedShift] = useState<ShiftSlot | null>(null);
+  const [detailOpen, setDetailOpen] = useState(false);
+  const [createOpen, setCreateOpen] = useState(false);
+  const [createDate, setCreateDate] = useState<string | undefined>();
+
+  const isManager = user?.role === "manager";
+
+  const handleShiftClick = (shift: ShiftSlot) => {
+    setSelectedShift(shift);
+    setDetailOpen(true);
+  };
+
+  const handleCreateShift = (date: string) => {
+    setCreateDate(date);
+    setCreateOpen(true);
+  };
+
+  const handleDateSelect = (date: string) => {
+    // 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();
+
+  return (
+    <div className="flex min-h-screen">
+      {/* ── 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>
+          </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">
+            View
+          </p>
+          <button
+            type="button"
+            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)"
+            }`}
+          >
+            <i className="fa-solid fa-table-columns w-4 text-center"></i>
+            <span className="flex-1 text-left">Weekly</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)"
+            }`}
+          >
+            <i className="fa-solid fa-calendar w-4 text-center"></i>
+            <span className="flex-1 text-left">Monthly</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
+            </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)"
+            >
+              <i className="fa-solid fa-crosshairs w-4 text-center"></i>
+              <span className="flex-1 text-left">Today</span>
+            </button>
+          </div>
+
+          {/* 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
+              </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)"
+              >
+                <i className="fa-solid fa-store w-4 text-center"></i>
+                <span className="flex-1 text-left">Dashboard</span>
+              </Link>
+            </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
+              </p>
+              <p className="mt-1 text-lg font-bold text-(--color-primary)">
+                {weeklyBudget.toLocaleString("vi-VN")}
+              </p>
+              <p className="text-[10px] text-(--color-text-muted)">VND</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)">
+              <i
+                className={`fa-solid ${isManager ? "fa-user-tie" : "fa-user"} text-sm text-(--color-primary)`}
+              ></i>
+            </div>
+            <div className="min-w-0 flex-1">
+              <p className="text-foreground truncate text-sm font-semibold">
+                {user?.name ?? "Staff"}
+              </p>
+              <p className="text-xs text-(--color-text-muted)">
+                {isManager ? "Manager" : "Staff"}
+              </p>
+            </div>
+          </div>
+          <div className="mt-1 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"
+            >
+              <i className="fa-solid fa-house"></i>
+              Home
+            </Link>
+            <button
+              type="button"
+              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>
+              Logout
+            </button>
+          </div>
+        </div>
+      </aside>
+
+      {/* ── 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>
+            </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>
+
+            {/* 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>
+            )}
+
+            {/* 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>
+            </div>
+          </div>
+        </header>
+
+        {/* Content */}
+        <main className="flex-1 p-4 md:p-6">
+          {/* Desktop views */}
+          <div className="hidden md:block">
+            {view === "week" ? (
+              <WeeklySchedule
+                onShiftClick={handleShiftClick}
+                onCreateShift={isManager ? handleCreateShift : undefined}
+              />
+            ) : (
+              <MonthlyCalendar
+                onShiftClick={handleShiftClick}
+                onDateSelect={isManager ? handleDateSelect : undefined}
+              />
+            )}
+          </div>
+
+          {/* Mobile view */}
+          <div className="md:hidden">
+            {view === "week" ? (
+              <WeeklySchedule
+                onShiftClick={handleShiftClick}
+                onCreateShift={isManager ? handleCreateShift : undefined}
+                mobileCalendarHeader
+              />
+            ) : (
+              <MobileShiftView onShiftClick={handleShiftClick} />
+            )}
+          </div>
+
+          {/* Mobile FAB for manager */}
+          {isManager && (
+            <button
+              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"
+            >
+              <i className="fa-solid fa-plus text-lg"></i>
+            </button>
+          )}
+        </main>
+      </div>
+
+      {/* Modals */}
+      <ShiftDetailModal
+        shift={selectedShift}
+        isOpen={detailOpen}
+        onClose={() => {
+          setDetailOpen(false);
+          setSelectedShift(null);
+        }}
+      />
+      <ShiftCreateModal
+        isOpen={createOpen}
+        onClose={() => setCreateOpen(false)}
+        defaultDate={createDate}
+      />
+    </div>
+  );
+}

app/providers.tsx

@@ -2,7 +2,6 @@
 
 import { AuthProvider } from "@/lib/auth-context";
 import { CartProvider } from "@/lib/cart-context";
-import { MenuProvider } from "@/lib/menu-context";
 
 /**
  * Client-side providers wrapper.
@@ -12,9 +11,7 @@ import { MenuProvider } from "@/lib/menu-context";
 export function Providers({ children }: { children: React.ReactNode }) {
   return (
     <AuthProvider>
-      <MenuProvider>
-        <CartProvider>{children}</CartProvider>
-      </MenuProvider>
+      <CartProvider>{children}</CartProvider>
     </AuthProvider>
   );
 }

components/COMPONENTS.md

@@ -1,7 +1,7 @@
 # Components Documentation
 
-> This project follows **Atomic Design** pattern.
-> See `Atomic.md` at project root for full structure guide.
+> This project follows **Atomic Design** pattern. See `Atomic.md` at project
+> root for full structure guide.
 
 ## Directory Structure
 
@@ -19,17 +19,21 @@ components/
 
 ### ProductCard (`molecules/cards/ProductCard.tsx`)
 
-**Description:** Product card molecule. Displays product image, name, description, formatted price, and a Buy button. Width is controlled by the parent grid (w-full).
+**Description:** Product card molecule. Displays product image, name,
+description, formatted price, and a Buy button. Width is controlled by the
+parent grid (w-full).
 
 **Atomic level:** Molecule (composed of Button, Caption, Text atoms)
 
 ### ShopCard (`molecules/cards/ShopCard.tsx`)
 
-**Description:** Shop discovery card. Displays shop image, name, address, and a link to the menu.
+**Description:** Shop discovery card. Displays shop image, name, address, and a
+link to the menu.
 
 ### SearchBar (`molecules/search-bar/SearchBar.tsx`)
 
-**Description:** Search input with clear button. Controlled component — value and onChange come from parent.
+**Description:** Search input with clear button. Controlled component — value
+and onChange come from parent.
 
 ---
 
@@ -37,35 +41,41 @@ components/
 
 ### CategorySidebar (`organisms/navigation/CategorySidebar.tsx`)
 
-**Description:** Left sidebar with collapsible category filter. Sticky below header, full viewport height minus header.
+**Description:** Left sidebar with collapsible category filter. Sticky below
+header, full viewport height minus header.
 
 ### CartFab (`organisms/cart/CartFab.tsx`)
 
-**Description:** Floating Action Button displaying cart item count. Links to /payment page.
+**Description:** Floating Action Button displaying cart item count. Links to
+/payment page.
 
 ### ProductGrid (`organisms/product-grid/ProductGrid.tsx`)
 
-**Description:** Full product grid organism with mobile category tabs, filtering, and empty state. Uses useCart and useMenu contexts.
+**Description:** Full product grid organism with mobile category tabs,
+filtering, and empty state. Uses useCart and useMenu contexts.
 
 ### ShopGrid (`organisms/shop-grid/ShopGrid.tsx`)
 
-**Description:** Responsive grid of ShopCard molecules for the feed/discovery page.
+**Description:** Responsive grid of ShopCard molecules for the feed/discovery
+page.
 
 ### ReviewModal (`organisms/modals/ReviewModal.tsx`)
 
-**Description:** Modal for customer reviews. Shows 5-star rating and textarea. After submission, displays thank-you message.
+**Description:** Modal for customer reviews. Shows 5-star rating and textarea.
+After submission, displays thank-you message.
 
 ### Analytics Charts (`organisms/analytics/`)
 
-**Description:** Pure-SVG chart and table components for the Financial Analytics dashboard. All components are interactive with hover tooltips.
+**Description:** Pure-SVG chart and table components for the Financial Analytics
+dashboard. All components are interactive with hover tooltips.
 
-| Component | File | Description |
-|-----------|------|-------------|
-| LineChart | LineChart.tsx | Revenue trend line chart with area fill and hover tooltips |
-| BarChart | BarChart.tsx | Grouped bar chart comparing current vs previous period |
-| PieChart | PieChart.tsx | Pie chart with interactive legend for category breakdown |
-| SummaryCard | SummaryCard.tsx | Metric card with period-over-period comparison indicator |
-| ProductTable | ProductTable.tsx | Sortable product sales table with profit margin badges |
+| Component    | File             | Description                                                |
+| ------------ | ---------------- | ---------------------------------------------------------- |
+| LineChart    | LineChart.tsx    | Revenue trend line chart with area fill and hover tooltips |
+| BarChart     | BarChart.tsx     | Grouped bar chart comparing current vs previous period     |
+| PieChart     | PieChart.tsx     | Pie chart with interactive legend for category breakdown   |
+| SummaryCard  | SummaryCard.tsx  | Metric card with period-over-period comparison indicator   |
+| ProductTable | ProductTable.tsx | Sortable product sales table with profit margin badges     |
 
 **Usage:** Imported via `@/components/organisms/analytics` barrel index.
 
@@ -75,11 +85,13 @@ components/
 
 ### MainLayout (`templates/main-layout/MainLayout.tsx`)
 
-**Description:** Main layout template — wraps content with Header, Footer, and CartFab. Used by (main) route group.
+**Description:** Main layout template — wraps content with Header, Footer, and
+CartFab. Used by (main) route group.
 
 ### AuthLayout (`templates/auth-layout/AuthLayout.tsx`)
 
-**Description:** Auth layout template — centers content in screen. Used by login/register pages.
+**Description:** Auth layout template — centers content in screen. Used by
+login/register pages.
 
 ### FeedLayout (`templates/feed-layout/FeedLayout.tsx`)
 
@@ -87,7 +99,8 @@ components/
 
 ### ManagerLayout (`templates/manager-layout/ManagerLayout.tsx`)
 
-**Description:** Manager layout template — auth guard + ManagerProvider. Used by the manager route group.
+**Description:** Manager layout template — auth guard + ManagerProvider. Used by
+the manager route group.
 
 ---
 
@@ -95,16 +108,20 @@ components/
 
 ### AuthContext (`lib/auth-context.tsx`)
 
-Manages user authentication state including login, logout, and registration. Uses localStorage for persistence.
+Manages user authentication state including login, logout, and registration.
+Uses localStorage for persistence.
 
 ### CartContext (`lib/cart-context.tsx`)
 
-Manages shopping cart state with localStorage persistence. Tracks items, quantities, and totals.
+Manages shopping cart state with localStorage persistence. Tracks items,
+quantities, and totals.
 
 ### MenuContext (`lib/menu-context.tsx`)
 
-Provides shared activeCategory state across components. Synchronizes Header mobile menu and CategorySidebar selection.
+Provides shared activeCategory state across components. Synchronizes Header
+mobile menu and CategorySidebar selection.
 
 ### ManagerContext (`lib/manager-context.tsx`)
 
-Manages menu CRUD state (products, combos, categories) for the manager dashboard.
+Manages menu CRUD state (products, combos, categories) for the manager
+dashboard.

components/atoms/ATOMS.md

@@ -1,16 +1,18 @@
 # Atoms Components Library
 
-**Status:** ✅ Phase 1 Implementation Complete
-**Created:** 2026-04-03
+**Status:** ✅ Phase 1 Implementation Complete **Created:** 2026-04-03
 **Foundation:** Atomic Design Pattern
 
 ---
 
 ## 📚 Overview
 
-Atoms are the basic building blocks of your UI. They are small, focused, reusable components that have no dependencies on other components (except potentially other atoms).
+Atoms are the basic building blocks of your UI. They are small, focused,
+reusable components that have no dependencies on other components (except
+potentially other atoms).
 
 **Key Principles:**
+
 - ✅ No business logic
 - ✅ No context/hooks (useAuth, useCart, etc.)
 - ✅ Pure props-based
@@ -25,9 +27,11 @@ Atoms are the basic building blocks of your UI. They are small, focused, reusabl
 ### Buttons (`buttons/`)
 
 #### **Button.tsx**
+
 Main interactive button component with multiple variants and sizes.
 
 **Props:**
+
 - `variant` - "primary" | "secondary" | "danger" | "ghost" (default: "primary")
 - `size` - "sm" | "md" | "lg" (default: "md")
 - `icon` - FontAwesome icon class (optional)
@@ -38,6 +42,7 @@ Main interactive button component with multiple variants and sizes.
 - All standard HTML button attributes
 
 **Usage:**
+
 ```tsx
 import { Button } from "@/components/atoms";
 
@@ -55,6 +60,7 @@ import { Button } from "@/components/atoms";
 ```
 
 **Styling:**
+
 - Primary: Branded color with dark hover
 - Secondary: Border style with light background on hover
 - Danger: Red for destructive actions
@@ -63,15 +69,18 @@ import { Button } from "@/components/atoms";
 ---
 
 #### **IconButton.tsx**
+
 Button designed specifically for icon-only interactions.
 
 **Props:**
+
 - `variant` - "primary" | "secondary" | "danger" | "ghost"
 - `size` - "sm" (8x8) | "md" (10x10) | "lg" (12x12)
 - `icon` - FontAwesome icon class (required)
 - All standard HTML button attributes
 
 **Usage:**
+
 ```tsx
 import { IconButton } from "@/components/atoms";
 
@@ -84,9 +93,11 @@ import { IconButton } from "@/components/atoms";
 ### Inputs (`inputs/`)
 
 #### **TextInput.tsx**
+
 General text input field with optional label, error, and icon.
 
 **Props:**
+
 - `label` - string (optional)
 - `error` - string (optional, shows red border and error text)
 - `icon` - FontAwesome icon class (optional)
@@ -94,6 +105,7 @@ General text input field with optional label, error, and icon.
 - All standard HTML input attributes
 
 **Usage:**
+
 ```tsx
 import { TextInput } from "@/components/atoms";
 
@@ -115,9 +127,11 @@ import { TextInput } from "@/components/atoms";
 ---
 
 #### **SearchInput.tsx**
+
 Search input with built-in search icon and clear button.
 
 **Props:**
+
 - `value` - string (controlled input)
 - `onChange` - callback when text changes
 - `onClear` - callback for clear button (required for button to show)
@@ -125,6 +139,7 @@ Search input with built-in search icon and clear button.
 - All standard HTML input attributes
 
 **Usage:**
+
 ```tsx
 import { SearchInput } from "@/components/atoms";
 
@@ -135,20 +150,23 @@ const [query, setQuery] = useState("");
   onChange={(e) => setQuery(e.target.value)}
   onClear={() => setQuery("")}
   placeholder="Search products..."
-/>
+/>;
 ```
 
 ---
 
 #### **Textarea.tsx**
+
 Multi-line text input with optional label and error.
 
 **Props:**
+
 - `label` - string (optional)
 - `error` - string (optional)
 - All standard HTML textarea attributes
 
 **Usage:**
+
 ```tsx
 import { Textarea } from "@/components/atoms";
 
@@ -158,7 +176,7 @@ import { Textarea } from "@/components/atoms";
   rows={4}
   value={review}
   onChange={(e) => setReview(e.target.value)}
-/>
+/>;
 ```
 
 ---
@@ -166,14 +184,17 @@ import { Textarea } from "@/components/atoms";
 ### Typography (`typography/`)
 
 #### **Heading.tsx**
+
 Semantic heading component with level-based sizing.
 
 **Props:**
+
 - `level` - 1 | 2 | 3 | 4 | 5 | 6 (default: 2)
 - `children` - ReactNode
 - All standard HTML heading attributes
 
 **Sizing:**
+
 - Level 1: text-3xl font-bold
 - Level 2: text-2xl font-bold
 - Level 3: text-xl font-bold
@@ -182,6 +203,7 @@ Semantic heading component with level-based sizing.
 - Level 6: text-sm font-semibold
 
 **Usage:**
+
 ```tsx
 import { Heading } from "@/components/atoms";
 
@@ -193,20 +215,24 @@ import { Heading } from "@/components/atoms";
 ---
 
 #### **Text.tsx**
+
 Paragraph text with semantic variants.
 
 **Props:**
+
 - `variant` - "body1" | "body2" | "caption" | "label" (default: "body1")
 - `children` - ReactNode
 - All standard HTML paragraph attributes
 
 **Variants:**
+
 - body1: text-base (main content)
 - body2: text-sm (secondary content)
 - caption: text-xs (smallest text)
 - label: text-sm font-medium (form labels)
 
 **Usage:**
+
 ```tsx
 import { Text } from "@/components/atoms";
 
@@ -219,13 +245,16 @@ import { Text } from "@/components/atoms";
 ---
 
 #### **Caption.tsx**
+
 Small caption/note text component.
 
 **Props:**
+
 - `children` - ReactNode
 - All standard HTML span attributes
 
 **Usage:**
+
 ```tsx
 import { Caption } from "@/components/atoms";
 
@@ -238,15 +267,19 @@ import { Caption } from "@/components/atoms";
 ### Badges (`badges/`)
 
 #### **Badge.tsx**
+
 Labeled badge component for highlighting information.
 
 **Props:**
-- `variant` - "primary" | "secondary" | "success" | "danger" | "warning" (default: "primary")
+
+- `variant` - "primary" | "secondary" | "success" | "danger" | "warning"
+  (default: "primary")
 - `size` - "sm" | "md" (default: "md")
 - `children` - ReactNode
 - All standard HTML span attributes
 
 **Variants:**
+
 - primary: Branded color
 - secondary: Light gray
 - success: Green
@@ -254,6 +287,7 @@ Labeled badge component for highlighting information.
 - warning: Yellow
 
 **Usage:**
+
 ```tsx
 import { Badge } from "@/components/atoms";
 
@@ -265,14 +299,17 @@ import { Badge } from "@/components/atoms";
 ---
 
 #### **PriceBadge.tsx**
+
 Specialized badge for displaying formatted prices.
 
 **Props:**
+
 - `price` - number
 - `currency` - string (default: "VND")
 - All standard HTML span attributes
 
 **Usage:**
+
 ```tsx
 import { PriceBadge } from "@/components/atoms";
 
@@ -281,6 +318,7 @@ import { PriceBadge } from "@/components/atoms";
 ```
 
 **Output:**
+
 - VND: "50.000 ₫"
 - USD: "$99.99"
 
@@ -289,13 +327,16 @@ import { PriceBadge } from "@/components/atoms";
 ### Dividers (`dividers/`)
 
 #### **Divider.tsx**
+
 Visual separator element.
 
 **Props:**
+
 - `orientation` - "horizontal" | "vertical" (default: "horizontal")
 - All standard HTML hr attributes
 
 **Usage:**
+
 ```tsx
 import { Divider } from "@/components/atoms";
 
@@ -332,34 +373,41 @@ Change one variable in `globals.css` to update all atoms across the app.
 ## 🔄 Import Patterns
 
 ### Individual Imports
+
 ```tsx
-import { Button } from "@/components/atoms/buttons";
-import { TextInput, SearchInput } from "@/components/atoms/inputs";
-import { Heading, Text, Caption } from "@/components/atoms/typography";
 import { Badge, PriceBadge } from "@/components/atoms/badges";
+import { Button } from "@/components/atoms/buttons";
 import { Divider } from "@/components/atoms/dividers";
+import { SearchInput, TextInput } from "@/components/atoms/inputs";
+import { Caption, Heading, Text } from "@/components/atoms/typography";
 ```
 
 ### Barrel Exports (Recommended)
+
 ```tsx
 import {
-  Button,
-  IconButton,
-  TextInput,
-  SearchInput,
-  Textarea,
-  Heading,
-  Text,
-  Caption,
   Badge,
-  PriceBadge,
+  Button,
+  Caption,
   Divider,
+  Heading,
+  IconButton,
+  PriceBadge,
+  SearchInput,
+  Text,
+  TextInput,
+  Textarea,
 } from "@/components/atoms";
 ```
 
 ### Type Imports
+
 ```tsx
-import type { ButtonProps, TextInputProps, HeadingProps } from "@/components/atoms";
+import type {
+  ButtonProps,
+  HeadingProps,
+  TextInputProps,
+} from "@/components/atoms";
 ```
 
 ---
@@ -367,13 +415,10 @@ import type { ButtonProps, TextInputProps, HeadingProps } from "@/components/ato
 ## ✅ Usage Examples
 
 ### Form Field
+
 ```tsx
 <div className="space-y-4">
-  <TextInput
-    label="Name"
-    placeholder="Enter your name"
-    type="text"
-  />
+  <TextInput label="Name" placeholder="Enter your name" type="text" />
   <TextInput
     label="Email"
     placeholder="user@example.com"
@@ -385,11 +430,12 @@ import type { ButtonProps, TextInputProps, HeadingProps } from "@/components/ato
 ```
 
 ### Product Card
+
 ```tsx
 <div className="rounded-lg border p-4">
   <Heading level={3}>Product Name</Heading>
   <Text variant="body2">Product description</Text>
-  <div className="flex items-center justify-between mt-4">
+  <div className="mt-4 flex items-center justify-between">
     <PriceBadge price={50000} />
     <Button icon="fa-cart-plus">Add to Cart</Button>
   </div>
@@ -397,6 +443,7 @@ import type { ButtonProps, TextInputProps, HeadingProps } from "@/components/ato
 ```
 
 ### Rating Display
+
 ```tsx
 <div>
   <Heading level={4}>Reviews</Heading>
@@ -410,6 +457,7 @@ import type { ButtonProps, TextInputProps, HeadingProps } from "@/components/ato
 ## 🧪 Testing Atoms
 
 ### Props Validation
+
 ```tsx
 // ✅ Valid
 <Button variant="primary" size="sm">Click</Button>
@@ -420,7 +468,9 @@ import type { ButtonProps, TextInputProps, HeadingProps } from "@/components/ato
 ```
 
 ### Accessibility
+
 All atoms include:
+
 - Semantic HTML
 - ARIA labels where appropriate
 - Keyboard navigation support
@@ -466,7 +516,8 @@ components/atoms/
 
 ## 🚀 Next Steps
 
-Once atoms are comfortable, the next phase is creating **Molecules** - combinations of atoms:
+Once atoms are comfortable, the next phase is creating **Molecules** -
+combinations of atoms:
 
 - **ProductCard** - Image + Text + Badge + Button
 - **FormField** - Label + Input + Error Text
@@ -489,6 +540,5 @@ See `OPTIMIZATION_PLAN.md` for the full roadmap.
 
 ---
 
-**Status:** ✅ Complete & Ready for Use
-**Last Updated:** 2026-04-03
-**Phase:** 1 of 5
+**Status:** ✅ Complete & Ready for Use **Last Updated:** 2026-04-03 **Phase:**
+1 of 5

components/atoms/badges/Badge.tsx

@@ -1,31 +0,0 @@
-import type { BadgeProps } from "./Badge.types";
-
-export default function Badge({
-  variant = "primary",
-  size = "md",
-  children,
-  className = "",
-  ...props
-}: BadgeProps) {
-  const variants = {
-    primary: "bg-(--color-primary) text-white",
-    secondary: "bg-(--color-border-light) text-(--color-text-secondary)",
-    success: "bg-green-100 text-green-700",
-    danger: "bg-red-100 text-red-700",
-    warning: "bg-yellow-100 text-yellow-700",
-  };
-
-  const sizes = {
-    sm: "px-2 py-1 text-xs",
-    md: "px-3 py-1.5 text-sm",
-  };
-
-  return (
-    <span
-      className={`inline-flex items-center justify-center rounded-full font-semibold ${variants[variant]} ${sizes[size]} ${className}`}
-      {...props}
-    >
-      {children}
-    </span>
-  );
-}

components/atoms/badges/Badge.types.ts

@@ -1,7 +0,0 @@
-import { HTMLAttributes } from "react";
-
-export interface BadgeProps extends HTMLAttributes<HTMLSpanElement> {
-  variant?: "primary" | "secondary" | "success" | "danger" | "warning";
-  size?: "sm" | "md";
-  children: React.ReactNode;
-}

components/atoms/badges/PriceBadge.tsx

@@ -1,31 +0,0 @@
-import { HTMLAttributes } from "react";
-
-export interface PriceBadgeProps extends HTMLAttributes<HTMLSpanElement> {
-  price: number;
-  currency?: string;
-  className?: string;
-}
-
-export default function PriceBadge({
-  price,
-  currency = "VND",
-  className = "",
-  ...props
-}: PriceBadgeProps) {
-  const formattedPrice =
-    currency === "VND"
-      ? price.toLocaleString("vi-VN", {
-          style: "currency",
-          currency: "VND",
-        })
-      : `${price.toFixed(2)} ${currency}`;
-
-  return (
-    <span
-      className={`text-sm font-bold text-(--color-primary) ${className}`}
-      {...props}
-    >
-      {formattedPrice}
-    </span>
-  );
-}

components/atoms/badges/index.ts

@@ -1,4 +0,0 @@
-export { default as Badge } from "./Badge";
-export { default as PriceBadge } from "./PriceBadge";
-export type { BadgeProps } from "./Badge.types";
-export type { PriceBadgeProps } from "./PriceBadge";

components/atoms/buttons/Button.tsx

@@ -8,16 +8,19 @@ export default function Button({
   size = "md",
   icon,
   iconPosition = "left",
+  className = "",
   disabled = false,
   children,
   ...props
 }: ButtonProps) {
   const styles = {
     base: "font-semibold rounded-lg transition-colors disabled:opacity-50 disabled:cursor-not-allowed inline-flex items-center justify-center gap-1.5",
-    payment: "inline-flex cursor-pointer items-center justify-center gap-2 rounded-xl transition-colors",
-    login: "w-full cursor-pointer rounded-xl py-3 font-semibold transition-all duration-150",
-  }
-  
+    payment:
+      "inline-flex cursor-pointer items-center justify-center gap-2 rounded-xl transition-colors",
+    login:
+      "w-full cursor-pointer rounded-xl py-3 font-semibold transition-all duration-150",
+  };
+
   const variants = {
     primary:
       "bg-(--color-primary) text-white hover:bg-(--color-primary-dark) active:scale-95",
@@ -25,8 +28,10 @@ export default function Button({
       "border border-(--color-border) hover:bg-(--color-border-light) active:scale-95",
     danger: "bg-red-500 text-white hover:bg-red-600 active:scale-95",
     ghost: "bg-transparent hover:bg-(--color-border-light) active:scale-95",
-    primaryNoBorder: "border-none bg-(--color-primary) text-white hover:bg-(--color-primary-dark) active:scale-98",
-    bgWhite: "border-2 border-(--color-primary) bg-white text-(--color-primary) hover:bg-(--color-primary) hover:text-white active:scale-98",
+    primaryNoBorder:
+      "border-none bg-(--color-primary) text-white hover:bg-(--color-primary-dark) active:scale-98",
+    bgWhite:
+      "border-2 border-(--color-primary) bg-white text-(--color-primary) hover:bg-(--color-primary) hover:text-white active:scale-98",
   };
 
   const sizes = {
@@ -39,7 +44,7 @@ export default function Button({
 
   return (
     <button
-      className={`${styles[style]} ${variants[variant]} ${sizes[size]}`}
+      className={`${styles[style]} ${variants[variant]} ${sizes[size]} ${className}`}
       disabled={disabled}
       {...props}
     >

components/atoms/buttons/Button.types.ts

@@ -1,11 +1,21 @@
 import { ButtonHTMLAttributes } from "react";
 
-export interface ButtonProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'style'> {
+export interface ButtonProps extends Omit<
+  ButtonHTMLAttributes<HTMLButtonElement>,
+  "style"
+> {
   style?: "base" | "payment" | "login";
-  variant?: "primary" | "secondary" | "danger" | "ghost" | "primaryNoBorder" | "bgWhite";
+  variant?:
+    | "primary"
+    | "secondary"
+    | "danger"
+    | "ghost"
+    | "primaryNoBorder"
+    | "bgWhite";
   size?: "sm" | "md" | "lg";
   icon?: string; // FontAwesome class like "fa-solid fa-cart-plus"
   iconPosition?: "left" | "right";
+  className?: string;
   disabled?: boolean;
   children: React.ReactNode;
 }

components/atoms/errors/Error.types.ts

@@ -3,4 +3,4 @@ import { InputHTMLAttributes, TextareaHTMLAttributes } from "react";
 export interface ErrorMessageLoginProps {
   message: string;
   type?: string;
- }
+}

components/atoms/errors/ErrorMessageLogin.tsx

@@ -26,7 +26,5 @@ export default function ErrorMessageLogin({
     );
   }
 
-  return (
-    type === "primary" ? primaryType() : secondaryType()
-  );
+  return type === "primary" ? primaryType() : secondaryType();
 }

components/atoms/errors/index.ts

@@ -1,4 +1,2 @@
 export { default as ErrorMessageLogin } from "./ErrorMessageLogin";
-export type {
-  ErrorMessageLoginProps,
-} from "./Error.types";
+export type { ErrorMessageLoginProps } from "./Error.types";

components/atoms/index.ts

@@ -3,17 +3,13 @@ export { Button } from "./buttons";
 export type { ButtonProps } from "./buttons";
 
 // Inputs
-export { TextInput, SearchInput, Textarea } from "./inputs";
-export type { TextInputProps, SearchInputProps, TextareaProps } from "./inputs";
+export { TextInput, Textarea } from "./inputs";
+export type { TextInputProps, TextareaProps } from "./inputs";
 
 // Typography
 export { Heading, Text, Caption } from "./typography";
 export type { HeadingProps, TextProps, CaptionProps } from "./typography";
 
-// Badges
-export { Badge, PriceBadge } from "./badges";
-export type { BadgeProps } from "./badges";
-
 // Dividers
 export { Divider } from "./dividers";
 export type { DividerProps } from "./dividers";

components/atoms/inputs/Input.types.ts

@@ -13,17 +13,3 @@ export interface TextareaProps extends TextareaHTMLAttributes<HTMLTextAreaElemen
   error?: string;
   className?: string;
 }
-
-export interface SearchInputProps extends InputHTMLAttributes<HTMLInputElement> {
-  onClear?: () => void;
-  className?: string;
-}
-
-export interface LoginInputProps extends InputHTMLAttributes<HTMLInputElement> {
-  label: string;
-  type: string;
-  name: string;
-  value: string;
-  errors?: string;
-  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
-}

components/atoms/inputs/LoginInput.tsx

@@ -1,56 +0,0 @@
-import { useState } from "react";
-
-import { LoginInputProps } from "./Input.types";
-
-export default function LoginInput({
-  label,
-  type,
-  name,
-  value,
-  errors,
-  onChange,
-  ...restProps
-}: LoginInputProps) {
-  const [showPassword, setShowPassword] = useState(false);
-
-  function isPassword() {
-    if (type === "password") {
-      return (
-        <button
-          type="button"
-          onClick={() => setShowPassword(!showPassword)}
-          className="absolute top-1/2 right-4 -translate-y-1/2 text-(--color-text-muted) transition-colors hover:text-(--color-primary)"
-          aria-label={showPassword ? "Ẩn mật khẩu" : "Hiện mật khẩu"}
-        >
-          <i
-            className={`fa-solid ${showPassword ? "fa-eye-slash" : "fa-eye"}`}
-          ></i>
-        </button>
-      );
-    }
-    return "";
-  }
-
-  return (
-    <div>
-      <label
-        htmlFor={name}
-        className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
-      >
-        {label}
-      </label>
-      <div className="relative">
-        <i className="fa-solid fa-user absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block"></i>
-        <input
-          id={name}
-          type={showPassword ? "text" : type}
-          value={value}
-          onChange={onChange}
-          placeholder= {type === "password" ? "Mật khẩu" : "admin / số điện thoại / tên nhân viên"}
-          className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-10 py-3 transition-all duration-150 outline-none placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary) lg:pl-11 ${errors ? "border-red-400" : "border-(--color-border)"} `}
-        />
-        {isPassword()}
-      </div>
-    </div>
-  );
-}

components/atoms/inputs/SearchInput.tsx

@@ -1,33 +0,0 @@
-"use client";
-
-import type { SearchInputProps } from "./Input.types";
-
-export default function SearchInput({
-  value,
-  onChange,
-  onClear,
-  className = "",
-  ...props
-}: SearchInputProps) {
-  return (
-    <div className="relative w-full">
-      <i className="fa-solid fa-magnifying-glass pointer-events-none absolute top-1/2 left-3 -translate-y-1/2 text-sm text-(--color-text-muted)"></i>
-      <input
-        type="text"
-        value={value}
-        onChange={onChange}
-        className={`w-full rounded-lg border border-(--color-border) bg-transparent py-2 pr-9 pl-9 text-sm transition-all duration-150 placeholder:text-(--color-text-muted) focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)/20 focus:outline-none ${className}`}
-        {...props}
-      />
-      {value && onClear && (
-        <button
-          type="button"
-          onClick={onClear}
-          className="absolute top-1/2 right-3 -translate-y-1/2 text-(--color-text-muted) transition-colors hover:text-(--color-primary)"
-        >
-          <i className="fa-solid fa-xmark text-sm"></i>
-        </button>
-      )}
-    </div>
-  );
-}

components/atoms/inputs/index.ts

@@ -1,9 +1,3 @@
 export { default as TextInput } from "./TextInput";
-export { default as SearchInput } from "./SearchInput";
 export { default as Textarea } from "./Textarea";
-export type {
-  TextInputProps,
-  SearchInputProps,
-  TextareaProps,
-  LoginInputProps,
-} from "./Input.types";
+export type { TextInputProps, TextareaProps } from "./Input.types";

components/molecules/cards/Card.types.ts

@@ -1,5 +1,3 @@
-import type { Product } from "@/lib/types";
-
 export interface ProductCardProps {
   image: string;
   imageAlt?: string;

components/molecules/cards/PaymentSummaryCard.tsx

@@ -1,34 +1,30 @@
+import { formatPrice } from "@/app/(main)/payment/page";
 import Button from "@/components/atoms/buttons/Button";
-import Link from "next/link";
-
 import { ReviewModal } from "@/components/organisms/modals";
+import Link from "next/link";
 import { useState } from "react";
 
 import type { PaymentSummaryCardProps } from "./Card.types";
 
-const formatPrice = (value: number) =>
-  value.toLocaleString("vi-VN", { style: "currency", currency: "VND" });
-
 export default function PaymentSummaryCard({
   totalPrice,
   isCustomer = false,
   backHref,
 }: PaymentSummaryCardProps) {
-
-    const [isReviewOpen, setIsReviewOpen] = useState(false);
-    const handlePayment = () => {
+  const [isReviewOpen, setIsReviewOpen] = useState(false);
+  const handlePayment = () => {
     // UI-only: open review modal after "payment"
     if (isCustomer) {
-        setIsReviewOpen(true);
-  }
-};
+      setIsReviewOpen(true);
+    }
+  };
   return (
     <aside className="shrink-0 xl:w-85">
       <div className="bg-card sticky top-[calc(var(--spacing-header-height)+1rem)] rounded-2xl border border-(--color-border-light) p-4 md:p-5">
-        <h2 className="mb-4 text-lg font-bold">Hóa đơn</h2>
+        <h2 className="mb-4 text-lg font-bold">Bill</h2>
 
         <div className="flex items-center justify-between border-b border-(--color-border-light) pb-4">
-          <span className="text-(--color-text-muted)">Tổng cộng</span>
+          <span className="text-(--color-text-muted)">Total</span>
           <span className="text-xl font-bold text-(--color-primary)">
             {formatPrice(totalPrice)}
           </span>
@@ -42,7 +38,7 @@ export default function PaymentSummaryCard({
             size="md"
             variant="primary"
           >
-            Tiền mặt
+            Cash
           </Button>
 
           <Button
@@ -63,11 +59,14 @@ export default function PaymentSummaryCard({
               size="md"
               variant="primary"
             >
-              Đánh giá
+              Review
             </Button>
           )}
 
-          <Link href={backHref || "/"}  className={isCustomer ? "" : "col-span-2"}>
+          <Link
+            href={backHref || "/"}
+            className={isCustomer ? "" : "col-span-2"}
+          >
             <Button
               style="payment"
               onClick={() => setIsReviewOpen(false)}
@@ -76,7 +75,7 @@ export default function PaymentSummaryCard({
               variant="secondary"
               className="w-full"
             >
-              Quay về
+              Return
             </Button>
           </Link>
         </div>

components/molecules/cards/ProductCard.tsx

@@ -38,7 +38,7 @@ export default function ProductCard({
         </div>
         {/* Product image */}
         <Image
-          src={image}
+          src={image || "/"}
           alt={imageAlt}
           fill
           className="z-1 object-cover"
@@ -62,8 +62,14 @@ export default function ProductCard({
         <Text variant="body2" className="font-bold">
           {formattedPrice}
         </Text>
-        <Button onClick={onBuy} variant="primary" size="sm" icon="fa-cart-plus">
-          Mua
+        <Button
+          onClick={onBuy}
+          variant="primary"
+          size="sm"
+          icon="fa-cart-plus"
+          aria-label={`Mua ${productName}`}
+        >
+          Buy
         </Button>
       </div>
     </div>

components/molecules/cards/ShiftCard.tsx

@@ -0,0 +1,119 @@
+"use client";
+
+import type { ShiftSlot } from "@/lib/types";
+
+import type { ShiftCardProps } from "./ShiftCard.types";
+
+const STATUS_STYLES: Record<
+  ShiftSlot["status"],
+  { bg: string; text: string; label: string }
+> = {
+  available: {
+    bg: "bg-blue-50 border-blue-200",
+    text: "text-blue-700",
+    label: "Còn trống",
+  },
+  registered: {
+    bg: "bg-blue-100 border-blue-400",
+    text: "text-blue-900",
+    label: "Đã đăng ký",
+  },
+  approved_leave: {
+    bg: "bg-purple-50 border-purple-300",
+    text: "text-purple-700",
+    label: "Nghỉ phép",
+  },
+  absent: {
+    bg: "bg-red-50 border-red-300",
+    text: "text-red-700",
+    label: "Vắng mặt",
+  },
+};
+
+function formatWage(wage: number): string {
+  if (wage >= 1000) {
+    return `${(wage / 1000).toFixed(0)}k`;
+  }
+  return wage.toLocaleString("vi-VN");
+}
+
+export default function ShiftCard({
+  shift,
+  compact = false,
+  onClick,
+}: ShiftCardProps) {
+  const style = STATUS_STYLES[shift.status];
+
+  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 ${style.bg} ${style.text}`}
+      >
+        <p className="font-semibold">
+          {shift.startTime} – {shift.endTime}
+        </p>
+        <p className="mt-0.5 opacity-75">
+          {shift.durationHours}h · {formatWage(shift.wage)}
+        </p>
+      </button>
+    );
+  }
+
+  return (
+    <button
+      type="button"
+      onClick={() => onClick?.(shift)}
+      className={`w-full cursor-pointer rounded-xl border p-3 text-left transition-shadow hover:shadow-md ${style.bg} ${style.text}`}
+    >
+      <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">
+            {shift.durationHours}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.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.name}
+              </span>
+            ))}
+          </div>
+        </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>
+      )}
+    </button>
+  );
+}

components/molecules/cards/ShiftCard.types.ts

@@ -0,0 +1,7 @@
+import type { ShiftSlot } from "@/lib/types";
+
+export interface ShiftCardProps {
+  shift: ShiftSlot;
+  compact?: boolean;
+  onClick?: (shift: ShiftSlot) => void;
+}

components/molecules/cards/ShopCard.tsx

@@ -28,7 +28,7 @@ export default function ShopCard({ name, address, image }: ShopCardProps) {
             className="inline-flex shrink-0 items-center gap-1.5 rounded-xl bg-(--color-primary) px-3.5 py-2 text-xs font-semibold text-white no-underline transition-all duration-150 hover:bg-(--color-primary-dark) active:scale-95"
           >
             <i className="fa-solid fa-book-open text-[10px]"></i>
-            Xem menu
+            View menu
           </Link>
         </div>
 

components/molecules/cards/index.ts

@@ -1,3 +1,5 @@
 export { default as ProductCard } from "./ProductCard";
 export { default as ShopCard } from "./ShopCard";
+export { default as ShiftCard } from "./ShiftCard";
 export type { ProductCardProps, ShopCardProps } from "./Card.types";
+export type { ShiftCardProps } from "./ShiftCard.types";

components/molecules/search-bar/SearchBar.tsx

@@ -17,6 +17,7 @@ export default function SearchBar({
         value={value}
         onChange={(e) => onChange(e.target.value)}
         placeholder={placeholder}
+        aria-label="Tìm kiếm món ăn"
         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 && (

components/organisms/analytics/BarChart.tsx

@@ -1,110 +0,0 @@
-"use client";
-
-import { formatCurrency } from "@/lib/analytics-utils";
-import type { RevenueDataPoint } from "@/lib/types";
-import { useState } from "react";
-
-interface BarChartProps {
-  current: RevenueDataPoint[];
-  previous: RevenueDataPoint[];
-  height?: number;
-}
-
-/**
- * Pure-SVG grouped bar chart comparing current vs previous period revenue.
- * Hover bars show tooltip with label, revenue, and order count.
- * Tooltip auto-flips above/below bar top to stay inside the viewBox.
- */
-export function BarChart({ current, previous, height = 200 }: BarChartProps) {
-  const [hovered, setHovered] = useState<{ set: "cur" | "prev"; idx: number } | null>(null);
-  const W = 800;
-  const H = height;
-  const padL = 56, padR = 16, padT = 16, padB = 40;
-  const chartW = W - padL - padR;
-  const chartH = H - padT - padB;
-
-  const n = current.length;
-  const maxVal = Math.max(...current.map((d) => d.revenue), ...previous.map((d) => d.revenue)) || 1;
-  const groupW = chartW / n;
-  const barW = groupW * 0.35;
-  const gap = groupW * 0.05;
-
-  const yTicks = 5;
-  const gridLines = Array.from({ length: yTicks + 1 }, (_, i) => ({
-    val: (maxVal / yTicks) * (yTicks - i),
-    y: padT + (i / yTicks) * chartH,
-  }));
-
-  const step = Math.ceil(n / 8);
-
-  return (
-    <div className="relative w-full overflow-x-auto">
-      <svg
-        viewBox={`0 0 ${W} ${H}`}
-        className="w-full"
-        style={{ height: H, minWidth: 320 }}
-        onMouseLeave={() => setHovered(null)}
-      >
-        {gridLines.map((g, i) => (
-          <g key={i}>
-            <line x1={padL} y1={g.y} x2={W - padR} y2={g.y} stroke="#E2C9A8" strokeWidth="1" strokeDasharray={i === yTicks ? "0" : "4 3"} />
-            <text x={padL - 6} y={g.y + 4} textAnchor="end" fontSize="10" fill="#A08060">{formatCurrency(g.val)}</text>
-          </g>
-        ))}
-
-        {current.map((d, i) => {
-          const groupX = padL + i * groupW;
-          const curH = (d.revenue / maxVal) * chartH;
-          const prevH = ((previous[i]?.revenue ?? 0) / maxVal) * chartH;
-          const curX = groupX + gap;
-          const prevX = curX + barW + gap;
-          const isHovCur = hovered?.set === "cur" && hovered.idx === i;
-          const isHovPrev = hovered?.set === "prev" && hovered.idx === i;
-          return (
-            <g key={i}>
-              <rect x={prevX} y={padT + chartH - prevH} width={barW} height={prevH} rx="3"
-                fill={isHovPrev ? "#A0785A" : "#E2C9A8"}
-                style={{ cursor: "pointer", transition: "fill 150ms" }}
-                onMouseEnter={() => setHovered({ set: "prev", idx: i })} />
-              <rect x={curX} y={padT + chartH - curH} width={barW} height={curH} rx="3"
-                fill={isHovCur ? "#4A3728" : "#6F4E37"}
-                style={{ cursor: "pointer", transition: "fill 150ms" }}
-                onMouseEnter={() => setHovered({ set: "cur", idx: i })} />
-              {i % step === 0 && (
-                <text x={groupX + groupW / 2} y={H - 8} textAnchor="middle" fontSize="10" fill="#A08060">{d.label}</text>
-              )}
-            </g>
-          );
-        })}
-
-        {hovered !== null && (() => {
-          const d = hovered.set === "cur" ? current[hovered.idx] : previous[hovered.idx];
-          if (!d) return null;
-          const groupX = padL + hovered.idx * groupW;
-          const tipW = 130, tipH = 50;
-          const tipX = Math.min(Math.max(groupX - tipW / 2, padL), W - padR - tipW);
-          const barH = (d.revenue / maxVal) * chartH;
-          const barTopY = padT + chartH - barH;
-          const aboveY = barTopY - tipH - 8;
-          const tipY = Math.min(Math.max(aboveY >= padT ? aboveY : barTopY + 8, padT), padT + chartH - tipH);
-          return (
-            <g>
-              <rect x={tipX} y={tipY} width={tipW} height={tipH} rx="6" fill="#3D2B1F" opacity="0.92" />
-              <text x={tipX + tipW / 2} y={tipY + 15} textAnchor="middle" fontSize="10" fill="#F0D9A8">
-                {d.label} ({hovered.set === "cur" ? "Hiện tại" : "Trước"})
-              </text>
-              <text x={tipX + tipW / 2} y={tipY + 30} textAnchor="middle" fontSize="11" fontWeight="600" fill="#C8973A">{formatCurrency(d.revenue)}</text>
-              <text x={tipX + tipW / 2} y={tipY + 44} textAnchor="middle" fontSize="10" fill="#A08060">{d.orders} đơn hàng</text>
-            </g>
-          );
-        })()}
-
-        {/* Legend */}
-        <rect x={padL} y={4} width={10} height={10} rx="2" fill="#6F4E37" />
-        <text x={padL + 13} y={13} fontSize="10" fill="#6F4E37">Hiện tại</text>
-        <rect x={padL + 65} y={4} width={10} height={10} rx="2" fill="#E2C9A8" />
-        <text x={padL + 78} y={13} fontSize="10" fill="#A08060">Kỳ trước</text>
-      </svg>
-    </div>
-  );
-}

components/organisms/analytics/LineChart.tsx

@@ -1,113 +0,0 @@
-"use client";
-
-import { formatCurrency } from "@/lib/analytics-utils";
-import type { RevenueDataPoint } from "@/lib/types";
-import { useState } from "react";
-
-interface LineChartProps {
-  data: RevenueDataPoint[];
-  height?: number;
-}
-
-/**
- * Pure-SVG interactive line chart for revenue over time.
- * Hover dots show tooltip with label, revenue, and order count.
- * Tooltip auto-flips above/below the dot to stay inside the viewBox.
- */
-export function LineChart({ data, height = 200 }: LineChartProps) {
-  const [hovered, setHovered] = useState<number | null>(null);
-  const W = 800;
-  const H = height;
-  const padL = 56, padR = 16, padT = 16, padB = 40;
-  const chartW = W - padL - padR;
-  const chartH = H - padT - padB;
-
-  const maxRev = Math.max(...data.map((d) => d.revenue));
-  const range = maxRev || 1;
-
-  const points = data.map((d, i) => ({
-    x: padL + (i / (data.length - 1)) * chartW,
-    y: padT + chartH - (d.revenue / range) * chartH,
-    data: d,
-    index: i,
-  }));
-
-  const pathD = points
-    .map((p, i) => `${i === 0 ? "M" : "L"} ${p.x.toFixed(1)} ${p.y.toFixed(1)}`)
-    .join(" ");
-
-  const areaD =
-    pathD +
-    ` L ${points[points.length - 1].x.toFixed(1)} ${(padT + chartH).toFixed(1)}` +
-    ` L ${points[0].x.toFixed(1)} ${(padT + chartH).toFixed(1)} Z`;
-
-  const yTicks = 5;
-  const gridLines = Array.from({ length: yTicks + 1 }, (_, i) => ({
-    val: (range / yTicks) * (yTicks - i),
-    y: padT + (i / yTicks) * chartH,
-  }));
-
-  const step = Math.ceil(data.length / 10);
-
-  return (
-    <div className="relative w-full overflow-x-auto">
-      <svg
-        viewBox={`0 0 ${W} ${H}`}
-        className="w-full"
-        style={{ height: H, minWidth: 320 }}
-        onMouseLeave={() => setHovered(null)}
-      >
-        <defs>
-          <linearGradient id="areaGrad" x1="0" y1="0" x2="0" y2="1">
-            <stop offset="0%" stopColor="#6F4E37" stopOpacity="0.25" />
-            <stop offset="100%" stopColor="#6F4E37" stopOpacity="0.02" />
-          </linearGradient>
-        </defs>
-
-        {gridLines.map((g, i) => (
-          <g key={i}>
-            <line x1={padL} y1={g.y} x2={W - padR} y2={g.y} stroke="#E2C9A8" strokeWidth="1" strokeDasharray={i === yTicks ? "0" : "4 3"} />
-            <text x={padL - 6} y={g.y + 4} textAnchor="end" fontSize="10" fill="#A08060">{formatCurrency(g.val)}</text>
-          </g>
-        ))}
-
-        <path d={areaD} fill="url(#areaGrad)" />
-        <path d={pathD} fill="none" stroke="#6F4E37" strokeWidth="2.5" strokeLinejoin="round" strokeLinecap="round" />
-
-        {points.map((p, i) =>
-          i % step === 0 ? (
-            <text key={i} x={p.x} y={H - 8} textAnchor="middle" fontSize="10" fill="#A08060">{p.data.label}</text>
-          ) : null,
-        )}
-
-        {points.map((p) => (
-          <circle
-            key={p.index}
-            cx={p.x} cy={p.y}
-            r={hovered === p.index ? 5 : 3}
-            fill={hovered === p.index ? "#C8973A" : "#6F4E37"}
-            stroke="#FDF6EC" strokeWidth="2"
-            style={{ cursor: "pointer", transition: "r 150ms" }}
-            onMouseEnter={() => setHovered(p.index)}
-          />
-        ))}
-
-        {hovered !== null && (() => {
-          const p = points[hovered];
-          const tipW = 120, tipH = 48;
-          const tipX = Math.min(Math.max(p.x - tipW / 2, padL), W - padR - tipW);
-          const aboveY = p.y - tipH - 10;
-          const tipY = Math.min(Math.max(aboveY >= padT ? aboveY : p.y + 10, padT), padT + chartH - tipH);
-          return (
-            <g>
-              <rect x={tipX} y={tipY} width={tipW} height={tipH} rx="6" fill="#3D2B1F" opacity="0.92" />
-              <text x={tipX + tipW / 2} y={tipY + 16} textAnchor="middle" fontSize="10" fill="#F0D9A8">{p.data.label}</text>
-              <text x={tipX + tipW / 2} y={tipY + 30} textAnchor="middle" fontSize="11" fontWeight="600" fill="#C8973A">{formatCurrency(p.data.revenue)}</text>
-              <text x={tipX + tipW / 2} y={tipY + 44} textAnchor="middle" fontSize="10" fill="#A08060">{p.data.orders} đơn</text>
-            </g>
-          );
-        })()}
-      </svg>
-    </div>
-  );
-}

components/organisms/analytics/PieChart.tsx

@@ -1,109 +0,0 @@
-"use client";
-
-import { useState, useMemo } from "react";
-
-export interface PieSlice {
-  label: string;
-  value: number;
-  color: string;
-}
-
-interface PieChartProps {
-  data: PieSlice[];
-}
-
-/**
- * Pure-SVG interactive pie chart.
- * Hover a slice or legend item to highlight it and show its percentage.
- */
-export function PieChart({ data }: PieChartProps) {
-  const [hovered, setHovered] = useState<number | null>(null);
-  const R = 80;
-  const CX = 110;
-  const CY = 110;
-  const total = data.reduce((s, d) => s + d.value, 0) || 1;
-
-  const slices = useMemo(() => {
-    type Acc = { items: ReturnType<typeof makeSlice>[]; angle: number };
-
-    const makeSlice = (d: PieSlice, i: number, startAngle: number) => {
-      const angle = (d.value / total) * 2 * Math.PI;
-      const endAngle = startAngle + angle;
-      const midAngle = startAngle + angle / 2;
-      const x1 = CX + R * Math.cos(startAngle);
-      const y1 = CY + R * Math.sin(startAngle);
-      const x2 = CX + R * Math.cos(endAngle);
-      const y2 = CY + R * Math.sin(endAngle);
-      const largeArc = angle > Math.PI ? 1 : 0;
-      const pathD = `M ${CX} ${CY} L ${x1.toFixed(2)} ${y1.toFixed(2)} A ${R} ${R} 0 ${largeArc} 1 ${x2.toFixed(2)} ${y2.toFixed(2)} Z`;
-      return {
-        ...d,
-        pathD,
-        labelX: CX + R * 0.65 * Math.cos(midAngle),
-        labelY: CY + R * 0.65 * Math.sin(midAngle),
-        percent: (d.value / total) * 100,
-        index: i,
-        endAngle,
-      };
-    };
-
-    const { items } = data.reduce<Acc>(
-      (acc, d, i) => {
-        const slice = makeSlice(d, i, acc.angle);
-        return { items: [...acc.items, slice], angle: slice.endAngle };
-      },
-      { items: [], angle: -Math.PI / 2 },
-    );
-    return items;
-  }, [data, total]);
-
-  return (
-    <div className="flex flex-col items-center gap-3 sm:flex-row sm:items-start">
-      <svg
-        viewBox="0 0 220 220"
-        className="w-full max-w-55 shrink-0"
-        style={{ height: 220 }}
-        onMouseLeave={() => setHovered(null)}
-      >
-        {slices.map((s) => (
-          <path
-            key={s.index}
-            d={s.pathD}
-            fill={s.color}
-            stroke="#FDF6EC"
-            strokeWidth="2"
-            style={{ cursor: "pointer", transition: "opacity 200ms" }}
-            onMouseEnter={() => setHovered(s.index)}
-            opacity={hovered !== null && hovered !== s.index ? 0.65 : 1}
-          />
-        ))}
-        {hovered !== null && (
-          <text x={CX} y={CY + 5} textAnchor="middle" fontSize="12" fontWeight="bold" fill="#3D2B1F">
-            {slices[hovered].percent.toFixed(1)}%
-          </text>
-        )}
-      </svg>
-
-      {/* Legend */}
-      <div className="flex flex-wrap gap-x-4 gap-y-2 sm:flex-col">
-        {slices.map((s) => (
-          <div
-            key={s.index}
-            className="flex cursor-pointer items-center gap-2 text-sm"
-            onMouseEnter={() => setHovered(s.index)}
-            onMouseLeave={() => setHovered(null)}
-          >
-            <span className="inline-block h-3 w-3 shrink-0 rounded-full" style={{ backgroundColor: s.color }} />
-            <span
-              className="max-w-35 truncate"
-              style={{ color: hovered === s.index ? "#3D2B1F" : "#6F4E37", fontWeight: hovered === s.index ? 600 : 400 }}
-            >
-              {s.label}
-            </span>
-            <span className="text-xs text-(--color-text-muted)">{s.percent.toFixed(1)}%</span>
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}

components/organisms/analytics/ProductTable.tsx

@@ -1,101 +0,0 @@
-"use client";
-
-import { formatCurrencyFull } from "@/lib/analytics-utils";
-import { MENU_CATEGORIES } from "@/lib/constants";
-import type { ProductSalesStats } from "@/lib/types";
-import { useMemo, useState } from "react";
-
-interface ProductTableProps {
-  data: ProductSalesStats[];
-}
-
-const categoryName = (id: string) =>
-  MENU_CATEGORIES.find((c) => c.id === id)?.name ?? id;
-
-/**
- * Sortable product sales table.
- * Click column headers to sort ascending/descending.
- */
-export function ProductTable({ data }: ProductTableProps) {
-  const [sortKey, setSortKey] = useState<keyof ProductSalesStats>("revenue");
-  const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
-
-  const sorted = useMemo(
-    () =>
-      [...data].sort((a, b) => {
-        const av = a[sortKey] as number;
-        const bv = b[sortKey] as number;
-        return sortDir === "desc" ? bv - av : av - bv;
-      }),
-    [data, sortKey, sortDir],
-  );
-
-  const handleSort = (key: keyof ProductSalesStats) => {
-    if (key === sortKey) setSortDir((d) => (d === "desc" ? "asc" : "desc"));
-    else { setSortKey(key); setSortDir("desc"); }
-  };
-
-  const sortIcon = (col: keyof ProductSalesStats) => (
-    <i className={`fa-solid ml-1 text-xs ${
-      sortKey === col
-        ? sortDir === "desc" ? "fa-sort-down text-(--color-primary)" : "fa-sort-up text-(--color-primary)"
-        : "fa-sort text-(--color-text-muted)"
-    }`} />
-  );
-
-  const SortTh = ({ col, label, className = "" }: { col: keyof ProductSalesStats; label: string; className?: string }) => (
-    <th
-      className={`cursor-pointer px-4 py-3 font-semibold text-(--color-text-secondary) hover:text-(--color-primary) ${className}`}
-      onClick={() => handleSort(col)}
-    >
-      {label} {sortIcon(col)}
-    </th>
-  );
-
-  return (
-    <div className="overflow-x-auto rounded-xl border border-(--color-border-light)">
-      <table className="w-full min-w-175 text-sm">
-        <thead>
-          <tr className="bg-background border-b border-(--color-border-light)">
-            <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">#</th>
-            <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">Sản phẩm</th>
-            <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">Danh mục</th>
-            <SortTh col="unitsSold" label="Số lượng" className="text-right" />
-            <SortTh col="revenue" label="Doanh thu" className="text-right" />
-            <th className="px-4 py-3 text-right font-semibold text-(--color-text-secondary)">Giá nhập</th>
-            <th className="px-4 py-3 text-right font-semibold text-(--color-text-secondary)">Giá bán</th>
-            <SortTh col="profit" label="Lợi nhuận" className="text-right" />
-            <SortTh col="profitMargin" label="Biên LN" className="text-right" />
-          </tr>
-        </thead>
-        <tbody>
-          {sorted.map((row, i) => (
-            <tr key={row.productId} className="border-b border-(--color-border-light) bg-(--color-bg-card) transition-colors hover:bg-(--color-accent-light)/30">
-              <td className="px-4 py-3 text-(--color-text-muted)">{i + 1}</td>
-              <td className="text-foreground px-4 py-3 font-medium">{row.name}</td>
-              <td className="px-4 py-3">
-                <span className="rounded-full bg-(--color-accent-light) px-2 py-0.5 text-xs text-(--color-primary)">
-                  {categoryName(row.category)}
-                </span>
-              </td>
-              <td className="text-foreground px-4 py-3 text-right tabular-nums">{row.unitsSold.toLocaleString()}</td>
-              <td className="px-4 py-3 text-right font-medium text-(--color-primary) tabular-nums">{formatCurrencyFull(row.revenue)}</td>
-              <td className="px-4 py-3 text-right text-(--color-text-muted) tabular-nums">{formatCurrencyFull(row.costPrice)}</td>
-              <td className="px-4 py-3 text-right text-(--color-text-secondary) tabular-nums">{formatCurrencyFull(row.sellingPrice)}</td>
-              <td className="px-4 py-3 text-right font-medium text-green-600 tabular-nums">{formatCurrencyFull(row.profit)}</td>
-              <td className="px-4 py-3 text-right">
-                <span className={`inline-block rounded-full px-2 py-0.5 text-xs font-semibold ${
-                  row.profitMargin >= 70 ? "bg-green-100 text-green-700"
-                  : row.profitMargin >= 60 ? "bg-yellow-100 text-yellow-700"
-                  : "bg-red-100 text-red-600"
-                }`}>
-                  {row.profitMargin.toFixed(1)}%
-                </span>
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </div>
-  );
-}

components/organisms/analytics/SummaryCard.tsx

@@ -1,59 +0,0 @@
-import { formatCurrency } from "@/lib/analytics-utils";
-
-export interface SummaryCardProps {
-  icon: string;
-  title: string;
-  value: string;
-  change: number;
-  changePercent: number;
-  isPositive: boolean;
-  subtitle?: string;
-}
-
-/**
- * Summary metric card with period-over-period comparison indicator.
- * Used in the Financial Analytics dashboard header row.
- */
-export function SummaryCard({
-  icon,
-  title,
-  value,
-  change,
-  changePercent,
-  isPositive,
-  subtitle,
-}: SummaryCardProps) {
-  return (
-    <div className="rounded-2xl border border-(--color-border-light) bg-(--color-bg-card) p-5 shadow-sm">
-      <div className="mb-3 flex items-center gap-3">
-        <span className="flex h-10 w-10 items-center justify-center rounded-xl bg-(--color-accent-light) text-lg text-(--color-primary)">
-          <i className={icon}></i>
-        </span>
-        <span className="text-sm font-medium text-(--color-text-muted)">{title}</span>
-      </div>
-      <p className="text-foreground text-2xl font-bold tabular-nums">{value}</p>
-      {subtitle && (
-        <p className="mt-0.5 text-xs text-(--color-text-muted)">{subtitle}</p>
-      )}
-      <div
-        className={`mt-3 flex items-center gap-1.5 text-sm font-medium ${
-          isPositive ? "text-green-600" : "text-red-500"
-        }`}
-      >
-        <i
-          className={`fa-solid text-xs ${
-            isPositive ? "fa-arrow-trend-up" : "fa-arrow-trend-down"
-          }`}
-        ></i>
-        <span>
-          {isPositive ? "+" : ""}
-          {changePercent.toFixed(1)}%
-        </span>
-        <span className="text-xs font-normal text-(--color-text-muted)">
-          ({isPositive ? "+" : ""}
-          {formatCurrency(change)}) so với kỳ trước
-        </span>
-      </div>
-    </div>
-  );
-}

components/organisms/analytics/index.ts

@@ -1,7 +0,0 @@
-export { BarChart } from "./BarChart";
-export { LineChart } from "./LineChart";
-export { PieChart } from "./PieChart";
-export type { PieSlice } from "./PieChart";
-export { ProductTable } from "./ProductTable";
-export { SummaryCard } from "./SummaryCard";
-export type { SummaryCardProps } from "./SummaryCard";

components/organisms/forms/LoginForm.tsx

@@ -1,117 +1,128 @@
+"use client";
+
+import Button from "@/components/atoms/buttons/Button";
 import ErrorMessageLogin from "@/components/atoms/errors/ErrorMessageLogin";
-import LoginInput from "@/components/atoms/inputs/LoginInput";
-import { useAuth } from "@/lib/auth-context";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { FormEvent, useState } from "react";
-import Button from "@/components/atoms/buttons/Button";
+
+const PHONE_REGEX = /^(0[35789])[0-9]{8}$/;
 
 export default function LoginForm() {
   const router = useRouter();
-  const { login } = useAuth();
 
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-  const [errors, setErrors] = useState({
-    username: "",
-    password: "",
-    general: "",
-  });
+  const [phone, setPhone] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [errors, setErrors] = useState({ phone: "", general: "" });
 
   const validate = (): boolean => {
-    const newErrors = { username: "", password: "", general: "" };
-    let isValid = true;
-
-    if (!username.trim()) {
-      newErrors.username = "Vui lòng nhập tên đăng nhập";
-      isValid = false;
+    if (!phone.trim()) {
+      setErrors({ phone: "Please enter your phone number", general: "" });
+      return false;
     }
-
-    if (!password.trim()) {
-      newErrors.password = "Vui lòng nhập mật khẩu";
-      isValid = false;
-    } else if (password.length < 4) {
-      newErrors.password = "Mật khẩu phải có ít nhất 4 ký tự";
-      isValid = false;
+    if (!PHONE_REGEX.test(phone)) {
+      setErrors({
+        phone: "Invalid phone number (e.g. 0987654321)",
+        general: "",
+      });
+      return false;
     }
-
-    setErrors(newErrors);
-    return isValid;
+    return true;
   };
 
-  const handleSubmit = (e: FormEvent) => {
+  const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-
     if (!validate()) return;
 
-    const success = login(username, password);
+    setIsLoading(true);
+    setErrors({ phone: "", general: "" });
 
-    if (success) {
-      router.push("/");
-    } else {
-      setErrors({
-        username: "",
-        password: "",
-        general: "Tên đăng nhập hoặc mật khẩu không đúng",
+    try {
+      const res = await fetch("/api/sms_otp", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone }),
       });
+
+      const role = (await res.text().catch(() => "")).trim();
+
+      if (res.ok && (role === "customer" || role === "manager")) {
+        sessionStorage.setItem("login_phone", phone);
+        sessionStorage.setItem("login_role", role);
+        router.push(role === "manager" ? "/login/password" : "/login/otp");
+      } else if (res.status === 404) {
+        setErrors({ phone: "", general: "Phone number not registered" });
+      } else {
+        setErrors({
+          phone: "",
+          general: "An error occurred, please try again",
+        });
+      }
+    } catch {
+      setErrors({ phone: "", general: "Unable to connect, please try again" });
+    } finally {
+      setIsLoading(false);
     }
   };
 
   return (
     <div>
-      {/* Error Message */}
       {errors.general && <ErrorMessageLogin message={errors.general} />}
 
       <form onSubmit={handleSubmit} className="space-y-5">
         <div>
-          {/* Username Input */}
-          <LoginInput
-            label="Tên đăng nhập"
-            type="text"
-            name="username"
-            value={username}
-            onChange={(e) => {
-              setUsername(e.target.value);
-              setErrors({ ...errors, username: "", general: "" });
-            }}
-            errors={errors.username}
-          />
-          {errors.username && (
-            <ErrorMessageLogin message={errors.username} type="secondary" />
+          <label
+            htmlFor="phone"
+            className="mb-2 block text-sm font-medium text-(--color-text-secondary)"
+          >
+            Phone number
+          </label>
+          <div className="relative">
+            <i className="fa-solid fa-phone absolute top-1/2 left-4 hidden -translate-y-1/2 text-(--color-text-muted) lg:block"></i>
+            <input
+              id="phone"
+              type="tel"
+              value={phone}
+              onChange={(e) => {
+                setPhone(e.target.value);
+                setErrors({ phone: "", general: "" });
+              }}
+              placeholder="0987654321"
+              disabled={isLoading}
+              className={`text-foreground focus:ring-opacity-20 w-full rounded-xl border bg-white px-10 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.phone ? "border-red-400" : "border-(--color-border)"}`}
+            />
+          </div>
+          {errors.phone && (
+            <ErrorMessageLogin message={errors.phone} type="secondary" />
           )}
+          <p className="mt-2 text-xs text-(--color-text-muted)">
+            Enter a Vietnamese phone number (10 digits, starting with 0)
+          </p>
         </div>
 
-        {/* Password Input */}
-        <div>
-          <LoginInput
-            label="Mật khẩu"
-            type="password"
-            name="password"
-            value={password}
-            onChange={(e) => {
-              setPassword(e.target.value);
-              setErrors({ ...errors, password: "", general: "" });
-            }}
-            errors={errors.password}
-          />
-          {errors.password && (
-            <ErrorMessageLogin message={errors.password} type="secondary" />
-          )}
-        </div>
-
-        {/* Buttons */}
         <div className="space-y-3 pt-2">
-          {/* Login Button */}
-          <Button variant="primaryNoBorder" type="submit" style="login" size="lg">
-            Đăng nhập
+          <Button
+            variant="primaryNoBorder"
+            type="submit"
+            style="login"
+            size="lg"
+            disabled={isLoading}
+          >
+            {isLoading ? (
+              <>
+                <i className="fa-solid fa-spinner fa-spin mr-2"></i>
+                Processing...
+              </>
+            ) : (
+              "Continue"
+            )}
           </Button>
 
-          {/* Register Button */}
           <Link
             href="/register"
             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 active:scale-98"
           >
-            Đăng ký tài khoản
+            Create account
           </Link>
         </div>
       </form>

components/organisms/index.ts

@@ -23,16 +23,26 @@ export {
   StatusBadge,
   DeleteConfirm,
   ProductModal,
-  CategoryModal,
-  ComboModal,
   ProductsTab,
-  CategoriesTab,
-  CombosTab,
 } from "./manager";
 export type {
   ProductModalProps,
-  CategoryModalProps,
-  ComboModalProps,
   DeleteConfirmProps,
   StatusBadgeProps,
 } from "./manager";
+
+// Shift Schedule
+export {
+  WeeklySchedule,
+  MonthlyCalendar,
+  MobileShiftView,
+  ShiftDetailModal,
+  ShiftCreateModal,
+} from "./shift-schedule";
+export type {
+  WeeklyScheduleProps,
+  MonthlyCalendarProps,
+  MobileShiftViewProps,
+  ShiftDetailModalProps,
+  ShiftCreateModalProps,
+} from "./shift-schedule";

components/organisms/manager/CategoriesTab.tsx

@@ -1,110 +0,0 @@
-"use client";
-
-import { useManager } from "@/lib/manager-context";
-import type { MenuCategory } from "@/lib/types";
-import { useState } from "react";
-
-import CategoryModal from "./CategoryModal";
-import DeleteConfirm from "./DeleteConfirm";
-
-export default function CategoriesTab() {
-  const { categories, products, addCategory, updateCategory, deleteCategory } =
-    useManager();
-
-  const [modalCategory, setModalCategory] = useState<
-    MenuCategory | null | "new"
-  >(null);
-  const [deleteTarget, setDeleteTarget] = useState<MenuCategory | null>(null);
-
-  const getProductCount = (catId: string) =>
-    products.filter((p) => p.category === catId).length;
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center justify-between">
-        <p className="text-sm text-(--color-text-muted)">
-          <strong className="text-foreground">{categories.length}</strong> danh
-          mục
-        </p>
-        <button
-          onClick={() => setModalCategory("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 danh mục</span>
-        </button>
-      </div>
-
-      <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-        {categories.map((cat) => {
-          const count = getProductCount(cat.id);
-          return (
-            <div
-              key={cat.id}
-              className="group relative flex items-center gap-4 rounded-2xl border border-(--color-border-light) bg-white p-4 shadow-sm transition hover:shadow-md"
-            >
-              <div className="flex h-12 w-12 shrink-0 items-center justify-center rounded-xl bg-(--color-accent-light)">
-                <i className={`${cat.icon} text-xl text-(--color-primary)`}></i>
-              </div>
-              <div className="min-w-0 flex-1">
-                <p className="text-foreground truncate font-semibold">
-                  {cat.name}
-                </p>
-                <p className="text-xs text-(--color-text-muted)">{count} món</p>
-              </div>
-              <div className="flex flex-col gap-1 opacity-0 transition-opacity group-hover:opacity-100">
-                <button
-                  onClick={() => setModalCategory(cat)}
-                  title="Chỉnh sửa"
-                  className="flex h-7 w-7 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-[11px]"></i>
-                </button>
-                <button
-                  onClick={() => setDeleteTarget(cat)}
-                  title="Xóa"
-                  className="flex h-7 w-7 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-[11px]"></i>
-                </button>
-              </div>
-            </div>
-          );
-        })}
-
-        {categories.length === 0 && (
-          <div className="col-span-full flex flex-col items-center gap-3 py-16 text-(--color-text-muted)">
-            <i className="fa-solid fa-tag text-4xl opacity-30"></i>
-            <p className="text-sm">Chưa có danh mục nào</p>
-          </div>
-        )}
-      </div>
-
-      {modalCategory !== null && (
-        <CategoryModal
-          category={modalCategory === "new" ? null : modalCategory}
-          onSave={(data) => {
-            if ("id" in data) {
-              updateCategory(data as MenuCategory);
-            } else {
-              addCategory(data);
-            }
-            setModalCategory(null);
-          }}
-          onClose={() => setModalCategory(null)}
-        />
-      )}
-
-      {deleteTarget !== null && (
-        <DeleteConfirm
-          name={deleteTarget.name}
-          onConfirm={() => {
-            deleteCategory(deleteTarget.id);
-            setDeleteTarget(null);
-          }}
-          onClose={() => setDeleteTarget(null)}
-        />
-      )}
-    </div>
-  );
-}

components/organisms/manager/CategoryModal.tsx

@@ -1,123 +0,0 @@
-"use client";
-
-import type { MenuCategory } from "@/lib/types";
-import { useState } from "react";
-
-import type { CategoryModalProps } from "./Manager.types";
-
-const FA_ICONS = [
-  "fa-solid fa-mug-hot",
-  "fa-solid fa-leaf",
-  "fa-solid fa-jar",
-  "fa-solid fa-blender",
-  "fa-solid fa-mug-saucer",
-  "fa-solid fa-ice-cream",
-  "fa-solid fa-layer-group",
-  "fa-solid fa-burger",
-  "fa-solid fa-pizza-slice",
-  "fa-solid fa-bowl-food",
-  "fa-solid fa-candy-cane",
-  "fa-solid fa-cookie",
-  "fa-solid fa-cake-candles",
-  "fa-solid fa-drumstick-bite",
-  "fa-solid fa-fish",
-  "fa-solid fa-carrot",
-];
-
-export default function CategoryModal({
-  category,
-  onSave,
-  onClose,
-}: CategoryModalProps) {
-  const isEdit = category !== null;
-  const [form, setForm] = useState<Omit<MenuCategory, "id">>({
-    name: category?.name ?? "",
-    icon: category?.icon ?? FA_ICONS[0],
-  });
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    if (isEdit && category) {
-      onSave({ ...form, id: category.id });
-    } else {
-      onSave(form);
-    }
-  };
-
-  return (
-    <div
-      className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 p-4 backdrop-blur-sm"
-      onClick={(e) => e.target === e.currentTarget && onClose()}
-    >
-      <div className="w-full max-w-md 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 danh mục" : "Thêm danh mục mới"}
-          </h2>
-          <button
-            title="Close"
-            onClick={onClose}
-            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>
-          </button>
-        </div>
-
-        <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 danh mục <span className="text-red-500">*</span>
-            </label>
-            <input
-              required
-              type="text"
-              value={form.name}
-              onChange={(e) => setForm({ ...form, name: e.target.value })}
-              className="text-foreground w-full rounded-xl border border-(--color-border) bg-white px-3 py-2 text-sm transition outline-none focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)/20"
-              placeholder="Ví dụ: Cà Phê"
-            />
-          </div>
-
-          <div>
-            <label className="mb-2 block text-sm font-medium text-(--color-text-secondary)">
-              Icon
-            </label>
-            <div className="grid grid-cols-8 gap-2">
-              {FA_ICONS.map((icon) => (
-                <button
-                  key={icon}
-                  type="button"
-                  onClick={() => setForm({ ...form, icon })}
-                  title={icon}
-                  className={`flex h-9 w-9 cursor-pointer items-center justify-center rounded-lg border transition ${
-                    form.icon === icon
-                      ? "border-(--color-primary) bg-(--color-primary) text-white"
-                      : "bg-background border-(--color-border-light) text-(--color-text-secondary) hover:border-(--color-primary-light) hover:text-(--color-primary)"
-                  }`}
-                >
-                  <i className={`${icon} text-sm`}></i>
-                </button>
-              ))}
-            </div>
-          </div>
-
-          <div className="flex gap-3 pt-1">
-            <button
-              type="button"
-              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
-            </button>
-            <button
-              type="submit"
-              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"
-            >
-              {isEdit ? "Lưu thay đổi" : "Thêm danh mục"}
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  );
-}

components/organisms/manager/ComboModal.tsx

@@ -1,237 +0,0 @@
-"use client";
-
-import type { Combo, Product } from "@/lib/types";
-import { useState } from "react";
-
-import type { ComboModalProps } from "./Manager.types";
-
-function formatPrice(price: number) {
-  return price.toLocaleString("vi-VN") + "đ";
-}
-
-export default function ComboModal({
-  combo,
-  products,
-  onSave,
-  onClose,
-}: ComboModalProps) {
-  const isEdit = combo !== null;
-  const [form, setForm] = useState<Omit<Combo, "id">>({
-    name: combo?.name ?? "",
-    description: combo?.description ?? "",
-    price: combo?.price ?? 0,
-    image: combo?.image ?? "/imgs/products/placeholder.jpg",
-    items: combo?.items ?? [],
-    available: combo?.available ?? true,
-  });
-
-  const updateItemQty = (productId: number, qty: number) => {
-    if (qty <= 0) {
-      setForm((prev) => ({
-        ...prev,
-        items: prev.items.filter((i) => i.productId !== productId),
-      }));
-    } else {
-      setForm((prev) => {
-        const existing = prev.items.find((i) => i.productId === productId);
-        if (existing) {
-          return {
-            ...prev,
-            items: prev.items.map((i) =>
-              i.productId === productId ? { ...i, quantity: qty } : i,
-            ),
-          };
-        }
-        return {
-          ...prev,
-          items: [...prev.items, { productId, quantity: qty }],
-        };
-      });
-    }
-  };
-
-  const getQty = (productId: number) =>
-    form.items.find((i) => i.productId === productId)?.quantity ?? 0;
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    if (form.items.length === 0) return;
-    if (isEdit && combo) {
-      onSave({ ...form, id: combo.id });
-    } else {
-      onSave(form);
-    }
-  };
-
-  const inputCls =
-    "w-full rounded-xl border border-(--color-border) bg-white px-3 py-2 text-sm transition outline-none focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)/20";
-
-  return (
-    <div
-      className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 p-4 backdrop-blur-sm"
-      onClick={(e) => e.target === e.currentTarget && onClose()}
-    >
-      <div className="flex max-h-[90vh] w-full max-w-xl flex-col 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 combo" : "Thêm combo mới"}
-          </h2>
-          <button
-            title="Close"
-            onClick={onClose}
-            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>
-          </button>
-        </div>
-
-        <form
-          onSubmit={handleSubmit}
-          className="flex flex-1 flex-col overflow-hidden"
-        >
-          <div className="flex-1 space-y-4 overflow-y-auto px-6 py-5">
-            <div>
-              <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-                Tên combo <span className="text-red-500">*</span>
-              </label>
-              <input
-                required
-                type="text"
-                value={form.name}
-                onChange={(e) => setForm({ ...form, name: e.target.value })}
-                className={inputCls}
-                placeholder="Ví dụ: Combo Cà Phê Đôi"
-              />
-            </div>
-
-            <div>
-              <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-                Giá combo (đ) <span className="text-red-500">*</span>
-              </label>
-              <input
-                title="Giá combo"
-                required
-                type="number"
-                min={0}
-                step={1000}
-                value={form.price}
-                onChange={(e) =>
-                  setForm({ ...form, price: Number(e.target.value) })
-                }
-                className={inputCls}
-              />
-            </div>
-
-            <div>
-              <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-                Mô tả
-              </label>
-              <textarea
-                title="Mô tả combo"
-                rows={2}
-                value={form.description}
-                onChange={(e) =>
-                  setForm({ ...form, description: e.target.value })
-                }
-                className={`${inputCls} resize-none`}
-              />
-            </div>
-
-            <div>
-              <label className="mb-2 block text-sm font-medium text-(--color-text-secondary)">
-                Món trong combo{" "}
-                {form.items.length === 0 && (
-                  <span className="text-xs text-red-500">
-                    (Chọn ít nhất 1 món)
-                  </span>
-                )}
-              </label>
-              <div className="bg-background max-h-48 space-y-1.5 overflow-y-auto rounded-xl border border-(--color-border-light) p-2">
-                {products.map((p) => {
-                  const qty = getQty(p.id);
-                  return (
-                    <div
-                      key={p.id}
-                      className="flex items-center justify-between rounded-lg bg-white px-3 py-2 text-sm"
-                    >
-                      <span className="text-foreground flex-1 truncate">
-                        {p.name}
-                      </span>
-                      <span className="mr-3 text-xs text-(--color-text-muted)">
-                        {formatPrice(p.price)}
-                      </span>
-                      <div className="flex items-center gap-1">
-                        <button
-                          title="Giảm"
-                          type="button"
-                          onClick={() => updateItemQty(p.id, qty - 1)}
-                          disabled={qty === 0}
-                          className="flex h-6 w-6 cursor-pointer items-center justify-center rounded-full border border-(--color-border) bg-white text-xs text-(--color-text-secondary) transition hover:border-(--color-primary) hover:text-(--color-primary) disabled:cursor-not-allowed disabled:opacity-40"
-                        >
-                          <i className="fa-solid fa-minus"></i>
-                        </button>
-                        <span className="text-foreground w-5 text-center text-sm font-semibold">
-                          {qty}
-                        </span>
-                        <button
-                          title="Tăng"
-                          type="button"
-                          onClick={() => updateItemQty(p.id, qty + 1)}
-                          className="flex h-6 w-6 cursor-pointer items-center justify-center rounded-full border border-(--color-border) bg-white text-xs text-(--color-text-secondary) transition hover:border-(--color-primary) hover:text-(--color-primary)"
-                        >
-                          <i className="fa-solid fa-plus"></i>
-                        </button>
-                      </div>
-                    </div>
-                  );
-                })}
-              </div>
-            </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-xs text-(--color-text-muted)">
-                  {form.available ? "Còn hàng" : "Tạm hết"}
-                </p>
-              </div>
-              <button
-                title="Chuyển đổi trạng thái"
-                type="button"
-                onClick={() => setForm({ ...form, available: !form.available })}
-                className={`relative h-6 w-11 cursor-pointer rounded-full border-none transition-colors duration-200 ${
-                  form.available ? "bg-(--color-primary)" : "bg-gray-300"
-                }`}
-              >
-                <span
-                  className={`absolute top-0.5 left-0 h-5 w-5 rounded-full bg-white shadow transition-transform duration-200 ${
-                    form.available ? "translate-x-5.5" : "translate-x-0.5"
-                  }`}
-                />
-              </button>
-            </div>
-          </div>
-
-          <div className="flex gap-3 border-t border-(--color-border-light) px-6 py-4">
-            <button
-              type="button"
-              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
-            </button>
-            <button
-              type="submit"
-              disabled={form.items.length === 0}
-              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:cursor-not-allowed disabled:opacity-50"
-            >
-              {isEdit ? "Lưu thay đổi" : "Thêm combo"}
-            </button>
-          </div>
-        </form>
-      </div>
-    </div>
-  );
-}

components/organisms/manager/CombosTab.tsx

@@ -1,149 +0,0 @@
-"use client";
-
-import { useManager } from "@/lib/manager-context";
-import type { Combo } from "@/lib/types";
-import { useState } from "react";
-
-import ComboModal from "./ComboModal";
-import DeleteConfirm from "./DeleteConfirm";
-import StatusBadge from "./StatusBadge";
-
-function formatPrice(price: number) {
-  return price.toLocaleString("vi-VN") + "đ";
-}
-
-export default function CombosTab() {
-  const {
-    combos,
-    products,
-    addCombo,
-    updateCombo,
-    deleteCombo,
-    toggleComboAvailability,
-  } = useManager();
-
-  const [modalCombo, setModalCombo] = useState<Combo | null | "new">(null);
-  const [deleteTarget, setDeleteTarget] = useState<Combo | null>(null);
-
-  const getProductName = (id: number) =>
-    products.find((p) => p.id === id)?.name ?? `Món #${id}`;
-
-  return (
-    <div className="space-y-4">
-      <div className="flex items-center justify-between">
-        <p className="text-sm text-(--color-text-muted)">
-          <strong className="text-foreground">{combos.length}</strong> combo
-        </p>
-        <button
-          onClick={() => setModalCombo("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 combo</span>
-        </button>
-      </div>
-
-      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
-        {combos.length === 0 ? (
-          <div className="col-span-full flex flex-col items-center gap-3 py-16 text-(--color-text-muted)">
-            <i className="fa-solid fa-layer-group text-4xl opacity-30"></i>
-            <p className="text-sm">Chưa có combo nào</p>
-          </div>
-        ) : (
-          combos.map((combo) => (
-            <div
-              key={combo.id}
-              className="flex flex-col rounded-2xl border border-(--color-border-light) bg-white shadow-sm transition hover:shadow-md"
-            >
-              <div className="flex items-start justify-between p-4">
-                <div className="min-w-0 flex-1">
-                  <h3 className="text-foreground truncate font-semibold">
-                    {combo.name}
-                  </h3>
-                  {combo.description && (
-                    <p className="mt-1 line-clamp-2 text-xs text-(--color-text-muted)">
-                      {combo.description}
-                    </p>
-                  )}
-                </div>
-                <button
-                  onClick={() => toggleComboAvailability(combo.id)}
-                  className="ml-3 shrink-0 cursor-pointer border-none bg-transparent"
-                  title="Đổi trạng thái"
-                >
-                  <StatusBadge available={combo.available} />
-                </button>
-              </div>
-
-              <div className="bg-background mx-4 mb-3 rounded-xl px-3 py-2">
-                <p className="mb-1 text-[11px] font-semibold tracking-wide text-(--color-text-muted) uppercase">
-                  Bao gồm
-                </p>
-                <ul className="space-y-0.5">
-                  {combo.items.map((item) => (
-                    <li
-                      key={item.productId}
-                      className="flex items-center justify-between text-xs text-(--color-text-secondary)"
-                    >
-                      <span>{getProductName(item.productId)}</span>
-                      <span className="font-medium">×{item.quantity}</span>
-                    </li>
-                  ))}
-                </ul>
-              </div>
-
-              <div className="flex items-center justify-between border-t border-(--color-border-light) px-4 py-3">
-                <span className="text-base font-bold text-(--color-primary)">
-                  {formatPrice(combo.price)}
-                </span>
-                <div className="flex gap-1.5">
-                  <button
-                    onClick={() => setModalCombo(combo)}
-                    title="Chỉnh sửa"
-                    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(combo)}
-                    title="Xóa"
-                    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>
-                  </button>
-                </div>
-              </div>
-            </div>
-          ))
-        )}
-      </div>
-
-      {modalCombo !== null && (
-        <ComboModal
-          combo={modalCombo === "new" ? null : modalCombo}
-          products={products}
-          onSave={(data) => {
-            if ("id" in data) {
-              updateCombo(data as Combo);
-            } else {
-              addCombo(data);
-            }
-            setModalCombo(null);
-          }}
-          onClose={() => setModalCombo(null)}
-        />
-      )}
-
-      {deleteTarget !== null && (
-        <DeleteConfirm
-          name={deleteTarget.name}
-          onConfirm={() => {
-            deleteCombo(deleteTarget.id);
-            setDeleteTarget(null);
-          }}
-          onClose={() => setDeleteTarget(null)}
-        />
-      )}
-    </div>
-  );
-}

components/organisms/manager/Manager.types.ts

@@ -1,22 +1,8 @@
-import type { Combo, MenuCategory, Product } from "@/lib/types";
+import type { MenuItemEntity } from "@/lib/types";
 
 export interface ProductModalProps {
-  product: Product | null; // null = add mode
-  categories: MenuCategory[];
-  onSave: (p: Omit<Product, "id"> | Product) => void;
-  onClose: () => void;
-}
-
-export interface CategoryModalProps {
-  category: MenuCategory | null;
-  onSave: (c: Omit<MenuCategory, "id"> | MenuCategory) => void;
-  onClose: () => void;
-}
-
-export interface ComboModalProps {
-  combo: Combo | null;
-  products: Product[];
-  onSave: (c: Omit<Combo, "id"> | Combo) => void;
+  product: MenuItemEntity | null; 
+  onSave: (p: MenuItemEntity) => void;
   onClose: () => void;
 }
 

components/organisms/manager/MenuItemsTab.tsx

@@ -0,0 +1,256 @@
+"use client";
+
+import { eateryClient } from "@/lib/apollo-clients";
+import { useAuth } from "@/lib/auth-context";
+import {
+  MenuItemEntity,
+  addMenuItemMutation,
+  allEateriesQuery,
+} from "@/lib/types";
+import { gql } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client/react";
+import { useEffect, useState } from "react";
+
+const GET_EATERY_MENU = gql`
+  query GetEateryMenu {
+    allEateries {
+      id
+      menuItems {
+        id
+        name
+        price
+      }
+    }
+  }
+`;
+
+const ADD_MENU_ITEM = gql`
+  mutation addMenuItem($menuItem: AddMenuItemInput!) {
+    addMenuItem(menuItem: $menuItem) {
+      id
+      name
+      price
+    }
+  }
+`;
+
+function formatPrice(price: number) {
+  return price.toLocaleString("vi-VN") + "đ";
+}
+
+export default function MenuItemsTab() {
+  const { user } = useAuth();
+  const [menuItems, setMenuItems] = useState<MenuItemEntity[]>([]);
+
+  const {
+    data,
+    loading: gqlLoading,
+    error: gqlError,
+  } = useQuery<allEateriesQuery>(GET_EATERY_MENU, {
+    client: eateryClient,
+    fetchPolicy: "network-only",
+  });
+
+  const [mutateAddMenuItem] = useMutation<addMenuItemMutation>(ADD_MENU_ITEM, {
+    client: eateryClient,
+  });
+
+  const [showForm, setShowForm] = useState(false);
+  const [newName, setNewName] = useState("");
+  const [newPrice, setNewPrice] = useState("");
+  const [submitting, setSubmitting] = useState(false);
+  const [submitError, setSubmitError] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (data?.allEateries?.[0]) {
+      setMenuItems(data.allEateries[0].menuItems);
+    }
+  }, [data]);
+
+  const handleAdd = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!newName.trim() || !newPrice) return;
+
+    setSubmitting(true);
+    setSubmitError(null);
+
+    try {
+      const { data: mutationResult } = await mutateAddMenuItem({
+        variables: {
+          menuItem: {
+            name: newName,
+            price: parseFloat(newPrice),
+          },
+        },
+      });
+
+      if (mutationResult?.addMenuItem) {
+        setMenuItems((prev) => [...prev, mutationResult.addMenuItem]);
+        closeForm();
+      }
+    } catch (err: any) {
+      console.error("Mutation Error:", err);
+      setSubmitError(err.message || "Không thể thêm món. Vui lòng thử lại.");
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  const closeForm = () => {
+    setShowForm(false);
+    setSubmitError(null);
+    setNewName("");
+    setNewPrice("");
+  };
+
+  if (gqlLoading && menuItems.length === 0)
+    return <div className="py-16 text-center">Đang tải menu...</div>;
+  if (gqlError)
+    return (
+      <div className="py-16 text-center text-red-500">
+        Lỗi: {gqlError.message}
+      </div>
+    );
+
+  return (
+    <div className="space-y-4">
+      {/* Toolbar */}
+      <div className="flex items-center justify-between">
+        <p className="text-sm text-(--color-text-muted)">
+          <strong className="text-foreground">{menuItems.length}</strong> món
+          trong menu
+        </p>
+        <button
+          onClick={() => setShowForm(true)}
+          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>
+        </button>
+      </div>
+
+      {/* Table */}
+      <div className="overflow-x-auto rounded-2xl border border-(--color-border-light) bg-white shadow-sm">
+        <table className="min-w-full divide-y divide-(--color-border-light) text-sm">
+          <thead className="bg-background">
+            <tr>
+              <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">
+                Tên món
+              </th>
+              <th className="px-4 py-3 text-right font-semibold text-(--color-text-secondary)">
+                Giá
+              </th>
+            </tr>
+          </thead>
+          <tbody className="divide-y divide-(--color-border-light)">
+            {menuItems.length === 0 ? (
+              <tr>
+                <td
+                  colSpan={2}
+                  className="py-12 text-center text-(--color-text-muted)"
+                >
+                  <i className="fa-solid fa-bowl-food mb-2 block text-3xl opacity-30"></i>
+                  Chưa có món nào trong menu
+                </td>
+              </tr>
+            ) : (
+              menuItems.map((item) => (
+                <tr
+                  key={item.id}
+                  className="hover:bg-background transition-colors"
+                >
+                  <td className="px-4 py-3">
+                    <p className="text-foreground font-medium">{item.name}</p>
+                  </td>
+                  <td className="px-4 py-3 text-right font-semibold text-(--color-primary)">
+                    {formatPrice(item.price)}
+                  </td>
+                </tr>
+              ))
+            )}
+          </tbody>
+        </table>
+      </div>
+
+      {/* Add Item Modal */}
+      {showForm && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/30 backdrop-blur-sm">
+          <div className="w-full max-w-sm rounded-2xl bg-white p-6 shadow-lg">
+            <div className="mb-4 flex items-center justify-between">
+              <h2 className="text-foreground font-bold">Thêm món mới</h2>
+              <button
+                onClick={closeForm}
+                className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent text-(--color-text-muted) hover:text-(--color-primary)"
+              >
+                <i className="fa-solid fa-xmark"></i>
+              </button>
+            </div>
+
+            <form onSubmit={handleAdd} className="space-y-4">
+              <div>
+                <label className="mb-1.5 block text-sm font-medium text-(--color-text-secondary)">
+                  Tên món <span className="text-red-500">*</span>
+                </label>
+                <input
+                  type="text"
+                  value={newName}
+                  onChange={(e) => setNewName(e.target.value)}
+                  placeholder="Nhập tên món..."
+                  required
+                  className="text-foreground w-full rounded-xl border border-(--color-border) bg-white px-3 py-2 text-sm transition outline-none focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)/20"
+                />
+              </div>
+
+              <div>
+                <label className="mb-1.5 block text-sm font-medium text-(--color-text-secondary)">
+                  Giá (VNĐ) <span className="text-red-500">*</span>
+                </label>
+                <input
+                  type="number"
+                  value={newPrice}
+                  onChange={(e) => setNewPrice(e.target.value)}
+                  placeholder="Nhập giá..."
+                  required
+                  min={0}
+                  step={500}
+                  className="text-foreground w-full rounded-xl border border-(--color-border) bg-white px-3 py-2 text-sm transition outline-none focus:border-(--color-primary) focus:ring-2 focus:ring-(--color-primary)/20"
+                />
+              </div>
+
+              {submitError && (
+                <p className="text-sm text-red-500">
+                  <i className="fa-solid fa-circle-exclamation mr-1"></i>
+                  {submitError}
+                </p>
+              )}
+
+              <div className="flex gap-2 pt-2">
+                <button
+                  type="button"
+                  onClick={closeForm}
+                  className="hover:bg-background flex-1 cursor-pointer rounded-xl border border-(--color-border-light) bg-transparent py-2 text-sm font-medium text-(--color-text-secondary) transition"
+                >
+                  Hủy
+                </button>
+                <button
+                  type="submit"
+                  disabled={submitting}
+                  className="flex-1 cursor-pointer rounded-xl border-none bg-(--color-primary) py-2 text-sm font-semibold text-white transition hover:bg-(--color-primary-dark) disabled:opacity-60"
+                >
+                  {submitting ? (
+                    <>
+                      <i className="fa-solid fa-spinner mr-1 animate-spin"></i>
+                      Đang lưu...
+                    </>
+                  ) : (
+                    "Thêm món"
+                  )}
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

components/organisms/manager/ProductModal.tsx

@@ -1,22 +1,20 @@
 "use client";
 
-import type { Product } from "@/lib/types";
+import type { MenuItemEntity } from "@/lib/types";
 import { useState } from "react";
 
 import type { ProductModalProps } from "./Manager.types";
 
 export default function ProductModal({
   product,
-  categories,
   onSave,
   onClose,
 }: ProductModalProps) {
   const isEdit = product !== null;
-  const [form, setForm] = useState<Omit<Product, "id">>({
+  const [form, setForm] = useState<MenuItemEntity>({
     name: product?.name ?? "",
-    category: product?.category ?? categories[0]?.id ?? "",
     price: product?.price ?? 0,
-    image: product?.image ?? "/imgs/products/placeholder.jpg",
+    imageUrl: product?.imageUrl ?? "/imgs/products/placeholder.jpg",
     description: product?.description ?? "",
     available: product?.available ?? true,
   });
@@ -67,42 +65,22 @@ export default function ProductModal({
             />
           </div>
 
-          <div className="grid grid-cols-2 gap-3">
-            <div>
-              <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-                Danh mục <span className="text-red-500">*</span>
-              </label>
-              <select
-                required
-                title="Chọn danh mục"
-                value={form.category}
-                onChange={(e) => setForm({ ...form, category: e.target.value })}
-                className={inputCls}
-              >
-                {categories.map((cat) => (
-                  <option key={cat.id} value={cat.id}>
-                    {cat.name}
-                  </option>
-                ))}
-              </select>
-            </div>
-            <div>
-              <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
-                Giá (đ) <span className="text-red-500">*</span>
-              </label>
-              <input
-                required
-                type="number"
-                min={0}
-                step={1000}
-                value={form.price}
-                onChange={(e) =>
-                  setForm({ ...form, price: Number(e.target.value) })
-                }
-                className={inputCls}
-                placeholder="25000"
-              />
-            </div>
+          <div>
+            <label className="mb-1 block text-sm font-medium text-(--color-text-secondary)">
+              Giá (đ) <span className="text-red-500">*</span>
+            </label>
+            <input
+              required
+              type="number"
+              min={0}
+              step={1000}
+              value={form.price}
+              onChange={(e) =>
+                setForm({ ...form, price: Number(e.target.value) })
+              }
+              className={inputCls}
+              placeholder="25000"
+            />
           </div>
 
           <div>

components/organisms/manager/ProductsTab.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useManager } from "@/lib/manager-context";
-import type { Product } from "@/lib/types";
+import type { MenuItemEntity } from "@/lib/types";
 import { useState } from "react";
 
 import DeleteConfirm from "./DeleteConfirm";
@@ -15,25 +15,22 @@ function formatPrice(price: number) {
 export default function ProductsTab() {
   const {
     products,
-    categories,
     addProduct,
     updateProduct,
     deleteProduct,
     toggleProductAvailability,
   } = useManager();
 
-  const [filterCategory, setFilterCategory] = useState("all");
   const [filterStatus, setFilterStatus] = useState<
     "all" | "available" | "unavailable"
   >("all");
   const [search, setSearch] = useState("");
-  const [modalProduct, setModalProduct] = useState<Product | null | "new">(
-    null,
-  );
-  const [deleteTarget, setDeleteTarget] = useState<Product | null>(null);
+  const [modalProduct, setModalProduct] = useState<
+    MenuItemEntity | null | "new"
+  >(null);
+  const [deleteTarget, setDeleteTarget] = useState<MenuItemEntity>(null!);
 
   const filtered = products.filter((p) => {
-    if (filterCategory !== "all" && p.category !== filterCategory) return false;
     if (filterStatus === "available" && p.available === false) return false;
     if (filterStatus === "unavailable" && p.available !== false) return false;
     if (
@@ -45,9 +42,6 @@ export default function ProductsTab() {
     return true;
   });
 
-  const getCategoryName = (id: string) =>
-    categories.find((c) => c.id === id)?.name ?? id;
-
   return (
     <div className="space-y-4">
       {/* Toolbar */}
@@ -73,20 +67,6 @@ export default function ProductsTab() {
           )}
         </div>
 
-        <select
-          value={filterCategory}
-          onChange={(e) => setFilterCategory(e.target.value)}
-          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 danh mục"
-        >
-          <option value="all">Tất cả danh mục</option>
-          {categories.map((cat) => (
-            <option key={cat.id} value={cat.id}>
-              {cat.name}
-            </option>
-          ))}
-        </select>
-
         <select
           value={filterStatus}
           onChange={(e) =>
@@ -125,9 +105,6 @@ export default function ProductsTab() {
               <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">
                 Tên món
               </th>
-              <th className="px-4 py-3 text-left font-semibold text-(--color-text-secondary)">
-                Danh mục
-              </th>
               <th className="px-4 py-3 text-right font-semibold text-(--color-text-secondary)">
                 Giá
               </th>
@@ -152,7 +129,10 @@ export default function ProductsTab() {
               </tr>
             ) : (
               filtered.map((p) => (
-                <tr key={p.id} className="hover:bg-background transition-colors">
+                <tr
+                  key={p.id}
+                  className="hover:bg-background transition-colors"
+                >
                   <td className="px-4 py-3">
                     <div>
                       <p className="text-foreground font-medium">{p.name}</p>
@@ -163,20 +143,12 @@ export default function ProductsTab() {
                       )}
                     </div>
                   </td>
-                  <td className="px-4 py-3">
-                    <span className="inline-flex items-center gap-1.5 rounded-full bg-(--color-accent-light) px-2.5 py-0.5 text-xs font-medium text-(--color-primary-dark)">
-                      <i
-                        className={`${categories.find((c) => c.id === p.category)?.icon ?? "fa-solid fa-tag"} text-[10px]`}
-                      ></i>
-                      {getCategoryName(p.category)}
-                    </span>
-                  </td>
                   <td className="px-4 py-3 text-right font-semibold text-(--color-primary)">
                     {formatPrice(p.price)}
                   </td>
                   <td className="px-4 py-3 text-center">
                     <button
-                      onClick={() => toggleProductAvailability(p.id)}
+                      onClick={() => toggleProductAvailability(p)}
                       title="Nhấn để đổi trạng thái"
                       className="cursor-pointer border-none bg-transparent"
                     >
@@ -211,10 +183,9 @@ export default function ProductsTab() {
       {modalProduct !== null && (
         <ProductModal
           product={modalProduct === "new" ? null : modalProduct}
-          categories={categories}
-          onSave={(data) => {
+          onSave={(data: MenuItemEntity) => {
             if ("id" in data) {
-              updateProduct(data as Product);
+              updateProduct(data);
             } else {
               addProduct(data);
             }
@@ -228,10 +199,10 @@ export default function ProductsTab() {
         <DeleteConfirm
           name={deleteTarget.name}
           onConfirm={() => {
-            deleteProduct(deleteTarget.id);
-            setDeleteTarget(null);
+            deleteProduct(deleteTarget.id!);
+            setDeleteTarget(null!);
           }}
-          onClose={() => setDeleteTarget(null)}
+          onClose={() => setDeleteTarget(null!)}
         />
       )}
     </div>

components/organisms/manager/StatusBadge.tsx

@@ -14,7 +14,7 @@ export default function StatusBadge({ available }: StatusBadgeProps) {
           available ? "bg-emerald-500" : "bg-amber-500"
         }`}
       />
-      {available ? "Còn hàng" : "Tạm hết"}
+      {available ? "In stock" : "Out of stock"}
     </span>
   );
 }

components/organisms/manager/index.ts

@@ -1,15 +1,10 @@
 export { default as StatusBadge } from "./StatusBadge";
 export { default as DeleteConfirm } from "./DeleteConfirm";
 export { default as ProductModal } from "./ProductModal";
-export { default as CategoryModal } from "./CategoryModal";
-export { default as ComboModal } from "./ComboModal";
 export { default as ProductsTab } from "./ProductsTab";
-export { default as CategoriesTab } from "./CategoriesTab";
-export { default as CombosTab } from "./CombosTab";
+export { default as MenuItemsTab } from "./MenuItemsTab";
 export type {
   ProductModalProps,
-  CategoryModalProps,
-  ComboModalProps,
   DeleteConfirmProps,
   StatusBadgeProps,
 } from "./Manager.types";

components/organisms/modals/ReviewModal.tsx

@@ -49,13 +49,13 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
               <i className="fa-solid fa-heart text-(--color-accent)"></i>
             </div>
             <Heading level={2} id="review-modal-title">
-              Cảm ơn quý khách
+              Thank you
             </Heading>
             <Text variant="body2" className="mt-2">
-              Chúng tôi trân trọng đánh giá của bạn!
+              We appreciate your feedback!
             </Text>
             <Button onClick={handleClose} variant="primary" className="mt-4">
-              Đóng
+              Close
             </Button>
           </div>
         ) : (
@@ -65,21 +65,21 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
               id="review-modal-title"
               className="text-foreground mb-1 text-xl font-bold"
             >
-              Đánh giá của bạn
+              Your Review
             </h2>
             <p className="mb-5 text-sm text-(--color-text-muted)">
-              Hãy cho chúng tôi biết trải nghiệm của bạn hôm nay
+              Tell us about your experience today
             </p>
 
             {/* Star rating */}
             <div className="mb-5">
               <p className="mb-2 text-sm font-medium text-(--color-text-secondary)">
-                Mức độ hài lòng
+                Satisfaction level
               </p>
               <div
                 className="flex gap-2"
                 role="radiogroup"
-                aria-label="Xếp hạng sao"
+                aria-label="Star rating"
               >
                 {[1, 2, 3, 4, 5].map((star) => {
                   const isActive = star <= (hovered || rating);
@@ -90,7 +90,7 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
                       onClick={() => setRating(star)}
                       onMouseEnter={() => setHovered(star)}
                       onMouseLeave={() => setHovered(0)}
-                      aria-label={`${star} sao`}
+                      aria-label={`${star} star`}
                       aria-pressed={rating === star}
                       className="text-3xl transition-transform hover:scale-110 active:scale-95 sm:text-4xl"
                     >
@@ -108,7 +108,7 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
               {rating > 0 && (
                 <p className="mt-1.5 text-xs text-(--color-text-muted)">
                   {
-                    ["", "Rất tệ", "Tệ", "Bình thường", "Tốt", "Xuất sắc"][
+                    ["", "Very poor", "Poor", "Average", "Good", "Excellent"][
                       rating
                     ]
                   }
@@ -120,10 +120,10 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
             <div className="mb-6">
               <Textarea
                 id="review-text"
-                label="Nhận xét (tùy chọn)"
+                label="Comment (optional)"
                 value={review}
                 onChange={(e) => setReview(e.target.value)}
-                placeholder="Chia sẻ cảm nhận của bạn về đồ uống, dịch vụ..."
+                placeholder="Share your thoughts on the drinks, service..."
                 rows={4}
               />
             </div>
@@ -137,7 +137,7 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
                 className="flex-1"
                 icon="fa-arrow-left"
               >
-                Quay lại
+                Go back
               </Button>
               <Button
                 type="button"
@@ -146,7 +146,7 @@ export default function ReviewModal({ isOpen, onClose }: ReviewModalProps) {
                 className="flex-1"
                 icon="fa-check"
               >
-                Xác nhận
+                Confirm
               </Button>
             </div>
           </>

components/organisms/navigation/CategorySidebar.tsx

@@ -1,7 +1,6 @@
 "use client";
 
-import { MENU_CATEGORIES, SHOP_INFO } from "@/lib/constants";
-import type { MenuCategory } from "@/lib/types";
+import { SHOP_INFO } from "@/lib/constants";
 import type React from "react";
 
 import type { CategorySidebarProps } from "./Navigation.types";
@@ -18,8 +17,6 @@ import type { CategorySidebarProps } from "./Navigation.types";
 export default function CategorySidebar({
   isOpen,
   onToggle,
-  activeCategory = "all",
-  onCategoryChange,
 }: CategorySidebarProps) {
   return (
     <aside
@@ -47,6 +44,7 @@ export default function CategorySidebar({
         <button
           onClick={onToggle}
           title={isOpen ? "Thu gọn menu" : "Mở rộng menu"}
+          aria-label={isOpen ? "Thu gọn menu" : "Mở rộng 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
@@ -57,40 +55,6 @@ export default function CategorySidebar({
         </button>
       </div>
 
-      {/* ── Category list ── */}
-      <nav className="flex-1 py-2">
-        <ul className="flex flex-col gap-0.5 px-2">
-          {MENU_CATEGORIES.map((cat: MenuCategory) => {
-            const isActive = activeCategory === cat.id;
-            return (
-              <li key={cat.id}>
-                <button
-                  onClick={() => onCategoryChange?.(cat.id)}
-                  title={!isOpen ? cat.name : undefined}
-                  className={`flex w-full cursor-pointer items-center rounded-xl border-none text-sm font-medium transition-all duration-150 xl:justify-start xl:gap-3 xl:px-3 xl:py-2.5 ${isOpen ? "gap-3 px-3 py-2.5" : "justify-center px-0 py-2.5"} ${
-                    isActive
-                      ? "bg-(--color-primary) text-white shadow-sm"
-                      : "bg-transparent text-(--color-text-secondary) hover:bg-(--color-border-light) hover:text-(--color-primary-dark)"
-                  } `}
-                >
-                  {/* Icon */}
-                  <i
-                    className={` ${cat.icon} w-5 shrink-0 text-center text-base ${isActive ? "text-white" : "text-(--color-primary)"} `}
-                  ></i>
-
-                  {/* Label — hidden when collapsed, always shown on xl+ */}
-                  <span
-                    className={`overflow-hidden text-ellipsis whitespace-nowrap ${isOpen ? "block" : "hidden"} xl:block`}
-                  >
-                    {cat.name}
-                  </span>
-                </button>
-              </li>
-            );
-          })}
-        </ul>
-      </nav>
-
       {/* ── Sidebar footer: opening hours ── */}
       <div
         className={`shrink-0 border-t border-(--color-border) py-3 xl:px-4 ${isOpen ? "px-4" : "flex justify-center px-0"} `}

components/organisms/product-grid/ProductGrid.tsx

@@ -2,8 +2,7 @@
 
 import { ProductCard } from "@/components/molecules/cards";
 import { useCart } from "@/lib/cart-context";
-import { MENU_CATEGORIES, MOCK_PRODUCTS } from "@/lib/constants";
-import { useMenu } from "@/lib/menu-context";
+import { useManager } from "@/lib/manager-context";
 
 import type { ProductGridProps } from "./ProductGrid.types";
 
@@ -11,68 +10,40 @@ export default function ProductGrid({
   searchQuery = "",
   isSidebarOpen = false,
 }: ProductGridProps) {
-  const { activeCategory, setActiveCategory } = useMenu();
   const { addToCart } = useCart();
+  const { products } = useManager();
 
-  const filteredProducts = MOCK_PRODUCTS.filter((p) => {
+  const filteredProducts = products.filter((p) => {
     const isAvailable = p.available !== false;
-    const matchesCategory =
-      activeCategory === "all" || p.category === activeCategory;
     const matchesSearch =
       searchQuery.trim() === "" ||
       p.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
       p.description.toLowerCase().includes(searchQuery.toLowerCase());
-    return isAvailable && matchesCategory && matchesSearch;
+    return isAvailable && matchesSearch;
   });
 
-  const activeCategoryLabel =
-    MENU_CATEGORIES.find((c) => c.id === activeCategory)?.name ?? "Tất cả";
-
   const gridCols = isSidebarOpen
     ? "grid-cols-1 min-[480px]:grid-cols-2 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4"
     : "grid-cols-1 min-[480px]:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5";
 
   return (
     <>
-      {/* ── Mobile category menu — visible only on < md ── */}
-      <div className="bg-background sticky top-18 z-50 -mx-4 mb-4 overflow-x-auto px-4 pt-2 md:hidden">
-        <div className="flex items-center gap-1.5 pb-1">
-          {MENU_CATEGORIES.map((cat) => {
-            const isActive = activeCategory === cat.id;
-            return (
-              <button
-                key={cat.id}
-                onClick={() => setActiveCategory(cat.id)}
-                className={`flex shrink-0 cursor-pointer items-center gap-1.5 rounded-xl border-none px-3 py-2 text-sm font-medium whitespace-nowrap transition-all duration-150 ${
-                  isActive
-                    ? "bg-(--color-primary) text-white shadow-sm"
-                    : "bg-transparent text-(--color-text-secondary) hover:bg-(--color-border-light) hover:text-(--color-primary-dark)"
-                } `}
-              >
-                <i
-                  className={` ${cat.icon} shrink-0 text-sm ${isActive ? "text-white" : "text-(--color-primary)"} `}
-                ></i>
-                <span>{cat.name}</span>
-              </button>
-            );
-          })}
-        </div>
-      </div>
-
       {/* ── Product grid ── */}
       {filteredProducts.length > 0 ? (
         <div className={`grid gap-4 ${gridCols}`}>
-          {filteredProducts.map((product) => (
-            <ProductCard
-              key={product.id}
-              image={product.image}
-              imageAlt={product.name}
-              productName={product.name}
-              price={product.price}
-              description={product.description}
-              onBuy={() => addToCart(product)}
-            />
-          ))}
+          {filteredProducts.map(
+            ({ id, imageUrl, name, price, description }) => (
+              <ProductCard
+                key={id}
+                image={imageUrl}
+                imageAlt={name}
+                productName={name}
+                price={price}
+                description={description}
+                onBuy={() => addToCart({ productId: id!, quantity: 1 })}
+              />
+            ),
+          )}
         </div>
       ) : (
         /* Empty state */

components/organisms/shift-schedule/MobileShiftView.tsx

@@ -0,0 +1,252 @@
+"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",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+
+export default function MobileShiftView({
+  onShiftClick,
+}: MobileShiftViewProps) {
+  const { currentDate, shifts, goToNextMonth, goToPrevMonth } = useShift();
+  const [selectedDate, setSelectedDate] = useState<string>(
+    formatDateISO(new Date(2026, 3, 10)),
+  );
+
+  const calendarDays = useMemo(() => {
+    const year = currentDate.getFullYear();
+    const month = currentDate.getMonth();
+    const firstDay = new Date(year, month, 1);
+    const lastDay = new Date(year, month + 1, 0);
+
+    let startOffset = firstDay.getDay() - 1;
+    if (startOffset < 0) startOffset = 6;
+
+    const days: (Date | null)[] = [];
+    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));
+    }
+    while (days.length % 7 !== 0) days.push(null);
+    return days;
+  }, [currentDate]);
+
+  const getDotColors = (date: Date): string[] => {
+    const dateStr = formatDateISO(date);
+    const dayShifts = shifts.filter((s) => s.date === dateStr);
+    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(() => {
+    return shifts.filter((s) => s.date === selectedDate);
+  }, [shifts, selectedDate]);
+
+  const selectedDateObj = new Date(selectedDate + "T00:00:00");
+  const dayOfWeek = DAY_HEADERS[(selectedDateObj.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 navigation */}
+        <div className="mb-3 flex items-center justify-between">
+          <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"
+          >
+            <i className="fa-solid fa-chevron-left text-xs"></i>
+          </button>
+          <h3 className="text-foreground text-sm font-bold">
+            {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"
+          >
+            <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 dateStr = formatDateISO(date);
+            const today = isToday(date);
+            const selected = dateStr === selectedDate;
+            const dots = getDotColors(date);
+
+            return (
+              <button
+                type="button"
+                key={i}
+                onClick={() => setSelectedDate(dateStr)}
+                className={`flex cursor-pointer flex-col items-center border-none bg-transparent p-1 transition ${
+                  selected ? "rounded-lg bg-(--color-primary)/10" : ""
+                }`}
+              >
+                <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>
+
+        {/* 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>
+          </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" : ""})
+          </span>
+        </h3>
+
+        {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
+            </p>
+          </div>
+        ) : (
+          <div className="space-y-3">
+            {DEPARTMENTS.map((dept) => {
+              const deptShifts = selectedShifts.filter(
+                (s) => s.department === dept.id,
+              );
+              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>
+        )}
+      </div>
+    </div>
+  );
+}

components/organisms/shift-schedule/MonthlyCalendar.tsx

@@ -0,0 +1,164 @@
+"use client";
+
+import { useShift } from "@/lib/shift-context";
+import { useMemo } from "react";
+
+import type { MonthlyCalendarProps } 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()
+  );
+}
+
+export default function MonthlyCalendar({
+  onShiftClick,
+  onDateSelect,
+}: MonthlyCalendarProps) {
+  const { currentDate, shifts } = useShift();
+
+  const calendarDays = useMemo(() => {
+    const year = currentDate.getFullYear();
+    const month = currentDate.getMonth();
+    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++) {
+      days.push(new Date(year, month, d));
+    }
+
+    // Fill trailing empty cells to complete the grid
+    while (days.length % 7 !== 0) {
+      days.push(null);
+    }
+
+    return days;
+  }, [currentDate]);
+
+  const getShiftSummary = (date: Date) => {
+    const dateStr = formatDateISO(date);
+    const dayShifts = shifts.filter((s) => s.date === dateStr);
+    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, available, registered, leave, absent };
+  };
+
+  return (
+    <div className="overflow-hidden rounded-xl border border-(--color-border-light)">
+      {/* Day headers */}
+      <div className="grid grid-cols-7 border-b border-(--color-border-light) bg-gray-50">
+        {DAY_HEADERS.map((day) => (
+          <div
+            key={day}
+            className="px-2 py-2.5 text-center text-xs 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="min-h-25 border-r border-b border-(--color-border-light) bg-gray-50/30"
+              />
+            );
+          }
+
+          const summary = getShiftSummary(date);
+          const today = isToday(date);
+
+          return (
+            <button
+              type="button"
+              key={i}
+              onClick={() => onDateSelect?.(formatDateISO(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" : ""
+              }`}
+            >
+              <span
+                className={`inline-flex h-7 w-7 items-center justify-center rounded-full text-sm ${
+                  today
+                    ? "bg-(--color-primary) font-bold text-white"
+                    : "text-foreground font-medium"
+                }`}
+              >
+                {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>
+                  )}
+                </div>
+              )}
+            </button>
+          );
+        })}
+      </div>
+    </div>
+  );
+}

components/organisms/shift-schedule/ShiftCreateModal.tsx

@@ -0,0 +1,220 @@
+"use client";
+
+import { DEPARTMENTS } from "@/lib/constants";
+import { useShift } from "@/lib/shift-context";
+import { useEffect, useState } from "react";
+
+import type { ShiftCreateModalProps } from "./ShiftSchedule.types";
+
+export default function ShiftCreateModal({
+  isOpen,
+  onClose,
+  defaultDate,
+}: ShiftCreateModalProps) {
+  const { createShift } = useShift();
+
+  const [date, setDate] = useState(defaultDate ?? "2026-04-10");
+  const [startTime, setStartTime] = useState("08:00");
+  const [endTime, setEndTime] = useState("12:00");
+  const [department, setDepartment] = useState("bar");
+  const [maxStaff, setMaxStaff] = useState(2);
+  const [wage, setWage] = useState(120000);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (isOpen) {
+      setDate(defaultDate ?? "2026-04-10");
+    }
+  }, [defaultDate, isOpen]);
+
+  if (!isOpen) return null;
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    setError(null);
+
+    // Validate
+    if (!date || !startTime || !endTime) {
+      setError("Please fill in all required fields.");
+      return;
+    }
+
+    const [sh, sm] = startTime.split(":").map(Number);
+    const [eh, em] = endTime.split(":").map(Number);
+    const startMinutes = sh * 60 + sm;
+    const endMinutes = eh * 60 + em;
+
+    if (endMinutes <= startMinutes) {
+      setError("End time must be after start time.");
+      return;
+    }
+
+    const durationHours = (endMinutes - startMinutes) / 60;
+
+    createShift({
+      date,
+      startTime,
+      endTime,
+      durationHours,
+      wage,
+      department,
+      maxStaff,
+      registeredStaff: [],
+      status: "available",
+    });
+
+    onClose();
+  };
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
+      {/* Backdrop */}
+      <div className="absolute inset-0 bg-black/40" onClick={onClose} />
+
+      {/* Modal */}
+      <div className="relative w-full max-w-md rounded-2xl bg-white shadow-xl">
+        {/* Header */}
+        <div className="flex items-center justify-between border-b border-(--color-border-light) px-5 py-4">
+          <div>
+            <h2 className="text-foreground text-base font-bold">
+              Create New Shift
+            </h2>
+            <p className="text-xs text-(--color-text-muted)">
+              Add a shift time slot for staff
+            </p>
+          </div>
+          <button
+            title="Close"
+            type="button"
+            onClick={onClose}
+            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-xmark"></i>
+          </button>
+        </div>
+
+        {/* Form */}
+        <form onSubmit={handleSubmit} className="space-y-4 px-5 py-4">
+          {/* Date */}
+          <div>
+            <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
+              Date
+            </label>
+            <input
+              title="Date"
+              type="date"
+              value={date}
+              onChange={(e) => setDate(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)"
+            />
+          </div>
+
+          {/* Time range */}
+          <div className="grid grid-cols-2 gap-3">
+            <div>
+              <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
+                Start Time
+              </label>
+              <input
+                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)"
+              />
+            </div>
+            <div>
+              <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
+                End Time
+              </label>
+              <input
+                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)"
+              />
+            </div>
+          </div>
+
+          {/* Department */}
+          <div>
+            <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
+              Bộ phận
+            </label>
+            <select
+              title="Department"
+              value={department}
+              onChange={(e) => setDepartment(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)"
+            >
+              {DEPARTMENTS.map((dept) => (
+                <option key={dept.id} value={dept.id}>
+                  {dept.name}
+                </option>
+              ))}
+            </select>
+          </div>
+
+          {/* Max staff & Wage */}
+          <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
+              </label>
+              <input
+                title="Max Staff"
+                type="number"
+                min={1}
+                max={10}
+                value={maxStaff}
+                onChange={(e) => setMaxStaff(Number(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)"
+              />
+            </div>
+            <div>
+              <label className="mb-1 block text-xs font-semibold text-(--color-text-secondary)">
+                Lương ca (VND)
+              </label>
+              <input
+                title="Wage"
+                type="number"
+                min={0}
+                step={10000}
+                value={wage}
+                onChange={(e) => setWage(Number(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)"
+              />
+            </div>
+          </div>
+
+          {/* Error */}
+          {error && (
+            <div className="rounded-xl bg-red-50 px-4 py-3 text-sm text-red-700">
+              <i className="fa-solid fa-circle-exclamation mr-2"></i>
+              {error}
+            </div>
+          )}
+
+          {/* Actions */}
+          <div className="flex gap-2 pt-2">
+            <button
+              type="submit"
+              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
+            </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
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

components/organisms/shift-schedule/ShiftDetailModal.tsx

@@ -0,0 +1,259 @@
+"use client";
+
+import { useAuth } from "@/lib/auth-context";
+import { DEPARTMENTS } from "@/lib/constants";
+import { useShift } from "@/lib/shift-context";
+import { useState } from "react";
+
+import type { ShiftDetailModalProps } from "./ShiftSchedule.types";
+
+export default function ShiftDetailModal({
+  shift,
+  isOpen,
+  onClose,
+}: ShiftDetailModalProps) {
+  const { user } = useAuth();
+  const { registerShift, unregisterShift, deleteShift } = useShift();
+  const [error, setError] = useState<string | null>(null);
+  const [success, setSuccess] = useState<string | null>(null);
+
+  if (!isOpen || !shift) return null;
+
+  const dept = DEPARTMENTS.find((d) => d.id === shift.department);
+  const isManager = user?.role === "manager";
+  const isRegistered = user
+    ? shift.registeredStaff.some((s) => s.id === user.id)
+    : false;
+  const isFull = shift.registeredStaff.length >= shift.maxStaff;
+
+  const handleRegister = () => {
+    if (!user) return;
+    setError(null);
+    setSuccess(null);
+    const result = registerShift(shift.id, user.id, user.name);
+    if (result.success) {
+      setSuccess("Đăng ký ca thành công!");
+      setTimeout(onClose, 1200);
+    } else {
+      setError(result.error ?? "Có lỗi xảy ra.");
+    }
+  };
+
+  const handleUnregister = () => {
+    if (!user) return;
+    setError(null);
+    unregisterShift(shift.id, user.id);
+    setSuccess("Đã hủy đăng ký ca.");
+    setTimeout(onClose, 1200);
+  };
+
+  const handleManagerUnregister = (staffId: number) => {
+    unregisterShift(shift.id, staffId);
+    setSuccess("Đã xóa nhân viên khỏi ca.");
+  };
+
+  const handleDelete = () => {
+    deleteShift(shift.id);
+    onClose();
+  };
+
+  const statusLabel = {
+    available: "Còn trống",
+    registered: "Đã đăng ký",
+    approved_leave: "Nghỉ phép",
+    absent: "Vắng mặt",
+  };
+
+  const statusColor = {
+    available: "bg-blue-100 text-blue-700",
+    registered: "bg-blue-200 text-blue-900",
+    approved_leave: "bg-purple-100 text-purple-700",
+    absent: "bg-red-100 text-red-700",
+  };
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center p-4">
+      {/* Backdrop */}
+      <div className="absolute inset-0 bg-black/40" onClick={onClose} />
+
+      {/* Modal */}
+      <div className="relative w-full max-w-md rounded-2xl bg-white shadow-xl">
+        {/* Header */}
+        <div className="flex items-center justify-between border-b border-(--color-border-light) px-5 py-4">
+          <div className="flex items-center gap-3">
+            {dept && <i className={`${dept.icon} text-(--color-primary)`}></i>}
+            <div>
+              <h2 className="text-foreground text-base font-bold">
+                Chi tiết ca làm
+              </h2>
+              <p className="text-xs text-(--color-text-muted)">{dept?.name}</p>
+            </div>
+          </div>
+          <button
+            title="Close"
+            type="button"
+            onClick={onClose}
+            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-xmark"></i>
+          </button>
+        </div>
+
+        {/* Body */}
+        <div className="space-y-4 px-5 py-4">
+          {/* Status badge */}
+          <div className="flex items-center gap-2">
+            <span
+              className={`rounded-full px-3 py-1 text-xs font-semibold ${statusColor[shift.status]}`}
+            >
+              {statusLabel[shift.status]}
+            </span>
+          </div>
+
+          {/* Shift info grid */}
+          <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
+              </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",
+                  },
+                )}
+              </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
+              </p>
+              <p className="text-foreground mt-1 text-sm font-bold">
+                {shift.startTime} – {shift.endTime}
+              </p>
+            </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
+              </p>
+              <p className="text-foreground mt-1 text-sm font-bold">
+                {shift.durationHours} 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
+              </p>
+              <p className="mt-1 text-sm font-bold text-(--color-primary)">
+                {shift.wage.toLocaleString("vi-VN")} VND
+              </p>
+            </div>
+          </div>
+
+          {/* 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})
+            </p>
+            {shift.registeredStaff.length === 0 ? (
+              <p className="text-xs text-(--color-text-muted) italic">
+                Chưa có ai đăng ký
+              </p>
+            ) : (
+              <div className="space-y-2">
+                {shift.registeredStaff.map((staff) => (
+                  <div
+                    key={staff.id}
+                    className="flex items-center justify-between rounded-xl bg-gray-50 px-3 py-2"
+                  >
+                    <div className="flex items-center gap-2">
+                      <div className="flex h-7 w-7 items-center justify-center rounded-full bg-(--color-primary)/10">
+                        <i className="fa-solid fa-user text-[10px] text-(--color-primary)"></i>
+                      </div>
+                      <span className="text-foreground text-sm font-medium">
+                        {staff.name}
+                      </span>
+                    </div>
+                    {isManager && (
+                      <button
+                        type="button"
+                        onClick={() => handleManagerUnregister(staff.id)}
+                        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
+                      </button>
+                    )}
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+
+          {/* Feedback messages */}
+          {error && (
+            <div className="rounded-xl bg-red-50 px-4 py-3 text-sm text-red-700">
+              <i className="fa-solid fa-circle-exclamation mr-2"></i>
+              {error}
+            </div>
+          )}
+          {success && (
+            <div className="rounded-xl bg-green-50 px-4 py-3 text-sm text-green-700">
+              <i className="fa-solid fa-circle-check mr-2"></i>
+              {success}
+            </div>
+          )}
+        </div>
+
+        {/* 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>
+            )}
+          {isRegistered && (
+            <button
+              type="button"
+              onClick={handleUnregister}
+              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ý
+            </button>
+          )}
+          {isManager && (
+            <button
+              type="button"
+              onClick={handleDelete}
+              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
+            </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"
+          >
+            Đóng
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}

components/organisms/shift-schedule/ShiftSchedule.types.ts

@@ -0,0 +1,28 @@
+import type { ShiftSlot } from "@/lib/types";
+
+export interface WeeklyScheduleProps {
+  onShiftClick: (shift: ShiftSlot) => void;
+  onCreateShift?: (date: string) => void;
+  mobileCalendarHeader?: boolean;
+}
+
+export interface MonthlyCalendarProps {
+  onShiftClick: (shift: ShiftSlot) => void;
+  onDateSelect?: (date: string) => void;
+}
+
+export interface MobileShiftViewProps {
+  onShiftClick: (shift: ShiftSlot) => void;
+}
+
+export interface ShiftDetailModalProps {
+  shift: ShiftSlot | null;
+  isOpen: boolean;
+  onClose: () => void;
+}
+
+export interface ShiftCreateModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  defaultDate?: string;
+}

components/organisms/shift-schedule/WeeklySchedule.tsx

@@ -0,0 +1,289 @@
+"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 { WeeklyScheduleProps } from "./ShiftSchedule.types";
+
+const MONTH_NAMES_EN = [
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+
+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(2026, 3, 10);
+  return (
+    d.getDate() === today.getDate() &&
+    d.getMonth() === today.getMonth() &&
+    d.getFullYear() === today.getFullYear()
+  );
+}
+
+export default function WeeklySchedule({
+  onShiftClick,
+  onCreateShift,
+  mobileCalendarHeader = false,
+}: WeeklyScheduleProps) {
+  const {
+    currentDate,
+    getWeekDates,
+    getShiftsForDate,
+    goToNextWeek,
+    goToPrevWeek,
+  } = useShift();
+  const weekDates = getWeekDates();
+
+  const [selectedDate, setSelectedDate] = useState<string>(
+    formatDateISO(weekDates[0] ?? currentDate),
+  );
+
+  const statusDotsByDate = useMemo(() => {
+    const map: Record<string, string[]> = {};
+    weekDates.forEach((date) => {
+      const dateStr = formatDateISO(date);
+      const dayShifts = getShiftsForDate(dateStr);
+      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[dateStr] = dots.slice(0, 3);
+    });
+    return map;
+  }, [weekDates, getShiftsForDate]);
+
+  const selectedDateObj = useMemo(() => {
+    const inWeek = weekDates.find((d) => formatDateISO(d) === selectedDate);
+    return inWeek ?? weekDates[0] ?? currentDate;
+  }, [selectedDate, weekDates, currentDate]);
+
+  const selectedDateStr = formatDateISO(selectedDateObj);
+
+  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 dateStr = formatDateISO(date);
+            const active = dateStr === selectedDateStr;
+            const dots = statusDotsByDate[dateStr] ?? [];
+            return (
+              <button
+                key={i}
+                type="button"
+                onClick={() => setSelectedDate(dateStr)}
+                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(date)
+                      ? "bg-indigo-500 text-white"
+                      : i >= 5
+                        ? "text-pink-500"
+                        : "text-sky-500"
+                  }`}
+                >
+                  {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(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>
+  );
+
+  if (mobileCalendarHeader) {
+    return renderMobileDayView ?? null;
+  }
+
+  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(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">
+                  {formatDateShort(date)}
+                </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}
+                  </span>
+                </div>
+              </td>
+              {weekDates.map((date, i) => {
+                const dateStr = formatDateISO(date);
+                const shifts = getShiftsForDate(dateStr).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(date) ? "bg-(--color-primary)/5" : ""
+                    }`}
+                  >
+                    <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>
+                );
+              })}
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+}

components/organisms/shift-schedule/index.ts

@@ -0,0 +1,12 @@
+export { default as WeeklySchedule } from "./WeeklySchedule";
+export { default as MonthlyCalendar } from "./MonthlyCalendar";
+export { default as MobileShiftView } from "./MobileShiftView";
+export { default as ShiftDetailModal } from "./ShiftDetailModal";
+export { default as ShiftCreateModal } from "./ShiftCreateModal";
+export type {
+  WeeklyScheduleProps,
+  MonthlyCalendarProps,
+  MobileShiftViewProps,
+  ShiftDetailModalProps,
+  ShiftCreateModalProps,
+} from "./ShiftSchedule.types";

components/organisms/shop-grid/ShopGrid.tsx

@@ -23,7 +23,9 @@ export default function ShopGrid({
     return (
       <div className="flex flex-col items-center justify-center gap-4 py-24 text-(--color-text-muted)">
         <i className="fa-solid fa-store text-5xl opacity-30"></i>
-        <p className="text-base font-medium">Không tìm thấy quán nào phù hợp</p>
+        <p className="text-base font-medium">
+          No shops found matching your search
+        </p>
       </div>
     );
   }

components/templates/auth-layout/AuthLayout.tsx

@@ -1,13 +0,0 @@
-import type { AuthLayoutProps } from "./AuthLayout.types";
-
-/**
- * Auth layout template — centers content in the screen.
- * Used by login and register pages.
- */
-export default function AuthLayout({ children }: AuthLayoutProps) {
-  return (
-    <div className="bg-background flex min-h-screen items-center justify-center px-4 py-8">
-      {children}
-    </div>
-  );
-}

components/templates/auth-layout/AuthLayout.types.ts

@@ -1,3 +0,0 @@
-export interface AuthLayoutProps {
-  children: React.ReactNode;
-}

components/templates/auth-layout/index.ts

@@ -1,2 +0,0 @@
-export { default as AuthLayout } from "./AuthLayout";
-export type { AuthLayoutProps } from "./AuthLayout.types";

components/templates/index.ts

@@ -2,10 +2,6 @@
 export { MainLayout } from "./main-layout";
 export type { MainLayoutProps } from "./main-layout";
 
-// Auth Layout
-export { AuthLayout } from "./auth-layout";
-export type { AuthLayoutProps } from "./auth-layout";
-
 // Feed Layout
 export { FeedLayout } from "./feed-layout";
 export type { FeedLayoutProps } from "./feed-layout";
@@ -13,3 +9,7 @@ export type { FeedLayoutProps } from "./feed-layout";
 // Manager Layout
 export { ManagerLayout } from "./manager-layout";
 export type { ManagerLayoutProps } from "./manager-layout";
+
+// Staff Layout
+export { StaffLayout } from "./staff-layout";
+export type { StaffLayoutProps } from "./staff-layout";

components/templates/manager-layout/ManagerLayout.tsx

@@ -13,16 +13,16 @@ import type { ManagerLayoutProps } from "./ManagerLayout.types";
  * Redirects non-managers away; shows loading state while auth resolves.
  */
 export default function ManagerLayout({ children }: ManagerLayoutProps) {
-  const { user } = useAuth();
+  const { user, isInitialized } = useAuth();
   const router = useRouter();
 
   useEffect(() => {
-    if (user !== null && user.role !== "manager") {
+    if (isInitialized && user !== null && user.role !== "manager") {
       router.replace("/");
     }
-  }, [user, router]);
+  }, [user, isInitialized, router]);
 
-  if (user === null) {
+  if (!isInitialized || user === null) {
     return (
       <div className="bg-background flex min-h-screen items-center justify-center">
         <div className="flex flex-col items-center gap-4 text-(--color-text-muted)">

components/templates/staff-layout/StaffLayout.tsx

@@ -0,0 +1,49 @@
+"use client";
+
+import { useAuth } from "@/lib/auth-context";
+import { ShiftProvider } from "@/lib/shift-context";
+import Link from "next/link";
+import { useRouter } from "next/navigation";
+import { useEffect } from "react";
+
+import type { StaffLayoutProps } from "./StaffLayout.types";
+
+/**
+ * Staff layout template — wraps content with auth guard and ShiftProvider.
+ * Allows both staff and manager roles; redirects customers away.
+ */
+export default function StaffLayout({ children }: StaffLayoutProps) {
+  const { user } = useAuth();
+  const router = useRouter();
+
+  useEffect(() => {
+    if (user !== null && user.role === "customer") {
+      router.replace("/");
+    }
+  }, [user, router]);
+
+  if (user === null) {
+    return (
+      <div className="bg-background flex min-h-screen items-center justify-center">
+        <div className="flex flex-col items-center gap-4 text-(--color-text-muted)">
+          <i className="fa-solid fa-spinner fa-spin text-3xl text-(--color-primary)"></i>
+          <p className="text-sm">Đang kiểm tra quyền truy cập...</p>
+          <Link
+            href="/login"
+            className="text-sm font-medium text-(--color-primary) hover:underline"
+          >
+            Đăng nhập nếu chưa có tài khoản
+          </Link>
+        </div>
+      </div>
+    );
+  }
+
+  if (user.role === "customer") return null;
+
+  return (
+    <ShiftProvider>
+      <div className="bg-background flex min-h-screen flex-col">{children}</div>
+    </ShiftProvider>
+  );
+}

components/templates/staff-layout/StaffLayout.types.ts

@@ -0,0 +1,3 @@
+export interface StaffLayoutProps {
+  children: React.ReactNode;
+}

components/templates/staff-layout/index.ts

@@ -0,0 +1,2 @@
+export { default as StaffLayout } from "./StaffLayout";
+export type { StaffLayoutProps } from "./StaffLayout.types";

k8s.yaml

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

layouts/footer.tsx

@@ -48,7 +48,7 @@ export default function Footer() {
             <ul className="flex flex-col gap-2 text-sm opacity-80">
               <li className="flex items-start gap-2">
                 <i className="fa-solid fa-location-dot mt-0.5 w-4 shrink-0 text-center text-(--color-accent)"></i>
-                <span>Địa chỉ: {SHOP_INFO.address}</span>
+                <span>Address: {SHOP_INFO.address}</span>
               </li>
               <li className="flex items-center gap-2">
                 <i className="fa-solid fa-phone w-4 shrink-0 text-center text-(--color-accent)"></i>
@@ -56,7 +56,7 @@ export default function Footer() {
                   href={`tel:${SHOP_INFO.phone}`}
                   className="transition-colors duration-150 hover:text-(--color-accent)"
                 >
-                  Số điện thoại: {SHOP_INFO.phone}
+                  Phone: {SHOP_INFO.phone}
                 </a>
               </li>
               <li className="flex items-center gap-2">
@@ -83,7 +83,7 @@ export default function Footer() {
             {/* ── 2. Social links ── */}
             <div className="col-span-1">
               <h3 className="mb-4 text-sm font-bold tracking-wider text-(--color-accent) uppercase">
-                Kết nối
+                Follow Us
               </h3>
               <ul className="flex flex-col gap-3">
                 <li>
@@ -129,20 +129,20 @@ export default function Footer() {
             {/* ── 3. WiFi card ── */}
             <div className="col-span-1">
               <h3 className="mb-4 text-sm font-bold tracking-wider text-(--color-accent) uppercase">
-                WiFi Miễn Phí
+                Free WiFi
               </h3>
               <div className="border-opacity-50 bg-opacity-30 rounded-xl border border-(--color-primary-light) bg-(--color-primary-dark) p-4">
                 <div className="mb-3 flex items-center gap-2">
                   <i className="fa-solid fa-wifi shrink-0 text-lg text-(--color-accent)"></i>
                   <span className="text-sm font-semibold">
-                    Kết nối miễn phí
+                    Connect for free
                   </span>
                 </div>
                 {/* Stacked label + value rows — no overflow risk */}
                 <div className="flex flex-col gap-3 text-sm">
                   <div className="flex flex-col gap-1">
                     <span className="text-xs tracking-wide uppercase opacity-60">
-                      Tên mạng
+                      Network name
                     </span>
                     <span className="border-opacity-30 rounded border border-(--color-accent) px-2 py-1 font-mono font-bold break-all text-(--color-accent)">
                       {SHOP_INFO.wifi.name}
@@ -150,7 +150,7 @@ export default function Footer() {
                   </div>
                   <div className="flex flex-col gap-1">
                     <span className="text-xs tracking-wide uppercase opacity-60">
-                      Mật khẩu
+                      Password
                     </span>
                     <span className="border-opacity-30 rounded border border-(--color-accent) px-2 py-1 font-mono font-bold tracking-wider break-all text-(--color-accent)">
                       {SHOP_INFO.wifi.password}
@@ -170,9 +170,9 @@ export default function Footer() {
             © {new Date().getFullYear()} {SHOP_INFO.name}. All rights reserved.
           </span>
           <span className="flex items-center gap-1">
-            Được vận hành{" "}
+            Powered by{" "}
             <i className="fa-solid fa-heart mx-1 text-(--color-accent)"></i>{" "}
-            bằng Drinkool
+            Drinkool
           </span>
         </div>
       </div>

layouts/header.tsx

@@ -72,11 +72,11 @@ export default function Header() {
             /* Guest: sign-in button */
             <button
               onClick={handleAuthClick}
-              title="Đăng nhập"
+              title="Sign in"
               className="flex cursor-pointer items-center gap-2.5 rounded-xl border-none bg-(--color-primary) px-5 py-2.5 text-sm font-semibold text-white transition-all duration-150 hover:bg-(--color-primary-dark) active:scale-95"
             >
               <i className="fa-solid fa-right-to-bracket"></i>
-              <span className="hidden sm:inline">Đăng nhập</span>
+              <span className="hidden sm:inline">Sign in</span>
             </button>
           ) : user.role === "manager" ? (
             /* Manager: dashboard link + logout */
@@ -90,37 +90,48 @@ export default function Header() {
               </Link>
               <button
                 onClick={handleAuthClick}
-                title="Đăng xuất"
+                title="Sign out"
+                aria-label="Sign out"
                 className="flex cursor-pointer items-center gap-2 rounded-xl border border-(--color-border) bg-transparent px-3 py-2.5 text-sm font-medium text-(--color-text-muted) transition-all duration-150 hover:border-red-300 hover:bg-red-50 hover:text-red-500 active:scale-95"
               >
                 <i className="fa-solid fa-right-from-bracket text-base"></i>
               </button>
             </div>
           ) : user.role === "staff" ? (
-            /* Staff: avatar + name */
-            <button
-              onClick={handleAuthClick}
-              title="Nhấn để đăng xuất"
-              className="bg-background flex cursor-pointer items-center gap-2.5 rounded-xl border border-(--color-border) px-4 py-2 text-sm font-semibold text-(--color-text-secondary) transition-all duration-150 hover:border-(--color-primary-light) hover:bg-(--color-border-light) active:scale-95"
-            >
-              {/* Avatar circle */}
-              <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-(--color-primary-light) text-xs text-white">
-                <i className="fa-solid fa-user"></i>
-              </div>
-              <span className="hidden sm:inline">{user.name}</span>
-            </button>
+            /* Staff: Register shift + avatar + name */
+            <div className="flex items-center gap-2">
+              <Link
+                href="/staff/schedule"
+                className="flex items-center gap-2 rounded-xl border border-(--color-accent) bg-(--color-accent-light) px-4 py-2.5 text-sm font-semibold text-(--color-primary-dark) no-underline transition-all duration-150 hover:bg-(--color-accent) hover:text-white"
+              >
+                <i className="fa-solid fa-calendar-check text-base"></i>
+                <span className="hidden sm:inline">My Shifts</span>
+              </Link>
+              <button
+                onClick={handleAuthClick}
+                title="Click to sign out"
+                aria-label="Sign out"
+                className="bg-background flex cursor-pointer items-center gap-2.5 rounded-xl border border-(--color-border) px-4 py-2 text-sm font-semibold text-(--color-text-secondary) transition-all duration-150 hover:border-(--color-primary-light) hover:bg-(--color-border-light) active:scale-95"
+              >
+                {/* Avatar circle */}
+                <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-(--color-primary-light) text-xs text-white">
+                  <i className="fa-solid fa-user"></i>
+                </div>
+                <span className="hidden sm:inline">{user.name}</span>
+              </button>
+            </div>
           ) : (
             /* Customer: phone icon + label */
             <button
               onClick={handleAuthClick}
-              title={`Khách hàng - ${user.phone || ""} - Nhấn để đăng xuất`}
+              title={`Customer - ${user.phone || ""} - Click to sign out`}
               className="flex cursor-pointer items-center gap-2.5 rounded-xl border-none bg-(--color-primary-light) px-4 py-2 text-sm font-semibold text-white transition-all duration-150 hover:bg-(--color-primary) active:scale-95"
             >
               {/* Customer icon */}
               <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-white text-xs text-(--color-primary-light)">
                 <i className="fa-solid fa-user"></i>
               </div>
-              <span className="hidden sm:inline">Khách hàng</span>
+              <span className="hidden sm:inline">Customer</span>
             </button>
           )}
         </div>

lib/apollo-clients.ts

@@ -0,0 +1,52 @@
+import {
+  ApolloClient,
+  ApolloLink,
+  HttpLink,
+  InMemoryCache,
+  Observable,
+} from "@apollo/client";
+
+const responseWrapperLink = new ApolloLink((operation, forward) => {
+  return new Observable((observer) => {
+    const handle = forward(operation).subscribe({
+      next: (response) => {
+        // Kiểm tra nếu dữ liệu trả về bị "trần" (thiếu data property)
+        if (
+          response &&
+          !Object.prototype.hasOwnProperty.call(response, "data")
+        ) {
+          // Khởi tạo một object mới theo chuẩn GraphQL
+          const formattedResponse = {
+            data: response,
+            errors: (response as any).errors,
+          };
+          observer.next(formattedResponse);
+        } else {
+          observer.next(response);
+        }
+      },
+      error: observer.error.bind(observer),
+      complete: observer.complete.bind(observer),
+    });
+
+    return () => {
+      if (handle) handle.unsubscribe();
+    };
+  });
+});
+
+export const cartClient = new ApolloClient({
+  link: ApolloLink.from([
+    responseWrapperLink,
+    new HttpLink({ uri: "/api/cart/graphql" }),
+  ]),
+  cache: new InMemoryCache(),
+});
+
+export const eateryClient = new ApolloClient({
+  link: ApolloLink.from([
+    responseWrapperLink,
+    new HttpLink({ uri: "/api/eatery/graphql" }),
+  ]),
+  cache: new InMemoryCache(),
+});

lib/auth-context.tsx

@@ -12,95 +12,21 @@ import type { User } from "./types";
 
 interface AuthContextType {
   user: User | null;
-  login: (username: string, password: string) => boolean;
+  setUser: (user: User | null) => void;
+  isInitialized: boolean;
+  login: (
+    username: string,
+    password: string,
+  ) => Promise<{ ok: boolean; status?: number }>;
   logout: () => void;
-  registerPhone: string | null;
-  setRegisterPhone: (phone: string | null) => void;
-  completeRegistration: (phone: string) => void;
 }
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
 
-// Mock user database
-const MOCK_AUTH_DB = {
-  // Admin
-  admin: {
-    username: "admin",
-    password: "admin",
-    user: {
-      id: 1,
-      name: "Quản lý",
-      role: "manager" as const,
-      avatar: null,
-      phone: "0912345678",
-    },
-  },
-
-  // Staff (username and password are their names)
-  "Nguyễn Văn An": {
-    username: "Nguyễn Văn An",
-    password: "Nguyễn Văn An",
-    user: {
-      id: 2,
-      name: "Nguyễn Văn An",
-      role: "staff" as const,
-      avatar: null,
-      phone: "0901234567",
-    },
-  },
-  "Trần Thị Bình": {
-    username: "Trần Thị Bình",
-    password: "Trần Thị Bình",
-    user: {
-      id: 3,
-      name: "Trần Thị Bình",
-      role: "staff" as const,
-      avatar: null,
-      phone: "0902345678",
-    },
-  },
-  "Lê Văn Cường": {
-    username: "Lê Văn Cường",
-    password: "Lê Văn Cường",
-    user: {
-      id: 4,
-      name: "Lê Văn Cường",
-      role: "staff" as const,
-      avatar: null,
-      phone: "0903456789",
-    },
-  },
-
-  // Customers (username is phone number, password is custom)
-  "0987654321": {
-    username: "0987654321",
-    password: "user1",
-    user: {
-      id: 5,
-      name: "Khách hàng",
-      role: "customer" as const,
-      avatar: null,
-      phone: "0987654321",
-    },
-  },
-  "0976543210": {
-    username: "0976543210",
-    password: "user1",
-    user: {
-      id: 6,
-      name: "Khách hàng",
-      role: "customer" as const,
-      avatar: null,
-      phone: "0976543210",
-    },
-  },
-};
-
 export function AuthProvider({ children }: { children: ReactNode }) {
   const [user, setUser] = useState<User | null>(null);
-  const [registerPhone, setRegisterPhone] = useState<string | null>(null);
+  const [isInitialized, setIsInitialized] = useState(false);
 
-  // Load user from localStorage on mount
   useEffect(() => {
     const savedUser = localStorage.getItem("coffee-shop-user");
     if (savedUser) {
@@ -110,18 +36,36 @@ export function AuthProvider({ children }: { children: ReactNode }) {
         console.error("Failed to parse saved user", e);
       }
     }
+    setIsInitialized(true);
   }, []);
 
-  const login = (username: string, password: string): boolean => {
-    const authEntry = MOCK_AUTH_DB[username as keyof typeof MOCK_AUTH_DB];
+  const login = async (
+    username: string,
+    password: string,
+  ): Promise<{ ok: boolean; status?: number }> => {
+    const isPhone = /^0\d{9}$/.test(username.trim());
+    const role = isPhone ? "customer" : "manager";
 
-    if (authEntry && authEntry.password === password) {
-      setUser(authEntry.user);
-      localStorage.setItem("coffee-shop-user", JSON.stringify(authEntry.user));
-      return true;
+    try {
+      const response = await fetch("/api/login", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ phone: username, password, role }),
+      });
+
+      if (response.ok) {
+        const userData = await response.json();
+        setUser(userData);
+        localStorage.setItem("coffee-shop-user", JSON.stringify(userData));
+        return { ok: true };
+      } else {
+        console.error("Đăng nhập thất bại:", response.status);
+        return { ok: false, status: response.status };
+      }
+    } catch (error) {
+      console.error("Lỗi kết nối API:", error);
+      return { ok: false };
     }
-
-    return false;
   };
 
   const logout = () => {
@@ -129,37 +73,14 @@ export function AuthProvider({ children }: { children: ReactNode }) {
     localStorage.removeItem("coffee-shop-user");
   };
 
-  const completeRegistration = (phone: string) => {
-    // Create new customer account
-    const newUser: User = {
-      id: Date.now(),
-      name: "Khách hàng",
-      role: "customer",
-      avatar: null,
-      phone,
-    };
-
-    // Add to mock database (in real app, this would be API call)
-    (MOCK_AUTH_DB as any)[phone] = {
-      username: phone,
-      password: "user1", // Default password for new customers
-      user: newUser,
-    };
-
-    setUser(newUser);
-    localStorage.setItem("coffee-shop-user", JSON.stringify(newUser));
-    setRegisterPhone(null);
-  };
-
   return (
     <AuthContext.Provider
       value={{
         user,
+        setUser,
+        isInitialized,
         login,
         logout,
-        registerPhone,
-        setRegisterPhone,
-        completeRegistration,
       }}
     >
       {children}

lib/cart-context.tsx

@@ -1,134 +1,193 @@
 "use client";
 
-import type { Product } from "@/lib/types";
+import { gql } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client/react";
 import { createContext, useContext, useEffect, useMemo, useState } from "react";
 
-export interface CartItem {
-  id: number;
-  name: string;
-  description: string;
-  price: number;
-  quantity: number;
-}
+import { cartClient, eateryClient } from "./apollo-clients";
+import {
+  CartEntity,
+  CartItemEntity,
+  addMenuItemMutation,
+  allEateriesQuery,
+  createCartMutation,
+  getCartQuery,
+} from "./types";
 
 interface CartContextValue {
-  items: CartItem[];
+  items: CartItemEntity[];
   totalItems: number;
   totalPrice: number;
-  addToCart: (product: Product) => void;
-  increaseQty: (id: number) => void;
-  decreaseQty: (id: number) => void;
-  removeFromCart: (id: number) => void;
-  setQuantity: (id: number, quantity: number) => void;
+  addToCart: (product: CartItemEntity) => void;
+  increaseQty: (id: string) => void;
+  decreaseQty: (id: string) => void;
+  removeFromCart: (id: string) => void;
+  setQuantity: (id: string, quantity: number) => void;
 }
 
-const STORAGE_KEY = "coffee-shop-cart";
+const CART_ID = "cartId";
 const CartContext = createContext<CartContextValue | null>(null);
 
+const GET_CART_ITEMS = gql`
+  query getCart($cartId: String!) {
+    getCart(cartId: $cartId) {
+      Id
+      userId
+      eateryId
+      items {
+        productId
+        quantity
+        priceAtTimeOfAdding
+        subTotal
+      }
+      totalAmount
+      paymentQrUrl
+    }
+  }
+`;
+
+const GET_EATERY = gql`
+  query GetEateryMenu {
+    allEateries {
+      id
+    }
+  }
+`;
+
+const CREATE_CART = gql`
+  mutation createCart($eateryId: String!) {
+    createCart(eateryId: $eateryId)
+  }
+`;
+
+const ADD_ITEM = gql`
+  mutation addItem(
+    $cartId: String!
+    $menuItemId: String!
+    $quantity: BigInteger!
+  ) {
+    addItem(cartId: $cartId, menuItemId: $menuItemId, quantity: $quantity) {
+      Id
+      userId
+      eateryId
+      items {
+        productId
+        quantity
+        priceAtTimeOfAdding
+        subTotal
+      }
+      totalAmount
+      paymentQrUrl
+    }
+  }
+`;
+
 export function CartProvider({ children }: { children: React.ReactNode }) {
-  const [items, setItems] = useState<CartItem[]>([]);
+  const [cart, setCart] = useState<CartEntity>(null!);
+  const [cartId, setCartId] = useState<string | null>(null);
+
+  const { data: eateryData } = useQuery<allEateriesQuery>(GET_EATERY, {
+    client: eateryClient,
+  });
+
+  const [createCart] = useMutation<createCartMutation>(CREATE_CART, {
+    client: cartClient,
+  });
+
+  const { data, loading, error } = useQuery<getCartQuery>(GET_CART_ITEMS, {
+    client: cartClient,
+    variables: { cartId },
+    skip: !cartId,
+  });
+
+  const [addMenuItem] = useMutation<addMenuItemMutation>(ADD_ITEM, {
+    client: cartClient,
+  });
 
   useEffect(() => {
-    try {
-      const raw = localStorage.getItem(STORAGE_KEY);
-      if (!raw) return;
-      const parsed = JSON.parse(raw) as CartItem[];
-      if (Array.isArray(parsed)) {
-        setItems(parsed.filter((i) => i && i.id && i.quantity > 0));
+    const createCartFunc = async () => {
+      if (eateryData && eateryData.allEateries?.length > 0) {
+        try {
+          const firstEateryId = eateryData.allEateries[0].id;
+          const { data: mutationResult } = await createCart({
+            variables: { eateryId: firstEateryId },
+          });
+
+          const newCartId = mutationResult!.createCart;
+          if (newCartId) {
+            localStorage.setItem(CART_ID, newCartId);
+            setCartId(newCartId);
+          }
+        } catch (err) {
+          console.error("Lỗi khi tạo giỏ hàng:", err);
+        }
       }
-    } catch {
-      localStorage.removeItem(STORAGE_KEY);
+    };
+
+    if (error) createCartFunc();
+    else {
+      const localCartId = localStorage.getItem(CART_ID);
+      if (localCartId) setCartId(localCartId);
     }
-  }, []);
+  }, [eateryData, createCart, data, loading]);
 
   useEffect(() => {
-    localStorage.setItem(STORAGE_KEY, JSON.stringify(items));
-  }, [items]);
+    if (data?.getCart) setCart(data.getCart);
+  }, [data]);
 
-  const addToCart = (product: Product) => {
-    setItems((prev) => {
-      const index = prev.findIndex((i) => i.id === product.id);
-      if (index === -1) {
-        return [
-          ...prev,
-          {
-            id: product.id,
-            name: product.name,
-            description: product.description,
-            price: product.price,
-            quantity: 1,
-          },
-        ];
-      }
+  const addToCart = async (product: CartItemEntity) => {
+    if (!cartId) return;
 
-      const next = [...prev];
-      next[index] = { ...next[index], quantity: next[index].quantity + 1 };
-      return next;
+    const { data: result } = await addMenuItem({
+      variables: {
+        cartId,
+        menuItemId: product.productId!,
+        quantity: product.quantity,
+      },
     });
+
+    if (result) setCart(result.addItem);
   };
 
-  const increaseQty = (id: number) => {
-    setItems((prev) =>
-      prev.map((item) =>
-        item.id === id ? { ...item, quantity: item.quantity + 1 } : item,
-      ),
-    );
+  const setQuantity = async (id: string, quantity: number) => {
+    if (!cartId) return;
+
+    const { data: result } = await addMenuItem({
+      variables: {
+        cartId,
+        menuItemId: id,
+        quantity,
+      },
+    });
+
+    if (result) setCart(result.addItem);
   };
 
-  const decreaseQty = (id: number) => {
-    setItems((prev) =>
-      prev
-        .map((item) =>
-          item.id === id
-            ? { ...item, quantity: Math.max(0, item.quantity - 1) }
-            : item,
-        )
-        .filter((item) => item.quantity > 0),
-    );
-  };
+  const removeFromCart = (id: string) => setQuantity(id, 0);
 
-  const removeFromCart = (id: number) => {
-    setItems((prev) => prev.filter((item) => item.id !== id));
-  };
+  const increaseQty = (id: string) =>
+    setQuantity(id, cart.items.find((i) => i.productId == id)!.quantity + 1);
 
-  const setQuantity = (id: number, quantity: number) => {
-    const safeQty = Number.isFinite(quantity)
-      ? Math.max(0, Math.floor(quantity))
-      : 0;
-    if (safeQty === 0) {
-      removeFromCart(id);
-      return;
-    }
-
-    setItems((prev) =>
-      prev.map((item) =>
-        item.id === id ? { ...item, quantity: safeQty } : item,
-      ),
-    );
-  };
+  const decreaseQty = (id: string) =>
+    setQuantity(id, cart.items.find((i) => i.productId == id)!.quantity - 1);
 
   const totalItems = useMemo(
-    () => items.reduce((sum, item) => sum + item.quantity, 0),
-    [items],
-  );
-
-  const totalPrice = useMemo(
-    () => items.reduce((sum, item) => sum + item.price * item.quantity, 0),
-    [items],
+    () => cart?.items.reduce((sum, item) => sum + item.quantity, 0),
+    [cart],
   );
 
   const value = useMemo(
     () => ({
-      items,
+      items: cart?.items,
       totalItems,
-      totalPrice,
+      totalPrice: cart?.totalAmount,
       addToCart,
       increaseQty,
       decreaseQty,
       removeFromCart,
       setQuantity,
     }),
-    [items, totalItems, totalPrice],
+    [cart?.items, cart?.totalAmount],
   );
 
   return <CartContext.Provider value={value}>{children}</CartContext.Provider>;

lib/constants.ts

@@ -1,9 +1,9 @@
 import type {
-  Combo,
-  MenuCategory,
-  Product,
+  Department,
+  MenuItemEntity,
   ProductSalesStats,
   RevenueDataPoint,
+  ShiftSlot,
   Shop,
   ShopInfo,
   SocialLinks,
@@ -13,9 +13,9 @@ import type {
 // ===== SHOP INFORMATION =====
 export const SHOP_INFO: ShopInfo = {
   name: "Coffee Shop",
-  tagline: "Hương vị đậm đà – Khoảnh khắc thư giãn",
+  tagline: "Rich Flavors – Moments of Relaxation",
   logo: "/imgs/logo.png",
-  address: "123 Đường Nguyễn Huệ, Quận 1, TP. Hồ Chí Minh",
+  address: "123 Nguyen Hue Street, District 1, Ho Chi Minh City",
   phone: "0901 234 567",
   managerPhone: "0912 345 678",
   email: "contact@coffeeshop.vn",
@@ -23,7 +23,7 @@ export const SHOP_INFO: ShopInfo = {
     name: "CoffeeShop_Free",
     password: "coffee2024",
   },
-  openHours: "07:00 – 22:00 (Thứ 2 – Chủ nhật)",
+  openHours: "07:00 – 22:00 (Monday – Sunday)",
 };
 
 // ===== SOCIAL LINKS =====
@@ -33,248 +33,6 @@ export const SOCIAL_LINKS: SocialLinks = {
   website: "/",
 };
 
-// ===== MENU CATEGORIES =====
-// Each category has a unique FontAwesome icon representing the item type
-export const MENU_CATEGORIES: MenuCategory[] = [
-  { id: "all", name: "Tất cả", icon: "fa-solid fa-border-all" },
-  { id: "cafe", name: "Cà Phê", icon: "fa-solid fa-mug-hot" },
-  { id: "tra", name: "Trà", icon: "fa-solid fa-leaf" },
-  { id: "sua-chua", name: "Sữa Chua", icon: "fa-solid fa-jar" },
-  { id: "nuoc-ep", name: "Nước Ép", icon: "fa-solid fa-blender" },
-  { id: "latte", name: "Latte", icon: "fa-solid fa-mug-saucer" },
-  {
-    id: "giai-khat",
-    name: "Giải Khát / Ăn Vặt",
-    icon: "fa-solid fa-ice-cream",
-  },
-  { id: "topping", name: "Topping", icon: "fa-solid fa-layer-group" },
-];
-
-// ===== MOCK PRODUCTS =====
-// Placeholder data – replace with real API calls when backend is ready
-export const MOCK_PRODUCTS: Product[] = [
-  {
-    id: 1,
-    name: "Cà Phê Đen",
-    category: "cafe",
-    price: 25000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Cà phê đen truyền thống, đậm đà hương vị Việt Nam, pha phin thủ công.",
-    available: true,
-  },
-  {
-    id: 2,
-    name: "Cà Phê Sữa",
-    category: "cafe",
-    price: 30000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Cà phê sữa đặc thơm ngon, béo ngậy, kết hợp hoàn hảo giữa cà phê và sữa đặc.",
-    available: true,
-  },
-  {
-    id: 3,
-    name: "Bạc Xỉu",
-    category: "cafe",
-    price: 32000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Bạc xỉu nhẹ nhàng, ít cà phê nhiều sữa, thích hợp cho người mới uống cà phê.",
-    available: true,
-  },
-  {
-    id: 4,
-    name: "Cà Phê Trứng",
-    category: "cafe",
-    price: 45000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Cà phê trứng đặc sản Hà Nội, lớp kem trứng mịn màng phủ trên nền cà phê đậm đà.",
-    available: true,
-  },
-  {
-    id: 5,
-    name: "Trà Đào Cam Sả",
-    category: "tra",
-    price: 35000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Trà đào thơm mát kết hợp cam tươi và sả, thanh mát và giải nhiệt tuyệt vời.",
-    available: true,
-  },
-  {
-    id: 6,
-    name: "Trà Xanh Matcha",
-    category: "tra",
-    price: 40000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Matcha Nhật Bản nguyên chất, vị đắng nhẹ đặc trưng, thơm mát và bổ dưỡng.",
-    available: true,
-  },
-  {
-    id: 7,
-    name: "Trà Vải Hoa Nhài",
-    category: "tra",
-    price: 38000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Trà vải thanh ngọt kết hợp hương hoa nhài dịu dàng, thư giãn tâm hồn.",
-    available: true,
-  },
-  {
-    id: 8,
-    name: "Sữa Chua Trân Châu",
-    category: "sua-chua",
-    price: 38000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Sữa chua mịn màng kết hợp trân châu đen dẻo dai, chua ngọt hài hòa.",
-    available: true,
-  },
-  {
-    id: 9,
-    name: "Sữa Chua Dâu",
-    category: "sua-chua",
-    price: 40000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Sữa chua mát lạnh với dâu tươi ngọt chua, giàu vitamin và khoáng chất.",
-    available: true,
-  },
-  {
-    id: 10,
-    name: "Nước Ép Cam",
-    category: "nuoc-ep",
-    price: 35000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Nước ép cam tươi nguyên chất, giàu vitamin C, tốt cho sức khỏe.",
-    available: true,
-  },
-  {
-    id: 11,
-    name: "Nước Ép Dưa Hấu",
-    category: "nuoc-ep",
-    price: 30000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Nước ép dưa hấu mát lạnh, giải nhiệt tức thì trong những ngày hè oi bức.",
-    available: true,
-  },
-  {
-    id: 12,
-    name: "Latte Caramel",
-    category: "latte",
-    price: 45000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Latte caramel ngọt ngào, thơm béo với lớp foam sữa mịn và sốt caramel.",
-    available: true,
-  },
-  {
-    id: 13,
-    name: "Latte Vanilla",
-    category: "latte",
-    price: 45000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Latte vanilla nhẹ nhàng, hương thơm dịu dàng từ vanilla tự nhiên.",
-    available: true,
-  },
-  {
-    id: 14,
-    name: "Bánh Mì Nướng Bơ",
-    category: "giai-khat",
-    price: 20000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Bánh mì nướng giòn rụm, phết bơ thơm và mứt dâu, ăn kèm cà phê tuyệt vời.",
-    available: true,
-  },
-  {
-    id: 15,
-    name: "Bánh Flan",
-    category: "giai-khat",
-    price: 25000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Bánh flan mềm mịn, ngọt ngào với lớp caramel vàng óng, tan chảy trong miệng.",
-    available: true,
-  },
-  {
-    id: 16,
-    name: "Trân Châu Đen",
-    category: "topping",
-    price: 10000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Trân châu đen dẻo dai, thêm vào bất kỳ đồ uống nào để tăng thêm hương vị.",
-    available: true,
-  },
-  {
-    id: 17,
-    name: "Thạch Cà Phê",
-    category: "topping",
-    price: 10000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Thạch cà phê mát lạnh, thêm hương vị đặc biệt cho đồ uống của bạn.",
-    available: true,
-  },
-  {
-    id: 18,
-    name: "Trân Châu Trắng",
-    category: "topping",
-    price: 10000,
-    image: "/imgs/products/placeholder.jpg",
-    description:
-      "Trân châu trắng dẻo dai, thêm vào bất kỳ đồ uống nào để tăng thêm hương vị.",
-    available: true,
-  },
-];
-
-// ===== MOCK COMBOS =====
-export const MOCK_COMBOS: Combo[] = [
-  {
-    id: 1,
-    name: "Combo Cà Phê Đôi",
-    description: "2 ly cà phê đen + 2 bánh mì nướng bơ, tiết kiệm 15%.",
-    price: 75000,
-    image: "/imgs/products/placeholder.jpg",
-    items: [
-      { productId: 1, quantity: 2 },
-      { productId: 14, quantity: 2 },
-    ],
-    available: true,
-  },
-  {
-    id: 2,
-    name: "Combo Trà Sữa Nhóm",
-    description: "2 trà đào cam sả + 2 trà xanh matcha, dành cho nhóm bạn.",
-    price: 130000,
-    image: "/imgs/products/placeholder.jpg",
-    items: [
-      { productId: 5, quantity: 2 },
-      { productId: 6, quantity: 2 },
-    ],
-    available: true,
-  },
-  {
-    id: 3,
-    name: "Combo Buổi Sáng",
-    description: "1 cà phê sữa + 1 bánh flan, khởi đầu ngày mới ngọt ngào.",
-    price: 48000,
-    image: "/imgs/products/placeholder.jpg",
-    items: [
-      { productId: 2, quantity: 1 },
-      { productId: 15, quantity: 1 },
-    ],
-    available: false,
-  },
-];
-
 // ===== MOCK SHOPS (for Feed page) =====
 export const MOCK_SHOPS: Shop[] = [
   {
@@ -352,34 +110,34 @@ export const MOCK_REVENUE_DAILY: RevenueDataPoint[] = [
 
 // Weekly revenue (last 12 weeks)
 export const MOCK_REVENUE_WEEKLY: RevenueDataPoint[] = [
-  { label: "T1/W1", revenue: 8200000, orders: 295 },
-  { label: "T1/W2", revenue: 9450000, orders: 340 },
-  { label: "T1/W3", revenue: 10100000, orders: 362 },
-  { label: "T1/W4", revenue: 8750000, orders: 315 },
-  { label: "T2/W1", revenue: 9200000, orders: 330 },
-  { label: "T2/W2", revenue: 10500000, orders: 378 },
-  { label: "T2/W3", revenue: 11200000, orders: 400 },
-  { label: "T2/W4", revenue: 9800000, orders: 352 },
-  { label: "T3/W1", revenue: 10400000, orders: 374 },
-  { label: "T3/W2", revenue: 11800000, orders: 424 },
-  { label: "T3/W3", revenue: 12500000, orders: 448 },
-  { label: "T3/W4", revenue: 10900000, orders: 392 },
+  { label: "Jan/W1", revenue: 8200000, orders: 295 },
+  { label: "Jan/W2", revenue: 9450000, orders: 340 },
+  { label: "Jan/W3", revenue: 10100000, orders: 362 },
+  { label: "Jan/W4", revenue: 8750000, orders: 315 },
+  { label: "Feb/W1", revenue: 9200000, orders: 330 },
+  { label: "Feb/W2", revenue: 10500000, orders: 378 },
+  { label: "Feb/W3", revenue: 11200000, orders: 400 },
+  { label: "Feb/W4", revenue: 9800000, orders: 352 },
+  { label: "Mar/W1", revenue: 10400000, orders: 374 },
+  { label: "Mar/W2", revenue: 11800000, orders: 424 },
+  { label: "Mar/W3", revenue: 12500000, orders: 448 },
+  { label: "Mar/W4", revenue: 10900000, orders: 392 },
 ];
 
 // Monthly revenue (last 12 months)
 export const MOCK_REVENUE_MONTHLY: RevenueDataPoint[] = [
-  { label: "T4/2025", revenue: 42000000, orders: 1512 },
-  { label: "T5/2025", revenue: 45500000, orders: 1638 },
-  { label: "T6/2025", revenue: 48000000, orders: 1728 },
-  { label: "T7/2025", revenue: 52000000, orders: 1872 },
-  { label: "T8/2025", revenue: 49500000, orders: 1782 },
-  { label: "T9/2025", revenue: 46800000, orders: 1685 },
-  { label: "T10/2025", revenue: 51200000, orders: 1843 },
-  { label: "T11/2025", revenue: 55000000, orders: 1980 },
-  { label: "T12/2025", revenue: 62000000, orders: 2232 },
-  { label: "T1/2026", revenue: 44000000, orders: 1584 },
-  { label: "T2/2026", revenue: 47500000, orders: 1710 },
-  { label: "T3/2026", revenue: 53500000, orders: 1926 },
+  { label: "Apr/2025", revenue: 42000000, orders: 1512 },
+  { label: "May/2025", revenue: 45500000, orders: 1638 },
+  { label: "Jun/2025", revenue: 48000000, orders: 1728 },
+  { label: "Jul/2025", revenue: 52000000, orders: 1872 },
+  { label: "Aug/2025", revenue: 49500000, orders: 1782 },
+  { label: "Sep/2025", revenue: 46800000, orders: 1685 },
+  { label: "Oct/2025", revenue: 51200000, orders: 1843 },
+  { label: "Nov/2025", revenue: 55000000, orders: 1980 },
+  { label: "Dec/2025", revenue: 62000000, orders: 2232 },
+  { label: "Jan/2026", revenue: 44000000, orders: 1584 },
+  { label: "Feb/2026", revenue: 47500000, orders: 1710 },
+  { label: "Mar/2026", revenue: 53500000, orders: 1926 },
 ];
 
 // Yearly revenue (last 5 years)
@@ -391,220 +149,99 @@ export const MOCK_REVENUE_YEARLY: RevenueDataPoint[] = [
   { label: "2026", revenue: 180000000, orders: 6480 },
 ];
 
-// Product sales statistics (with cost price for profit analysis)
-export const MOCK_PRODUCT_SALES: ProductSalesStats[] = [
-  {
-    productId: 12,
-    name: "Latte Caramel",
-    category: "latte",
-    unitsSold: 487,
-    revenue: 21915000,
-    costPrice: 18000,
-    sellingPrice: 45000,
-    profit: 13185000,
-    profitMargin: 60.2,
-  },
-  {
-    productId: 6,
-    name: "Trà Xanh Matcha",
-    category: "tra",
-    unitsSold: 412,
-    revenue: 16480000,
-    costPrice: 15000,
-    sellingPrice: 40000,
-    profit: 10300000,
-    profitMargin: 62.5,
-  },
-  {
-    productId: 5,
-    name: "Trà Đào Cam Sả",
-    category: "tra",
-    unitsSold: 398,
-    revenue: 13930000,
-    costPrice: 12000,
-    sellingPrice: 35000,
-    profit: 9153000,
-    profitMargin: 65.7,
-  },
-  {
-    productId: 13,
-    name: "Latte Vanilla",
-    category: "latte",
-    unitsSold: 356,
-    revenue: 16020000,
-    costPrice: 18000,
-    sellingPrice: 45000,
-    profit: 9612000,
-    profitMargin: 60.0,
-  },
-  {
-    productId: 4,
-    name: "Cà Phê Trứng",
-    category: "cafe",
-    unitsSold: 340,
-    revenue: 15300000,
-    costPrice: 16000,
-    sellingPrice: 45000,
-    profit: 9860000,
-    profitMargin: 64.4,
-  },
-  {
-    productId: 2,
-    name: "Cà Phê Sữa",
-    category: "cafe",
-    unitsSold: 325,
-    revenue: 9750000,
-    costPrice: 10000,
-    sellingPrice: 30000,
-    profit: 6500000,
-    profitMargin: 66.7,
-  },
-  {
-    productId: 3,
-    name: "Bạc Xỉu",
-    category: "cafe",
-    unitsSold: 298,
-    revenue: 9536000,
-    costPrice: 11000,
-    sellingPrice: 32000,
-    profit: 6259000,
-    profitMargin: 65.6,
-  },
-  {
-    productId: 1,
-    name: "Cà Phê Đen",
-    category: "cafe",
-    unitsSold: 285,
-    revenue: 7125000,
-    costPrice: 8000,
-    sellingPrice: 25000,
-    profit: 4845000,
-    profitMargin: 68.0,
-  },
-  {
-    productId: 9,
-    name: "Sữa Chua Dâu",
-    category: "sua-chua",
-    unitsSold: 267,
-    revenue: 10680000,
-    costPrice: 15000,
-    sellingPrice: 40000,
-    profit: 6675000,
-    profitMargin: 62.5,
-  },
-  {
-    productId: 10,
-    name: "Nước Ép Cam",
-    category: "nuoc-ep",
-    unitsSold: 241,
-    revenue: 8435000,
-    costPrice: 12000,
-    sellingPrice: 35000,
-    profit: 5543000,
-    profitMargin: 65.7,
-  },
-  {
-    productId: 8,
-    name: "Sữa Chua Trân Châu",
-    category: "sua-chua",
-    unitsSold: 228,
-    revenue: 8664000,
-    costPrice: 14000,
-    sellingPrice: 38000,
-    profit: 5472000,
-    profitMargin: 63.2,
-  },
-  {
-    productId: 7,
-    name: "Trà Vải Hoa Nhài",
-    category: "tra",
-    unitsSold: 215,
-    revenue: 8170000,
-    costPrice: 13000,
-    sellingPrice: 38000,
-    profit: 5375000,
-    profitMargin: 65.8,
-  },
-  {
-    productId: 15,
-    name: "Bánh Flan",
-    category: "giai-khat",
-    unitsSold: 198,
-    revenue: 4950000,
-    costPrice: 8000,
-    sellingPrice: 25000,
-    profit: 3366000,
-    profitMargin: 68.0,
-  },
-  {
-    productId: 11,
-    name: "Nước Ép Dưa Hấu",
-    category: "nuoc-ep",
-    unitsSold: 182,
-    revenue: 5460000,
-    costPrice: 10000,
-    sellingPrice: 30000,
-    profit: 3640000,
-    profitMargin: 66.7,
-  },
-  {
-    productId: 14,
-    name: "Bánh Mì Nướng Bơ",
-    category: "giai-khat",
-    unitsSold: 175,
-    revenue: 3500000,
-    costPrice: 6000,
-    sellingPrice: 20000,
-    profit: 2450000,
-    profitMargin: 70.0,
-  },
-  {
-    productId: 16,
-    name: "Trân Châu Đen",
-    category: "topping",
-    unitsSold: 456,
-    revenue: 4560000,
-    costPrice: 2000,
-    sellingPrice: 10000,
-    profit: 3648000,
-    profitMargin: 80.0,
-  },
-  {
-    productId: 17,
-    name: "Thạch Cà Phê",
-    category: "topping",
-    unitsSold: 389,
-    revenue: 3890000,
-    costPrice: 2000,
-    sellingPrice: 10000,
-    profit: 3112000,
-    profitMargin: 80.0,
-  },
-  {
-    productId: 18,
-    name: "Trân Châu Trắng",
-    category: "topping",
-    unitsSold: 342,
-    revenue: 3420000,
-    costPrice: 2000,
-    sellingPrice: 10000,
-    profit: 2736000,
-    profitMargin: 80.0,
-  },
-];
+/**
+ * Generate mock shift slots for the weeks around today (April 2026).
+ * Covers Mon 6 Apr – Sun 26 Apr 2026.
+ */
+function generateMockShifts(): ShiftSlot[] {
+  const shifts: ShiftSlot[] = [];
+  const departments = ["bar", "kitchen", "cashier", "janitor"];
+  const timeSlots = [
+    { start: "07:00", end: "11:00", hours: 4, wage: 120000 },
+    { start: "11:00", end: "15:00", hours: 4, wage: 120000 },
+    { start: "15:00", end: "19:00", hours: 4, wage: 120000 },
+    { start: "19:00", end: "22:00", hours: 3, wage: 100000 },
+  ];
 
-// ===== MOCK USERS (for UI demo – replace with real auth) =====
-export const MOCK_USERS: Record<string, User> = {
-  manager: {
-    id: 1,
-    name: "Nguyễn Văn An",
-    role: "manager",
-    avatar: null,
-  },
-  staff: {
-    id: 2,
-    name: "Trần Thị Bình",
-    role: "staff",
-    avatar: null,
-  },
-};
+  const staffPool = [
+    { id: 2, name: "Alex Nguyen" },
+    { id: 3, name: "Binh Tran" },
+    { id: 4, name: "Cuong Le" },
+  ];
+
+  // Generate shifts from April 6 to April 26, 2026
+  let shiftCounter = 0;
+  for (let day = 6; day <= 26; day++) {
+    const dateStr = `2026-04-${day.toString().padStart(2, "0")}`;
+
+    for (const dept of departments) {
+      // Not every department has shifts every day
+      if (dept === "janitor" && day % 3 !== 0) continue;
+
+      for (const slot of timeSlots) {
+        // Skip some slots randomly for variety
+        if (dept === "kitchen" && slot.start === "19:00") continue;
+        if (dept === "cashier" && slot.start === "07:00" && day % 2 === 0)
+          continue;
+
+        shiftCounter++;
+        const shiftId = `shift_${shiftCounter.toString().padStart(3, "0")}`;
+
+        // Determine registration status
+        const registered: { id: number; name: string }[] = [];
+        let status: ShiftSlot["status"] = "available";
+
+        // Past shifts (before April 10) are mostly registered
+        if (day < 10) {
+          const staffIdx = shiftCounter % staffPool.length;
+          registered.push(staffPool[staffIdx]);
+          if (shiftCounter % 7 === 0) {
+            registered.push(staffPool[(staffIdx + 1) % staffPool.length]);
+          }
+          status = "registered";
+          // Some past shifts have leave/absent
+          if (shiftCounter % 11 === 0) status = "approved_leave";
+          if (shiftCounter % 13 === 0) status = "absent";
+        }
+        // Current week (April 6-12): mix of registered and available
+        else if (day >= 10 && day <= 12) {
+          if (shiftCounter % 3 === 0) {
+            registered.push(staffPool[shiftCounter % staffPool.length]);
+            status = "registered";
+          }
+        }
+        // Future shifts: mostly available, some registered
+        else {
+          if (shiftCounter % 5 === 0) {
+            registered.push(staffPool[shiftCounter % staffPool.length]);
+            status = "registered";
+          }
+        }
+
+        shifts.push({
+          id: "shiftId",
+          date: dateStr,
+          startTime: slot.start,
+          endTime: slot.end,
+          durationHours: slot.hours,
+          wage: slot.wage,
+          department: dept,
+          maxStaff: dept === "bar" ? 3 : 2,
+          registeredStaff: registered,
+          status,
+        });
+      }
+    }
+  }
+
+  return shifts;
+}
+
+export const MOCK_SHIFT_SLOTS: ShiftSlot[] = generateMockShifts();
+
+export const DEPARTMENTS: Department[] = [
+  { id: "bar", name: "Bar Staff", icon: "fa-solid fa-martini-glass-citrus" },
+  { id: "kitchen", name: "Kitchen", icon: "fa-solid fa-kitchen-set" },
+  { id: "cashier", name: "Cashier", icon: "fa-solid fa-cash-register" },
+  { id: "janitor", name: "Janitor", icon: "fa-solid fa-broom" },
+];

lib/manager-context.tsx

@@ -1,149 +1,182 @@
 "use client";
 
-import { ReactNode, createContext, useContext, useState } from "react";
+import { gql } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client/react";
+import {
+  ReactNode,
+  createContext,
+  useContext,
+  useEffect,
+  useState,
+} from "react";
 
-import { MENU_CATEGORIES, MOCK_COMBOS, MOCK_PRODUCTS } from "./constants";
-import type { Combo, ComboItem, MenuCategory, Product } from "./types";
+import { eateryClient } from "./apollo-clients";
+import {
+  type MenuItemEntity,
+  type addMenuItemMutation,
+  type allEateriesQuery,
+  deleteMenuItemMutation,
+  updateMenuItemMutation,
+} from "./types";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
-export type ManagerTab = "products" | "combos" | "categories";
+export type ManagerTab = "products";
 
 interface ManagerContextType {
   // Data
-  products: Product[];
-  combos: Combo[];
-  categories: MenuCategory[];
+  products: MenuItemEntity[];
 
   // Active tab
   activeTab: ManagerTab;
   setActiveTab: (tab: ManagerTab) => void;
 
-  // Product actions
-  addProduct: (product: Omit<Product, "id">) => void;
-  updateProduct: (product: Product) => void;
-  deleteProduct: (id: number) => void;
-  toggleProductAvailability: (id: number) => void;
-
-  // Combo actions
-  addCombo: (combo: Omit<Combo, "id">) => void;
-  updateCombo: (combo: Combo) => void;
-  deleteCombo: (id: number) => void;
-  toggleComboAvailability: (id: number) => void;
-
-  // Category actions
-  addCategory: (category: Omit<MenuCategory, "id">) => void;
-  updateCategory: (category: MenuCategory) => void;
-  deleteCategory: (id: string) => void;
+  // MenuItemEntity actions
+  addProduct: (product: MenuItemEntity) => void;
+  updateProduct: (product: MenuItemEntity) => void;
+  deleteProduct: (id: string) => void;
+  toggleProductAvailability: (product: MenuItemEntity) => void;
 }
 
 // ─── Context ──────────────────────────────────────────────────────────────────
 
 const ManagerContext = createContext<ManagerContextType | undefined>(undefined);
 
+// ___ Graphql __________________________________________________________________
+
+const GET_EATERY_MENU = gql`
+  query GetEateryMenu {
+    allEateries {
+      id
+      menuItems {
+        id
+        name
+        available
+        description
+        price
+      }
+    }
+  }
+`;
+
+const ADD_MENU_ITEM = gql`
+  mutation addMenuItem($menuItem: AddMenuItemInput!) {
+    addMenuItem(menuItem: $menuItem) {
+      id
+      name
+      available
+      description
+      price
+    }
+  }
+`;
+
+const UPDATE_MENU_ITEM = gql`
+  mutation updateMenuItem($menuItem: UpdateMenuItemInput!) {
+    updateMenuItem(menuItem: $menuItem) {
+      id
+      name
+      available
+      description
+      price
+    }
+  }
+`;
+
+const DELETE_MENU_ITEM = gql`
+  mutation deleteMenuItem($input: String!) {
+    deleteMenuItem(menuItemId: $input)
+  }
+`;
+
 // ─── Provider ─────────────────────────────────────────────────────────────────
 
 export function ManagerProvider({ children }: { children: ReactNode }) {
-  const [products, setProducts] = useState<Product[]>(MOCK_PRODUCTS);
-  const [combos, setCombos] = useState<Combo[]>(MOCK_COMBOS);
-  // Filter out the "all" pseudo-category — managers manage real categories only
-  const [categories, setCategories] = useState<MenuCategory[]>(
-    MENU_CATEGORIES.filter((c) => c.id !== "all"),
-  );
+  const [products, setProducts] = useState<MenuItemEntity[]>([]);
   const [activeTab, setActiveTab] = useState<ManagerTab>("products");
 
-  // ── Product actions ──────────────────────────────────────────────────────
+  const { data } = useQuery<allEateriesQuery>(GET_EATERY_MENU, {
+    client: eateryClient,
+    fetchPolicy: "network-only",
+  });
 
-  const addProduct = (product: Omit<Product, "id">) => {
-    const newProduct: Product = {
-      ...product,
-      id: Date.now(),
-    };
-    setProducts((prev) => [...prev, newProduct]);
+  const [mutateAddMenuItem] = useMutation<addMenuItemMutation>(ADD_MENU_ITEM, {
+    client: eateryClient,
+  });
+
+  const [mutateUpdateMenuItem] = useMutation<updateMenuItemMutation>(
+    UPDATE_MENU_ITEM,
+    { client: eateryClient },
+  );
+
+  const [mutateDeleteMenuItem] = useMutation<deleteMenuItemMutation>(
+    DELETE_MENU_ITEM,
+    { client: eateryClient },
+  );
+
+  useEffect(() => {
+    if (data?.allEateries?.[0]) {
+      setProducts(data.allEateries[0].menuItems);
+    }
+  }, [data]);
+
+  // ── MenuItemEntity actions ──────────────────────────────────────────────────────
+
+  const addProduct = async (product: MenuItemEntity) => {
+    const { data } = await mutateAddMenuItem({
+      variables: {
+        menuItem: product,
+      },
+    });
+
+    if (data) setProducts((prev) => [...prev, data.addMenuItem]);
   };
 
-  const updateProduct = (product: Product) => {
-    setProducts((prev) => prev.map((p) => (p.id === product.id ? product : p)));
+  const updateProduct = async (product: MenuItemEntity) => {
+    const { data } = await mutateUpdateMenuItem({
+      variables: {
+        menuItem: product,
+      },
+    });
+
+    if (data)
+      setProducts((prev) =>
+        prev.map((p) => (p.id === product.id ? data.updateMenuItem : p)),
+      );
   };
 
-  const deleteProduct = (id: number) => {
-    setProducts((prev) => prev.filter((p) => p.id !== id));
+  const deleteProduct = async (id: string) => {
+    const { data } = await mutateDeleteMenuItem({ variables: { input: id } });
+
+    if (data)
+      setProducts((prev) =>
+        prev.filter((p) => !(p.id == id && data.deleteMenuItem)),
+      );
   };
 
-  const toggleProductAvailability = (id: number) => {
-    setProducts((prev) =>
-      prev.map((p) =>
-        p.id === id ? { ...p, available: !(p.available ?? true) } : p,
-      ),
-    );
-  };
+  const toggleProductAvailability = async (product: MenuItemEntity) => {
+    const { data } = await mutateUpdateMenuItem({
+      variables: {
+        menuItem: { ...product, available: !product.available },
+      },
+    });
 
-  // ── Combo actions ────────────────────────────────────────────────────────
-
-  const addCombo = (combo: Omit<Combo, "id">) => {
-    const newCombo: Combo = { ...combo, id: Date.now() };
-    setCombos((prev) => [...prev, newCombo]);
-  };
-
-  const updateCombo = (combo: Combo) => {
-    setCombos((prev) => prev.map((c) => (c.id === combo.id ? combo : c)));
-  };
-
-  const deleteCombo = (id: number) => {
-    setCombos((prev) => prev.filter((c) => c.id !== id));
-  };
-
-  const toggleComboAvailability = (id: number) => {
-    setCombos((prev) =>
-      prev.map((c) => (c.id === id ? { ...c, available: !c.available } : c)),
-    );
-  };
-
-  // ── Category actions ─────────────────────────────────────────────────────
-
-  const addCategory = (category: Omit<MenuCategory, "id">) => {
-    const slug = category.name
-      .toLowerCase()
-      .normalize("NFD")
-      .replace(/[\u0300-\u036f]/g, "")
-      .replace(/[^a-z0-9]+/g, "-")
-      .replace(/(^-|-$)/g, "");
-    const newCategory: MenuCategory = {
-      ...category,
-      id: `${slug}-${Date.now()}`,
-    };
-    setCategories((prev) => [...prev, newCategory]);
-  };
-
-  const updateCategory = (category: MenuCategory) => {
-    setCategories((prev) =>
-      prev.map((c) => (c.id === category.id ? category : c)),
-    );
-  };
-
-  const deleteCategory = (id: string) => {
-    setCategories((prev) => prev.filter((c) => c.id !== id));
+    if (data)
+      setProducts((prev) =>
+        prev.map((p) => (p.id === product.id ? data.updateMenuItem : p)),
+      );
   };
 
   return (
     <ManagerContext.Provider
       value={{
         products,
-        combos,
-        categories,
         activeTab,
         setActiveTab,
         addProduct,
         updateProduct,
         deleteProduct,
         toggleProductAvailability,
-        addCombo,
-        updateCombo,
-        deleteCombo,
-        toggleComboAvailability,
-        addCategory,
-        updateCategory,
-        deleteCategory,
       }}
     >
       {children}

lib/menu-context.tsx

@@ -1,34 +0,0 @@
-"use client";
-
-import { createContext, useContext, useState } from "react";
-
-interface MenuContextType {
-  /** Currently selected category id */
-  activeCategory: string;
-  /** Update the active category */
-  setActiveCategory: (id: string) => void;
-}
-
-const MenuContext = createContext<MenuContextType>({
-  activeCategory: "all",
-  setActiveCategory: () => {},
-});
-
-/**
- * Provides shared activeCategory state to both the Header (mobile scrollable menu)
- * and the Navbar sidebar (md+), so both always reflect the same selection.
- */
-export function MenuProvider({ children }: { children: React.ReactNode }) {
-  const [activeCategory, setActiveCategory] = useState("all");
-
-  return (
-    <MenuContext.Provider value={{ activeCategory, setActiveCategory }}>
-      {children}
-    </MenuContext.Provider>
-  );
-}
-
-/** Consume the shared menu state anywhere inside MenuProvider */
-export function useMenu() {
-  return useContext(MenuContext);
-}

lib/shift-context.tsx

@@ -0,0 +1,320 @@
+"use client";
+
+import {
+  ReactNode,
+  createContext,
+  useCallback,
+  useContext,
+  useState,
+} from "react";
+
+import { MOCK_SHIFT_SLOTS } from "./constants";
+import type { ShiftSlot, ShiftStatus } from "./types";
+
+// ─── Types ────────────────────────────────────────────────────────────────────
+
+export type ScheduleView = "week" | "month";
+
+interface ShiftContextType {
+  // Data
+  shifts: ShiftSlot[];
+  view: ScheduleView;
+  setView: (view: ScheduleView) => void;
+
+  // Current date navigation
+  currentDate: Date;
+  goToNextWeek: () => void;
+  goToPrevWeek: () => void;
+  goToNextMonth: () => void;
+  goToPrevMonth: () => void;
+  goToToday: () => void;
+
+  // Shift actions
+  registerShift: (
+    shiftId: string,
+    staffId: number,
+    staffName: string,
+  ) => { success: boolean; error?: string };
+  unregisterShift: (shiftId: string, staffId: number) => void;
+  createShift: (shift: Omit<ShiftSlot, "id">) => void;
+  updateShift: (shift: ShiftSlot) => void;
+  deleteShift: (shiftId: string) => void;
+
+  // Helpers
+  getShiftsForDate: (date: string) => ShiftSlot[];
+  getShiftsForWeek: (weekStart: Date) => ShiftSlot[];
+  getWeekDates: () => Date[];
+  hasConflict: (
+    date: string,
+    startTime: string,
+    endTime: string,
+    staffId: number,
+    excludeShiftId?: string,
+  ) => boolean;
+  getWeeklyBudget: () => number;
+}
+
+// ─── Context ──────────────────────────────────────────────────────────────────
+
+const ShiftContext = createContext<ShiftContextType | undefined>(undefined);
+
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+
+function getMonday(d: Date): Date {
+  const date = new Date(d);
+  const day = date.getDay();
+  const diff = date.getDate() - day + (day === 0 ? -6 : 1);
+  date.setDate(diff);
+  date.setHours(0, 0, 0, 0);
+  return date;
+}
+
+function formatDate(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 timeToMinutes(time: string): number {
+  const [h, m] = time.split(":").map(Number);
+  return h * 60 + m;
+}
+
+function timesOverlap(
+  start1: string,
+  end1: string,
+  start2: string,
+  end2: string,
+): boolean {
+  const s1 = timeToMinutes(start1);
+  const e1 = timeToMinutes(end1);
+  const s2 = timeToMinutes(start2);
+  const e2 = timeToMinutes(end2);
+  return s1 < e2 && s2 < e1;
+}
+
+// ─── Provider ─────────────────────────────────────────────────────────────────
+
+export function ShiftProvider({ children }: { children: ReactNode }) {
+  const [shifts, setShifts] = useState<ShiftSlot[]>(MOCK_SHIFT_SLOTS);
+  const [view, setView] = useState<ScheduleView>("week");
+  const [currentDate, setCurrentDate] = useState<Date>(new Date(2026, 3, 10)); // April 10, 2026
+
+  // ── Navigation ──────────────────────────────────────────────────────────
+
+  const goToNextWeek = useCallback(() => {
+    setCurrentDate((prev) => {
+      const next = new Date(prev);
+      next.setDate(next.getDate() + 7);
+      return next;
+    });
+  }, []);
+
+  const goToPrevWeek = useCallback(() => {
+    setCurrentDate((prev) => {
+      const next = new Date(prev);
+      next.setDate(next.getDate() - 7);
+      return next;
+    });
+  }, []);
+
+  const goToNextMonth = useCallback(() => {
+    setCurrentDate((prev) => {
+      const next = new Date(prev);
+      next.setMonth(next.getMonth() + 1);
+      return next;
+    });
+  }, []);
+
+  const goToPrevMonth = useCallback(() => {
+    setCurrentDate((prev) => {
+      const next = new Date(prev);
+      next.setMonth(next.getMonth() - 1);
+      return next;
+    });
+  }, []);
+
+  const goToToday = useCallback(() => {
+    setCurrentDate(new Date(2026, 3, 10));
+  }, []);
+
+  // ── Query helpers ───────────────────────────────────────────────────────
+
+  const getWeekDates = useCallback((): Date[] => {
+    const monday = getMonday(currentDate);
+    return Array.from({ length: 7 }, (_, i) => {
+      const d = new Date(monday);
+      d.setDate(monday.getDate() + i);
+      return d;
+    });
+  }, [currentDate]);
+
+  const getShiftsForDate = useCallback(
+    (date: string): ShiftSlot[] => {
+      return shifts.filter((s) => s.date === date);
+    },
+    [shifts],
+  );
+
+  const getShiftsForWeek = useCallback(
+    (weekStart: Date): ShiftSlot[] => {
+      const dates = Array.from({ length: 7 }, (_, i) => {
+        const d = new Date(weekStart);
+        d.setDate(weekStart.getDate() + i);
+        return formatDate(d);
+      });
+      return shifts.filter((s) => dates.includes(s.date));
+    },
+    [shifts],
+  );
+
+  const hasConflict = useCallback(
+    (
+      date: string,
+      startTime: string,
+      endTime: string,
+      staffId: number,
+      excludeShiftId?: string,
+    ): boolean => {
+      return shifts.some(
+        (s) =>
+          s.date === date &&
+          s.id !== excludeShiftId &&
+          s.registeredStaff.some((rs) => rs.id === staffId) &&
+          timesOverlap(startTime, endTime, s.startTime, s.endTime),
+      );
+    },
+    [shifts],
+  );
+
+  const getWeeklyBudget = useCallback((): number => {
+    const weekDates = getWeekDates().map(formatDate);
+    return shifts
+      .filter((s) => weekDates.includes(s.date) && s.registeredStaff.length > 0)
+      .reduce((sum, s) => sum + s.wage * s.registeredStaff.length, 0);
+  }, [shifts, getWeekDates]);
+
+  // ── Shift actions ───────────────────────────────────────────────────────
+
+  const registerShift = useCallback(
+    (
+      shiftId: string,
+      staffId: number,
+      staffName: string,
+    ): { 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) {
+        return { success: false, error: "Ca làm đã đủ người." };
+      }
+
+      if (shift.registeredStaff.some((rs) => rs.id === staffId)) {
+        return { success: false, error: "Bạn đã đăng ký ca này rồi." };
+      }
+
+      if (
+        hasConflict(
+          shift.date,
+          shift.startTime,
+          shift.endTime,
+          staffId,
+          shiftId,
+        )
+      ) {
+        return {
+          success: false,
+          error: "Xung đột lịch! Bạn đã có ca làm trùng giờ trong ngày này.",
+        };
+      }
+
+      setShifts((prev) =>
+        prev.map((s) =>
+          s.id === shiftId
+            ? {
+                ...s,
+                registeredStaff: [
+                  ...s.registeredStaff,
+                  { id: staffId, name: staffName },
+                ],
+                status: "registered" as ShiftStatus,
+              }
+            : s,
+        ),
+      );
+
+      return { success: true };
+    },
+    [shifts, hasConflict],
+  );
+
+  const unregisterShift = useCallback((shiftId: string, staffId: number) => {
+    setShifts((prev) =>
+      prev.map((s) => {
+        if (s.id !== shiftId) return s;
+        const updated = s.registeredStaff.filter((rs) => rs.id !== staffId);
+        return {
+          ...s,
+          registeredStaff: updated,
+          status:
+            updated.length === 0 ? ("available" as ShiftStatus) : s.status,
+        };
+      }),
+    );
+  }, []);
+
+  const createShift = useCallback((shift: Omit<ShiftSlot, "id">) => {
+    const newShift: ShiftSlot = {
+      ...shift,
+      id: `shift_${Date.now()}`,
+    };
+    setShifts((prev) => [...prev, newShift]);
+  }, []);
+
+  const updateShift = useCallback((shift: ShiftSlot) => {
+    setShifts((prev) => prev.map((s) => (s.id === shift.id ? shift : s)));
+  }, []);
+
+  const deleteShift = useCallback((shiftId: string) => {
+    setShifts((prev) => prev.filter((s) => s.id !== shiftId));
+  }, []);
+
+  return (
+    <ShiftContext.Provider
+      value={{
+        shifts,
+        view,
+        setView,
+        currentDate,
+        goToNextWeek,
+        goToPrevWeek,
+        goToNextMonth,
+        goToPrevMonth,
+        goToToday,
+        registerShift,
+        unregisterShift,
+        createShift,
+        updateShift,
+        deleteShift,
+        getShiftsForDate,
+        getShiftsForWeek,
+        getWeekDates,
+        hasConflict,
+        getWeeklyBudget,
+      }}
+    >
+      {children}
+    </ShiftContext.Provider>
+  );
+}
+
+// ─── Hook ─────────────────────────────────────────────────────────────────────
+
+export function useShift() {
+  const context = useContext(ShiftContext);
+  if (context === undefined) {
+    throw new Error("useShift must be used within a ShiftProvider");
+  }
+  return context;
+}

lib/types.ts

@@ -9,24 +9,6 @@ export interface User {
   phone?: string;
 }
 
-// ===== MENU TYPES =====
-export interface MenuCategory {
-  id: string;
-  name: string;
-  icon: string; // FontAwesome class e.g. "fa-solid fa-mug-hot"
-}
-
-// ===== PRODUCT TYPES =====
-export interface Product {
-  id: number;
-  name: string;
-  category: string; // matches MenuCategory.id
-  price: number;
-  image: string;
-  description: string;
-  available?: boolean;
-}
-
 // ===== SHOP INFO TYPES =====
 export interface WifiInfo {
   name: string;
@@ -99,18 +81,94 @@ export interface FinancialSummary {
   profitComparison: PeriodComparison;
 }
 
-// ===== COMBO TYPES =====
-export interface ComboItem {
-  productId: number;
-  quantity: number;
-}
+// ===== SHIFT / SCHEDULE TYPES =====
+export type ShiftStatus =
+  | "available"
+  | "registered"
+  | "approved_leave"
+  | "absent";
 
-export interface Combo {
+export interface RegisteredStaff {
   id: number;
   name: string;
-  description: string;
-  price: number;
-  image: string;
-  items: ComboItem[]; // list of products + quantities in this combo
-  available: boolean;
+}
+
+export interface ShiftSlot {
+  id: string;
+  date: string; // ISO date string "YYYY-MM-DD"
+  startTime: string; // "HH:mm"
+  endTime: string; // "HH:mm"
+  durationHours: number;
+  wage: number; // VND per shift
+  department: string;
+  maxStaff: number;
+  registeredStaff: RegisteredStaff[];
+  status: ShiftStatus;
+}
+
+export interface Department {
+  id: string;
+  name: string;
+  icon: string; // FontAwesome class
+}
+
+export interface MenuItemEntity {
+  id?: string;
+  name: string;
+  price: number;
+  eatery?: EateryEntity;
+  imageUrl: string;
+  available: boolean;
+  description: string;
+}
+
+export interface ShiftEntity {}
+
+export interface EateryEntity {
+  id: string;
+  ownerId: string;
+  name: string;
+  menuItems: MenuItemEntity[];
+  shifts: ShiftEntity[];
+}
+
+export interface allEateriesQuery {
+  allEateries: EateryEntity[];
+}
+
+export interface addMenuItemMutation {
+  addMenuItem: MenuItemEntity;
+}
+
+export interface updateMenuItemMutation {
+  updateMenuItem: MenuItemEntity;
+}
+
+export interface deleteMenuItemMutation {
+  deleteMenuItem: boolean;
+}
+
+export interface CartItemEntity {
+  productId: string;
+  quantity: number;
+  priceAtTimeOfAdding?: number;
+}
+
+export interface CartEntity {
+  Id: string;
+  items: CartItemEntity[];
+  totalAmount: number;
+  paymentQrUrl: string;
+}
+
+export interface getCartQuery {
+  getCart: CartEntity;
+}
+
+export interface createCartMutation {
+  createCart: string;
+}
+
+export interface addMenuItemMutation {
+  addItem: CartEntity;
 }

next.config.ts

@@ -19,6 +19,15 @@ const nextConfig: NextConfig = {
       },
     ],
   },
+  async rewrites() {
+    const gatewayUrl = "http://host.docker.internal:32080";
+    return [
+      {
+        source: "/api/:path*",
+        destination: `${gatewayUrl}/api/:path*`,
+      },
+    ];
+  },
 };
 
 export default nextConfig;