diff --git a/.gitignore b/.gitignore index b39f751a..cd32dc28 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ logs *.log npm-debug.log* +yarn.lock # Runtime data pids diff --git a/README.md b/README.md index 106539ad..3cfd2647 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ TiddlyGit is a cross-platform desktop app that make [nodejs-TiddlyWiki](https://github.com/Jermolene/TiddlyWiki5#installing-tiddlywiki-on-nodejs) easy to access. +The desktop app shell is based on [https://github.com/atomery/singlebox](atomery/singlebox) and [atomery/webcatalog](https://github.com/atomery/webcatalog), they provide lots of utils around website-generated-app, much powerful than generating app from website simply using Chrome. + ### Why Github? Because Github is one of the best free civil [BaaS](https://www.alibabacloud.com/blog/backend-as-a-service-baas-for-efficient-software-development_519851): diff --git a/public/libs/create-menu.js b/public/libs/create-menu.js index 40320b61..8ec407fe 100755 --- a/public/libs/create-menu.js +++ b/public/libs/create-menu.js @@ -311,8 +311,19 @@ function createMenu() { submenu: [ { role: 'minimize' }, { role: 'close' }, - { role: 'minimize' }, - { role: 'zoom' }, + // role: 'zoom' is only supported on macOS + process.platform === 'darwin' ? { + role: 'zoom', + } : { + label: 'Zoom', + click: () => { + const win = mainWindow.get(); + + if (win != null) { + win.maximize(); + } + }, + }, { type: 'separator' }, { role: 'front' }, { type: 'separator' }, diff --git a/public/preload/view.js b/public/preload/view.js index 5768b83e..fc041c34 100644 --- a/public/preload/view.js +++ b/public/preload/view.js @@ -334,7 +334,6 @@ webFrame.executeJavaScript(` notif.addEventListener('click', () => { window.postMessage({ type: 'focus-workspace', workspaceId: "${workspaceId}" }); }); - console.log(notif); return notif; } return null; diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..f45d8f11 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} diff --git a/src/listeners/index.js b/src/listeners/index.js index 24818cd3..9dead92c 100755 --- a/src/listeners/index.js +++ b/src/listeners/index.js @@ -48,16 +48,16 @@ const loadListeners = (store) => { store.dispatch(setWorkspace(id, value)); }); - ipcRenderer.on('set-workspaces', () => { - store.dispatch(setWorkspaces()); + ipcRenderer.on('set-workspaces', (e, newWorkspaces) => { + store.dispatch(setWorkspaces(newWorkspaces)); }); ipcRenderer.on('set-workspace-meta', (e, id, value) => { store.dispatch(setWorkspaceMeta(id, value)); }); - ipcRenderer.on('set-workspace-metas', () => { - store.dispatch(setWorkspaceMetas()); + ipcRenderer.on('set-workspace-metas', (newWorkspaceMetas) => { + store.dispatch(setWorkspaceMetas(newWorkspaceMetas)); }); ipcRenderer.on('update-can-go-back', (e, value) => {