fix: canonical URLs to always include locale prefix

Fixed Canonical Redirect Error in Google Search Console by ensuring
canonical URLs always include the locale prefix (/sr, /en, /de, /fr)
instead of omitting it for the default locale.

Changes:
- layout.tsx: Fixed canonical and hreflang URL generation
- page.tsx: Fixed homepage canonical URL
- contact/page.tsx: Fixed contact page canonical URL
- about/page.tsx: Fixed about page canonical URL
- products/page.tsx: Fixed products page canonical URL
- products/[slug]/page.tsx: Fixed product detail canonical URL

Before: /contact (when locale=sr)
After: /sr/contact (all locales)

Fixes: Canonical Redirect Error in Google Search Console

.gitea/workflows/build.yaml

@@ -0,0 +1,68 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches: [master, main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Trigger BuildKit Build
+      run: |
+        kubectl delete job build-manoon-headless-action -n gitea --ignore-not-found=true 2>/dev/null || true
+        
+        cat << 'JOBEOF' | kubectl apply -f -
+        apiVersion: batch/v1
+        kind: Job
+        metadata:
+          name: build-manoon-headless-action
+          namespace: gitea
+        spec:
+          ttlSecondsAfterFinished: 86400
+          template:
+            spec:
+              restartPolicy: Never
+              initContainers:
+              - name: clone
+                image: alpine/git:latest
+                command: ["sh", "-c"]
+                args:
+                  - git clone --depth 1 http://gitea:3000/unchained/manoon-headless.git /workspace
+                volumeMounts:
+                - name: workspace
+                  mountPath: /workspace
+              containers:
+              - name: build
+                image: moby/buildkit:latest
+                command: ["sh", "-c"]
+                args:
+                  - |
+                    mkdir -p /root/.docker
+                    cp /docker-config/.dockerconfigjson /root/.docker/config.json
+                    buildctl --addr tcp://buildkit.gitea.svc.cluster.local:1234 build \
+                      --frontend dockerfile.v0 \
+                      --local context=/workspace \
+                      --local dockerfile=/workspace \
+                      --opt build-arg:NEXT_PUBLIC_SALEOR_API_URL=https://api.manoonoils.com/graphql/ \
+                      --opt build-arg:NEXT_PUBLIC_SITE_URL=https://manoonoils.com \
+                      --opt build-arg:NEXT_PUBLIC_OPENPANEL_CLIENT_ID=fa61f8ae-0b5d-4187-a9b1-5a04b0025674 \
+                      --opt build-arg:NEXT_PUBLIC_RYBBIT_HOST=https://rybbit.nodecrew.me \
+                      --opt build-arg:NEXT_PUBLIC_RYBBIT_SITE_ID=1 \
+                      --no-cache \
+                      --output type=image,name=ghcr.io/unchainedio/manoon-headless:latest,push=true
+                volumeMounts:
+                - name: workspace
+                  mountPath: /workspace
+                - name: docker-config
+                  mountPath: /docker-config
+                  readOnly: true
+              volumes:
+              - name: workspace
+                emptyDir: {}
+              - name: docker-config
+                secret:
+                  secretName: ghcr-pull-secret
+        JOBEOF
+        
+        echo "Build triggered!"

.opencode/PROJECT_MEMORY.md

@@ -0,0 +1,189 @@
+# ManoonOils Project Memory
+
+## Project Overview
+- **Name:** ManoonOils Headless Storefront
+- **Type:** Next.js 16 + Saleor e-commerce
+- **URL:** https://manoonoils.com
+- **Tech Stack:** React 19, TypeScript, Tailwind CSS v4, GraphQL/Apollo
+
+## Git Workflow (CRITICAL)
+
+```
+feature/* → dev → master
+```
+
+### Rules (MUST FOLLOW)
+1. **All work starts on feature branch** - Never commit to dev/master directly
+2. **Commit working code immediately** - No uncommitted files in working directory
+3. **Clean working directory before switching branches** - Run `git status` first
+4. **Flow forward only** - feature → dev → master, never skip
+5. **Reset feature branches after merge** - Keep synchronized with master
+
+### Workflow Steps
+```bash
+# 1. Create feature branch
+git checkout -b feature/description
+
+# 2. Work and commit WORKING code
+git add .
+git commit -m "type: description"
+git push origin feature/description
+
+# 3. Merge to dev for testing
+git checkout dev
+git merge feature/description
+git push origin dev
+
+# 4. Merge to master for production
+git checkout master
+git merge dev
+git push origin master
+
+# 5. Reset feature branch to match master
+git checkout feature/description
+git reset --hard master
+git push origin feature/description --force
+```
+
+### Commit Types
+- `feat:` - New feature
+- `fix:` - Bug fix
+- `docs:` - Documentation
+- `style:` - Formatting
+- `refactor:` - Code restructuring
+- `test:` - Tests
+- `chore:` - Build/process
+
+## Project Structure
+
+### Key Directories
+```
+src/
+├── app/[locale]/          # i18n routes
+├── components/
+│   ├── home/              # Homepage sections
+│   ├── layout/            # Header, Footer
+│   ├── providers/         # Context providers
+│   └── ui/                # Reusable UI
+├── hooks/                 # Custom hooks
+├── lib/
+│   ├── mautic.ts         # Mautic API client
+│   ├── geoip.ts          # GeoIP service
+│   └── analytics.ts      # Analytics tracking
+├── i18n/messages/        # Translations (sr, en, de, fr)
+k8s/                      # Kubernetes manifests
+```
+
+### Important Files
+- `k8s/deployment.yaml` - Production deployment config
+- `src/app/[locale]/layout.tsx` - Root layout with ExitIntentDetector
+- `src/lib/mautic.ts` - Mautic integration
+- `.env.local` - Environment variables
+
+## Environment Variables
+
+### Required for Production
+```bash
+# Saleor
+NEXT_PUBLIC_SALEOR_API_URL=https://api.manoonoils.com/graphql/
+
+# Mautic
+MAUTIC_CLIENT_ID=2_23cgmaqef8kgg8oo4kggc0w4wccwoss8o8w48o8sc40cowgkkg
+MAUTIC_CLIENT_SECRET=4k8367ab306co48c4c8g8sco8cgcwwww044gwccs0o0c8w4gco
+MAUTIC_API_URL=https://mautic.nodecrew.me
+
+# Analytics
+NEXT_PUBLIC_RYBBIT_HOST=https://rybbit.nodecrew.me
+NEXT_PUBLIC_RYBBIT_SITE_ID=1
+RYBBIT_API_KEY=...
+
+# Email
+RESEND_API_KEY=...
+```
+
+## Current Features
+
+### Email Capture Popup
+- **Location:** `src/components/home/EmailCapturePopup.tsx`
+- **Trigger:** `src/components/home/ExitIntentDetector.tsx`
+- **Triggers:** Scroll 10% OR exit intent (mouse leaving viewport)
+- **Delay:** Scroll has 5s delay, exit intent shows immediately
+- **Fields:** First name (optional), Email (required)
+- **Tracking:** UTM params, device info, time on page, referrer
+- **Integration:** Creates contact in Mautic with tags
+
+### API Routes
+- `/api/email-capture` - Handles form submission to Mautic
+- `/api/geoip` - Returns country/region from IP
+
+### i18n Support
+- **Locales:** sr (default), en, de, fr
+- **Translation files:** `src/i18n/messages/*.json`
+
+## Common Commands
+
+### Development
+```bash
+npm run dev          # Start dev server
+npm run build        # Production build
+npm run test         # Run tests
+```
+
+### Kubernetes (doorwaysftw server)
+```bash
+# Check pods
+ssh doorwaysftw "kubectl get pods -n manoonoils"
+
+# Restart storefront
+ssh doorwaysftw "kubectl delete pod -n manoonoils -l app=storefront"
+
+# Check logs
+ssh doorwaysftw "kubectl logs -n manoonoils deployment/storefront"
+
+# Verify env vars
+ssh doorwaysftw "kubectl exec -n manoonoils deployment/storefront -- env | grep MAUTIC"
+```
+
+## Known Issues & Solutions
+
+### Hydration Errors
+- **Cause:** `AnalyticsProvider` returning `null`
+- **Solution:** Return `<></>` instead, or remove component
+
+### Popup Not Showing
+- Check `ExitIntentDetector` is in `layout.tsx`
+- Verify `useVisitorStore` isn't showing popup already shown
+- Check browser console for errors
+
+### Mautic API Failures
+- Verify env vars in k8s deployment
+- Check Mautic credentials haven't expired
+- Ensure country code isn't "Local" (use "XX" instead)
+
+## Deployment Checklist
+
+Before deploying to production:
+- [ ] All tests pass (`npm run test`)
+- [ ] Build succeeds (`npm run build`)
+- [ ] No uncommitted changes (`git status`)
+- [ ] Merged to dev and tested
+- [ ] Merged to master
+- [ ] K8s deployment.yaml has correct env vars
+- [ ] Pod restarted to pick up new code
+- [ ] Smoke test on production URL
+
+## Architecture Decisions
+
+### Why No AnalyticsProvider?
+Removed because it returns `null` causing hydration mismatches. Analytics scripts loaded directly in layout.
+
+### Why Direct Rybbit URL?
+Using `https://rybbit.nodecrew.me/api/script.js` instead of `/api/script.js` preserves real visitor IP.
+
+### Why Exit Intent + Scroll?
+Exit intent catches leaving users immediately. Scroll trigger catches engaged users after delay.
+
+## Contact
+- **Maintainer:** User
+- **K8s Server:** doorwaysftw (100.109.29.45)
+- **Mautic:** https://mautic.nodecrew.me

CONTRIBUTING.md

@@ -0,0 +1,51 @@
+# Git Workflow
+
+## Branch Strategy
+
+```
+feature/* → dev → master
+```
+
+| Branch | Purpose |
+|--------|---------|
+| `master` | Production only |
+| `dev` | Integration/testing |
+| `feature/*` | All new work |
+
+## Rules
+
+1. **All work starts on a feature branch** - Never commit to dev/master directly
+2. **Commit early and often** - Working code = committed code
+3. **No uncommitted files** - Working directory must be clean before switching branches
+4. **Always flow forward** - feature → dev → master, never skip
+5. **Reset feature branches after merge** - Keep them synchronized with master
+
+## Workflow
+
+```bash
+# Start work
+git checkout -b feature/name
+
+# Commit working code immediately
+git add .
+git commit -m "feat: description"
+
+# Test on dev
+git checkout dev
+git merge feature/name
+
+# Deploy to production
+git checkout master
+git merge dev
+
+# Clean up
+git checkout feature/name
+git reset --hard master
+```
+
+## Pre-Flight Check
+
+Before switching branches:
+```bash
+git status  # Must be clean
+```

Dockerfile

@@ -1,17 +1,25 @@
-# Multi-stage build for Next.js
 FROM node:20-slim AS builder
 
 WORKDIR /app
 
-# Copy package files
+ARG NEXT_PUBLIC_SALEOR_API_URL
+ARG NEXT_PUBLIC_SITE_URL
+ARG NEXT_PUBLIC_OPENPANEL_CLIENT_ID
+ARG NEXT_PUBLIC_RYBBIT_HOST
+ARG NEXT_PUBLIC_RYBBIT_SITE_ID
+
+ENV NEXT_PUBLIC_SALEOR_API_URL=${NEXT_PUBLIC_SALEOR_API_URL}
+ENV NEXT_PUBLIC_SITE_URL=${NEXT_PUBLIC_SITE_URL}
+ENV NEXT_PUBLIC_OPENPANEL_CLIENT_ID=${NEXT_PUBLIC_OPENPANEL_CLIENT_ID}
+ENV NEXT_PUBLIC_RYBBIT_HOST=${NEXT_PUBLIC_RYBBIT_HOST}
+ENV NEXT_PUBLIC_RYBBIT_SITE_ID=${NEXT_PUBLIC_RYBBIT_SITE_ID}
+
 COPY package*.json ./
 RUN npm install --prefer-offline --no-audit
 
-# Copy source and build
 COPY . .
 RUN npm run build
 
-# Production stage
 FROM node:20-slim AS runner
 
 WORKDIR /app
@@ -20,7 +28,6 @@ ENV NODE_ENV=production
 ENV PORT=3000
 ENV HOSTNAME=0.0.0.0
 
-# Copy necessary files from builder
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/.next/standalone ./
 COPY --from=builder /app/.next/static ./.next/static

README.md

@@ -39,3 +39,6 @@ Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/bui
 // Auto-deploy test: 2026-03-07T09:02:49Z
 // Auto-deploy test: 2026-03-07T10:33:23Z
 // Auto-deploy test 2: 2026-03-07T10:37:05Z
+# Trigger build Sun Apr  5 06:32:05 AM EET 2026
+# Trigger build with env vars Sun Apr  5 08:45:00 AM EET 2026
+# Build test Sun Apr  5 12:59:49 PM EET 2026

k8s/deployment.yaml

@@ -13,102 +13,16 @@ spec:
       labels:
         app: storefront
     spec:
-      initContainers:
-      - name: clone
-        image: alpine/git:latest
-        command:
-        - sh
-        - -c
-        - |
-          set -e
-          apk add --no-cache git
-          git clone --depth 1 --branch master \
-            http://gitea.gitea.svc.cluster.local:3000/unchained/manoon-headless.git \
-            /workspace
-          echo "Clone complete."
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-        securityContext:
-          runAsUser: 0
-        resources:
-          limits:
-            cpu: 500m
-            memory: 256Mi
-      - name: install
-        image: node:20-slim
-        workingDir: /workspace
-        command:
-        - sh
-        - -c
-        - |
-          set -e
-          echo "Installing dependencies..."
-          npm install --prefer-offline --no-audit 2>&1
-          echo "Dependencies installed."
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-        securityContext:
-          runAsUser: 0
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 3Gi
-          requests:
-            cpu: 100m
-            memory: 1Gi
-      - name: build
-        image: node:20-slim
-        workingDir: /workspace
-        command:
-        - sh
-        - -c
-        - |
-          set -e
-          echo "Building Next.js app..."
-          npm run build
-          echo "Build complete!"
-        env:
-        - name: NODE_ENV
-          value: "production"
-        - name: NEXT_PUBLIC_SALEOR_API_URL
-          value: "https://api.manoonoils.com/graphql/"
-        - name: NEXT_PUBLIC_SITE_URL
-          value: "https://manoonoils.com"
-        - name: DASHBOARD_URL
-          value: "https://dashboard.manoonoils.com"
-        - name: NEXT_PUBLIC_OPENPANEL_CLIENT_ID
-          value: "fa61f8ae-0b5d-4187-a9b1-5a04b0025674"
-        - name: OPENPANEL_CLIENT_SECRET
-          value: "91126be0d1e78e657e0427df82733832.c6d30edf6ee673da9650a883604169a13ab8579a0dde70cb39b477f4cf441f90"
-        - name: OPENPANEL_API_URL
-          value: "https://op.nodecrew.me/api"
-        - name: MAUTIC_CLIENT_ID
-          value: "2_23cgmaqef8kgg8oo4kggc0w4wccwoss8o8w48o8sc40cowgkkg"
-        - name: MAUTIC_CLIENT_SECRET
-          value: "4k8367ab306co48c4c8g8sco8cgcwwww044gwccs0o0c8w4gco"
-        - name: MAUTIC_API_URL
-          value: "https://mautic.nodecrew.me"
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-        securityContext:
-          runAsUser: 0
-        resources:
-          limits:
-            cpu: 2000m
-            memory: 2Gi
-          requests:
-            cpu: 100m
-            memory: 512Mi
+      imagePullSecrets:
+      - name: ghcr-pull-secret
       containers:
       - name: storefront
-        image: node:20-slim
-        workingDir: /workspace
+        image: ghcr.io/unchainedio/manoon-headless:latest # {"": "flux-system:manoon-headless"}
+        imagePullPolicy: Always
         command:
-        - npm
-        - start
+        - node
+        - server.js
+        workingDir: /app
         ports:
         - containerPort: 3000
         env:
@@ -169,10 +83,3 @@ spec:
             port: 3000
           periodSeconds: 5
           failureThreshold: 3
-        volumeMounts:
-        - name: workspace
-          mountPath: /workspace
-      volumes:
-      - name: workspace
-        emptyDir:
-          sizeLimit: 2Gi

k8s/kustomization.yaml

@@ -5,6 +5,3 @@ resources:
   - service.yaml
   - middleware.yaml
   - ingress.yaml
-images:
-  - name: ghcr.io/unchainedio/manoon-headless
-    newTag: 2c27fc6  # Updated by GitHub Actions

src/app/[locale]/about/page.tsx

@@ -19,7 +19,7 @@ export async function generateMetadata({ params }: AboutPageProps): Promise<Meta
   const metadata = getPageMetadata(validLocale as Locale);
   const keywords = getPageKeywords(validLocale as Locale, 'about');
   
-  const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`;
+  const localePrefix = `/${validLocale}`;
   const canonicalUrl = `${baseUrl}${localePrefix}/about`;
   
   return {

src/app/[locale]/contact/page.tsx

@@ -16,7 +16,7 @@ export async function generateMetadata({ params }: ContactPageProps): Promise<Me
   const metadata = getPageMetadata(validLocale as Locale);
   const keywords = getPageKeywords(validLocale as Locale, 'contact');
   
-  const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`;
+  const localePrefix = `/${validLocale}`;
   const canonicalUrl = `${baseUrl}${localePrefix}/contact`;
   
   return {

src/app/[locale]/layout.tsx

@@ -21,11 +21,11 @@ export async function generateMetadata({
 }): Promise<Metadata> {
   const { locale } = await params;
   const validLocale = isValidLocale(locale) ? locale : DEFAULT_LOCALE;
-  const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${locale}`;
+  const localePrefix = `/${locale}`;
 
   const languages: Record<string, string> = {};
   for (const loc of SUPPORTED_LOCALES) {
-    const prefix = loc === DEFAULT_LOCALE ? "" : `/${loc}`;
+    const prefix = `/${loc}`;
     languages[loc] = `${baseUrl}${prefix}`;
   }
 

src/app/[locale]/page.tsx

@@ -29,8 +29,8 @@ export async function generateMetadata({ params }: { params: Promise<{ locale: s
   setRequestLocale(validLocale);
   
   // Build canonical URL
-  const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`;
-  const canonicalUrl = `${baseUrl}${localePrefix || '/'}`;
+  const localePrefix = `/${validLocale}`;
+  const canonicalUrl = `${baseUrl}${localePrefix}`;
   
   return {
     title: metadata.home.title,

src/app/[locale]/products/[slug]/page.tsx

@@ -57,7 +57,7 @@ export async function generateMetadata({ params }: ProductPageProps): Promise<Me
   const secondaryKeywords = keywords.secondary.map(replaceTemplate);
   
   // Build canonical URL
-  const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`;
+  const localePrefix = `/${validLocale}`;
   const canonicalUrl = `${baseUrl}${localePrefix}/products/${slug}`;
   
   // Get product image for OpenGraph

src/app/[locale]/products/page.tsx

@@ -24,7 +24,7 @@ export async function generateMetadata({ params }: ProductsPageProps): Promise<M
   const keywords = getPageKeywords(validLocale as Locale, 'products');
   
   // Build canonical URL
-  const localePrefix = validLocale === DEFAULT_LOCALE ? "" : `/${validLocale}`;
+  const localePrefix = `/${validLocale}`;
   const canonicalUrl = `${baseUrl}${localePrefix}/products`;
   
   return {