From d4a4a168cd0ce29cd785eb822c49fdcd7aa175d6 Mon Sep 17 00:00:00 2001 From: lumozx <969671691@qq.com> Date: Mon, 16 Oct 2023 16:26:18 +0800 Subject: [PATCH 1/3] fix: registerySystemPlugin -> registerSystemPlugin --- .../{registerySystemPlugin.ts => registerSystemPlugin.ts} | 0 src/main/index.ts | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/main/common/{registerySystemPlugin.ts => registerSystemPlugin.ts} (100%) diff --git a/src/main/common/registerySystemPlugin.ts b/src/main/common/registerSystemPlugin.ts similarity index 100% rename from src/main/common/registerySystemPlugin.ts rename to src/main/common/registerSystemPlugin.ts diff --git a/src/main/index.ts b/src/main/index.ts index 4e300c0..4784c93 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -21,7 +21,7 @@ import { import '../common/utils/localPlugin'; -import registerySystemPlugin from './common/registerySystemPlugin'; +import registerSystemPlugin from './common/registerSystemPlugin'; class App { public windowCreator: { init: () => void; getWindow: () => BrowserWindow }; @@ -36,7 +36,7 @@ class App { if (!gotTheLock) { app.quit(); } else { - this.systemPlugins = registerySystemPlugin(); + this.systemPlugins = registerSystemPlugin(); this.beforeReady(); this.onReady(); this.onRunning(); From af11f465186692afedf07bb80a50767918d66232 Mon Sep 17 00:00:00 2001 From: lumozx <969671691@qq.com> Date: Mon, 16 Oct 2023 16:26:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20LICENSE=E9=9D=9Emd=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- README.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 27a1344..8a6655d 100644 --- a/README.md +++ b/README.md @@ -94,4 +94,4 @@ This project exists thanks to all the people who contribute. [[Contribute](https ![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png) ## License -This project is licensed under the MIT License - see the [LICENSE.md](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details. diff --git a/README.zh-CN.md b/README.zh-CN.md index f2fd93f..b2fad49 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -94,5 +94,5 @@ This project exists thanks to all the people who contribute. [[Contribute](https ![image](https://user-images.githubusercontent.com/21073039/127327603-9796f246-ee4b-4950-a69d-ce3205ec9569.png) ## License -This project is licensed under the MIT License - see the [LICENSE.md](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](https://github.com/rubickCenter/rubick/blob/master/LICENSE) file for details. From 9c92e0f5faf3cc6f1d8763a20e492d3253fdb354 Mon Sep 17 00:00:00 2001 From: lumozx <969671691@qq.com> Date: Mon, 16 Oct 2023 16:30:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=BC=95=E5=AF=BC=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、margin-left太宽导致出现滚动条 2、aligin-items -> align-items 3、按钮优化鼠标手势 --- guide/src/App.vue | 8 +++++--- public/guide/css/app.5b19f647.css | 1 + public/guide/css/app.8c142cf3.css | 1 - public/guide/index.html | 2 +- public/guide/js/{app.b3377163.js => app.c403c1a5.js} | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 public/guide/css/app.5b19f647.css delete mode 100644 public/guide/css/app.8c142cf3.css rename public/guide/js/{app.b3377163.js => app.c403c1a5.js} (96%) diff --git a/guide/src/App.vue b/guide/src/App.vue index bb13c6f..338f980 100644 --- a/guide/src/App.vue +++ b/guide/src/App.vue @@ -102,11 +102,11 @@ const netStep = () => { } .info { padding-top: 42px; - margin-left: 178px; + margin-left: 84px; box-sizing: border-box; - width: 100%; text-align: left; position: relative; + align-self: flex-start; color: @text-color; .top-icon { position: absolute; @@ -147,9 +147,11 @@ const netStep = () => { background: @primary-color; color: #fff; display: flex; - aligin-items: center; + align-items: center; justify-content: center; border-radius: 4px; + cursor: pointer; + user-select: none; } } diff --git a/public/guide/css/app.5b19f647.css b/public/guide/css/app.5b19f647.css new file mode 100644 index 0000000..2455c03 --- /dev/null +++ b/public/guide/css/app.5b19f647.css @@ -0,0 +1 @@ +*{margin:0;padding:0}.guide-container .step0{padding:28px;padding-top:36px;box-sizing:border-box;display:flex;flex-direction:column;width:100vw;height:100vh}.guide-container .title{font-size:28px;font-weight:600;color:#574777}.guide-container .down-line{line-height:24px;color:#ff4ea4}.guide-container .desc{padding-top:10px;box-sizing:border-box;font-size:24px}.guide-container .img-container{flex:1;display:flex;flex-direction:column;justify-content:center;align-items:center}.guide-container .img{width:680px}.guide-container .info{padding-top:42px;margin-left:84px;box-sizing:border-box;text-align:left;position:relative;align-self:flex-start;color:#574777}.guide-container .info .top-icon{position:absolute;left:0;top:0;-webkit-user-select:none;-moz-user-select:none;user-select:none;width:1em;height:1em;display:inline-block;fill:currentcolor;flex-shrink:0;transition:fill .2s cubic-bezier(.4,0,.2,1) 0ms;font-size:1.5rem}.footer{position:fixed;bottom:0;left:0;width:100%;justify-content:space-between;padding:20px;box-sizing:border-box}.footer,.footer .step{display:flex;align-items:center}.footer .step-num{margin-right:20px}.footer .button{width:100px;height:40px;line-height:40px;background:#ff4ea4;color:#fff;display:flex;align-items:center;justify-content:center;border-radius:4px;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;user-select:none}.step4 .img{width:300px}.step1 .img{width:550px} \ No newline at end of file diff --git a/public/guide/css/app.8c142cf3.css b/public/guide/css/app.8c142cf3.css deleted file mode 100644 index 7de0077..0000000 --- a/public/guide/css/app.8c142cf3.css +++ /dev/null @@ -1 +0,0 @@ -*{margin:0;padding:0}.guide-container .step0{padding:28px;padding-top:36px;box-sizing:border-box;display:flex;flex-direction:column;width:100vw;height:100vh}.guide-container .title{font-size:28px;font-weight:600;color:#574777}.guide-container .down-line{line-height:24px;color:#ff4ea4}.guide-container .desc{padding-top:10px;box-sizing:border-box;font-size:24px}.guide-container .img-container{flex:1;display:flex;flex-direction:column;justify-content:center;align-items:center}.guide-container .img{width:680px}.guide-container .info{padding-top:42px;margin-left:178px;box-sizing:border-box;width:100%;text-align:left;position:relative;color:#574777}.guide-container .info .top-icon{position:absolute;left:0;top:0;-webkit-user-select:none;-moz-user-select:none;user-select:none;width:1em;height:1em;display:inline-block;fill:currentcolor;flex-shrink:0;transition:fill .2s cubic-bezier(.4,0,.2,1) 0ms;font-size:1.5rem}.footer{position:fixed;bottom:0;left:0;width:100%;justify-content:space-between;padding:20px;box-sizing:border-box}.footer,.footer .step{display:flex;align-items:center}.footer .step-num{margin-right:20px}.footer .button{width:100px;height:40px;line-height:40px;background:#ff4ea4;color:#fff;display:flex;aligin-items:center;justify-content:center;border-radius:4px}.step4 .img{width:300px}.step1 .img{width:550px} \ No newline at end of file diff --git a/public/guide/index.html b/public/guide/index.html index 118570b..77d06f1 100644 --- a/public/guide/index.html +++ b/public/guide/index.html @@ -1 +1 @@ -rubick 桌面端开源工具箱
\ No newline at end of file +rubick 桌面端开源工具箱
\ No newline at end of file diff --git a/public/guide/js/app.b3377163.js b/public/guide/js/app.c403c1a5.js similarity index 96% rename from public/guide/js/app.b3377163.js rename to public/guide/js/app.c403c1a5.js index 0a0e210..38f34d0 100644 --- a/public/guide/js/app.b3377163.js +++ b/public/guide/js/app.c403c1a5.js @@ -1 +1 @@ -(function(){"use strict";var i={544:function(i,n,s){var e=s(963),t=s(252),c=s(577),a=s.p+"img/img.02a1c5f1.png",r=s.p+"img/img_1.097595c9.png",l=s.p+"img/img_2.cd4c34db.png",o=s.p+"img/img_3.1ad5b474.png",u=s(262);const d={class:"guide-container"},v={class:"step0"},p=(0,t._)("div",{class:"title"},"您好，我叫 Rubick",-1),f=(0,t._)("div",{class:"desc"},[(0,t.Uk)("快捷键 "),(0,t._)("span",{class:"down-line"},"Alt + R"),(0,t.Uk)(" 可以快速打开我")],-1),g=(0,t._)("div",{class:"img-container"},[(0,t._)("img",{class:"img",src:a}),(0,t._)("div",{class:"info"},[(0,t._)("svg",{class:"top-icon",focusable:"false","aria-hidden":"true",viewBox:"0 0 24 24","data-testid":"NorthIcon"},[(0,t._)("path",{d:"m5 9 1.41 1.41L11 5.83V22h2V5.83l4.59 4.59L19 9l-7-7-7 7z"})]),(0,t.Uk)(" 点击 logo 进入插件市场 ")])],-1),m=[p,f,g],w={class:"step0 step1"},_=(0,t.uE)('
选择需要的插件安装
基于 npm 的插件包管理，像小程序一样，用完即走
',3),h=[_],b={class:"step0"},y=(0,t.uE)('
关键字搜索应用和插件
搜索框内输入关键字可以搜索安装的应用和插件
',3),O=[y],k={class:"step0 step1"},j=(0,t.uE)('
完全开源免费，支持内网部署
进入插件市场的 账户与设置 菜单，进行内网部署设置
',3),x=[j],F={class:"footer"},E=(0,t._)("div",null,null,-1),z={class:"step"},C={class:"step-num"};var R={__name:"App",setup(i){const n=(0,u.iH)(0),{ipcRenderer:s}=window.require("electron"),a=()=>{if(n.value>=3)return s.send("guide:service",{type:"close"});n.value=n.value+1};return(i,s)=>((0,t.wg)(),(0,t.iD)("div",d,[(0,t.wy)((0,t._)("div",v,m,512),[[e.F8,0===n.value]]),(0,t.wy)((0,t._)("div",w,h,512),[[e.F8,1===n.value]]),(0,t.wy)((0,t._)("div",b,O,512),[[e.F8,2===n.value]]),(0,t.wy)((0,t._)("div",k,x,512),[[e.F8,3===n.value]]),(0,t._)("div",F,[E,(0,t._)("div",z,[(0,t._)("span",C,(0,c.zw)(n.value+1)+" / 4",1),(0,t._)("div",{class:"button",onClick:a},(0,c.zw)(n.value+1===4?"完成":"下一步"),1)])])]))}};const U=R;var A=U;(0,e.ri)(A).mount("#app")}},n={};function s(e){var t=n[e];if(void 0!==t)return t.exports;var c=n[e]={exports:{}};return i[e](c,c.exports,s),c.exports}s.m=i,function(){var i=[];s.O=function(n,e,t,c){if(!e){var a=1/0;for(u=0;u=c)&&Object.keys(s.O).every((function(i){return s.O[i](e[l])}))?e.splice(l--,1):(r=!1,c0&&i[u-1][2]>c;u--)i[u]=i[u-1];i[u]=[e,t,c]}}(),function(){s.d=function(i,n){for(var e in n)s.o(n,e)&&!s.o(i,e)&&Object.defineProperty(i,e,{enumerable:!0,get:n[e]})}}(),function(){s.g=function(){if("object"===typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(i){if("object"===typeof window)return window}}()}(),function(){s.o=function(i,n){return Object.prototype.hasOwnProperty.call(i,n)}}(),function(){s.p=""}(),function(){var i={143:0};s.O.j=function(n){return 0===i[n]};var n=function(n,e){var t,c,a=e[0],r=e[1],l=e[2],o=0;if(a.some((function(n){return 0!==i[n]}))){for(t in r)s.o(r,t)&&(s.m[t]=r[t]);if(l)var u=l(s)}for(n&&n(e);o选择需要的插件安装
基于 npm 的插件包管理，像小程序一样，用完即走
',3),h=[_],b={class:"step0"},y=(0,t.uE)('
关键字搜索应用和插件
搜索框内输入关键字可以搜索安装的应用和插件
',3),O=[y],k={class:"step0 step1"},j=(0,t.uE)('
完全开源免费，支持内网部署
进入插件市场的 账户与设置 菜单，进行内网部署设置
',3),x=[j],F={class:"footer"},E=(0,t._)("div",null,null,-1),z={class:"step"},C={class:"step-num"};var R={__name:"App",setup(i){const n=(0,u.iH)(0),{ipcRenderer:s}=window.require("electron"),a=()=>{if(n.value>=3)return s.send("guide:service",{type:"close"});n.value=n.value+1};return(i,s)=>((0,t.wg)(),(0,t.iD)("div",d,[(0,t.wy)((0,t._)("div",v,m,512),[[e.F8,0===n.value]]),(0,t.wy)((0,t._)("div",w,h,512),[[e.F8,1===n.value]]),(0,t.wy)((0,t._)("div",b,O,512),[[e.F8,2===n.value]]),(0,t.wy)((0,t._)("div",k,x,512),[[e.F8,3===n.value]]),(0,t._)("div",F,[E,(0,t._)("div",z,[(0,t._)("span",C,(0,c.zw)(n.value+1)+" / 4",1),(0,t._)("div",{class:"button",onClick:a},(0,c.zw)(n.value+1===4?"完成":"下一步"),1)])])]))}};const U=R;var A=U;(0,e.ri)(A).mount("#app")}},n={};function s(e){var t=n[e];if(void 0!==t)return t.exports;var c=n[e]={exports:{}};return i[e](c,c.exports,s),c.exports}s.m=i,function(){var i=[];s.O=function(n,e,t,c){if(!e){var a=1/0;for(u=0;u=c)&&Object.keys(s.O).every((function(i){return s.O[i](e[l])}))?e.splice(l--,1):(r=!1,c0&&i[u-1][2]>c;u--)i[u]=i[u-1];i[u]=[e,t,c]}}(),function(){s.d=function(i,n){for(var e in n)s.o(n,e)&&!s.o(i,e)&&Object.defineProperty(i,e,{enumerable:!0,get:n[e]})}}(),function(){s.g=function(){if("object"===typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(i){if("object"===typeof window)return window}}()}(),function(){s.o=function(i,n){return Object.prototype.hasOwnProperty.call(i,n)}}(),function(){s.p=""}(),function(){var i={143:0};s.O.j=function(n){return 0===i[n]};var n=function(n,e){var t,c,a=e[0],r=e[1],l=e[2],o=0;if(a.some((function(n){return 0!==i[n]}))){for(t in r)s.o(r,t)&&(s.m[t]=r[t]);if(l)var u=l(s)}for(n&&n(e);o