diff --git a/.eslintignore b/.eslintignore index 219d63f..b908d4d 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,3 +2,4 @@ test/unit/coverage/** test/unit/*.js test/e2e/*.js dist/ +src/**/*.js \ No newline at end of file diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 0000000..7ef9225 --- /dev/null +++ b/.yarnrc @@ -0,0 +1,12 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +registry "https://registry.npm.taobao.org" +sass_binary_site "https://npm.taobao.org/mirrors/node-sass/" +phantomjs_cdnurl "http://cnpmjs.org/downloads" +electron_mirror "https://npm.taobao.org/mirrors/electron/" +sqlite3_binary_host_mirror "https://foxgis.oss-cn-shanghai.aliyuncs.com/" +profiler_binary_host_mirror "https://npm.taobao.org/mirrors/node-inspector/" +chromedriver_cdnurl "https://cdn.npm.taobao.org/dist/chromedriver" + diff --git a/package.json b/package.json index 1c74c15..c9f0256 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "picgo", - "version": "2.4.0-beta.0", + "name": "piclist", + "version": "0.0.1", "private": true, "scripts": { "build": "vue-cli-service electron:build", @@ -24,6 +24,7 @@ "axios": "^0.19.0", "compare-versions": "^4.1.3", "core-js": "^3.27.1", + "custom-electron-titlebar": "^4.1.5", "element-plus": "^2.2.28", "fs-extra": "^10.0.0", "js-yaml": "^4.1.0", @@ -34,7 +35,7 @@ "picgo": "^1.5.0", "qrcode.vue": "^3.3.3", "shell-path": "2.1.0", - "uuidv4": "^6.2.11", + "uuid": "^9.0.0", "vue": "^3.2.45", "vue-router": "^4.1.6", "vue3-lazyload": "^0.3.6", @@ -52,6 +53,7 @@ "@types/node": "^16.10.2", "@types/request-promise-native": "^1.0.17", "@types/semver": "^7.3.8", + "@types/uuid": "^9.0.0", "@types/write-file-atomic": "^4.0.0", "@typescript-eslint/eslint-plugin": "^5.48.0", "@typescript-eslint/parser": "^5.48.0", @@ -66,7 +68,7 @@ "conventional-changelog": "^3.1.18", "cz-customizable": "^6.2.0", "dotenv": "^16.0.1", - "electron": "^16.0.6", + "electron": "^22.0.2", "electron-devtools-installer": "^3.2.0", "eslint": "^8.31.0", "eslint-config-standard": ">=16.0.0", diff --git a/public/i18n/en.yml b/public/i18n/en.yml index 9f49a08..874f6a1 100644 --- a/public/i18n/en.yml +++ b/public/i18n/en.yml @@ -14,7 +14,7 @@ UPLOADING: Uploading QUICK_UPLOAD: Quick Upload UPLOAD_BY_CLIPBOARD: Upload by Clipboard HIDE_WINDOW: Hide Window -SPONSOR_PICGO: Sponsor PicGo +SPONSOR_PICLIST: Sponsor PicList SHOW_PICBED_QRCODE: Show Picbed Qrcode PICBED_QRCODE: Picbed Qrcode ENABLE: Enable @@ -31,9 +31,10 @@ CHOOSE_YOUR_DEFAULT_PICBED: 'Choose ${d} as your default picbed:' UPLOAD_AREA: Upload Area GALLERY: Gallery PICBEDS_SETTINGS: Picbeds Settings -PICGO_SETTINGS: PicGo Settings +PICBEDS_MANAGE: Picbeds Manage +PICLIST_SETTINGS: PicList Settings PLUGIN_SETTINGS: Plugins Settings -PICGO_SPONSOR_TEXT: PicGo is a free software, if you like it, please don't forget to buy me a cup of coffee. +PICGO_SPONSOR_TEXT: PicList is a free software, if you like it, please don't forget to buy me a cup of coffee. ALIPAY: Alipay WECHATPAY: Wechat Pay CHOOSE_PICBED: Choose Picbed diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml index cf8c658..798f154 100644 --- a/public/i18n/zh-CN.yml +++ b/public/i18n/zh-CN.yml @@ -14,7 +14,7 @@ UPLOADING: 正在上传 QUICK_UPLOAD: 快捷上传 UPLOAD_BY_CLIPBOARD: 剪贴板图片上传 HIDE_WINDOW: 隐藏窗口 -SPONSOR_PICGO: 赞助 PicGo +SPONSOR_PICLIST: 赞助 PicList SHOW_PICBED_QRCODE: 生成图床配置二维码 PICBED_QRCODE: 图床配置二维码 ENABLE: 启用 @@ -31,9 +31,10 @@ CHOOSE_YOUR_DEFAULT_PICBED: 选择 ${d} 作为你默认图床： UPLOAD_AREA: 上传区 GALLERY: 相册 PICBEDS_SETTINGS: 图床设置 -PICGO_SETTINGS: PicGo设置 +PICBEDS_MANAGE: 图床管理 +PICLIST_SETTINGS: PicList设置 PLUGIN_SETTINGS: 插件设置 -PICGO_SPONSOR_TEXT: PicGo是免费开源的软件，如果你喜欢它，对你有帮助，不妨请我喝杯咖啡？ +PICGO_SPONSOR_TEXT: PicList是免费开源的软件，如果你喜欢它，对你有帮助，可以请我喝杯蜜雪冰城~ ALIPAY: 支付宝 WECHATPAY: 微信支付 CHOOSE_PICBED: 选择图床 diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml index 5ebdd64..c8787a5 100644 --- a/public/i18n/zh-TW.yml +++ b/public/i18n/zh-TW.yml @@ -14,7 +14,7 @@ UPLOADING: 正在上傳 QUICK_UPLOAD: 快速上傳 UPLOAD_BY_CLIPBOARD: 剪貼簿圖片上傳 HIDE_WINDOW: 隱藏視窗 -SPONSOR_PICGO: 贊助 PicGo +SPONSOR_PICLIST: 贊助 PicList SHOW_PICBED_QRCODE: 產生圖床配置 QRCODE PICBED_QRCODE: 圖床配置 QRCODE ENABLE: 啟用 @@ -31,9 +31,10 @@ CHOOSE_YOUR_DEFAULT_PICBED: 選擇 ${d} 作為你的預設圖床： UPLOAD_AREA: 上傳區 GALLERY: 相簿 PICBEDS_SETTINGS: 圖床設定 -PICGO_SETTINGS: PicGo設定 +PICBEDS_MANAGE: 圖床管理 +PICLIST_SETTINGS: PicList設定 PLUGIN_SETTINGS: 插件設定 -PICGO_SPONSOR_TEXT: PicGo是開放原始碼的軟體，如果你喜歡它，對你有幫助，不妨請我喝杯咖啡？ +PICGO_SPONSOR_TEXT: PicList是開放原始碼的軟體，如果你喜歡它，對你有幫助，不妨請我喝杯咖啡~ ALIPAY: 支付寶 WECHATPAY: 微信支付 CHOOSE_PICBED: 選擇圖床 diff --git a/public/logo.png b/public/logo.png index 99b92a5..496d5a5 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/public/menubar.png b/public/menubar.png index 311cc82..b64b7bd 100644 Binary files a/public/menubar.png and b/public/menubar.png differ diff --git a/public/roundLogo.png b/public/roundLogo.png index 6f0b179..496d5a5 100644 Binary files a/public/roundLogo.png and b/public/roundLogo.png differ diff --git a/public/squareLogo.png b/public/squareLogo.png index b5db542..496d5a5 100644 Binary files a/public/squareLogo.png and b/public/squareLogo.png differ diff --git a/src/main/apis/README.md b/src/main/apis/README.md index 8209412..8238c6c 100644 --- a/src/main/apis/README.md +++ b/src/main/apis/README.md @@ -3,11 +3,14 @@ ## core The lowest level APIs that are not dependent on each other. The upper APIs depend on them. +不相互依赖的最低级别api。 上层api依赖于它们。 ## app -Provide key API interfaces for PicGo application, including uploader, window management, shortcut key system, remotes handler, etc +Provide key API interfaces for PicList application, including uploader, window management, shortcut key system, remotes handler, etc +为PicList应用程序提供关键API接口，包括上传器、窗口管理、快捷键系统、远程处理程序等。 ## gui -GuiApi for PicGo plugins. +GuiApi for PicList plugins. +用于PicList插件的GuiApi。 diff --git a/src/main/apis/app/system/index.ts b/src/main/apis/app/system/index.ts index 037b978..6c1919c 100644 --- a/src/main/apis/app/system/index.ts +++ b/src/main/apis/app/system/index.ts @@ -31,9 +31,9 @@ export function createContextMenu () { label: T('ABOUT'), click () { dialog.showMessageBox({ - title: 'PicGo', - message: 'PicGo', - detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo` + title: 'PicList', + message: 'PicList', + detail: `Version: ${pkg.version}\nAuthor: Kuingsmile\nGithub: https://github.com/Kuingsmile/PicList` }) } }, @@ -117,10 +117,10 @@ export function createContextMenu () { label: T('ABOUT'), click () { dialog.showMessageBox({ - title: 'PicGo', - message: 'PicGo', + title: 'PicList', + message: 'PicList', buttons: ['Ok'], - detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo` + detail: `Version: ${pkg.version}\nAuthor: Kuingsmile\nGithub: https://github.com/Kuingsmile/PicList` }) } }, diff --git a/src/main/apis/app/window/windowList.ts b/src/main/apis/app/window/windowList.ts index 44d9a9b..99e99a7 100644 --- a/src/main/apis/app/window/windowList.ts +++ b/src/main/apis/app/window/windowList.ts @@ -60,14 +60,14 @@ windowList.set(IWindowList.SETTING_WINDOW, { multiple: false, options () { const options: IBrowserWindowOptions = { - height: 450, - width: 800, + height: 800, + width: 1200, show: false, frame: true, center: true, - fullscreenable: false, - resizable: false, - title: 'PicGo', + fullscreenable: true, + resizable: true, + title: 'PicList', vibrancy: 'ultra-dark', transparent: true, titleBarStyle: 'hidden', diff --git a/src/main/events/remotes/menu.ts b/src/main/events/remotes/menu.ts index 2b80362..be5605b 100644 --- a/src/main/events/remotes/menu.ts +++ b/src/main/events/remotes/menu.ts @@ -77,14 +77,14 @@ const buildMainPageMenu = (win: BrowserWindow) => { label: T('ABOUT'), click () { dialog.showMessageBox({ - title: 'PicGo', - message: 'PicGo', - detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo` + title: 'PicList', + message: 'PicList', + detail: `Version: ${pkg.version}\nAuthor: Kuingsmile\nGithub: https://github.com/Kuingsmile/PicList` }) } }, { - label: T('SPONSOR_PICGO'), + label: T('SPONSOR_PICLIST'), click () { win?.webContents?.send(SHOW_MAIN_PAGE_DONATION) } diff --git a/src/main/utils/handleUploaderConfig.ts b/src/main/utils/handleUploaderConfig.ts index cc46692..079daab 100644 --- a/src/main/utils/handleUploaderConfig.ts +++ b/src/main/utils/handleUploaderConfig.ts @@ -1,4 +1,4 @@ -import { uuid } from 'uuidv4' +import { v4 as uuid } from 'uuid' import { trimValues } from '#/utils/common' import picgo from '@core/picgo' diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 0bfff0f..ef17ed0 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -46,6 +46,7 @@ export default { height 100% font-family "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif #app + height 100% user-select none overflow hidden .el-button-group diff --git a/src/renderer/assets/squareLogo.png b/src/renderer/assets/squareLogo.png index b5db542..496d5a5 100644 Binary files a/src/renderer/assets/squareLogo.png and b/src/renderer/assets/squareLogo.png differ diff --git a/src/renderer/layouts/Main.vue b/src/renderer/layouts/Main.vue index eacf4a9..6591648 100644 --- a/src/renderer/layouts/Main.vue +++ b/src/renderer/layouts/Main.vue @@ -5,7 +5,7 @@ :class="{ 'darwin': os === 'darwin' }" >
- PicGo - {{ version }} + PicList - {{ version }}
{{ $T('UPLOAD_AREA') }} + + + + + {{ $T('PICBEDS_MANAGE') }} + @@ -82,7 +88,7 @@ - {{ $T('PICGO_SETTINGS') }} + {{ $T('PICLIST_SETTINGS') }} @@ -101,7 +107,7 @@ @@ -123,7 +129,7 @@ @@ -131,7 +137,8 @@
@@ -140,7 +147,8 @@
@@ -352,7 +360,7 @@ export default { diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index 22ccf11..19d6e15 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -5,7 +5,7 @@ align="middle" justify="center" > - {{ $T('PICGO_SETTINGS') }} - + {{ $T('PICLIST_SETTINGS') }} -