Fix jwt-token
This commit is contained in:
@@ -3,6 +3,7 @@ import { Outlet, Link, useLocation } from 'react-router-dom';
|
|||||||
import { useAuth } from '../contexts/AuthContext';
|
import { useAuth } from '../contexts/AuthContext';
|
||||||
import { useSocket } from '../contexts/SocketContext';
|
import { useSocket } from '../contexts/SocketContext';
|
||||||
import DebugToggle from './DebugToggle';
|
import DebugToggle from './DebugToggle';
|
||||||
|
import LanguageSelector from './common/LanguageSelector';
|
||||||
import { canAccessSettings, hasPermission } from '../utils/rbac';
|
import { canAccessSettings, hasPermission } from '../utils/rbac';
|
||||||
import {
|
import {
|
||||||
HomeIcon,
|
HomeIcon,
|
||||||
@@ -131,6 +132,9 @@ const Layout = () => {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Language selector */}
|
||||||
|
<LanguageSelector />
|
||||||
|
|
||||||
{/* User menu */}
|
{/* User menu */}
|
||||||
<div className="ml-3 relative">
|
<div className="ml-3 relative">
|
||||||
<div className="flex items-center space-x-2">
|
<div className="flex items-center space-x-2">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import { Outlet, NavLink, useLocation } from 'react-router-dom'
|
import { Outlet, NavLink, useLocation } from 'react-router-dom'
|
||||||
import { useAuth } from '../contexts/AuthContext'
|
import { useAuth } from '../contexts/AuthContext'
|
||||||
|
import LanguageSelector from './common/LanguageSelector'
|
||||||
import {
|
import {
|
||||||
HomeIcon,
|
HomeIcon,
|
||||||
BuildingOfficeIcon,
|
BuildingOfficeIcon,
|
||||||
@@ -83,6 +84,14 @@ const Layout = () => {
|
|||||||
|
|
||||||
{/* Main content */}
|
{/* Main content */}
|
||||||
<div className="pl-64">
|
<div className="pl-64">
|
||||||
|
{/* Top header bar */}
|
||||||
|
<div className="bg-white border-b border-gray-200 px-4 py-3">
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
|
<div></div> {/* Empty div for spacing */}
|
||||||
|
<LanguageSelector />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="py-6">
|
<div className="py-6">
|
||||||
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
<div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
|
|||||||
Reference in New Issue
Block a user