diff --git a/exeChmod.js b/exeChmod.js deleted file mode 100644 index f051481..0000000 --- a/exeChmod.js +++ /dev/null @@ -1,5 +0,0 @@ -var sh = require('shelljs'); - -sh.find('./dist/assets/exe').forEach(f => { - sh.chmod('+x', f); -}); diff --git a/package-lock.json b/package-lock.json index 55ff17a..123eabd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11164,6 +11164,154 @@ "is-finite": "1.0.2" } }, + "replace-in-file": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-3.4.0.tgz", + "integrity": "sha512-fto9Ooab00CniGkSjRCZCamER7P5S4mZHQ4w4dLd09nwP3FtFfjUJh8/OVC/In4ki5MEy+dYO5v9r7rtq2DrYQ==", + "dev": true, + "requires": { + "chalk": "2.4.1", + "glob": "7.1.2", + "yargs": "11.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true + }, + "yargs": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, "request": { "version": "2.87.0", "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", diff --git a/package.json b/package.json index e0dcb6c..b99f054 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "ng": "ng", "start": "ng serve", - "build": "ng build --prod && node exeChmod.js", + "build": "ng build", + "prepack": "ng build --delete-output-path=false && npm --prefix ./dist i ./dist --production && node postBuild.js", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", @@ -14,9 +15,9 @@ "dev": "electron ./src/electron.dev", "prod": "npm run build && electron ./dist/electron.prod", "reprod": "electron ./dist/electron.prod", - "package:win": "npm run build && cross-var electron-packager dist $npm_package_name-$npm_package_version --out=packages --arch=all --overwrite --platform=win32", - "package:osx": "npm run build && cross-var electron-packager dist $npm_package_name-$npm_package_version --out=packages --arch=all --overwrite --platform=darwin", - "package:lnx": "npm run build && cross-var electron-packager dist $npm_package_name-$npm_package_version --out=packages --arch=all --overwrite --platform=linux", + "package:win": "npm run prepack && cross-var electron-packager dist $npm_package_name-$npm_package_version --out=packages --arch=all --overwrite --icon=ystock.icns --platform=win32", + "package:osx": "npm run prepack && cross-var electron-packager dist $npm_package_name-$npm_package_version --out=packages --arch=all --overwrite --icon=ystock.icns --platform=darwin", + "package:lnx": "npm run prepack && cross-var electron-packager dist $npm_package_name-$npm_package_version --out=packages --arch=all --overwrite --icon=ystock.icns --platform=linux", "erb": "electron-rebuild" }, "private": true, @@ -74,6 +75,7 @@ "karma-jasmine": "~1.1.0", "karma-jasmine-html-reporter": "^0.2.2", "protractor": "~5.1.2", + "replace-in-file": "^3.4.0", "shelljs": "^0.8.2", "ts-node": "~4.1.0", "tslint": "~5.9.1", diff --git a/postBuild.js b/postBuild.js new file mode 100644 index 0000000..5e05cdc --- /dev/null +++ b/postBuild.js @@ -0,0 +1,21 @@ +//set geth exec permissions +var sh = require('shelljs'); +sh.find('./dist/assets/exe').forEach(f => { + sh.chmod('+x', f); +}); + +//replace baseref +const replace = require('replace-in-file'); +const options = { + files: './dist/index.html', + from: /base href="\/"/g, + to: 'base href="./"', +}; + +replace(options) + .then(changes => { + console.log('Modified files:', changes.join(', ')); + }) + .catch(error => { + console.error('Error occurred:', error); + }); diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index b3c7bc8..d3b5c0f 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/assets/images/stacked-512.png b/src/assets/images/stacked-512.png index 47019af..7a4ce00 100644 Binary files a/src/assets/images/stacked-512.png and b/src/assets/images/stacked-512.png differ diff --git a/src/package.json b/src/package.json index 6f68256..4b0d8f8 100644 --- a/src/package.json +++ b/src/package.json @@ -4,5 +4,10 @@ "version": "0.0.1", "description": "Tokenized Selfhood", "main": "electron.prod.js", - "license": "MIT" + "license": "MIT", + "dependencies": { + "electron-default-menu": "^1.0.1", + "untildify": "^3.0.3", + "web3": "^1.0.0-beta.34" + } } diff --git a/ystock.icns b/ystock.icns new file mode 100644 index 0000000..4229e90 Binary files /dev/null and b/ystock.icns differ