Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions dashboard/src/components/Layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,99 @@
}
}

/* ==================== Language Picker ==================== */
.lang-picker-wrap {
position: relative;
}

.lang-trigger-btn {
width: 100%;
}

.lang-popup {
position: absolute;
bottom: calc(100% + 8px);
left: 0;
right: 0;
background: var(--bg-white);
border: 1px solid var(--border);
border-radius: var(--radius);
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12);
overflow: hidden;
display: flex;
flex-direction: column;
transform-origin: bottom center;
transform: scaleY(0.85) translateY(6px);
opacity: 0;
pointer-events: none;
transition:
transform 0.2s cubic-bezier(0.34, 1.56, 0.64, 1),
opacity 0.15s ease;
z-index: 200;
}

.lang-popup--open {
transform: scaleY(1) translateY(0);
opacity: 1;
pointer-events: auto;
}

.lang-option {
display: flex;
align-items: center;
justify-content: space-between;
gap: 0.5rem;
padding: 0.6rem 0.9rem;
font-size: 0.875rem;
font-weight: 500;
color: var(--text-secondary);
background: none;
border: none;
cursor: pointer;
text-align: start;
transition: background 0.15s, color 0.15s;
}

.lang-option:focus,
.lang-option:focus-visible {
outline: none;
}

.lang-option:hover {
background: var(--bg-light);
color: var(--text-primary);
}

.lang-option--active {
color: var(--primary);
background: rgba(37, 211, 102, 0.08);
}

.lang-option--active:hover {
background: rgba(37, 211, 102, 0.14);
}

.lang-option-label {
flex: 1;
}

.lang-check {
flex-shrink: 0;
color: var(--primary);
}

.sidebar.collapsed .lang-popup {
left: 50%;
right: auto;
min-width: 140px;
transform-origin: bottom left;
transform: scaleY(0.85) translateX(-50%) translateY(6px);
}

.sidebar.collapsed .lang-popup--open {
transform: scaleY(1) translateX(-50%) translateY(0);
}

/* ==================== RTL support ==================== */
[dir="rtl"] .sidebar {
border-right: none;
Expand Down
68 changes: 51 additions & 17 deletions dashboard/src/components/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect } from 'react';
import { useState, useEffect, useRef } from 'react';
import { NavLink, Outlet } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import {
Expand All @@ -19,10 +19,11 @@ import {
ChevronLeft,
ChevronRight,
Languages,
Check,
} from 'lucide-react';
import { useTheme } from '../hooks/useTheme';
import { type UserRole } from '../hooks/useRole';
import { supportedLanguages, type SupportedLanguage } from '../i18n';
import { languageOptions, type SupportedLanguage } from '../i18n';
import './Layout.css';

interface LayoutProps {
Expand Down Expand Up @@ -80,13 +81,28 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
const toggleMobile = () => setIsMobileOpen(!isMobileOpen);

const currentLang = (i18n.resolvedLanguage || i18n.language || 'en').split('-')[0] as SupportedLanguage;
const cycleLanguage = () => {
const idx = supportedLanguages.indexOf(currentLang);
const next = supportedLanguages[(idx + 1) % supportedLanguages.length];
void i18n.changeLanguage(next);
const isRtl = currentLang === 'he' || currentLang === 'ar';

const [isLangOpen, setIsLangOpen] = useState(false);
const langRef = useRef<HTMLDivElement>(null);

useEffect(() => {
const handleClickOutside = (e: MouseEvent) => {
if (langRef.current && !langRef.current.contains(e.target as Node)) {
setIsLangOpen(false);
}
};
if (isLangOpen) document.addEventListener('mousedown', handleClickOutside);
return () => document.removeEventListener('mousedown', handleClickOutside);
}, [isLangOpen]);

const selectLanguage = (code: SupportedLanguage) => {
void i18n.changeLanguage(code);
setIsLangOpen(false);
};
const languageLabel = currentLang === 'he' ? 'עברית' : 'EN';
const isRtl = currentLang === 'he';

const currentLangEntry = languageOptions.find(l => l.code === currentLang) ?? languageOptions[0];
const languageLabel = isCollapsed ? currentLangEntry.short : currentLangEntry.label;

return (
<div className="layout">
Expand Down Expand Up @@ -151,15 +167,33 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
</nav>

<div className="sidebar-footer">
<button
className="theme-toggle-btn"
onClick={cycleLanguage}
title={t('common.language')}
aria-label={t('common.language')}
>
<Languages size={18} />
{!isCollapsed && <span>{languageLabel}</span>}
</button>
<div className="lang-picker-wrap" ref={langRef}>
<button
className="theme-toggle-btn lang-trigger-btn"
onClick={() => setIsLangOpen(v => !v)}
title={t('common.language')}
aria-label={t('common.language')}
aria-expanded={isLangOpen}
>
<Languages size={18} />
{!isCollapsed && <span>{languageLabel}</span>}
</button>

<div className={`lang-popup ${isLangOpen ? 'lang-popup--open' : ''}`} role="listbox">
{languageOptions.map(lang => (
<button
key={lang.code}
className={`lang-option ${currentLang === lang.code ? 'lang-option--active' : ''}`}
role="option"
aria-selected={currentLang === lang.code}
onClick={() => selectLanguage(lang.code)}
>
<span className="lang-option-label">{lang.label}</span>
{currentLang === lang.code && <Check size={14} className="lang-check" />}
</button>
))}
</div>
</div>
<button
className="theme-toggle-btn"
onClick={toggleTheme}
Expand Down
18 changes: 16 additions & 2 deletions dashboard/src/i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,24 @@ import { initReactI18next } from 'react-i18next';
import LanguageDetector from 'i18next-browser-languagedetector';
import en from './locales/en.json';
import he from './locales/he.json';
import ar from './locales/ar.json';

export const supportedLanguages = ['en', 'he'] as const;
export const supportedLanguages = ['en', 'he', 'ar'] as const;
export type SupportedLanguage = (typeof supportedLanguages)[number];

export const rtlLanguages: SupportedLanguage[] = ['he'];
export const rtlLanguages: SupportedLanguage[] = ['he', 'ar'];

export interface LanguageOption {
code: SupportedLanguage;
label: string;
short: string;
}

export const languageOptions: LanguageOption[] = [
{ code: 'en', label: 'English', short: 'EN' },
{ code: 'he', label: 'עברית', short: 'HE' },
{ code: 'ar', label: 'العربية', short: 'AR' },
];

void i18n
.use(LanguageDetector)
Expand All @@ -16,6 +29,7 @@ void i18n
resources: {
en: { translation: en },
he: { translation: he },
ar: { translation: ar },
},
fallbackLng: 'en',
supportedLngs: supportedLanguages as unknown as string[],
Expand Down
Loading