diff --git a/README.md b/README.md index 3cfd2647..74783319 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ | macOS | Linux | Windows | | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| [![GitHub Actions macOS Build Status](https://github.com/atomery/singlebox/workflows/macOS/badge.svg)](https://github.com/atomery/singlebox/actions?query=workflow%3AmacOS) | [![GitHub Actions Linux Build Status](https://github.com/atomery/singlebox/workflows/Linux/badge.svg)](https://github.com/atomery/singlebox/actions?query=workflow%3ALinux) | [![GitHub Actions Windows Build Status](https://github.com/atomery/singlebox/workflows/Windows/badge.svg)](https://github.com/atomery/singlebox/actions?query=workflow%3AWindows) | +| [![GitHub Actions macOS Build Status](https://github.com/tiddly-gittly/tiddlygit-desktop/workflows/macOS/badge.svg)](https://github.com/tiddly-gittly/tiddlygit-desktop/actions?query=workflow%3AmacOS) | [![GitHub Actions Linux Build Status](https://github.com/tiddly-gittly/tiddlygit-desktop/workflows/Linux/badge.svg)](https://github.com/tiddly-gittly/tiddlygit-desktop/actions?query=workflow%3ALinux) | [![GitHub Actions Windows Build Status](https://github.com/tiddly-gittly/tiddlygit-desktop/workflows/Windows/badge.svg)](https://github.com/tiddly-gittly/tiddlygit-desktop/actions?query=workflow%3AWindows) | **TiddlyGit** - Customizable personal knowledge-base with Github as unlimited storage and blogging platform. @@ -10,8 +10,6 @@ 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): @@ -61,3 +59,9 @@ npm run dist ``` + +## Credits + +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. Also the independent developer @quanglam2807 behind these great tools helps me a lot when I develop TiddlyGit. + +Current Icon is download from [iconsdb](https://www.iconsdb.com/custom-color/github-11-icon.html) under Creative Commons Attribution-NoDerivs 3.0 , if you are a designer, please feel free to contribute your ICON if you have a better idea. diff --git a/build-resources/icon.icns b/build-resources/icon.icns index 68f6edc8..587ff73a 100644 Binary files a/build-resources/icon.icns and b/build-resources/icon.icns differ diff --git a/build-resources/icon.ico b/build-resources/icon.ico index 43396d7d..a3c98b64 100644 Binary files a/build-resources/icon.ico and b/build-resources/icon.ico differ diff --git a/build-resources/icon.png b/build-resources/icon.png index ca41011f..90e5bdc7 100644 Binary files a/build-resources/icon.png and b/build-resources/icon.png differ diff --git a/build-resources/installer.nsh b/build-resources/installer.nsh index a02cca37..439093e0 100644 --- a/build-resources/installer.nsh +++ b/build-resources/installer.nsh @@ -1,28 +1,28 @@ -# add registry to define Singlebox as browser and mail client on Windows 10+ +# add registry to define TiddlyGit as browser and mail client on Windows 10+ # rewritten in NSH from https://github.com/minbrowser/min/blob/master/main/registryConfig.js # fix https://github.com/atomery/webcatalog/issues/784 # useful doc https://github.com/electron-userland/electron-builder/issues/837#issuecomment-614127460 # useful doc https://www.electron.build/configuration/nsis#custom-nsis-script !macro customInstall - WriteRegStr HKCU 'Software\RegisteredApplications' 'Singlebox' 'Software\Clients\StartMenuInternet\Singlebox\Capabilities' - WriteRegStr HKCU 'Software\Classes\Singlebox' '' 'Singlebox Browser Document' - WriteRegStr HKCU 'Software\Classes\Singlebox\Application' 'ApplicationIcon' '$appExe,0' - WriteRegStr HKCU 'Software\Classes\Singlebox\Application' 'ApplicationName' 'Singlebox' - WriteRegStr HKCU 'Software\Classes\Singlebox\Application' 'AppUserModelId' 'Singlebox' - WriteRegStr HKCU 'Software\Classes\Singlebox\DefaulIcon' 'ApplicationIcon' '$appExe,0' - WriteRegStr HKCU 'Software\Classes\Singlebox\shell\open\command' '' '"$appExe" "%1"' - WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\StartMenu' 'StartMenuInternet' 'Singlebox' - WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\URLAssociations' 'http' 'Singlebox' - WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\URLAssociations' 'https' 'Singlebox' - WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\Capabilities\URLAssociations' 'mailto' 'Singlebox' - WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\DefaultIcon' '' '$appExe,0' - WriteRegDWORD HKCU 'Software\Clients\StartMenuInternet\Singlebox\InstallInfo' 'IconsVisible' 1 - WriteRegStr HKCU 'Software\Clients\StartMenuInternet\Singlebox\shell\open\command' '' '$appExe' + WriteRegStr HKCU 'Software\RegisteredApplications' 'TiddlyGit' 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities' + WriteRegStr HKCU 'Software\Classes\TiddlyGit' '' 'TiddlyGit Browser Document' + WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'ApplicationIcon' '$appExe,0' + WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'ApplicationName' 'TiddlyGit' + WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'AppUserModelId' 'TiddlyGit' + WriteRegStr HKCU 'Software\Classes\TiddlyGit\DefaulIcon' 'ApplicationIcon' '$appExe,0' + WriteRegStr HKCU 'Software\Classes\TiddlyGit\shell\open\command' '' '"$appExe" "%1"' + WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\StartMenu' 'StartMenuInternet' 'TiddlyGit' + WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'http' 'TiddlyGit' + WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'https' 'TiddlyGit' + WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'mailto' 'TiddlyGit' + WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\DefaultIcon' '' '$appExe,0' + WriteRegDWORD HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\InstallInfo' 'IconsVisible' 1 + WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\shell\open\command' '' '$appExe' !macroend !macro customUnInstall - DeleteRegValue HKCU 'Software\RegisteredApplications' 'Singlebox' - DeleteRegKey HKCU 'Software\Classes\Singlebox' - DeleteRegKey HKCU 'Software\Clients\StartMenuInternet\Singlebox' + DeleteRegValue HKCU 'Software\RegisteredApplications' 'TiddlyGit' + DeleteRegKey HKCU 'Software\Classes\TiddlyGit' + DeleteRegKey HKCU 'Software\Clients\StartMenuInternet\TiddlyGit' !macroend diff --git a/dist.js b/dist.js index 84c3d267..54d523fb 100644 --- a/dist.js +++ b/dist.js @@ -55,8 +55,8 @@ switch (process.platform) { const options = { targets, config: { - appId: 'com.singlebox.app', - productName: 'Singlebox', + appId: 'com.tiddlygit.app', + productName: 'TiddlyGit', asar: true, files: ['!tests/**/*', '!docs/**/*', '!template/**/*'], extraFiles: [ @@ -128,7 +128,7 @@ const options = { const appPath = `${appOutDir}/${appName}.app`; return notarize({ - appBundleId: 'com.singlebox.app', + appBundleId: 'com.tiddlygit.app', appPath, appleId: process.env.APPLE_ID, appleIdPassword: process.env.APPLE_ID_PASSWORD, diff --git a/public/icon.png b/public/icon.png index 0beed374..ac7251ce 100644 Binary files a/public/icon.png and b/public/icon.png differ diff --git a/public/icon@2x.png b/public/icon@2x.png index dbe4b6d2..694f4b87 100644 Binary files a/public/icon@2x.png and b/public/icon@2x.png differ diff --git a/public/icon@3x.png b/public/icon@3x.png index 17e3cf2b..216d5d78 100644 Binary files a/public/icon@3x.png and b/public/icon@3x.png differ diff --git a/public/icon@4x.png b/public/icon@4x.png index d45bcd42..5b1850e1 100644 Binary files a/public/icon@4x.png and b/public/icon@4x.png differ diff --git a/public/icon@5x.png b/public/icon@5x.png index c2fb5d2a..1c15b8de 100644 Binary files a/public/icon@5x.png and b/public/icon@5x.png differ diff --git a/public/index.html b/public/index.html index c2b22cf6..c5890209 100755 --- a/public/index.html +++ b/public/index.html @@ -1,7 +1,7 @@ - Singlebox + TiddlyGit diff --git a/public/libs/create-menu.js b/public/libs/create-menu.js index 8ec407fe..085cca0d 100755 --- a/public/libs/create-menu.js +++ b/public/libs/create-menu.js @@ -333,16 +333,16 @@ function createMenu() { role: 'help', submenu: [ { - label: 'Singlebox Support', - click: () => shell.openExternal('https://atomery.com/support?app=singlebox'), + label: 'TiddlyGit Support', + click: () => shell.openExternal('https://atomery.com/support?app=tiddlygit'), }, { label: 'Report a Bug via GitHub...', - click: () => shell.openExternal('https://github.com/atomery/singlebox/issues'), + click: () => shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues'), }, { label: 'Request a New Feature via GitHub...', - click: () => shell.openExternal('https://github.com/atomery/singlebox/issues/new?template=feature.md&title=feature%3A+'), + click: () => shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues/new?template=feature.md&title=feature%3A+'), }, { label: 'Submit New App to Catalog...', @@ -350,7 +350,7 @@ function createMenu() { }, { label: 'Learn More...', - click: () => shell.openExternal('https://singleboxapp.com'), + click: () => shell.openExternal('https://tiddlygitapp.com'), }, ], }, @@ -377,10 +377,10 @@ function createMenu() { if (process.platform === 'darwin') { template.unshift({ - label: 'Singlebox', + label: 'TiddlyGit', submenu: [ { - label: 'About Singlebox', + label: 'About TiddlyGit', click: () => aboutWindow.show(), }, { type: 'separator' }, diff --git a/public/menubar.png b/public/menubar.png index 58ed299a..0431bf0b 100644 Binary files a/public/menubar.png and b/public/menubar.png differ diff --git a/public/menubar@2x.png b/public/menubar@2x.png index 5c062223..8db041a4 100644 Binary files a/public/menubar@2x.png and b/public/menubar@2x.png differ diff --git a/public/menubarTemplate.png b/public/menubarTemplate.png index 2215356e..2b1a88fa 100644 Binary files a/public/menubarTemplate.png and b/public/menubarTemplate.png differ diff --git a/public/menubarTemplate@2x.png b/public/menubarTemplate@2x.png index d468a24c..5e3e2e36 100644 Binary files a/public/menubarTemplate@2x.png and b/public/menubarTemplate@2x.png differ diff --git a/public/preload/add-workspace.js b/public/preload/add-workspace.js index 8faabfb5..deb2cb85 100644 --- a/public/preload/add-workspace.js +++ b/public/preload/add-workspace.js @@ -104,12 +104,12 @@ remote.getCurrentWebContents().on('context-menu', (e, info) => { }, { type: 'separator' }, { - label: 'Singlebox Support', - click: () => shell.openExternal('https://atomery.com/support?app=singlebox'), + label: 'TiddlyGit Support', + click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose'), }, { - label: 'Singlebox Website', - click: () => shell.openExternal('https://singleboxapp.com'), + label: 'TiddlyGit Website', + click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop'), }, { type: 'separator' }, { diff --git a/public/preload/view.js b/public/preload/view.js index 3ee43d66..49e8f9d2 100644 --- a/public/preload/view.js +++ b/public/preload/view.js @@ -176,12 +176,12 @@ const handleLoaded = (event) => { }, { type: 'separator' }, { - label: 'Singlebox Support', - click: () => shell.openExternal('https://atomery.com/support?app=singlebox'), + label: 'TiddlyGit Support', + click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose'), }, { - label: 'Singlebox Website', - click: () => shell.openExternal('https://singleboxapp.com'), + label: 'TiddlyGit Website', + click: () => shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop'), }, { type: 'separator' }, { diff --git a/public/windows/main.js b/public/windows/main.js index 000f675d..f2efa02b 100644 --- a/public/windows/main.js +++ b/public/windows/main.js @@ -45,7 +45,7 @@ const createAsync = () => new Promise((resolve) => { index: REACT_PATH, tray, preloadWindow: true, - tooltip: 'Singlebox', + tooltip: 'TiddlyGit', browserWindow: { x: menubarWindowState.x, y: menubarWindowState.y, @@ -99,14 +99,14 @@ const createAsync = () => new Promise((resolve) => { const contextMenu = Menu.buildFromTemplate([ { - label: 'Open Singlebox', + label: 'Open TiddlyGit', click: () => mb.showWindow(), }, { type: 'separator', }, { - label: 'About Singlebox', + label: 'About TiddlyGit', click: () => ipcMain.emit('request-show-about-window'), }, { type: 'separator' }, @@ -164,7 +164,7 @@ const createAsync = () => new Promise((resolve) => { height: mainWindowState.height, minHeight: 100, minWidth: 350, - title: 'Singlebox', + title: 'TiddlyGit', titleBarStyle: 'hidden', show: false, // manually set dock icon for AppImage diff --git a/src/components/dialog-about/index.js b/src/components/dialog-about/index.js index c8416f68..b10bac1a 100644 --- a/src/components/dialog-about/index.js +++ b/src/components/dialog-about/index.js @@ -60,8 +60,8 @@ const About = (props) => { return (
- Singlebox - Singlebox + TiddlyGit + TiddlyGit {
@@ -97,10 +97,23 @@ const About = (props) => { ❤ by requestOpenInBrowser('https://atomery.com?utm_source=singlebox_app')} + onClick={() => requestOpenInBrowser('https://onetwo.ren/wiki/')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://atomery.com?utm_source=singlebox_app'); + requestOpenInBrowser('https://onetwo.ren/wiki/'); + }} + role="link" + tabIndex="0" + className={classes.link} + > + Lin Onetwo + + and + requestOpenInBrowser('https://atomery.com?utm_source=tiddlygit')} + onKeyDown={(e) => { + if (e.key !== 'Enter') return; + requestOpenInBrowser('https://atomery.com?utm_source=tiddlygit'); }} role="link" tabIndex="0" diff --git a/src/components/dialog-preferences/index.js b/src/components/dialog-preferences/index.js index 54c36c0f..45d5b795 100644 --- a/src/components/dialog-preferences/index.js +++ b/src/components/dialog-preferences/index.js @@ -764,7 +764,7 @@ const Preferences = ({ If notifications don't show up, make sure you enable notifications in - macOS Preferences > Notifications > Singlebox + macOS Preferences > Notifications > TiddlyGit . @@ -780,7 +780,7 @@ const Preferences = ({ - WebCatalog supports notifications out of the box. + TiddlyGit supports notifications out of the box. But for some web apps, to receive notifications, you will need to manually configure additional web app settings. @@ -1208,12 +1208,12 @@ const Preferences = ({ - requestOpenInBrowser('https://singleboxapp.com?utm_source=singlebox_app')}> + requestOpenInBrowser('https://tiddlygitapp.com?utm_source=tiddlygit_app')}> - requestOpenInBrowser('https://atomery.com/support?app=singlebox&utm_source=singlebox_app')}> + requestOpenInBrowser('https://atomery.com/support?app=tiddlygit&utm_source=tiddlygit_app')}> diff --git a/src/components/dialog-preferences/list-item-default-browser.js b/src/components/dialog-preferences/list-item-default-browser.js index 4b2e5ad3..043d2d69 100644 --- a/src/components/dialog-preferences/list-item-default-browser.js +++ b/src/components/dialog-preferences/list-item-default-browser.js @@ -26,7 +26,7 @@ const ListItemDefaultBrowser = () => { const userChoicePath = `HKCU\\SOFTWARE\\Microsoft\\Windows\\Shell\\Associations\\URLAssociations\\${protocolName}\\UserChoice`; window.require('electron').remote.require('regedit').list([userChoicePath], (err, result) => { try { - setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'Singlebox'); + setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'TiddlyGit'); } catch (tryErr) { // eslint-disable-next-line no-console console.log(tryErr); @@ -55,13 +55,13 @@ const ListItemDefaultBrowser = () => { if (isDefault) { return ( - + ); } const sharedListItemText = ( - + ); // open ms-settings on Windows 10 diff --git a/src/components/dialog-preferences/list-item-default-mail-client.js b/src/components/dialog-preferences/list-item-default-mail-client.js index c0a23e90..386f9105 100644 --- a/src/components/dialog-preferences/list-item-default-mail-client.js +++ b/src/components/dialog-preferences/list-item-default-mail-client.js @@ -26,7 +26,7 @@ const ListItemDefaultMailClient = () => { const userChoicePath = `HKCU\\SOFTWARE\\Microsoft\\Windows\\Shell\\Associations\\URLAssociations\\${protocolName}\\UserChoice`; window.require('electron').remote.require('regedit').list([userChoicePath], (err, result) => { try { - setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'Singlebox'); + setIsDefault(!err && result[userChoicePath].values.ProgId.value === 'TiddlyGit'); } catch (tryErr) { // eslint-disable-next-line no-console console.log(tryErr); @@ -55,7 +55,7 @@ const ListItemDefaultMailClient = () => { if (isDefault) { return ( - + ); } @@ -66,7 +66,7 @@ const ListItemDefaultMailClient = () => { return ( // https://docs.microsoft.com/en-us/windows/uwp/launch-resume/launch-settings-app requestOpenInBrowser('ms-settings:defaultapps')}> - + ); @@ -74,7 +74,7 @@ const ListItemDefaultMailClient = () => { return ( - +