GNVM - 使用 Go è¯è¨€ç¼–写的 Node.js 多版本管ç†å™¨
diff --git a/src/module/account.jsx b/src/module/account.jsx
new file mode 100644
index 000000000..edf389fab
--- /dev/null
+++ b/src/module/account.jsx
@@ -0,0 +1,144 @@
+console.log( "===== simpread option account load =====" )
+
+import {storage} from 'storage';
+import * as ss from 'stylesheet';
+import * as watch from 'watch';
+import * as run from 'runtime';
+
+import TextField from 'textfield';
+import Button from 'button';
+
+export default class AccountOpt extends React.Component {
+
+ static defaultProps = {
+ colors: ["rgb(255, 114, 129)", "rgb(64, 196, 255)", "rgb(255, 157, 68)", "rgb(140, 216, 66)", "rgb(251, 88, 74)", "rgb(255, 229, 95)", "rgb(0, 230, 118)", "rgb(0, 169, 240)", "rgb(128, 222, 234)", "rgb(247, 77, 95)", "rgb(255, 206, 73)", "rgb(250, 154, 63)", "rgb(255, 114, 129)", "rgb(57, 194, 241)", "rgb(141, 196, 72)", "rgb(128, 222, 234)", "rgb(83, 109, 254)", "rgb(255, 183, 77)", "rgb(197, 231, 99)", "rgb(239, 83, 80)", "rgb(0, 230, 118)", "rgb(57, 194, 241)", "rgb(100, 181, 246)", "rgb(119, 232, 86)", "rgb(239, 83, 80)", "rgb(0, 203, 232)", "rgb(0, 230, 118)", "rgb(255, 196, 0)", "rgb(255, 206, 73)", "rgb(167, 134, 116)", "rgb(86, 209, 216)", "rgb(253, 208, 174)", "rgb(197, 231, 99)", "rgb(239, 88, 74)", "rgb(249, 79, 40)", "rgb(255, 88, 100)", "rgb(197, 231, 99)", "rgb(0, 177, 251)", "rgb(255, 206, 73)", "rgb(251, 182, 75)", "rgb(197, 231, 99)", "rgb(35, 180, 210)", "rgb(255, 206, 73)", "rgb(255, 229, 95)", "rgb(64, 196, 255)", "rgb(255, 114, 129)", "rgb(119, 232, 86)", "rgb(139, 223, 231)", "rgb(0, 169, 240)"],
+ idx : "abcdefghijklmnopqrstuvwxyz0123456789",
+ }
+
+ state = {
+ uid_err : "",
+ name_err : "",
+ email_err: "",
+ };
+
+ onChangeName( event ) {
+ const value = event.target.value;
+ if ( /^([\u2E80-\u9FFFA-Za-z0-9]+)([ ]?)([\u2E80-\u9FFFA-Za-z0-9]*)$/ig.test( value ) ) {
+ this.setState({ name_err : "" });
+ } else this.setState({ name_err : "åªèƒ½åŒ…å«ä¸è‹±æ–‡ + æ•°å— + ä¸é—´çš„ç©ºæ ¼" });
+ storage.user.name = value;
+ }
+
+ onChangeEmail( event ) {
+ const value = event.target.value;
+ if ( /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/ig.test( value ) ) {
+ this.setState({ email_err : "" });
+ } else this.setState({ email_err : "请确ä¿è¾“å…¥æ£ç¡®çš„ Email 地å€" });
+ storage.user.email = value;
+ }
+
+ onChangeContact( event ) {
+ storage.user.contact = event.target.value.trim();
+ }
+
+ componentWillMount() {
+ if ( storage.user.uid == "" ) {
+ storage.user.uid = run.ID( "user" );
+ storage.Write( () => {
+ console.log( "current user info is ", storage.user )
+ this.setState({ uid_err : "" });
+ watch.SendMessage( "option", true );
+ }, storage.simpread );
+ }
+ this.props.load.first && this.stat();
+ }
+
+ stat() {
+ $.ajax({
+ url : storage.service + "/stats/service/count/",
+ method: "POST",
+ data : {type: this.props.load.update ? "update" : "first" }
+ }).done( ( result, textStatus, jqXHR ) => {
+ console.log( "count success " )
+ }).fail( error => {
+ console.log( "count failed ", error )
+ });
+ }
+
+ save() {
+ if ( storage.user.name.trim() == "" ) {
+ this.setState({ name_err : "昵称ä¸èƒ½ä¸ºç©º" });
+ return;
+ } else if ( storage.user.email.trim() == "" ) {
+ this.setState({ email_err : "昵称ä¸èƒ½ä¸ºç©º" });
+ return;
+ }
+ $.ajax({
+ url : storage.service + "/users/service/update/" + storage.user.uid,
+ method: "POST",
+ data : storage.user
+ }).done( ( result, textStatus, jqXHR ) => {
+ result.code == 201 ?
+ storage.Write( ()=> {
+ watch.SendMessage( "option", true );
+ new Notify().Render( "æ›´æ–°æˆåŠŸï¼Œè¯·åˆ·æ–°æœ¬é¡µï¼" );
+ }) :
+ new Notify().Render( 2, "更新出现错误，请ç¨åŽå†è¯•ï¼" );
+ }).fail( error => {
+ new Notify().Render( 2, "更新出现错误，请ç¨åŽå†è¯•ï¼" );
+ });
+ }
+
+ render() {
+ let avatar = this.props.user.avatar;
+ if ( avatar == "" ) {
+ avatar = this.props.user.name.substr( 0, 1 );
+ }
+ let idx = this.props.idx.indexOf( avatar.toLowerCase() );
+ idx == -1 && ( idx = 0 );
+ const color = this.props.colors[idx];
+ return (
+
+
用户信æ¯
+
+
+ { avatar && { avatar.toUpperCase() } }
+
+
+
+
+
+ this.onChangeName(e) } disable={false} />
+
+
+ this.onChangeEmail(e) } disable={false} />
+
+
+ this.onChangeContact(e) } disable={false} />
+
+
+
+
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/src/module/actionbar.jsx b/src/module/actionbar.jsx
index 3aad9143b..f0abdfc46 100644
--- a/src/module/actionbar.jsx
+++ b/src/module/actionbar.jsx
@@ -32,7 +32,7 @@ export default class Actionbar extends React.Component {
const obj = this.props.items[key].items[item];
return (
;
}
diff --git a/src/module/common.jsx b/src/module/common.jsx
index 0aa064e09..b51667614 100644
--- a/src/module/common.jsx
+++ b/src/module/common.jsx
@@ -9,7 +9,8 @@ import * as ver from 'version';
import * as menu from 'menu';
import * as watch from 'watch';
import * as exp from 'export';
-import {br} from 'browser';
+import {browser,br}from 'browser';
+import * as msg from 'message';
export default class CommonOpt extends React.Component {
@@ -23,20 +24,43 @@ export default class CommonOpt extends React.Component {
sync() {
let notify;
- const dbx = exp.dropbox,
- read = () => {
+ const dbx = exp.dropbox,
+ jianguo = exp.jianguo,
+ write = () => {
+ storage.option.sync = Now();
+ storage.Write( () => {
+ writeConfig();
+ });
+ },
+ readDropbox = () => {
notify = new Notify().Render({ content: "æ•°æ®åŒæ¥ä¸ï¼Œè¯·ç¨ç‰...", state: "loading" });
dbx.Exist( dbx.config_name, ( result, error ) => {
if ( result == -1 ) {
- storage.option.sync = Now();
- storage.Write( () => {
- dbx.Write( dbx.config_name, storage.Export(), callback );
- });
+ write();
} else {
dbx.Read( dbx.config_name, callback );
}
});
},
+ readJianguo = ( obj ) => {
+ notify = new Notify().Render({ content: "æ•°æ®åŒæ¥ä¸ï¼Œè¯·ç¨ç‰...", state: "loading" });
+ jianguo.Read( obj.username, obj.password, jianguo.config_name, result => {
+ if ( result && result.status == 404 ) {
+ write();
+ } else if ( result && result.status == 200 ) {
+ callback( "read", result.done );
+ }
+ });
+ },
+ writeConfig = () => {
+ if ( storage.option.save_at == "dropbox" ) {
+ dbx.Write( dbx.config_name, storage.Export(), callback );
+ } else {
+ jianguo.Add( storage.secret.jianguo.username, storage.secret.jianguo.password, jianguo.root + "/" + jianguo.config_name, storage.Export(), result => {
+ callback( "write", undefined, result && [ 201, 204 ].includes( result.status ) ? undefined : "error" );
+ });
+ }
+ },
callback = ( type, result, error ) => {
notify.complete();
switch ( type ) {
@@ -50,11 +74,8 @@ export default class CommonOpt extends React.Component {
remote = new Date( json.option.update.replace( /年|月/ig, "-" ).replace( "日", "" ));
if ( ver.Compare( json.version ) == 1 ) {
new Notify().Render( "本地版本与远程版本ä¸ä¸€è‡´ï¼Œä¸”本地版本较新，是å¦è¦†ç›–远程版本？", "覆盖", () => {
- storage.option.sync = Now();
- storage.Write( () => {
- watch.SendMessage( "import", true );
- dbx.Write( dbx.config_name, storage.Export(), callback );
- }, storage.simpread );
+ watch.SendMessage( "import", true );
+ write();
});
}
else if ( local < remote ) {
@@ -69,11 +90,8 @@ export default class CommonOpt extends React.Component {
});
} else if ( local > remote ) {
new Notify().Render( "本地é…置文件较新，是å¦è¦†ç›–远程备份文件？", "覆盖", () => {
- storage.option.sync = Now();
- storage.Write( () => {
- watch.SendMessage( "import", true );
- dbx.Write( dbx.config_name, storage.Export(), callback );
- }, storage.simpread );
+ watch.SendMessage( "import", true );
+ write();
});
} else {
new Notify().Render( "本地与远程数æ®ç›¸åŒï¼Œæ— 需é‡å¤åŒæ¥ã€‚" );
@@ -83,26 +101,32 @@ export default class CommonOpt extends React.Component {
};
storage.Safe( ()=> {
- const sec_dbx = storage.secret.dropbox;
- !sec_dbx.access_token ?
- new Notify().Render( `未对 ${ dbx.name } 授æƒï¼Œè¯·å…ˆè¿›è¡ŒæŽˆæƒæ“作。`, "授æƒ", () => {
- dbx.New().Auth();
- dbx.dtd
- .done( () => {
- sec_dbx.access_token = dbx.access_token;
- storage.Safe( () => {
- new Notify().Render( "授æƒæˆåŠŸï¼" );
- read();
- }, storage.secret );
- })
- .fail( error => {
- console.error( error )
- new Notify().Render( 2, `èŽ·å– ${ dbx.name } 授æƒå¤±è´¥ï¼Œè¯·é‡æ–°èŽ·å–。` );
- });
- }) : ( () => {
- dbx.access_token = sec_dbx.access_token;
- read();
- })();
+ browser.runtime.sendMessage( msg.Add( msg.MESSAGE_ACTION.track, { eventCategory: "sync", eventAction: "sync", eventValue: storage.option.save_at }) );
+ if ( storage.option.save_at == "dropbox" ) {
+ const sec_dbx = storage.secret.dropbox;
+ !sec_dbx.access_token ?
+ new Notify().Render( `未对 ${ dbx.name } 授æƒï¼Œè¯·å…ˆè¿›è¡ŒæŽˆæƒæ“作。`, "授æƒ", () => {
+ dbx.New().Auth();
+ dbx.dtd
+ .done( () => {
+ sec_dbx.access_token = dbx.access_token;
+ storage.Safe( () => {
+ new Notify().Render( "授æƒæˆåŠŸï¼" );
+ readDropbox();
+ }, storage.secret );
+ })
+ .fail( error => {
+ console.error( error )
+ new Notify().Render( 2, `èŽ·å– ${ dbx.name } 授æƒå¤±è´¥ï¼Œè¯·é‡æ–°èŽ·å–。` );
+ });
+ }) : ( () => {
+ dbx.access_token = sec_dbx.access_token;
+ readDropbox();
+ })();
+ } else {
+ const jianguo = storage.secret.jianguo;
+ !jianguo.access_token ? new Notify().Render( 2, `åšæžœäº‘
。` ) : readJianguo( storage.secret.jianguo );
+ }
});
}
@@ -112,7 +136,7 @@ export default class CommonOpt extends React.Component {
onload = event => {
if ( event && event.target && event.target.result ) {
try {
- let json = JSON.parse( event.target.result );
+ let json = ver.FixSubver( ver.patch, JSON.parse( event.target.result ));
const result = ver.Compare( json.version );
if ( result < 0 ) {
result == -1 && new Notify().Render( 2, "ä¸Šä¼ å¤±è´¥ï¼Œå½“å‰ç‰ˆæœ¬å¤ªä½Žï¼Œè¯·å‡çº§ç®€æ‚¦ã€‚" );
@@ -128,18 +152,24 @@ export default class CommonOpt extends React.Component {
storage.version != json.version &&
storage.Fix( json.read.sites, json.version, storage.version, json.focus.sites );
json = ver.Verify( json.version, json );
- new Notify().Render( "ä¸Šä¼ ç‰ˆæœ¬å¤ªä½Žï¼Œå·²è‡ªåŠ¨è½¬æ¢ä¸ºæœ€æ–°ç‰ˆæœ¬ã€‚" );
+ new Notify().Render({ type: 2, content: `ä¸Šä¼ ç‰ˆæœ¬å¤ªä½Žï¼Œå·²è‡ªåŠ¨è½¬æ¢ä¸ºæœ€æ–°ç‰ˆæœ¬ã€‚`, state: "holdon" });
}
menu.Refresh( json.option.menu );
+ ver.Incompatible( json.version, json ) && new Notify().Render({ type: 2, content: `æ£€æµ‹åˆ°ä½ æ›¾ç»ä¿®æ”¹è¿‡ç¬¬ä¸‰æ–¹é€‚é…æºï¼Œ
`, state: "holdon" });
+ ver.VerifyPlugins( json.option ) && new Notify().Render({ type: 2, content: `已清ç†å¤±æ•ˆçš„æ’件，详细请看
`, state: "holdon" });
json.option.origins && json.option.origins.length > 0 &&
- new Notify().Render( "导入的é…置文件包å«äº†ç¬¬ä¸‰æ–¹æºï¼Œè¯·é€šè¿‡æ‰‹åŠ¨å¯¼å…¥ã€‚" );
+ new Notify().Render({ content: `导入的é…置文件包å«äº†ç¬¬ä¸‰æ–¹æºï¼Œåˆ·æ–°åŽè¯·é‡æ–°
。`, state: "holdon" });
+ json.option.plugins && json.option.plugins.length > 0 &&
+ new Notify().Render({ content: `导入的é…置文件包å«äº†æ’件，刷新åŽè¯·é‡æ–°
。`, state: "holdon" });
this.importsecret( json.option.secret, { ...json.secret }, () => {
delete json.secret;
storage.Write( ()=> {
- watch.SendMessage( "import", true );
- new Notify().Render( "snackbar", "导入æˆåŠŸï¼Œè¯·åˆ·æ–°å½“å‰é¡µé¢ï¼Œä»¥ä¾¿æ–°é…置文件生效。", "刷新", () => {
- location.href = location.origin + location.pathname + "?simpread_mode=reload";
- });
+ storage.Plugins( () => {
+ watch.SendMessage( "import", true );
+ new Notify().Render( "snackbar", "导入æˆåŠŸï¼Œè¯·åˆ·æ–°å½“å‰é¡µé¢ï¼Œä»¥ä¾¿æ–°é…置文件生效。", "刷新", () => {
+ location.href = location.origin + location.pathname + "?simpread_mode=reload";
+ });
+ }, {} );
}, json );
});
}
@@ -166,6 +196,14 @@ export default class CommonOpt extends React.Component {
}
}
+ oldnewsites() {
+ new Notify().Render( "æ¤åŠŸèƒ½è½¬ç§»åˆ°
选项å¡é‡Œé¢ï¼Œ3 秒钟åŽè‡ªåŠ¨åˆ‡æ¢åˆ°æ¤é€‰é¡¹å¡ã€‚" );
+ setTimeout( ()=> {
+ location.href = location.origin + "/options/options.html#labs";
+ window.dispatchEvent( new CustomEvent( msg.MESSAGE_ACTION.turn_tab, { detail: { page: 3 }}));
+ }, 3000 );
+ }
+
newsites() {
const notify = new Notify().Render({ content: "æ•°æ®åŒæ¥ä¸ï¼Œè¯·ç¨ç‰...", state: "loading" });
storage.GetRemote( "remote", ( result, error ) => {
@@ -183,7 +221,7 @@ export default class CommonOpt extends React.Component {
}
clear() {
- new Notify().Render( "snackbar", "是å¦æ¸…除掉本地é…置文件？", "åŒæ„ ", () => {
+ new Notify().Render( "snackbar", "是å¦æ¸…除掉（已包å«è´¦æˆ·ä¿¡æ¯ï¼‰æœ¬åœ°é…置文件？", "åŒæ„ ", () => {
storage.Clear( "local", () => {
new Notify().Render( "snackbar", "清除æˆåŠŸï¼Œæ¤é¡µé¢éœ€åˆ·æ–°åŽæ‰èƒ½ç”Ÿæ•ˆï¼", "刷新 ", ()=>{
location.href = location.origin + location.pathname + "?simpread_mode=clear";
@@ -219,12 +257,15 @@ export default class CommonOpt extends React.Component {
render() {
return(
+ 
+ 
- 
- 
- 
- 
+ 
+ 
+ 
-- 多ç§ä¸»é¢˜ï¼š
- `白练ã€ç™½ç£ã€å¯ä¹‹èŠ±è‰²ã€ä¸å色ã€å¨Ÿé¼ ã€æœˆç™½ã€ç™¾åˆã€ç´ºé¼ ã€é»’鸢` ç‰
+> 在 1.0.0 版上线之åˆå°±å·²ç»æž„想了æ¤åŠŸèƒ½ï¼Œæ‰€ä»¥åœ¨æž„ç‘æ¤åŠŸèƒ½æ—¶ï¼ŒåŠ 入了很多åªæœ‰ **简悦 · æ ‡æ³¨** æ‰å…·æœ‰çš„功能。
-- 丰富的导出功能，包括：
+- 五ç§æ ‡æ³¨é¢œè‰²
- - 导出 [Markdown](https://github.com/Kenshin/simpread#æ„Ÿè°¢) · `HTML` · `PNG` · `PDF` · [epub](https://github.com/Kenshin/simpread/wiki/å‘é€åˆ°-epub)
+- å››ç§æ ‡æ³¨æ ·å¼
- - å‘é€é˜…读模å¼ä¼˜åŒ–åŽçš„页é¢åˆ° `Kindle`，详细é…ç½® [请看这里](https://github.com/Kenshin/simpread/wiki/å‘é€åˆ°-Kindle)
+- 自动识别 **æ–‡å—** · **图片** · **代ç 段**
- - 导出到 `Pocket` `Linnk` `Instapaper` 的功能，包括：`当å‰é¡µé¢çš„链接` `ç¨åŽè¯»`
+- **æ— é™å±‚级** çš„æ ‡ç¾ç³»ç»Ÿ
- - 导出到生产力工具，包括：`Dropbox` `Onenote` `Google Drive` `å°è±¡ç¬”è®° / Evernote`，详细请看 [授æƒæœåŠ¡](https://github.com/Kenshin/simpread/wiki/授æƒæœåŠ¡)
+- æ¯ä¸ªæ ‡ç¾å‡æ”¯æŒå¤‡æ³¨ä¸Žæ ‡ç¾ç³»ç»Ÿ
-- åŒæ¥ · ä¸Šä¼ /下载 é…ç½® · åŒæ¥é€‚é…列表 · [å¿«æ·é”®æ”¯æŒ](https://github.com/kenshin/simpread/wiki/å¿«æ·é”®) ç‰ï¼›
+- 结åˆç®€æ‚¦å¼ºå¤§çš„å‘é€åˆ°ç”Ÿäº§åŠ›å·¥å…·çš„功能，å¯å°†å½“å‰æ ‡æ³¨å‘é€åˆ°ç®€æ‚¦æ”¯æŒçš„å„ç§ç”Ÿäº§åŠ›å·¥å…·
-- 高级定制，包括：`å³é”®èœå•` `控制æ å¯éšè—` `阅读进度å¯éšè—` `自动进入阅读模å¼` [白åå•](https://github.com/kenshin/simpread/wiki/faq#白åå•) ä»¥åŠ [排除列表](https://github.com/kenshin/simpread/wiki/faq#排除列表) ç‰
+- è¿žç»æ ‡æ³¨
-- ç¨åŽè¯»
+- [æµ®åŠ¨æ ‡æ³¨æ ](http://ksria.com/simpread/docs/#/æ ‡æ³¨?id=浮动工具æ )
-#### 截图：
-
-
-
+- [æ ‡æ³¨ä¾§æ ](http://ksria.com/simpread/docs/#/æ ‡æ³¨?id=æ ‡æ³¨ä¾§æ )
-#### 照片集：
-> 包å«äº† `ç¨åŽè¯»` `é˜…è¯»æ¨¡å¼ Â· 设置界é¢` `导出到生产力工具` `å‘é€åˆ° Kindle` `è‡ªå®šä¹‰æ ·å¼` `åŒæ¥é…ç½®` `论å›ç±»é¡µé¢ · 分页` ç‰åŠŸèƒ½çš„截图（动图）
+> 如何使用以åŠè¯¦ç»†å†…容 [请看这里](http://ksria.com/simpread/docs/#/æ ‡æ³¨)
-* 
-`简悦`会自动检测当å‰é¡µé¢æ˜¯å¦å·²ç»é€‚é…，如适é…则在æµè§ˆå™¨å³ä¸Šè§’显示  ，使用以下三ç§æ–¹å¼å¯åŠ¨ï¼š
+> 简悦的ç¨åŽè¯»å€Ÿé‰´äº† ZK 笔记法的一些特点，专门针对信æ¯çš„æ•´åˆå¢žåŠ 了如下一些新功能：
+
+- [**åŒå‘链接**](http://ksria.com/simpread/docs/#/åŒå‘链接)
+- [**知识图谱**](http://ksria.com/simpread/docs/#/åŒå‘链接?id=图谱)
+- [**Mindmap**](http://ksria.com/simpread/docs/#/ç¨åŽè¯»?id=Mindmap)
+- **多ç§ä¿¡æ¯å±•ç¤ºæ–¹å¼ï¼ˆå¸ƒå±€ï¼‰**：[Evergreen](http://ksria.com/simpread/docs/#/ç¨åŽè¯»-多ç§å¸ƒå±€?id=Evergreen) · [Workflowy](http://ksria.com/simpread/docs/#/ç¨åŽè¯»-多ç§å¸ƒå±€?id=Workflowy) · [Kanban](http://ksria.com/simpread/docs/#/ç¨åŽè¯»-多ç§å¸ƒå±€?id=Kanban)
+- [**读å–本地 HTML**](https://github.com/Kenshin/simpread/discussions/2146)
+
+
+
+
+
+#### åŒæ¥åŠ©æ‰‹  
+
+
+
+> [简悦 · åŒæ¥åŠ©æ‰‹](http://ksria.com/simpread/docs/#/Sync) 是 **éšç€ç®€æ‚¦ 2.1.0 å‘布的一个全新的 Desktop App**，用于对简悦已知功能的补充，以åŠä¼š **æŒç»æ供更多** çš„å¯çŽ©æ€§ï¼ŒåŒ…括：
+
+1. **[自动åŒæ¥](http://ksria.com/simpread/docs/#/自动åŒæ¥)**
+2. **å°ä¹¦ç¾**
+3. 导出到文件 **本地的任æ„ä½ç½®**
+4. **原生 PDF · Epub** 导出
+5. **直接å‘é€åˆ°ä½ çš„ Kindle**
+6. 内置解æž
+7. **邮件å‘é€**
+
+åŒæ¥åŠ©æ‰‹çš„ Logo 自于社区用户 [Shawn](https://shawnan.design/) 的设计。
+
+#### æ’件系统 
+
+ > 使用 JavaScript 编写基于 `简悦` çš„æ’件了，请看 [æ’件ä¸å¿ƒ](https://simpread.ksria.cn/plugins/)
+
+## 全部功能
+
+
+
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+