diff --git a/README.md b/README.md index 7cfd916..35e668e 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ - Algorithm: https://github.com/CN-Tower/format-to-json #### 主页界面 -![](/assets/zjson.png) +![](/images/zjson.png) #### 对比界面 -![](/assets/zjson-diff.png) +![](/images/zjson-diff.png) ### 二、简单介绍 @@ -31,7 +31,7 @@ 相比其它在线格式化工具,如:bejson.com和json.cn等,转杰森界面更加专业、功能更加实用,绝对是开发和测试的好工具。 -![](/assets/mean_stack.jpg) +![](/images/mean-stack.jpg) ### 三、运行项目 diff --git a/assets/dmg_bg.png b/electron-app/dmg-bg.png similarity index 100% rename from assets/dmg_bg.png rename to electron-app/dmg-bg.png diff --git a/assets/zjson.icns b/electron-app/zjson.icns similarity index 100% rename from assets/zjson.icns rename to electron-app/zjson.icns diff --git a/assets/zjson.ico b/electron-app/zjson.ico similarity index 100% rename from assets/zjson.ico rename to electron-app/zjson.ico diff --git a/assets/mean_stack.jpg b/images/mean-stack.jpg similarity index 100% rename from assets/mean_stack.jpg rename to images/mean-stack.jpg diff --git a/assets/zjson-diff.png b/images/zjson-diff.png similarity index 100% rename from assets/zjson-diff.png rename to images/zjson-diff.png diff --git a/assets/zjson.png b/images/zjson.png similarity index 100% rename from assets/zjson.png rename to images/zjson.png diff --git a/package.json b/package.json index 6c8c74d..ce51e54 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "electron": "node scripts/prepare.js electron && ng build --prod && node scripts/electron.js && electron dist", "electron:dist": "electron dist", "electron:build": "node scripts/prepare.js electron && ng build --prod && node scripts/electron.js package && node scripts/webpack.config.js", - "electron:dmg": "electron-packager dist zjson --platform=darwin --out=package --icon=assets/zjson.icns --overwrite", - "electron:exe": "electron-packager dist zjson --platform=win32 --out=package --icon=assets/zjson.ico --overwrite", + "electron:dmg": "electron-packager dist zjson --platform=darwin --out=package --icon=electron-app/zjson.icns --overwrite", + "electron:exe": "electron-packager dist zjson --platform=win32 --out=package --icon=electron-app/zjson.ico --overwrite", "package:dmg": "node scripts/build-dmg.js && node scripts/rename.js dmg", "package:exe": "node scripts/build-exe.js && node scripts/rename.js exe", "preview": "serve build", @@ -78,6 +78,7 @@ "ts-node": "~5.0.1", "tslint": "~5.9.1", "typescript": "~2.7.2", + "webpack": "^4.46.0", "webpack5.51.1": "npm:webpack@5.51.1" } } diff --git a/scripts/build-dmg.js b/scripts/build-dmg.js index eb522d9..4a994d3 100644 --- a/scripts/build-dmg.js +++ b/scripts/build-dmg.js @@ -20,8 +20,8 @@ createDMG( out: outPath, name: 'zjson-darwin-x64', title: 'ZJSON', - background: path.join(rootPath, 'assets/dmg_bg.png'), - icon: path.join(rootPath, 'assets/zjson.icns'), + background: path.join(rootPath, 'electron-app/dmg-bg.png'), + icon: path.join(rootPath, 'electron-app/zjson.icns'), overwrite: true, }, (err) => { diff --git a/scripts/build-exe.js b/scripts/build-exe.js index b8fd805..8749086 100644 --- a/scripts/build-exe.js +++ b/scripts/build-exe.js @@ -19,8 +19,8 @@ files.forEach(f => fn.rm(f)); name: 'zjson', productName: 'zjson', exe: 'zjson.exe', - icon: path.join(rootPath, 'assets/zjson.ico'), - iconNuget: path.join(rootPath, 'assets/zjson.ico'), + icon: path.join(rootPath, 'electron-app/zjson.ico'), + iconNuget: path.join(rootPath, 'electron-app/zjson.ico'), homepage: 'https://www.zjson.net', description: 'A powerful json formate tool!', });