sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-18 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

switch lang tag on language switch, lint

Browse Source
This commit is contained in:
Eduard Gert
2026-06-18 16:16:45 +02:00
parent 461ec1c8f5
commit 731e87be72
11 changed files with 94 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/frontend/src/modules/main/MainHeader.tsx
+3 -2
View File
@@ -77,6 +77,7 @@ export const MainHeader = () => {
className={"select-none"}
aria-label={t("header.menu.open")}
aria-haspopup={"menu"}
aria-expanded={menuOpen}
/>
</DropdownMenuTrigger>
<DropdownMenuContent
@@ -150,7 +151,7 @@ export const MainHeader = () => {
);
return (
<div
<header
className={cn(
"wails-draggable relative z-10 shrink-0 cursor-default",
"top-3 flex h-12 items-center",
@@ -169,7 +170,7 @@ export const MainHeader = () => {
<div />
</div>
<div className={"absolute right-[1.3rem] top-1/2 -translate-y-1/2"}>{settingsSlot}</div>
</div>
</header>
);
};
client/ui/frontend/src/modules/main/MainPage.tsx
+2 -2
View File
@@ -44,7 +44,7 @@ const MainBody = () => {
const isAdvanced = viewMode === "advanced";
return (
<div className={"wails-draggable flex min-h-0 flex-1"}>
<main className={"wails-draggable flex min-h-0 flex-1"}>
{/* Windows narrower width compensates for the OS frame Wails counts differently than macOS.
See https://github.com/wailsapp/wails/issues/3260 */}
<div
@@ -65,7 +65,7 @@ const MainBody = () => {
<AdvancedAppRightPanel />
</NavSectionProvider>
)}
</div>
</main>
);
};
client/ui/frontend/src/modules/profiles/ProfileCreationModal.tsx
+3 -3
View File
@@ -71,11 +71,11 @@ export const ProfileCreationModal = ({ open, onOpenChange, onSubmit, initial }:
useEffect(() => {
if (!open) return;
initialModeRef.current = mode;
const id = window.setTimeout(() => {
const id = globalThis.setTimeout(() => {
nameRef.current?.focus();
nameRef.current?.select();
}, 0);
return () => window.clearTimeout(id);
return () => globalThis.clearTimeout(id);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [open]);
@@ -108,7 +108,7 @@ export const ProfileCreationModal = ({ open, onOpenChange, onSubmit, initial }:
}
const target = normalizeManagementUrl(trimmed);
const unchanged = initial && target === initial.managementUrl;
const unchanged = target === initial?.managementUrl;
return { url: target, needsReachCheck: !unchanged };
};
client/ui/frontend/src/modules/profiles/ProfilesTab.tsx
+3 -5
View File
@@ -504,11 +504,9 @@ const RowActions = ({
}: RowActionsProps) => {
const { t } = useTranslation();
const deleteDisabled = isDefault || isActive;
const deleteDisabledReason = isDefault
? t("profile.delete.disabledDefault")
: isActive
? t("profile.delete.disabledActive")
: null;
let deleteDisabledReason: string | null = null;
if (isDefault) deleteDisabledReason = t("profile.delete.disabledDefault");
else if (isActive) deleteDisabledReason = t("profile.delete.disabledActive");
return (
<div className={"inline-flex items-center gap-1"}>
<ActionIconButton
client/ui/frontend/src/modules/settings/SettingsPage.tsx
+38 -36
View File
@@ -87,43 +87,45 @@ export const SettingsPage = () => {
) : (
<div className={"h-px shrink-0 bg-nb-gray-920/0"} />
)}
<VerticalTabs value={active} onValueChange={setActive}>
<SettingsNavigation />
<AppRightPanel>
<AutostartSettingsProvider>
<SettingsProvider>
<ScrollArea.Root
key={active}
type={"auto"}
className={"min-h-0 flex-1 overflow-hidden"}
>
<ScrollArea.Viewport className={"h-full w-full"}>
<div className={"px-7 py-6"}>
{visibleTabs.map((tab) => (
<VerticalTabs.Content key={tab} value={tab}>
{TAB_CONTENT[tab]}
</VerticalTabs.Content>
))}
</div>
</ScrollArea.Viewport>
<ScrollArea.Scrollbar
orientation={"vertical"}
className={cn(
"flex touch-none select-none transition-colors",
"w-1.5 bg-transparent py-1",
)}
<main className={"flex min-h-0 flex-1"}>
<VerticalTabs value={active} onValueChange={setActive}>
<SettingsNavigation />
<AppRightPanel>
<AutostartSettingsProvider>
<SettingsProvider>
<ScrollArea.Root
key={active}
type={"auto"}
className={"min-h-0 flex-1 overflow-hidden"}
>
<ScrollArea.Thumb
className={
"relative flex-1 rounded-full bg-nb-gray-800 hover:bg-nb-gray-700"
}
/>
</ScrollArea.Scrollbar>
</ScrollArea.Root>
</SettingsProvider>
</AutostartSettingsProvider>
</AppRightPanel>
</VerticalTabs>
<ScrollArea.Viewport className={"h-full w-full"}>
<div className={"px-7 py-6"}>
{visibleTabs.map((tab) => (
<VerticalTabs.Content key={tab} value={tab}>
{TAB_CONTENT[tab]}
</VerticalTabs.Content>
))}
</div>
</ScrollArea.Viewport>
<ScrollArea.Scrollbar
orientation={"vertical"}
className={cn(
"flex touch-none select-none transition-colors",
"w-1.5 bg-transparent py-1",
)}
>
<ScrollArea.Thumb
className={
"relative flex-1 rounded-full bg-nb-gray-800 hover:bg-nb-gray-700"
}
/>
</ScrollArea.Scrollbar>
</ScrollArea.Root>
</SettingsProvider>
</AutostartSettingsProvider>
</AppRightPanel>
</VerticalTabs>
</main>
</>
);
};