Skip to content

Commit 2fb44b3

Browse files
committed
bugfix (await) & dev env improvement.
1 parent 4bb375a commit 2fb44b3

File tree

6 files changed

+32
-17
lines changed

6 files changed

+32
-17
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ RUN apt -y update && apt install -y --no-install-recommends \
55
libnotify-dev libasound2-dev libcap-dev \
66
libcups2-dev libxtst-dev \
77
libxss1 libnss3-dev gcc-multilib g++-multilib curl \
8-
gperf bison python3-dbusmock
8+
gperf bison python3-dbusmock

.devcontainer/devcontainer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
"stylelint.vscode-stylelint",
2929
"mikestead.dotenv",
3030
"bradlc.vscode-tailwindcss",
31-
"csstools.postcss"
31+
"csstools.postcss",
32+
"ms-azuretools.vscode-docker",
33+
"redhat.vscode-yaml"
3234
],
3335
"settings": {
3436
"editor.formatOnSave": true

.github/workflows/electron-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Electron App Build/release
33
on:
44
push:
55
tags:
6-
- 'v*'
6+
- "v*"
77

88
jobs:
99
release:

.vscode/settings.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
"[json]": {
1010
"editor.defaultFormatter": "esbenp.prettier-vscode"
1111
},
12+
"[jsonc]": {
13+
"editor.defaultFormatter": "esbenp.prettier-vscode",
14+
"editor.quickSuggestions": {
15+
"strings": true
16+
},
17+
"editor.suggest.insertMode": "replace"
18+
},
19+
"[yaml]": {
20+
"editor.defaultFormatter": "redhat.vscode-yaml"
21+
},
1222
"[typescriptreact]": {
1323
"editor.defaultFormatter": "esbenp.prettier-vscode"
1424
}

electron-builder.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ productName: Leavepad
33
directories:
44
buildResources: build
55
files:
6-
- '!**/.vscode/*'
7-
- '!src/*'
8-
- '!electron.vite.config.{js,ts,mjs,cjs}'
9-
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
10-
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
11-
- '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
6+
- "!**/.vscode/*"
7+
- "!src/*"
8+
- "!electron.vite.config.{js,ts,mjs,cjs}"
9+
- "!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}"
10+
- "!{.env,.env.*,.npmrc,pnpm-lock.yaml}"
11+
- "!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}"
1212
asarUnpack:
1313
- resources/**
1414
win:

src/renderer/src/App.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ function App(): JSX.Element {
108108
document.fonts.load('14px HackGen')
109109
document.fonts.load('14px NOTONOTO')
110110

111-
window.addEventListener('resize', () => {
111+
window.addEventListener('resize', async () => {
112112
editorRef.current?.layout()
113113

114-
window.api.updateAppState({
114+
await window.api.updateAppState({
115115
isSidebarOpen: isSidebarOpen,
116116
windowWidth: window.outerWidth,
117117
windowHeight: window.outerHeight,
@@ -164,7 +164,7 @@ function App(): JSX.Element {
164164
updatedAt: getTime(new Date())
165165
}
166166

167-
window.api.updateNote(willUpdateNote)
167+
await window.api.updateNote(willUpdateNote)
168168
const notes = await window.api.getNotes()
169169
setNotes(sortNotes(notes))
170170
}
@@ -193,7 +193,10 @@ function App(): JSX.Element {
193193
updatedAt: getTime(new Date())
194194
}
195195

196-
window.api.updateNote(willUpdateNote)
196+
// Update note.
197+
await window.api.updateNote(willUpdateNote)
198+
199+
// Get all notes after updating note.
197200
const notes = await window.api.getNotes()
198201
setNotes(sortNotes(notes))
199202

@@ -212,10 +215,10 @@ function App(): JSX.Element {
212215
)
213216
}
214217

215-
const onGlobalSettingsSubmit = (value: NoteEditorSettings) => {
218+
const onGlobalSettingsSubmit = async (value: NoteEditorSettings) => {
216219
setCurrentNoteEditorSettings(value)
217220
i18n.changeLanguage(value.language)
218-
window.api.updateSettings(value)
221+
await window.api.updateSettings(value)
219222
}
220223

221224
if (currentNote == null) {
@@ -242,10 +245,10 @@ function App(): JSX.Element {
242245
return notes
243246
}
244247

245-
const onClickSidebarMinimize = () => {
248+
const onClickSidebarMinimize = async () => {
246249
setSidebarOpen(!isSidebarOpen)
247250

248-
window.api.updateAppState({
251+
await window.api.updateAppState({
249252
isSidebarOpen: !isSidebarOpen,
250253
windowWidth: window.outerWidth,
251254
windowHeight: window.outerHeight,

0 commit comments

Comments
 (0)