feat: multi-module improvements across merchant, store, i18n, and customer systems
All checks were successful
All checks were successful
- Fix platform-grouped merchant sidebar menu with core items at root level - Add merchant store management (detail page, create store, team page) - Fix store settings 500 error by removing dead stripe/API tab - Move onboarding translations to module-owned locale files - Fix onboarding banner i18n with server-side rendering + context inheritance - Refactor login language selectors to use languageSelector() function (LANG-002) - Move HTTPException handling to global exception handler in merchant routes (API-003) - Add language selector to all login pages and portal headers - Fix customer module: drop order stats from customer model, add to orders module - Fix admin menu config visibility for super admin platform context - Fix storefront auth and layout issues - Add missing i18n translations for onboarding steps (en/fr/de/lb) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -20,10 +20,14 @@
|
||||
</div>
|
||||
|
||||
<ul class="flex items-center flex-shrink-0 space-x-6">
|
||||
<!-- Platform Context Indicator (for platform admins) -->
|
||||
<!-- Platform Context Indicator -->
|
||||
<li class="flex" x-data="platformContext()">
|
||||
<template x-if="platform && !isSuperAdmin">
|
||||
<!-- Super Admin + Platform selected -->
|
||||
<template x-if="isSuperAdmin && platform">
|
||||
<div class="flex items-center space-x-2">
|
||||
<span class="px-3 py-1 text-xs font-medium text-green-700 bg-green-100 dark:text-green-300 dark:bg-green-900/30 rounded-full">
|
||||
Super Admin
|
||||
</span>
|
||||
<span class="px-3 py-1 text-xs font-medium text-purple-700 bg-purple-100 dark:text-purple-300 dark:bg-purple-900/30 rounded-full">
|
||||
<span x-text="platform.name"></span>
|
||||
</span>
|
||||
@@ -34,10 +38,31 @@
|
||||
</a>
|
||||
</div>
|
||||
</template>
|
||||
<template x-if="isSuperAdmin">
|
||||
<span class="px-3 py-1 text-xs font-medium text-green-700 bg-green-100 dark:text-green-300 dark:bg-green-900/30 rounded-full">
|
||||
Super Admin
|
||||
</span>
|
||||
<!-- Super Admin + Global mode (no platform) -->
|
||||
<template x-if="isSuperAdmin && !platform">
|
||||
<div class="flex items-center space-x-2">
|
||||
<span class="px-3 py-1 text-xs font-medium text-green-700 bg-green-100 dark:text-green-300 dark:bg-green-900/30 rounded-full">
|
||||
Super Admin (Global)
|
||||
</span>
|
||||
<a href="/admin/select-platform"
|
||||
class="text-xs text-gray-500 hover:text-purple-600 dark:text-gray-400 dark:hover:text-purple-400"
|
||||
title="Switch platform">
|
||||
<span x-html="$icon('switch-horizontal', 'w-4 h-4')"></span>
|
||||
</a>
|
||||
</div>
|
||||
</template>
|
||||
<!-- Platform Admin -->
|
||||
<template x-if="!isSuperAdmin && platform">
|
||||
<div class="flex items-center space-x-2">
|
||||
<span class="px-3 py-1 text-xs font-medium text-purple-700 bg-purple-100 dark:text-purple-300 dark:bg-purple-900/30 rounded-full">
|
||||
<span x-text="platform.name"></span>
|
||||
</span>
|
||||
<a href="/admin/select-platform"
|
||||
class="text-xs text-gray-500 hover:text-purple-600 dark:text-gray-400 dark:hover:text-purple-400"
|
||||
title="Switch platform">
|
||||
<span x-html="$icon('switch-horizontal', 'w-4 h-4')"></span>
|
||||
</a>
|
||||
</div>
|
||||
</template>
|
||||
</li>
|
||||
|
||||
@@ -55,10 +80,11 @@
|
||||
<button
|
||||
@click="isLangOpen = !isLangOpen"
|
||||
@click.outside="isLangOpen = false"
|
||||
class="p-1 rounded-md focus:outline-none focus:shadow-outline-purple"
|
||||
class="inline-flex items-center gap-1 p-1 rounded-md focus:outline-none focus:shadow-outline-purple"
|
||||
aria-label="Change language"
|
||||
>
|
||||
<span class="fi text-lg" :class="'fi-' + languageFlags[currentLang]"></span>
|
||||
<span x-html="$icon('globe-alt', 'w-5 h-5')"></span>
|
||||
<span class="text-xs font-semibold text-gray-600 dark:text-gray-300 uppercase" x-text="currentLang"></span>
|
||||
</button>
|
||||
<div
|
||||
x-show="isLangOpen"
|
||||
@@ -263,7 +289,7 @@ function platformContext() {
|
||||
if (storedUser) {
|
||||
try {
|
||||
const user = JSON.parse(storedUser);
|
||||
this.isSuperAdmin = user.role === 'super_admin';
|
||||
this.isSuperAdmin = user.is_super_admin === true || user.role === 'super_admin';
|
||||
} catch (e) {
|
||||
console.warn('Failed to parse stored user:', e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user