Skip to content

Commit

Permalink
📦 Chore: upgrade electron uuid , change pkg name
Browse files Browse the repository at this point in the history
  • Loading branch information
Kuingsmile committed Jan 16, 2023
1 parent b9a75d8 commit 7421322
Show file tree
Hide file tree
Showing 28 changed files with 289 additions and 115 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ test/unit/coverage/**
test/unit/*.js
test/e2e/*.js
dist/
src/**/*.js
12 changes: 12 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -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"

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions public/i18n/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions public/i18n/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ UPLOADING: 正在上传
QUICK_UPLOAD: 快捷上传
UPLOAD_BY_CLIPBOARD: 剪贴板图片上传
HIDE_WINDOW: 隐藏窗口
SPONSOR_PICGO: 赞助 PicGo
SPONSOR_PICLIST: 赞助 PicList
SHOW_PICBED_QRCODE: 生成图床配置二维码
PICBED_QRCODE: 图床配置二维码
ENABLE: 启用
Expand All @@ -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: 选择图床
Expand Down
7 changes: 4 additions & 3 deletions public/i18n/zh-TW.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 啟用
Expand All @@ -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: 選擇圖床
Expand Down
Binary file modified public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/menubar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/roundLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/squareLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions src/main/apis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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。
12 changes: 6 additions & 6 deletions src/main/apis/app/system/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`
})
}
},
Expand Down Expand Up @@ -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`
})
}
},
Expand Down
10 changes: 5 additions & 5 deletions src/main/apis/app/window/windowList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions src/main/events/remotes/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/utils/handleUploaderConfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { uuid } from 'uuidv4'
import { v4 as uuid } from 'uuid'
import { trimValues } from '#/utils/common'
import picgo from '@core/picgo'

Expand Down
1 change: 1 addition & 0 deletions src/renderer/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified src/renderer/assets/squareLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 17 additions & 7 deletions src/renderer/layouts/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:class="{ 'darwin': os === 'darwin' }"
>
<div class="fake-title-bar__title">
PicGo - {{ version }}
PicList - {{ version }}
</div>
<div
v-if="os !== 'darwin'"
Expand Down Expand Up @@ -51,6 +51,12 @@
</el-icon>
<span>{{ $T('UPLOAD_AREA') }}</span>
</el-menu-item>
<el-menu-item :index="routerConfig.MANAGE_MAIN_PAGE">
<el-icon>
<PictureFilled />
</el-icon>
<span>{{ $T('PICBEDS_MANAGE') }}</span>
</el-menu-item>
<el-menu-item :index="routerConfig.GALLERY_PAGE">
<el-icon>
<PictureFilled />
Expand Down Expand Up @@ -82,7 +88,7 @@
<el-icon>
<Setting />
</el-icon>
<span>{{ $T('PICGO_SETTINGS') }}</span>
<span>{{ $T('PICLIST_SETTINGS') }}</span>
</el-menu-item>
<el-menu-item :index="routerConfig.PLUGIN_PAGE">
<el-icon>
Expand All @@ -101,7 +107,7 @@
<el-col
:span="19"
:offset="5"
style="height: 428px"
style="height: 100%"
class="main-wrapper"
:class="{ 'darwin': os === 'darwin' }"
>
Expand All @@ -123,15 +129,16 @@
</el-row>
<el-dialog
v-model="visible"
:title="$T('SPONSOR_PICGO')"
:title="$T('SPONSOR_PICLIST')"
width="70%"
top="10vh"
>
{{ $T('PICGO_SPONSOR_TEXT') }}
<el-row class="support">
<el-col :span="12">
<img
src="https://user-images.githubusercontent.com/12621342/34188165-e7cdf372-e56f-11e7-8732-1338c88b9bb7.jpg"
width="200"
src="https://pichoro.msq.pub/images/zhifubao_money.jpg"
:alt="$T('ALIPAY')"
>
<div class="support-title">
Expand All @@ -140,7 +147,8 @@
</el-col>
<el-col :span="12">
<img
src="https://user-images.githubusercontent.com/12621342/34188201-212cda84-e570-11e7-9b7a-abb298699d85.jpg"
width="200"
src="https://pichoro.msq.pub/images/wechat_money.jpg"
:alt="$T('WECHATPAY')"
>
<div class="support-title">
Expand Down Expand Up @@ -352,7 +360,7 @@ export default {
<style lang='stylus'>
$darwinBg = transparentify(#172426, #000, 0.7)
.setting-list-scroll
height 425px
height 800px
overflow-y auto
overflow-x hidden
margin-right 0!important
Expand All @@ -370,6 +378,7 @@ $darwinBg = transparentify(#172426, #000, 0.7)
text-align center
margin 10px auto
#main-page
height 100%
.qrcode-dialog
.qrcode-container
display flex
Expand Down Expand Up @@ -473,6 +482,7 @@ $darwinBg = transparentify(#172426, #000, 0.7)
.main-content
padding-top 22px
position relative
height calc(100vh - 22px)
z-index 10
.el-dialog__body
padding 20px
Expand Down
13 changes: 13 additions & 0 deletions src/renderer/manage/ManageMain.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<template>
<div id="appm">
{{ test }}
</div>
</template>

<script lang="ts" setup>
const test = 'test'
</script>

<style lang="stylus">
</style>
5 changes: 3 additions & 2 deletions src/renderer/pages/PicGoSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
align="middle"
justify="center"
>
{{ $T('PICGO_SETTINGS') }} -
{{ $T('PICLIST_SETTINGS') }} -
<el-icon
class="el-icon-document"
@click="goConfigPage"
Expand Down Expand Up @@ -930,10 +930,11 @@ export default {
&:hover
color #49B1F5
#picgo-setting
height 100%
.sub-title
font-size 14px
.setting-list
height 360px
height 100%
box-sizing border-box
overflow-y auto
overflow-x hidden
Expand Down
6 changes: 4 additions & 2 deletions src/renderer/pages/Upload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -293,18 +293,20 @@ export default {
align-items center
justify-content center
#upload-view
height 100%
.view-title
margin 20px auto
#upload-area
height 220px
height 400px
border 2px dashed #dddddd
border-radius 8px
text-align center
width 450px
width 800px
margin 0 auto
color #dddddd
cursor pointer
transition all .2s ease-in-out
align-items center
#upload-dragger
height 100%
&.is-dragover,
Expand Down
1 change: 1 addition & 0 deletions src/renderer/router/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ export const SETTING_PAGE = 'SettingPage'
export const PLUGIN_PAGE = 'PluginPage'
export const SHORTKEY_PAGE = 'ShortkeyPage'
export const UPLOADER_CONFIG_PAGE = 'UploaderConfigPage'
export const MANAGE_MAIN_PAGE = 'ManageMainPage'
5 changes: 5 additions & 0 deletions src/renderer/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ export default createRouter({
{
path: '/:pathMatch(.*)*',
redirect: '/'
},
{
path: '/manage-main-page',
name: config.MANAGE_MAIN_PAGE,
component: () => import(/* webpackChunkName: "ManageMainPage" */ '@/manage/ManageMain.vue')
}
]
})
Loading

0 comments on commit 7421322

Please sign in to comment.