Skip to content

Commit f25ab01

Browse files
committed
Fix settings and a few UI adjustment
1 parent 001ffb8 commit f25ab01

File tree

4 files changed

+27
-32
lines changed

4 files changed

+27
-32
lines changed

components/modals/password-modal.tsx

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ export default function PasswordScreen({
4949
onPress={() => {
5050
setIsOpen(false);
5151
// Reset all settings
52-
editorContext?.setEditorStates((prev) => ({
53-
...prev,
54-
settings: undefined,
55-
}));
52+
editorContext?.setPersistSettings(undefined);
5653
}}
5754
variant="light"
5855
disableRipple
@@ -72,14 +69,13 @@ export default function PasswordScreen({
7269
if (!editorContext?.persistSettings?.isPasswordSet) {
7370
// Set password if not already set
7471
const settings = editorContext?.persistSettings ?? {};
75-
editorContext?.setEditorStates((prev) => ({
76-
...prev,
77-
settings: {
78-
...settings,
72+
editorContext?.setPersistSettings((prev) => {
73+
return {
74+
...prev,
7975
isPasswordSet: true,
8076
password: password,
81-
},
82-
}));
77+
};
78+
});
8379

8480
// Encrypt API tokens
8581
const sttAPIKey = settings.sttAPIKey
@@ -111,17 +107,15 @@ export default function PasswordScreen({
111107
: undefined;
112108

113109
// Load password to context if the password was set
114-
const settings = editorContext?.persistSettings ?? {};
115-
editorContext?.setEditorStates((prev) => ({
116-
...prev,
117-
settings: {
118-
...settings,
110+
editorContext?.setPersistSettings((prev) => {
111+
return {
112+
...prev,
119113
sttAPIKey: sttAPIKey,
120114
llmAPIKey: llmAPIKey,
121115
ttsAPIKey: ttsAPIKey,
122116
password: password,
123-
},
124-
}));
117+
};
118+
});
125119
}
126120
}}
127121
>

components/modals/settings-modal.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,7 @@ export default function SettingModal({
381381
});
382382
} else {
383383
// Reset all settings
384-
updateEditorSettings({
385-
settings: undefined,
386-
});
384+
editorContext?.setPersistSettings(undefined);
387385
}
388386
}}
389387
>

components/nav-menu.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ export default function NavMenu({ isMenuOpen }: { isMenuOpen: boolean }) {
7070
<div className="h-full w-full bg-content2 p-2">
7171
<div className="flex h-full w-full flex-col items-center space-y-1">
7272
{!projectPath && (
73-
<div className="flex w-full flex-wrap justify-center gap-x-0.5 gap-y-0.5">
74-
<Button size="sm">New Project</Button>
73+
<div className="flex w-full flex-wrap justify-center gap-x-1 gap-y-1">
74+
<Button className="w-40">New Project</Button>
7575
<Button
76-
size="sm"
76+
className="w-40"
7777
onPress={() => {
7878
openFilePicker(true).then((folderPaths) => {
7979
console.log(folderPaths);
@@ -82,10 +82,10 @@ export default function NavMenu({ isMenuOpen }: { isMenuOpen: boolean }) {
8282
>
8383
Open Project
8484
</Button>
85-
<Button size="sm">Save Project</Button>
86-
<Button size="sm">New File</Button>
85+
<Button className="w-40">Save Project</Button>
86+
<Button className="w-40">New File</Button>
8787
<Button
88-
size="sm"
88+
className="w-40"
8989
onPress={() => {
9090
openFilePicker(false).then((filePaths) => {
9191
console.log(filePaths);
@@ -113,15 +113,14 @@ export default function NavMenu({ isMenuOpen }: { isMenuOpen: boolean }) {
113113
newVM?.setActiveView(view);
114114
return newVM;
115115
});
116-
117116
});
118117
});
119118
});
120119
}}
121120
>
122121
Open File
123122
</Button>
124-
<Button size="sm">Save File</Button>
123+
<Button className="w-40">Save File</Button>
125124
</div>
126125
)}
127126
</div>

components/view-display-area.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@ export default function ViewDisplayArea() {
3636
<div className="flex h-full w-full flex-col items-start justify-between gap-1.5 overflow-hidden rounded-xl bg-default p-2">
3737
<div className={`min-h-0 w-full flex-grow`}>
3838
{editorContext?.viewManager?.viewCount() === 0 ? (
39-
<div>
40-
<h1>Chisel Editor</h1>
41-
<p>Start by opening a file or project.</p>
39+
<div className="flex h-full w-full flex-col items-center justify-center gap-y-1 pb-12 text-default-foreground">
40+
<h1 className="text-center text-2xl font-bold">
41+
Welcome to Chisel Editor!
42+
</h1>
43+
<p className="text-center text-lg font-normal">
44+
Start by opening a file or project.
45+
</p>
4246
</div>
4347
) : (
4448
editorContext?.viewManager
@@ -73,7 +77,7 @@ export default function ViewDisplayArea() {
7377
>
7478
<AgentChatTerminalView
7579
ref={(ref) => {
76-
// if (ref) editorContext?.viewManager?.addView("2", ref);
80+
// TODO: Refactor this to use view manager
7781
}}
7882
/>
7983
</motion.div>

0 commit comments

Comments
 (0)