Skip to content

Commit

Permalink
upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
CN-Tower committed Aug 22, 2021
1 parent 672cf0b commit 146bf96
Show file tree
Hide file tree
Showing 139 changed files with 103 additions and 16,655 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ dist
tmp
out-tsc
package/
package-lock.json
*.dmg
*.msi
*.exe
*.nupkg

# dependencies
/node_modules
node_modules
package-lock.json
yarn-lock.json

# IDEs and editors
/.idea
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
- Algorithm: https://github.com/CN-Tower/format-to-json

#### 主页界面
![](/zjson.png)
![](/assets/zjson.png)
#### 对比界面
![](/zjson-diff.png)
![](/assets/zjson-diff.png)

### 二、简单介绍

Expand All @@ -31,7 +31,7 @@

相比其它在线格式化工具,如:bejson.com和json.cn等,转杰森界面更加专业、功能更加实用,绝对是开发和测试的好工具。

![](/mean.jpg)
![](/assets/mean_stack.jpg)

### 三、运行项目

Expand Down
Binary file added assets/dmg_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
2 changes: 1 addition & 1 deletion build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@ <h2>ZJSON</h2>&nbsp;<h5>.NET</h5>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.8/FileSaver.min.js"></script> -->
<!-- cdn2 end -->
<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.18d8a486114914821f7d.js"></script><script type="text/javascript" src="scripts.1db5d026d70e1dc15a88.js"></script><script type="text/javascript" src="main.1f040432f780973d113a.js"></script></body>
<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.18d8a486114914821f7d.js"></script><script type="text/javascript" src="scripts.1db5d026d70e1dc15a88.js"></script><script type="text/javascript" src="main.23b471c01390dd83afb2.js"></script></body>
</html>

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions electron-app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@

<!-- 百度统计 -->
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?d3aa7f1c94348134747346fd79bc79ee";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
const { ipcRenderer } = require('electron');
const { ebtRenderer } = require('electron-baidu-tongji');
ebtRenderer(ipcRenderer, '17128298');
</script>

<!-- Global site tag (gtag.js) - Google Analytics -->
Expand Down
5 changes: 4 additions & 1 deletion electron-app/main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const {app, BrowserWindow, ipcMain} = require('electron')
const {app, BrowserWindow, ipcMain} = require('electron');
const { ebtMain } = require('electron-baidu-tongji');
// const fetch = require('node-fetch');
// const fn = require('funclib');
// const fs = require('fs');
Expand Down Expand Up @@ -49,6 +50,8 @@ ipcMain.on('maxWindow', () => {
if (mainWindow) mainWindow.maximize();
});

ebtMain(ipcMain);

// function update() {
// fn.rm(tmpPath);
// fn.mk(tmpPath);
Expand Down
238 changes: 0 additions & 238 deletions electron-app/node_modules/funclib/README.md

This file was deleted.

Loading

0 comments on commit 146bf96

Please sign in to comment.