mirror of
https://github.com/tiddly-gittly/TidGi-Desktop.git
synced 2025-12-05 18:20:39 -08:00
refactor: rename tiddlygit to tidgi in code
This commit is contained in:
parent
6c1c14aa3a
commit
3cc2289937
36 changed files with 232 additions and 387 deletions
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
|
|
@ -1,7 +1,7 @@
|
||||||
blank_issues_enabled: true
|
blank_issues_enabled: true
|
||||||
contact_links:
|
contact_links:
|
||||||
- name: Discuss features Or Ask Questions 讨论现有功能或问问题
|
- name: Discuss features Or Ask Questions 讨论现有功能或问问题
|
||||||
url: https://github.com/tiddly-gittly/TiddlyGit-Desktop/discussions
|
url: https://github.com/tiddly-gittly/TidGi-Desktop/discussions
|
||||||
about: Question belongs to Discussion. 使用上的问题就不要发在 issue 了,发到 Discussion 吧
|
about: Question belongs to Discussion. 使用上的问题就不要发在 issue 了,发到 Discussion 吧
|
||||||
- name: Email
|
- name: Email
|
||||||
url: mailto:linonetwo012@gmail.com
|
url: mailto:linonetwo012@gmail.com
|
||||||
|
|
|
||||||
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
|
@ -13,7 +13,8 @@
|
||||||
"subwiki",
|
"subwiki",
|
||||||
"subwiki's",
|
"subwiki's",
|
||||||
"tiddlygit",
|
"tiddlygit",
|
||||||
"tiddlywiki's"
|
"tiddlywiki's",
|
||||||
|
"tidgi"
|
||||||
],
|
],
|
||||||
"i18n-ally.sourceLanguage": "zh",
|
"i18n-ally.sourceLanguage": "zh",
|
||||||
"i18n-ally.localesPaths": "localization/locales",
|
"i18n-ally.localesPaths": "localization/locales",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Privacy Policy
|
# Privacy Policy
|
||||||
|
|
||||||
TiddlyGit respects your privacy and does not track or log anything from you.
|
TidGi respects your privacy and does not track or log anything from you.
|
||||||
|
|
||||||
Still, the app does use third party services that may collect information used to identify you.
|
Still, the app does use third party services that may collect information used to identify you.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,28 +1,28 @@
|
||||||
# add registry to define TiddlyGit as browser and mail client on Windows 10+
|
# add registry to define TidGi as browser and mail client on Windows 10+
|
||||||
# rewritten in NSH from https://github.com/minbrowser/min/blob/master/main/registryConfig.js
|
# rewritten in NSH from https://github.com/minbrowser/min/blob/master/main/registryConfig.js
|
||||||
# fix https://github.com/atomery/webcatalog/issues/784
|
# fix https://github.com/atomery/webcatalog/issues/784
|
||||||
# useful doc https://github.com/electron-userland/electron-builder/issues/837#issuecomment-614127460
|
# useful doc https://github.com/electron-userland/electron-builder/issues/837#issuecomment-614127460
|
||||||
# useful doc https://www.electron.build/configuration/nsis#custom-nsis-script
|
# useful doc https://www.electron.build/configuration/nsis#custom-nsis-script
|
||||||
|
|
||||||
!macro customInstall
|
!macro customInstall
|
||||||
WriteRegStr HKCU 'Software\RegisteredApplications' 'TiddlyGit' 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities'
|
WriteRegStr HKCU 'Software\RegisteredApplications' 'TidGi' 'Software\Clients\StartMenuInternet\TidGi\Capabilities'
|
||||||
WriteRegStr HKCU 'Software\Classes\TiddlyGit' '' 'TiddlyGit Browser Document'
|
WriteRegStr HKCU 'Software\Classes\TidGi' '' 'TidGi Browser Document'
|
||||||
WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'ApplicationIcon' '$appExe,0'
|
WriteRegStr HKCU 'Software\Classes\TidGi\Application' 'ApplicationIcon' '$appExe,0'
|
||||||
WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'ApplicationName' 'TiddlyGit'
|
WriteRegStr HKCU 'Software\Classes\TidGi\Application' 'ApplicationName' 'TidGi'
|
||||||
WriteRegStr HKCU 'Software\Classes\TiddlyGit\Application' 'AppUserModelId' 'TiddlyGit'
|
WriteRegStr HKCU 'Software\Classes\TidGi\Application' 'AppUserModelId' 'TidGi'
|
||||||
WriteRegStr HKCU 'Software\Classes\TiddlyGit\DefaulIcon' 'ApplicationIcon' '$appExe,0'
|
WriteRegStr HKCU 'Software\Classes\TidGi\DefaulIcon' 'ApplicationIcon' '$appExe,0'
|
||||||
WriteRegStr HKCU 'Software\Classes\TiddlyGit\shell\open\command' '' '"$appExe" "%1"'
|
WriteRegStr HKCU 'Software\Classes\TidGi\shell\open\command' '' '"$appExe" "%1"'
|
||||||
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\StartMenu' 'StartMenuInternet' 'TiddlyGit'
|
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TidGi\Capabilities\StartMenu' 'StartMenuInternet' 'TidGi'
|
||||||
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'http' 'TiddlyGit'
|
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TidGi\Capabilities\URLAssociations' 'http' 'TidGi'
|
||||||
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'https' 'TiddlyGit'
|
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TidGi\Capabilities\URLAssociations' 'https' 'TidGi'
|
||||||
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\Capabilities\URLAssociations' 'mailto' 'TiddlyGit'
|
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TidGi\Capabilities\URLAssociations' 'mailto' 'TidGi'
|
||||||
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\DefaultIcon' '' '$appExe,0'
|
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TidGi\DefaultIcon' '' '$appExe,0'
|
||||||
WriteRegDWORD HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\InstallInfo' 'IconsVisible' 1
|
WriteRegDWORD HKCU 'Software\Clients\StartMenuInternet\TidGi\InstallInfo' 'IconsVisible' 1
|
||||||
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TiddlyGit\shell\open\command' '' '$appExe'
|
WriteRegStr HKCU 'Software\Clients\StartMenuInternet\TidGi\shell\open\command' '' '$appExe'
|
||||||
!macroend
|
!macroend
|
||||||
|
|
||||||
!macro customUnInstall
|
!macro customUnInstall
|
||||||
DeleteRegValue HKCU 'Software\RegisteredApplications' 'TiddlyGit'
|
DeleteRegValue HKCU 'Software\RegisteredApplications' 'TidGi'
|
||||||
DeleteRegKey HKCU 'Software\Classes\TiddlyGit'
|
DeleteRegKey HKCU 'Software\Classes\TidGi'
|
||||||
DeleteRegKey HKCU 'Software\Clients\StartMenuInternet\TiddlyGit'
|
DeleteRegKey HKCU 'Software\Clients\StartMenuInternet\TidGi'
|
||||||
!macroend
|
!macroend
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ For example: `tiddlywiki`
|
||||||
1. Add `ExternalsPlugin` in webpack.plugins.js (maybe optional for some deps, tiddlywiki needs this because its custom `require` can't require things that is bundled by webpack. `dugite` don't need this step)
|
1. Add `ExternalsPlugin` in webpack.plugins.js (maybe optional for some deps, tiddlywiki needs this because its custom `require` can't require things that is bundled by webpack. `dugite` don't need this step)
|
||||||
1. Add a `await fs.copy(path.join(projectRoot, 'node_modules/@tiddlygit/tiddlywiki')` in `scripts/afterPack.js` , to copy things to resource folder, that is outside of asar, so it can be used by the worker_thread in electron
|
1. Add a `await fs.copy(path.join(projectRoot, 'node_modules/@tiddlygit/tiddlywiki')` in `scripts/afterPack.js` , to copy things to resource folder, that is outside of asar, so it can be used by the worker_thread in electron
|
||||||
|
|
||||||
## How to add plugin that only execute inside TiddlyGit
|
## How to add plugin that only execute inside TidGi
|
||||||
|
|
||||||
Edit `src/services/wiki/wikiWorker.ts`, add another line like:
|
Edit `src/services/wiki/wikiWorker.ts`, add another line like:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
Feature: Open
|
Feature: Open
|
||||||
As a user of TiddlyGit
|
As a user of TidGi
|
||||||
I want to open the app
|
I want to open the app
|
||||||
So I can be more productive
|
So I can be more productive
|
||||||
|
|
||||||
Scenario: Opening TiddlyGit
|
Scenario: Opening TidGi
|
||||||
Given the app is launched
|
Given the app is launched
|
||||||
Then the element "#new-user-tip" is on the page
|
Then the element "#new-user-tip" is on the page
|
||||||
Then the element "#add-workspace-button" is on the page
|
Then the element "#add-workspace-button" is on the page
|
||||||
|
|
@ -12,7 +12,7 @@ Feature: Open
|
||||||
Given the app is launched
|
Given the app is launched
|
||||||
Then the element "#add-workspace-button" is on the page
|
Then the element "#add-workspace-button" is on the page
|
||||||
Then click on this element
|
Then click on this element
|
||||||
Then "添加工作区 tiddlygit-dev" window show up
|
Then "添加工作区 tidgi-dev" window show up
|
||||||
|
|
||||||
Scenario: Opening Preferences Page
|
Scenario: Opening Preferences Page
|
||||||
Given the app is launched
|
Given the app is launched
|
||||||
|
|
|
||||||
|
|
@ -2,29 +2,29 @@
|
||||||
import { setWorldConstructor, Given, Then, When } from '@cucumber/cucumber';
|
import { setWorldConstructor, Given, Then, When } from '@cucumber/cucumber';
|
||||||
import { delay } from 'bluebird';
|
import { delay } from 'bluebird';
|
||||||
import { expect } from 'chai';
|
import { expect } from 'chai';
|
||||||
import { TiddlyGitWorld } from '../supports/world';
|
import { TidGiWorld } from '../supports/world';
|
||||||
|
|
||||||
setWorldConstructor(TiddlyGitWorld);
|
setWorldConstructor(TidGiWorld);
|
||||||
|
|
||||||
Given('the app is launched', async function (this: TiddlyGitWorld) {
|
Given('the app is launched', async function (this: TidGiWorld) {
|
||||||
await delay(100);
|
await delay(100);
|
||||||
await this.start();
|
await this.start();
|
||||||
const windowCount = await this.app?.client?.getWindowCount();
|
const windowCount = await this.app?.client?.getWindowCount();
|
||||||
expect(windowCount).equal(1);
|
expect(windowCount).equal(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
Then('the element {string} is on the page', async function (this: TiddlyGitWorld, elementSelector: string) {
|
Then('the element {string} is on the page', async function (this: TidGiWorld, elementSelector: string) {
|
||||||
const result = await this.getElement(elementSelector);
|
const result = await this.getElement(elementSelector);
|
||||||
expect(result).to.not.be.undefined;
|
expect(result).to.not.be.undefined;
|
||||||
this.updateContext({ previousElement: result });
|
this.updateContext({ previousElement: result });
|
||||||
});
|
});
|
||||||
Then('click on this element', async function (this: TiddlyGitWorld) {
|
Then('click on this element', async function (this: TidGiWorld) {
|
||||||
expect(this.context?.previousElement).to.not.be.undefined;
|
expect(this.context?.previousElement).to.not.be.undefined;
|
||||||
if (this.context?.previousElement !== undefined) {
|
if (this.context?.previousElement !== undefined) {
|
||||||
await this.context.previousElement.click();
|
await this.context.previousElement.click();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Then('click on {string} element', async function (this: TiddlyGitWorld, elementSelector: string) {
|
Then('click on {string} element', async function (this: TidGiWorld, elementSelector: string) {
|
||||||
const result = await this.getElement(elementSelector);
|
const result = await this.getElement(elementSelector);
|
||||||
expect(result).to.not.be.undefined;
|
expect(result).to.not.be.undefined;
|
||||||
if (result !== undefined) {
|
if (result !== undefined) {
|
||||||
|
|
@ -32,7 +32,7 @@ Then('click on {string} element', async function (this: TiddlyGitWorld, elementS
|
||||||
await result.click();
|
await result.click();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
Then('{string} window show up', async function (this: TiddlyGitWorld, windowName: string) {
|
Then('{string} window show up', async function (this: TidGiWorld, windowName: string) {
|
||||||
// await delay(1000);
|
// await delay(1000);
|
||||||
const windowCount = await this.app?.client?.getWindowCount();
|
const windowCount = await this.app?.client?.getWindowCount();
|
||||||
expect(windowCount).equal(2);
|
expect(windowCount).equal(2);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ import fs from 'fs-extra';
|
||||||
|
|
||||||
import { DEFAULT_WIKI_FOLDER } from '../../src/constants/paths';
|
import { DEFAULT_WIKI_FOLDER } from '../../src/constants/paths';
|
||||||
import { SETTINGS_FOLDER } from '../../src/constants/appPaths';
|
import { SETTINGS_FOLDER } from '../../src/constants/appPaths';
|
||||||
import { TiddlyGitWorld } from './world';
|
import { TidGiWorld } from './world';
|
||||||
|
|
||||||
Before(async function () {
|
Before(async function () {
|
||||||
// clear setting folder
|
// clear setting folder
|
||||||
|
|
@ -11,7 +11,7 @@ Before(async function () {
|
||||||
await fs.remove(DEFAULT_WIKI_FOLDER);
|
await fs.remove(DEFAULT_WIKI_FOLDER);
|
||||||
});
|
});
|
||||||
|
|
||||||
After(async function (this: TiddlyGitWorld, testCase) {
|
After(async function (this: TidGiWorld, testCase) {
|
||||||
// print logs if test failed
|
// print logs if test failed
|
||||||
// if (this.app !== undefined && testCase.result?.status === Status.FAILED) {
|
// if (this.app !== undefined && testCase.result?.status === Status.FAILED) {
|
||||||
// console.log('main:\n---\n');
|
// console.log('main:\n---\n');
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,15 @@ import { Application } from 'spectron';
|
||||||
setDefaultTimeout(30 * 1000);
|
setDefaultTimeout(30 * 1000);
|
||||||
|
|
||||||
const projectRoot = path.join(__dirname, '..', '..');
|
const projectRoot = path.join(__dirname, '..', '..');
|
||||||
const packageName = process.env.npm_product_name ?? 'TiddlyGit';
|
const packageName = process.env.npm_product_name ?? 'TidGi';
|
||||||
|
|
||||||
interface IContext {
|
interface IContext {
|
||||||
previousElement?: WebdriverIO.Element;
|
previousElement?: WebdriverIO.Element;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Execution environment for TiddlyGit in cucumber-js
|
* Execution environment for TidGi in cucumber-js
|
||||||
*/
|
*/
|
||||||
export class TiddlyGitWorld extends World {
|
export class TidGiWorld extends World {
|
||||||
/** our electron app instance created by spectron */
|
/** our electron app instance created by spectron */
|
||||||
public app?: Application;
|
public app?: Application;
|
||||||
/** store selected element and other things, so subsequent cucumber statement can get context */
|
/** store selected element and other things, so subsequent cucumber statement can get context */
|
||||||
|
|
|
||||||
|
|
@ -5,16 +5,16 @@ const { version } = packageJson;
|
||||||
|
|
||||||
const config = {
|
const config = {
|
||||||
packagerConfig: {
|
packagerConfig: {
|
||||||
name: 'TiddlyGit',
|
name: 'TidGi',
|
||||||
executableName: 'TiddlyGit',
|
executableName: 'TidGi',
|
||||||
win32metadata: {
|
win32metadata: {
|
||||||
CompanyName: 'TiddlyWiki Community',
|
CompanyName: 'TiddlyWiki Community',
|
||||||
OriginalFilename: 'TiddlyGit Desktop',
|
OriginalFilename: 'TidGi Desktop',
|
||||||
},
|
},
|
||||||
protocols: [
|
protocols: [
|
||||||
{
|
{
|
||||||
name: 'TiddlyGit Launch Protocol',
|
name: 'TidGi Launch Protocol',
|
||||||
schemes: ['tiddlygit'],
|
schemes: ['tidgi'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
icon: 'build-resources/icon.icns',
|
icon: 'build-resources/icon.icns',
|
||||||
|
|
@ -28,7 +28,7 @@ const config = {
|
||||||
icon: 'build-resources/icon.icns',
|
icon: 'build-resources/icon.icns',
|
||||||
electronLanguages: ['zh_CN', 'en', 'ja'],
|
electronLanguages: ['zh_CN', 'en', 'ja'],
|
||||||
},
|
},
|
||||||
appBundleId: 'com.tiddlygit',
|
appBundleId: 'com.tidgi',
|
||||||
afterPrune: ['scripts/afterPack.js'],
|
afterPrune: ['scripts/afterPack.js'],
|
||||||
},
|
},
|
||||||
makers: [
|
makers: [
|
||||||
|
|
@ -37,7 +37,7 @@ const config = {
|
||||||
platforms: ['win32'],
|
platforms: ['win32'],
|
||||||
config: (arch) => {
|
config: (arch) => {
|
||||||
return {
|
return {
|
||||||
setupExe: `Install-TiddlyGit-${version}-Windows-${arch}.exe`,
|
setupExe: `Install-TidGi-${version}-Windows-${arch}.exe`,
|
||||||
setupIcon: 'build-resources/icon-installer.ico',
|
setupIcon: 'build-resources/icon-installer.ico',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,12 @@
|
||||||
"Preferences": "Pref..."
|
"Preferences": "Pref..."
|
||||||
},
|
},
|
||||||
"ContextMenu": {
|
"ContextMenu": {
|
||||||
"OpenTiddlyGit": "Open TiddlyGit",
|
"OpenTidGi": "Open TidGi",
|
||||||
"OpenTiddlyGitMenuBar": "Open TiddlyGit MenuBar",
|
"OpenTidGiMenuBar": "Open TidGi MenuBar",
|
||||||
"OpenLinkInNewWindow": "Open Link in New Window",
|
"OpenLinkInNewWindow": "Open Link in New Window",
|
||||||
"Preferences": "Preferences...",
|
"Preferences": "Preferences...",
|
||||||
"TiddlyGitSupport": "TiddlyGit Support",
|
"TidGiSupport": "TidGi Support",
|
||||||
"TiddlyGitWebsite": "TiddlyGit Website",
|
"TidGiWebsite": "TidGi Website",
|
||||||
"Quit": "Quit",
|
"Quit": "Quit",
|
||||||
"Notifications": "Notifications...",
|
"Notifications": "Notifications...",
|
||||||
"More": "More",
|
"More": "More",
|
||||||
|
|
@ -117,7 +117,7 @@
|
||||||
"GitTokenDescription": "The credentials used to log in to Git. Will expire after a certain period of time",
|
"GitTokenDescription": "The credentials used to log in to Git. Will expire after a certain period of time",
|
||||||
"NoGitInfoAlert": "You haven't selected an online Git repo address, or you haven't successfully logged in to your Github account. Click the Create button will create a local wiki that will not be automatically sync to Github. Please be aware.",
|
"NoGitInfoAlert": "You haven't selected an online Git repo address, or you haven't successfully logged in to your Github account. Click the Create button will create a local wiki that will not be automatically sync to Github. Please be aware.",
|
||||||
"LocalWorkspace": "Local Workspace",
|
"LocalWorkspace": "Local Workspace",
|
||||||
"LocalWorkspaceDescription": "Only use locally, fully control your own data. TiddlyGit will create a local git backup system for you, allowing you to go back to the previous versions of tiddlers, but all contents will be lost when the local folder is deleted.",
|
"LocalWorkspaceDescription": "Only use locally, fully control your own data. TidGi will create a local git backup system for you, allowing you to go back to the previous versions of tiddlers, but all contents will be lost when the local folder is deleted.",
|
||||||
"SyncedWorkspace": "Synced Workspace",
|
"SyncedWorkspace": "Synced Workspace",
|
||||||
"SyncedWorkspaceDescription": "To synchronize to an online storage service (such as Github), you need to login to a storage service or enter your login credentials, and have a good network connection. You can sync data across devices, and you still own the data when you use a trusted storage service. And even after the folder is accidentally deleted, you can still download the data from the online service to the local again.",
|
"SyncedWorkspaceDescription": "To synchronize to an online storage service (such as Github), you need to login to a storage service or enter your login credentials, and have a good network connection. You can sync data across devices, and you still own the data when you use a trusted storage service. And even after the folder is accidentally deleted, you can still download the data from the online service to the local again.",
|
||||||
"GitEmailDescription": "Email used for Git commit, and is used to count daily activities on Github and other online git services",
|
"GitEmailDescription": "Email used for Git commit, and is used to count daily activities on Github and other online git services",
|
||||||
|
|
@ -228,7 +228,7 @@
|
||||||
"HideMenuBarDetail": "Hide the menu bar unless the Alt+M is pressed.",
|
"HideMenuBarDetail": "Hide the menu bar unless the Alt+M is pressed.",
|
||||||
"AttachToTaskbar": "Attach to taskbar",
|
"AttachToTaskbar": "Attach to taskbar",
|
||||||
"AttachToMenuBar": "Attach to menu bar",
|
"AttachToMenuBar": "Attach to menu bar",
|
||||||
"AttachToMenuBarTip": "Make a small TiddlyGit popup window that pop when you click appbar mini icon. Tip: Right-click on mini app icon to access context menu.",
|
"AttachToMenuBarTip": "Make a small TidGi popup window that pop when you click appbar mini icon. Tip: Right-click on mini app icon to access context menu.",
|
||||||
"OpenLogFolder": "Open the Log folder",
|
"OpenLogFolder": "Open the Log folder",
|
||||||
"OpenLogFolderDetail": "When reporting a problem, please open the latest .log file in the folder and send its content to the developer, or paste it to pastebin.com and then paste the URL into the Github Issue",
|
"OpenLogFolderDetail": "When reporting a problem, please open the latest .log file in the folder and send its content to the developer, or paste it to pastebin.com and then paste the URL into the Github Issue",
|
||||||
"SystemDefalutTheme": "System Defalut Theme",
|
"SystemDefalutTheme": "System Defalut Theme",
|
||||||
|
|
@ -279,25 +279,25 @@
|
||||||
"Translatium": "Translatium",
|
"Translatium": "Translatium",
|
||||||
"WebCatalog": "WebCatalog",
|
"WebCatalog": "WebCatalog",
|
||||||
"WebCatalogIntro": "Magically turn any websites into cross platform apps. Work more productively and forget about switching tabs.",
|
"WebCatalogIntro": "Magically turn any websites into cross platform apps. Work more productively and forget about switching tabs.",
|
||||||
"WebCatalogEngineIntro": "WebCatalog is the initial code founder of TiddlyGit, we reuse lots of important code from the open-source WebCatalog, many thanks to WebCatalog and its author Quang Lam",
|
"WebCatalogEngineIntro": "WebCatalog is the initial code founder of TidGi, we reuse lots of important code from the open-source WebCatalog, many thanks to WebCatalog and its author Quang Lam",
|
||||||
"WebSite": "Website",
|
"WebSite": "Website",
|
||||||
"Support": "Support",
|
"Support": "Support",
|
||||||
"WikiMetaData": "Wiki Metadata",
|
"WikiMetaData": "Wiki Metadata",
|
||||||
"WikiMetaDataDescription": "Config Wiki metadata likes starting parameters",
|
"WikiMetaDataDescription": "Config Wiki metadata likes starting parameters",
|
||||||
"SwipeWithThreeFingersToNavigateDescription": "Navigate between pages with 3-finger gestures. Swipe left to go back or swipe right to go forward.<br/>To enable it, you also need to change<3>macOS Preferences → TrackPad → More Gestures → Swipe between page</3>to<5>Swipe with three fingers</5>or<7>Swipe with two or three fingers.</7>",
|
"SwipeWithThreeFingersToNavigateDescription": "Navigate between pages with 3-finger gestures. Swipe left to go back or swipe right to go forward.<br/>To enable it, you also need to change<3>macOS Preferences → TrackPad → More Gestures → Swipe between page</3>to<5>Swipe with three fingers</5>or<7>Swipe with two or three fingers.</7>",
|
||||||
"TestNotificationDescription": "<0>If notifications dont show up, make sure you enable notifications in<1>macOS Preferences → Notifications → TiddlyGit</1>.</0>",
|
"TestNotificationDescription": "<0>If notifications dont show up, make sure you enable notifications in<1>macOS Preferences → Notifications → TidGi</1>.</0>",
|
||||||
"HowToEnableNotifications": "<0>TiddlyGit supports notifications out of the box. But for some cases, to receive notifications, you will need to manually configure additional web app settings.</0><1>Learn more</1><2>.</2>",
|
"HowToEnableNotifications": "<0>TidGi supports notifications out of the box. But for some cases, to receive notifications, you will need to manually configure additional web app settings.</0><1>Learn more</1><2>.</2>",
|
||||||
"IgnoreCertificateErrorsDescription": "<0>Not recommended. </0><1>Learn more</1>.",
|
"IgnoreCertificateErrorsDescription": "<0>Not recommended. </0><1>Learn more</1>.",
|
||||||
"OpenMetaDataFolder": "Open the metadata folder of TiddlyGit workspace",
|
"OpenMetaDataFolder": "Open the metadata folder of TidGi workspace",
|
||||||
"OpenMetaDataFolderDetail": "TiddlyWiki's data and TiddlyGit's workspace metadata are stored separately. TiddlyGit's metadata includes workspace settings, etc., which are stored in this folder in JSON format.",
|
"OpenMetaDataFolderDetail": "TiddlyWiki's data and TidGi's workspace metadata are stored separately. TidGi's metadata includes workspace settings, etc., which are stored in this folder in JSON format.",
|
||||||
"HideSideBar": "Hide SideBar",
|
"HideSideBar": "Hide SideBar",
|
||||||
"HideTitleBar": "Hide Title Bar",
|
"HideTitleBar": "Hide Title Bar",
|
||||||
"ToggleMenuBar": "Toggle Menu Bar",
|
"ToggleMenuBar": "Toggle Menu Bar",
|
||||||
"NoAttach": "Resume Window Mode",
|
"NoAttach": "Resume Window Mode",
|
||||||
"MenubarAlwaysOnTop": "Menubar Always on top",
|
"MenubarAlwaysOnTop": "Menubar Always on top",
|
||||||
"MenubarAlwaysOnTopDetail": "Keep TiddlyGit’s Menubar always on top of other windows, and will not be covered by other windows",
|
"MenubarAlwaysOnTopDetail": "Keep TidGi’s Menubar always on top of other windows, and will not be covered by other windows",
|
||||||
"AlwaysOnTop": "Always on top",
|
"AlwaysOnTop": "Always on top",
|
||||||
"AlwaysOnTopDetail": "Keep TiddlyGit’s main window always on top of other windows, and will not be covered by other windows",
|
"AlwaysOnTopDetail": "Keep TidGi’s main window always on top of other windows, and will not be covered by other windows",
|
||||||
"RequireRestart": "Need to restart",
|
"RequireRestart": "Need to restart",
|
||||||
"ChooseLanguage": "Choose Language 选择语言"
|
"ChooseLanguage": "Choose Language 选择语言"
|
||||||
},
|
},
|
||||||
|
|
@ -336,8 +336,8 @@
|
||||||
"RequestFeatureViaGithub": "Request a New Feature via GitHub...",
|
"RequestFeatureViaGithub": "Request a New Feature via GitHub...",
|
||||||
"LearnMore": "Learn More...",
|
"LearnMore": "Learn More...",
|
||||||
"Edit": "Edit",
|
"Edit": "Edit",
|
||||||
"TiddlyGit": "TiddlyGit",
|
"TidGi": "TidGi",
|
||||||
"TiddlyGitMenuBar": "TiddlyGit MenuBar",
|
"TidGiMenuBar": "TidGi MenuBar",
|
||||||
"View": "View",
|
"View": "View",
|
||||||
"SelectPreviousWorkspace": "Select Previous Workspace",
|
"SelectPreviousWorkspace": "Select Previous Workspace",
|
||||||
"SelectNextWorkspace": "Select Next Workspace",
|
"SelectNextWorkspace": "Select Next Workspace",
|
||||||
|
|
|
||||||
|
|
@ -25,13 +25,13 @@
|
||||||
"Preferences": "设置..."
|
"Preferences": "设置..."
|
||||||
},
|
},
|
||||||
"ContextMenu": {
|
"ContextMenu": {
|
||||||
"OpenTiddlyGit": "打开太记",
|
"OpenTidGi": "打开太记",
|
||||||
"OpenTiddlyGitMenuBar": "打开太记小窗口",
|
"OpenTidGiMenuBar": "打开太记小窗口",
|
||||||
"OpenCommandPalette": "打开搜索与命令面板",
|
"OpenCommandPalette": "打开搜索与命令面板",
|
||||||
"OpenLinkInNewWindow": "在新窗口中打开链接",
|
"OpenLinkInNewWindow": "在新窗口中打开链接",
|
||||||
"Preferences": "设置...",
|
"Preferences": "设置...",
|
||||||
"TiddlyGitSupport": "TiddlyGit 用户支持",
|
"TidGiSupport": "TidGi 用户支持",
|
||||||
"TiddlyGitWebsite": "TiddlyGit 官网",
|
"TidGiWebsite": "TidGi 官网",
|
||||||
"Quit": "退出",
|
"Quit": "退出",
|
||||||
"More": "更多",
|
"More": "更多",
|
||||||
"About": "关于",
|
"About": "关于",
|
||||||
|
|
@ -59,8 +59,8 @@
|
||||||
"NoNetworkConnection": "无网络连接"
|
"NoNetworkConnection": "无网络连接"
|
||||||
},
|
},
|
||||||
"Menu": {
|
"Menu": {
|
||||||
"TiddlyGit": "太记",
|
"TidGi": "太记",
|
||||||
"TiddlyGitMenuBar": "太记小窗",
|
"TidGiMenuBar": "太记小窗",
|
||||||
"Edit": "编辑",
|
"Edit": "编辑",
|
||||||
"View": "查看",
|
"View": "查看",
|
||||||
"Find": "查找",
|
"Find": "查找",
|
||||||
|
|
@ -290,7 +290,7 @@
|
||||||
"TestNotification": "测试通知功能",
|
"TestNotification": "测试通知功能",
|
||||||
"Updates": "更新",
|
"Updates": "更新",
|
||||||
"WebCatalog": "网站目录App",
|
"WebCatalog": "网站目录App",
|
||||||
"WebCatalogEngineIntro": "「网站目录App」是TiddlyGit的最初代码的来源,我们重用了来自开源的「网站目录App」的许多重要代码,这要感谢「网站目录App」及其作者 Quang Lam",
|
"WebCatalogEngineIntro": "「网站目录App」是TidGi的最初代码的来源,我们重用了来自开源的「网站目录App」的许多重要代码,这要感谢「网站目录App」及其作者 Quang Lam",
|
||||||
"WebCatalogIntro": "神奇地将任何网站变成跨平台的应用程序。\n让你更加高效地工作,而无需在浏览器上来回切换浏览器Tab。",
|
"WebCatalogIntro": "神奇地将任何网站变成跨平台的应用程序。\n让你更加高效地工作,而无需在浏览器上来回切换浏览器Tab。",
|
||||||
"hardwareAcceleration": "使用硬件加速",
|
"hardwareAcceleration": "使用硬件加速",
|
||||||
"Languages": "语言/Lang",
|
"Languages": "语言/Lang",
|
||||||
|
|
@ -322,10 +322,10 @@
|
||||||
"TiddlyWiki": "太微(TiddlyWiki)",
|
"TiddlyWiki": "太微(TiddlyWiki)",
|
||||||
"System": "系统",
|
"System": "系统",
|
||||||
"TranslatiumIntro": "像外语系大佬一样翻译任何语言",
|
"TranslatiumIntro": "像外语系大佬一样翻译任何语言",
|
||||||
"HowToEnableNotifications": "<0>TiddlyGit支持原生通知功能。但在某些情况下,要接收通知,您需要手动配置一些Web应用设置。</0><1>了解详情</1><2>。</2>",
|
"HowToEnableNotifications": "<0>TidGi支持原生通知功能。但在某些情况下,要接收通知,您需要手动配置一些Web应用设置。</0><1>了解详情</1><2>。</2>",
|
||||||
"IgnoreCertificateErrorsDescription": "<0>不建议。</0><1>了解详情</1>。",
|
"IgnoreCertificateErrorsDescription": "<0>不建议。</0><1>了解详情</1>。",
|
||||||
"SwipeWithThreeFingersToNavigateDescription": "使用3个指手势在页面之间导航。向左轻扫可返回,向右轻扫可前进。<br/>要启用它,还需要更改<3>macOS首选项 → 触控板 → 更多手势 → 在页面间轻扫</3>到<5>用三个手指轻扫</5>或<7>用两个或三个手指轻扫。</7>",
|
"SwipeWithThreeFingersToNavigateDescription": "使用3个指手势在页面之间导航。向左轻扫可返回,向右轻扫可前进。<br/>要启用它,还需要更改<3>macOS首选项 → 触控板 → 更多手势 → 在页面间轻扫</3>到<5>用三个手指轻扫</5>或<7>用两个或三个手指轻扫。</7>",
|
||||||
"TestNotificationDescription": "<0>如果通知未显示,请确保在<1>macOS首选项 → 通知 → TiddlyGit中启用通知</1></0>",
|
"TestNotificationDescription": "<0>如果通知未显示,请确保在<1>macOS首选项 → 通知 → TidGi中启用通知</1></0>",
|
||||||
"RequireRestart": "需要重启",
|
"RequireRestart": "需要重启",
|
||||||
"MenubarAlwaysOnTop": "保持菜单栏小窗口在其他窗口上方",
|
"MenubarAlwaysOnTop": "保持菜单栏小窗口在其他窗口上方",
|
||||||
"MenubarAlwaysOnTopDetail": "让太记的菜单栏小窗口永远保持在其它窗口上方,不会被其他窗口覆盖",
|
"MenubarAlwaysOnTopDetail": "让太记的菜单栏小窗口永远保持在其它窗口上方,不会被其他窗口覆盖",
|
||||||
|
|
|
||||||
384
package-lock.json
generated
384
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "TiddlyGit",
|
"name": "TidGi",
|
||||||
"productName": "TiddlyGit",
|
"productName": "TidGi",
|
||||||
"description": "Customizable personal knowledge-base with Github as unlimited storage and blogging platform.",
|
"description": "Customizable personal knowledge-base with Github as unlimited storage and blogging platform.",
|
||||||
"version": "0.6.6",
|
"version": "0.6.6",
|
||||||
"license": "MPL 2.0",
|
"license": "MPL 2.0",
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
"lint:fix": "eslint ./src --ext js,ts,tsx,json --fix",
|
"lint:fix": "eslint ./src --ext js,ts,tsx,json --fix",
|
||||||
"installType": "typesync"
|
"installType": "typesync"
|
||||||
},
|
},
|
||||||
"repository": "https://github.com/tiddly-gittly/TiddlyGit-Desktop",
|
"repository": "https://github.com/tiddly-gittly/TidGi-Desktop",
|
||||||
"author": "Lin Onetwo <linonetwo012@gmail.com>, Quang Lam <quang.lam2807@gmail.com>",
|
"author": "Lin Onetwo <linonetwo012@gmail.com>, Quang Lam <quang.lam2807@gmail.com>",
|
||||||
"main": ".webpack/main",
|
"main": ".webpack/main",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ const keepingLprojRegEx = /(en|zh_CN)\.lproj/g;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param {*} buildPath /var/folders/qj/7j0zx32d0l75zmnrl1w3m3b80000gn/T/electron-packager/darwin-x64/TiddlyGit-darwin-x64/Electron.app/Contents/Resources/app
|
* @param {*} buildPath /var/folders/qj/7j0zx32d0l75zmnrl1w3m3b80000gn/T/electron-packager/darwin-x64/TidGi-darwin-x64/Electron.app/Contents/Resources/app
|
||||||
* @param {*} electronVersion 12.0.6
|
* @param {*} electronVersion 12.0.6
|
||||||
* @param {*} platform darwin
|
* @param {*} platform darwin
|
||||||
* @param {*} arch x64
|
* @param {*} arch x64
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ const CREATE_REPO_MUTATION = `
|
||||||
mutation CreateRepository($repoName: String!, $homepageUrl: URI, $ownerId: ID!, $visibility: RepositoryVisibility!) {
|
mutation CreateRepository($repoName: String!, $homepageUrl: URI, $ownerId: ID!, $visibility: RepositoryVisibility!) {
|
||||||
createRepository (input: {
|
createRepository (input: {
|
||||||
name: $repoName,
|
name: $repoName,
|
||||||
description: "A non-linear Wiki created using TiddlyGit-Desktop.",
|
description: "A non-linear Wiki created using TidGi-Desktop.",
|
||||||
hasIssuesEnabled: true,
|
hasIssuesEnabled: true,
|
||||||
hasWikiEnabled: false,
|
hasWikiEnabled: false,
|
||||||
homepageUrl: $homepageUrl,
|
homepageUrl: $homepageUrl,
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ export enum ViewChannel {
|
||||||
export enum WikiChannel {
|
export enum WikiChannel {
|
||||||
addTiddler = 'wiki-add-tiddler',
|
addTiddler = 'wiki-add-tiddler',
|
||||||
addTiddlerDone = 'wiki-add-tiddler-done',
|
addTiddlerDone = 'wiki-add-tiddler-done',
|
||||||
/** used to show wiki creation messages in the TiddlyGit UI for user to read */
|
/** used to show wiki creation messages in the TidGi UI for user to read */
|
||||||
createProgress = 'wiki-create-progress',
|
createProgress = 'wiki-create-progress',
|
||||||
generalNotification = 'wiki-notification-tiddly-git',
|
generalNotification = 'wiki-notification-tiddly-git',
|
||||||
getTiddlerText = 'wiki-get-tiddler-text',
|
getTiddlerText = 'wiki-get-tiddler-text',
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/** Used to store settings during dev and testing */
|
/** Used to store settings during dev and testing */
|
||||||
export const developmentSettingFolderName = 'settings-dev';
|
export const developmentSettingFolderName = 'settings-dev';
|
||||||
/** Used to place mock wiki during dev and testing */
|
/** Used to place mock wiki during dev and testing */
|
||||||
export const developmentWikiFolderName = 'tiddlygit-dev';
|
export const developmentWikiFolderName = 'tidgi-dev';
|
||||||
export const localizationFolderName = 'localization';
|
export const localizationFolderName = 'localization';
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,7 @@ if (!isTest) {
|
||||||
reportButton: (error) => {
|
reportButton: (error) => {
|
||||||
openNewGitHubIssue({
|
openNewGitHubIssue({
|
||||||
user: 'tiddly-gittly',
|
user: 'tiddly-gittly',
|
||||||
repo: 'TiddlyGit-Desktop',
|
repo: 'TidGi-Desktop',
|
||||||
template: 'bug.md',
|
template: 'bug.md',
|
||||||
title: `bug: ${(error.message ?? '').substring(0, 100)}`,
|
title: `bug: ${(error.message ?? '').substring(0, 100)}`,
|
||||||
body: `## Environment
|
body: `## Environment
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ const Title = styled.h6`
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TiddlyGitVersion = styled.p`
|
const TidGiVersion = styled.p`
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
@ -85,9 +85,9 @@ export default function About(): JSX.Element {
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<title>{t('ContextMenu.About')}</title>
|
<title>{t('ContextMenu.About')}</title>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
<Icon src={iconPath} alt="TiddlyGit" />
|
<Icon src={iconPath} alt="TidGi" />
|
||||||
<Title>TiddlyGit ({platform ?? 'Unknown Platform'})</Title>
|
<Title>TidGi ({platform ?? 'Unknown Platform'})</Title>
|
||||||
<TiddlyGitVersion>{`Version v${appVersion ?? ' - '}.`}</TiddlyGitVersion>
|
<TidGiVersion>{`Version v${appVersion ?? ' - '}.`}</TidGiVersion>
|
||||||
<DependenciesVersionsContainer>
|
<DependenciesVersionsContainer>
|
||||||
{versions?.map(({ name, version }) => (
|
{versions?.map(({ name, version }) => (
|
||||||
<DependenciesVersions key={name}>
|
<DependenciesVersions key={name}>
|
||||||
|
|
@ -97,10 +97,10 @@ export default function About(): JSX.Element {
|
||||||
</DependenciesVersionsContainer>
|
</DependenciesVersionsContainer>
|
||||||
|
|
||||||
<ButtonContainer>
|
<ButtonContainer>
|
||||||
<GoToTheWebsiteButton onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TiddlyGit-Desktop')}>
|
<GoToTheWebsiteButton onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TidGi-Desktop')}>
|
||||||
Website
|
Website
|
||||||
</GoToTheWebsiteButton>
|
</GoToTheWebsiteButton>
|
||||||
<GoToTheWebsiteButton onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose')}>
|
<GoToTheWebsiteButton onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TidGi-Desktop/issues/new/choose')}>
|
||||||
Support
|
Support
|
||||||
</GoToTheWebsiteButton>
|
</GoToTheWebsiteButton>
|
||||||
</ButtonContainer>
|
</ButtonContainer>
|
||||||
|
|
@ -127,12 +127,12 @@ export default function About(): JSX.Element {
|
||||||
</Link>
|
</Link>
|
||||||
<span> && </span>
|
<span> && </span>
|
||||||
<Link
|
<Link
|
||||||
onClick={async () => await window.service.native.open('https://webcatalog.app/?utm_source=tiddlygit_app')}
|
onClick={async () => await window.service.native.open('https://webcatalog.app/?utm_source=tidgi_app')}
|
||||||
onKeyDown={async (event) => {
|
onKeyDown={async (event) => {
|
||||||
if (event.key !== 'Enter') {
|
if (event.key !== 'Enter') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await window.service.native.open('https://webcatalog.app/?utm_source=tiddlygit_app');
|
await window.service.native.open('https://webcatalog.app/?utm_source=tidgi_app');
|
||||||
}}
|
}}
|
||||||
role="link"
|
role="link"
|
||||||
tabIndex={0}>
|
tabIndex={0}>
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ export function useWikiWorkspaceForm(options?: { fromExisted: boolean }) {
|
||||||
const wikiFolderLocation = window.remote.joinPath(parentFolderLocation ?? t('Error') ?? 'Error', wikiFolderName);
|
const wikiFolderLocation = window.remote.joinPath(parentFolderLocation ?? t('Error') ?? 'Error', wikiFolderName);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For importing existed nodejs wiki into TiddlyGit, we parse git url from the folder to import
|
* For importing existed nodejs wiki into TidGi, we parse git url from the folder to import
|
||||||
*/
|
*/
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void (async function getWorkspaceRemoteEffect(): Promise<void> {
|
void (async function getWorkspaceRemoteEffect(): Promise<void> {
|
||||||
|
|
|
||||||
|
|
@ -213,7 +213,7 @@ export default function Main(): JSX.Element {
|
||||||
<OuterRoot>
|
<OuterRoot>
|
||||||
<div id="test" data-usage="For spectron automating testing" />
|
<div id="test" data-usage="For spectron automating testing" />
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<title>{t('Menu.TiddlyGit')}</title>
|
<title>{t('Menu.TidGi')}</title>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
<Root>
|
<Root>
|
||||||
{sidebar && (
|
{sidebar && (
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,12 @@ export function FriendLinks(props: ISectionProps): JSX.Element {
|
||||||
<ChevronRightIcon color="action" />
|
<ChevronRightIcon color="action" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<Divider />
|
<Divider />
|
||||||
<ListItem button onClick={async () => await window.service.native.open('https://webcatalogapp.com?utm_source=tiddlygit_app')}>
|
<ListItem button onClick={async () => await window.service.native.open('https://webcatalogapp.com?utm_source=tidgi_app')}>
|
||||||
<ListItemText primary={<Logo src={webcatalogLogo} alt={t('Preference.WebCatalog')} />} secondary={t('Preference.WebCatalogIntro')} />
|
<ListItemText primary={<Logo src={webcatalogLogo} alt={t('Preference.WebCatalog')} />} secondary={t('Preference.WebCatalogIntro')} />
|
||||||
<ChevronRightIcon color="action" />
|
<ChevronRightIcon color="action" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<Divider />
|
<Divider />
|
||||||
<ListItem button onClick={async () => await window.service.native.open('https://translatiumapp.com?utm_source=tiddlygit_app')}>
|
<ListItem button onClick={async () => await window.service.native.open('https://translatiumapp.com?utm_source=tidgi_app')}>
|
||||||
<ListItemText primary={<Logo src={translatiumLogo} alt={t('Preference.Translatium')} />} secondary={t('Preference.TranslatiumIntro')} />
|
<ListItemText primary={<Logo src={translatiumLogo} alt={t('Preference.Translatium')} />} secondary={t('Preference.TranslatiumIntro')} />
|
||||||
<ChevronRightIcon color="action" />
|
<ChevronRightIcon color="action" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
|
|
|
||||||
|
|
@ -21,12 +21,12 @@ export function Miscellaneous(props: ISectionProps): JSX.Element {
|
||||||
<ChevronRightIcon color="action" />
|
<ChevronRightIcon color="action" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<Divider />
|
<Divider />
|
||||||
<ListItem button onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/tiddlygit-desktop/')}>
|
<ListItem button onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TidGi-desktop/')}>
|
||||||
<ListItemText primary={t('Preference.WebSite')} />
|
<ListItemText primary={t('Preference.WebSite')} />
|
||||||
<ChevronRightIcon color="action" />
|
<ChevronRightIcon color="action" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<Divider />
|
<Divider />
|
||||||
<ListItem button onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/tiddlygit-desktop/issues')}>
|
<ListItem button onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TidGi-desktop/issues')}>
|
||||||
<ListItemText primary={t('Preference.Support')} />
|
<ListItemText primary={t('Preference.Support')} />
|
||||||
<ChevronRightIcon color="action" />
|
<ChevronRightIcon color="action" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ export function Notifications(props: Required<ISectionProps>): JSX.Element {
|
||||||
<Trans t={t} i18nKey="Preference.TestNotificationDescription">
|
<Trans t={t} i18nKey="Preference.TestNotificationDescription">
|
||||||
<span>
|
<span>
|
||||||
If notifications dont show up, make sure you enable notifications in
|
If notifications dont show up, make sure you enable notifications in
|
||||||
<b>macOS Preferences → Notifications → TiddlyGit</b>.
|
<b>macOS Preferences → Notifications → TidGi</b>.
|
||||||
</span>
|
</span>
|
||||||
</Trans>
|
</Trans>
|
||||||
);
|
);
|
||||||
|
|
@ -135,7 +135,7 @@ export function Notifications(props: Required<ISectionProps>): JSX.Element {
|
||||||
secondary={
|
secondary={
|
||||||
<Trans t={t} i18nKey="Preference.HowToEnableNotifications">
|
<Trans t={t} i18nKey="Preference.HowToEnableNotifications">
|
||||||
<span>
|
<span>
|
||||||
TiddlyGit supports notifications out of the box. But for some cases, to receive notifications, you will need to manually configure
|
TidGi supports notifications out of the box. But for some cases, to receive notifications, you will need to manually configure
|
||||||
additional web app settings.
|
additional web app settings.
|
||||||
</span>
|
</span>
|
||||||
<Link
|
<Link
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ export function PrivacyAndSecurity(props: Required<ISectionProps>): JSX.Element
|
||||||
<Divider />
|
<Divider />
|
||||||
<ListItem
|
<ListItem
|
||||||
button
|
button
|
||||||
onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TiddlyGit-Desktop/blob/master/PrivacyPolicy.md')}>
|
onClick={async () => await window.service.native.open('https://github.com/tiddly-gittly/TidGi-Desktop/blob/master/PrivacyPolicy.md')}>
|
||||||
<ListItemText primary="Privacy Policy" />
|
<ListItemText primary="Privacy Policy" />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<title>TiddlyGit</title>
|
<title>TidGi</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import { BehaviorSubject } from 'rxjs';
|
||||||
import { IGitUserInfos } from '@services/git/interface';
|
import { IGitUserInfos } from '@services/git/interface';
|
||||||
|
|
||||||
const defaultUserInfos = {
|
const defaultUserInfos = {
|
||||||
userName: 'TiddlyGitUser',
|
userName: 'TidGiUser',
|
||||||
authing: undefined as IAuthingUserInfo | undefined,
|
authing: undefined as IAuthingUserInfo | undefined,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
export const defaultGitInfo = {
|
export const defaultGitInfo = {
|
||||||
email: 'tiddlygit@gmail.com',
|
email: 'tiddlygit@gmail.com',
|
||||||
gitUserName: 'tiddlygit',
|
gitUserName: 'tidgi',
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ export async function requestChangeLanguage(newLanguage: string): Promise<void>
|
||||||
lng: newLanguage,
|
lng: newLanguage,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
// change tiddlygit language
|
// change tidgi language
|
||||||
await windowService.sendToAllWindows(I18NChannels.changeLanguageRequest, {
|
await windowService.sendToAllWindows(I18NChannels.changeLanguageRequest, {
|
||||||
lng: newLanguage,
|
lng: newLanguage,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ const logger = (
|
||||||
transports: [
|
transports: [
|
||||||
new winston.transports.Console(),
|
new winston.transports.Console(),
|
||||||
new winston.transports.DailyRotateFile({
|
new winston.transports.DailyRotateFile({
|
||||||
filename: 'TiddlyGit-%DATE%.log',
|
filename: 'TidGi-%DATE%.log',
|
||||||
datePattern: 'YYYY-MM-DD',
|
datePattern: 'YYYY-MM-DD',
|
||||||
zippedArchive: false,
|
zippedArchive: false,
|
||||||
maxSize: '20mb',
|
maxSize: '20mb',
|
||||||
|
|
@ -42,7 +42,7 @@ const logger = (
|
||||||
],
|
],
|
||||||
exceptionHandlers: [
|
exceptionHandlers: [
|
||||||
new winston.transports.DailyRotateFile({
|
new winston.transports.DailyRotateFile({
|
||||||
filename: 'TiddlyGit-Exception-%DATE%.log',
|
filename: 'TidGi-Exception-%DATE%.log',
|
||||||
datePattern: 'YYYY-MM-DD',
|
datePattern: 'YYYY-MM-DD',
|
||||||
zippedArchive: false,
|
zippedArchive: false,
|
||||||
maxSize: '20mb',
|
maxSize: '20mb',
|
||||||
|
|
|
||||||
|
|
@ -118,8 +118,8 @@ export class MenuService implements IMenuService {
|
||||||
private loadDefaultMenuTemplate(): void {
|
private loadDefaultMenuTemplate(): void {
|
||||||
this._menuTemplate = [
|
this._menuTemplate = [
|
||||||
{
|
{
|
||||||
label: () => i18next.t('Menu.TiddlyGit'),
|
label: () => i18next.t('Menu.TidGi'),
|
||||||
id: 'TiddlyGit',
|
id: 'TidGi',
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
label: () => i18next.t('ContextMenu.About'),
|
label: () => i18next.t('ContextMenu.About'),
|
||||||
|
|
@ -147,7 +147,7 @@ export class MenuService implements IMenuService {
|
||||||
{ role: 'hide' },
|
{ role: 'hide' },
|
||||||
{ role: 'hideOthers' },
|
{ role: 'hideOthers' },
|
||||||
{ role: 'unhide' },
|
{ role: 'unhide' },
|
||||||
{ label: () => i18next.t('ContextMenu.Quit') + i18next.t('Menu.TiddlyGit'), role: 'quit' },
|
{ label: () => i18next.t('ContextMenu.Quit') + i18next.t('Menu.TidGi'), role: 'quit' },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -188,20 +188,20 @@ export class MenuService implements IMenuService {
|
||||||
id: 'help',
|
id: 'help',
|
||||||
submenu: [
|
submenu: [
|
||||||
{
|
{
|
||||||
label: () => i18next.t('ContextMenu.TiddlyGitSupport'),
|
label: () => i18next.t('ContextMenu.TidGiSupport'),
|
||||||
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues'),
|
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TidGi-desktop/issues'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: () => i18next.t('Menu.ReportBugViaGithub'),
|
label: () => i18next.t('Menu.ReportBugViaGithub'),
|
||||||
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues'),
|
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TidGi-desktop/issues'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: () => i18next.t('Menu.RequestFeatureViaGithub'),
|
label: () => i18next.t('Menu.RequestFeatureViaGithub'),
|
||||||
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/issues/new?template=feature.md&title=feature%3A+'),
|
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TidGi-desktop/issues/new?template=feature.md&title=feature%3A+'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: () => i18next.t('Menu.LearnMore'),
|
label: () => i18next.t('Menu.LearnMore'),
|
||||||
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/tiddlygit-desktop/'),
|
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TidGi-desktop/'),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
@ -465,12 +465,12 @@ export class MenuService implements IMenuService {
|
||||||
},
|
},
|
||||||
{ type: 'separator' },
|
{ type: 'separator' },
|
||||||
{
|
{
|
||||||
label: i18next.t('ContextMenu.TiddlyGitSupport'),
|
label: i18next.t('ContextMenu.TidGiSupport'),
|
||||||
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/new/choose'),
|
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TidGi-Desktop/issues/new/choose'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: i18next.t('ContextMenu.TiddlyGitWebsite'),
|
label: i18next.t('ContextMenu.TidGiWebsite'),
|
||||||
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TiddlyGit-Desktop'),
|
click: async () => await shell.openExternal('https://github.com/tiddly-gittly/TidGi-Desktop'),
|
||||||
},
|
},
|
||||||
{ type: 'separator' },
|
{ type: 'separator' },
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -516,7 +516,7 @@ export class Window implements IWindowService {
|
||||||
tray,
|
tray,
|
||||||
activateWithApp: false,
|
activateWithApp: false,
|
||||||
preloadWindow: true,
|
preloadWindow: true,
|
||||||
tooltip: i18n.t('Menu.TiddlyGitMenuBar'),
|
tooltip: i18n.t('Menu.TidGiMenuBar'),
|
||||||
browserWindow: mergeDeep(windowConfig, {
|
browserWindow: mergeDeep(windowConfig, {
|
||||||
show: false,
|
show: false,
|
||||||
minHeight: 100,
|
minHeight: 100,
|
||||||
|
|
@ -553,11 +553,11 @@ export class Window implements IWindowService {
|
||||||
// TODO: restore updater options here
|
// TODO: restore updater options here
|
||||||
const contextMenu = Menu.buildFromTemplate([
|
const contextMenu = Menu.buildFromTemplate([
|
||||||
{
|
{
|
||||||
label: i18n.t('ContextMenu.OpenTiddlyGit'),
|
label: i18n.t('ContextMenu.OpenTidGi'),
|
||||||
click: async () => await this.open(WindowNames.main),
|
click: async () => await this.open(WindowNames.main),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: i18n.t('ContextMenu.OpenTiddlyGitMenuBar'),
|
label: i18n.t('ContextMenu.OpenTidGiMenuBar'),
|
||||||
click: async () => await menuBar.showWindow(),
|
click: async () => await menuBar.showWindow(),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit ae3a954863d1e9702f3672342ad147fa1aee6f95
|
Subproject commit b35184e83de5a03c921bd874c9676cc851bfd212
|
||||||
|
|
@ -68,7 +68,7 @@ exports.renderer = _.compact([
|
||||||
// 'style-src': ["'self' 'unsafe-inline'"],
|
// 'style-src': ["'self' 'unsafe-inline'"],
|
||||||
// 'frame-src': ["'none'"],
|
// 'frame-src': ["'none'"],
|
||||||
// 'worker-src': ["'none'"],
|
// 'worker-src': ["'none'"],
|
||||||
// 'connect-src': ['https://api.github.com https://tiddlygit-desktop.authing.cn ws://localhost:3000'],
|
// 'connect-src': ['https://api.github.com https://tidgi-desktop.authing.cn ws://localhost:3000'],
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
// nonceEnabled: {
|
// nonceEnabled: {
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ module.exports = [
|
||||||
camel2DashComponentName: false,
|
camel2DashComponentName: false,
|
||||||
}),
|
}),
|
||||||
// svg-icons
|
// svg-icons
|
||||||
// FIXME: will cause `FolderIcon is not defined`, which cannot reproduce in MacOS and dev mode https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/88
|
// FIXME: will cause `FolderIcon is not defined`, which cannot reproduce in MacOS and dev mode https://github.com/tiddly-gittly/TidGi-Desktop/issues/88
|
||||||
// tsImportPluginFactory({
|
// tsImportPluginFactory({
|
||||||
// libraryDirectory: (importName) => {
|
// libraryDirectory: (importName) => {
|
||||||
// const stringVec = importName
|
// const stringVec = importName
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue