TDvorak/MyClub
1
0
Fork 0
mirror of https://github.com/Dvorinka/MyClubServer.git synced 2026-06-04 02:32:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote master branch - resolved conflicts in cache files and frontend components

Browse Source
This commit is contained in:
Tomas Dvorak
2025-10-19 17:31:01 +02:00
parent 77213f4e83 96ff7895a6
commit abe127fb51
14 changed files with 115 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/editor/MyUIbrixEditor.tsx
+3 -2
View File
@@ -119,8 +119,6 @@ const MyUIbrixStyleEditor: React.FC<MyUIbrixStyleEditorProps> = ({ pageType, onC
const isAdmin = user?.role === 'admin';
const clubTheme = useClubTheme();
// Early return if not admin - MUST be before any other hooks
if (!isAdmin) return null;
const [isEditing, setIsEditing] = useState(false);
const [configs, setConfigs] = useState<PageElementConfig[]>([]);
const [localChanges, setLocalChanges] = useState<Record<string, string>>({});
@@ -1233,6 +1231,9 @@ const MyUIbrixStyleEditor: React.FC<MyUIbrixStyleEditorProps> = ({ pageType, onC
});
}, [isEditing, viewport, primaryColor, toast]);
// Early return if not admin (after all hooks)
if (!isAdmin) return null;
return (
<>
{/* Edit Mode - Active */}