Skip to content

Commit d6178bb

Browse files
committed
fix: generate valid EasyTier config
1 parent b838674 commit d6178bb

22 files changed

Lines changed: 104 additions & 51 deletions

src/components/Expert/SectionAdvanced.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { Toggle } from '../common/Toggle';
55
import { Select } from '../common/Select';

src/components/Expert/SectionConnections.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { Select } from '../common/Select';
55
import { RepeatableField } from '../common/RepeatableField';

src/components/Expert/SectionIP.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { Toggle } from '../common/Toggle';
55

src/components/Expert/SectionLogging.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { Select } from '../common/Select';
55
import { getDefaultLogDir } from '../../types/config';
@@ -24,10 +24,7 @@ export function SectionLogging() {
2424
const { config, updateConfig } = useConfig();
2525

2626
const handleOSChange = (os: TargetOS) => {
27-
updateConfig({
28-
target_os: os,
29-
file_logger: { ...(config.file_logger ?? {}), dir: getDefaultLogDir(os) },
30-
});
27+
updateConfig({ target_os: os });
3128
};
3229

3330
return (
@@ -61,7 +58,7 @@ export function SectionLogging() {
6158
options={levelOptions}
6259
onChange={(v) =>
6360
updateConfig({
64-
console_logger: { level: v, ...(config.console_logger ?? {}) },
61+
console_logger: { ...(config.console_logger ?? {}), level: v },
6562
})
6663
}
6764
/>
@@ -74,7 +71,7 @@ export function SectionLogging() {
7471
options={levelOptions}
7572
onChange={(v) =>
7673
updateConfig({
77-
file_logger: { level: v, ...(config.file_logger ?? {}) },
74+
file_logger: { ...(config.file_logger ?? {}), level: v },
7875
})
7976
}
8077
/>
@@ -90,7 +87,7 @@ export function SectionLogging() {
9087
file_logger: { ...(config.file_logger ?? {}), dir: e.target.value },
9188
})
9289
}
93-
placeholder="/tmp/easytier"
90+
placeholder={getDefaultLogDir(config.target_os) ?? '/tmp/easytier'}
9491
className="w-full px-4 py-2.5 rounded-xl bg-white dark:bg-[#27272a] text-sm text-[var(--color-text-h)] dark:text-[var(--color-text-h-dark)] border border-[var(--color-border)] dark:border-[#3f3f46] focus:outline-none focus:ring-1 focus:ring-[var(--color-border)] dark:focus:ring-[var(--color-border-dark)]"
9592
/>
9693
</FormField>

src/components/Expert/SectionNetwork.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState } from 'react';
22
import { useTranslation } from 'react-i18next';
33
import { Shuffle, Eye, EyeOff } from 'lucide-react';
4-
import { useConfig } from '../../context/ConfigContext';
4+
import { useConfig } from '../../context/useConfig';
55
import { FormField } from '../common/FormField';
66
import { randomNetworkName, randomSecret } from '../../utils/random';
77

src/components/Expert/SectionPortForward.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { Plus, Trash2 } from 'lucide-react';
55
import type { PortForwardConfig } from '../../types/config';

src/components/Expert/SectionProxyRoutes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { RepeatableField } from '../common/RepeatableField';
55

src/components/Expert/SectionVPN.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useTranslation } from 'react-i18next';
2-
import { useConfig } from '../../context/ConfigContext';
2+
import { useConfig } from '../../context/useConfig';
33
import { FormField } from '../common/FormField';
44
import { Toggle } from '../common/Toggle';
55

src/components/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Wand2, SlidersHorizontal, Sun, Moon } from 'lucide-react';
22
import { useTranslation } from 'react-i18next';
33
import { useState, useEffect } from 'react';
4-
import { useConfig } from '../context/ConfigContext';
4+
import { useConfig } from '../context/useConfig';
55
import { getTheme, setTheme, type ThemeMode } from '../utils/theme';
66
import { LanguageSwitcher } from './LanguageSwitcher';
77

src/components/TomlPreview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState } from 'react';
22
import { useTranslation } from 'react-i18next';
33
import { FileDown, Copy, Check, ChevronUp, ChevronDown } from 'lucide-react';
4-
import { useConfig } from '../context/ConfigContext';
4+
import { useConfig } from '../context/useConfig';
55
import { generateToml, downloadToml } from '../utils/toml';
66

77
export function TomlPreview() {

0 commit comments

Comments
 (0)