Skip to content

Commit

Permalink
Merge pull request #9 from energywebfoundation/feat/rebranding
Browse files Browse the repository at this point in the history
feat(rebranding): icons, names and paths changed
  • Loading branch information
ngyam authored Sep 17, 2018
2 parents 6e12c99 + 1cc0933 commit 3f4cfa8
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 25 deletions.
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ _Before filing a new issue, please **provide the following information**._
> I'm running:
>
> - **Parity client version**: 0.0.0
> - **Parity UI version**: 0.0.0
> - **EnergyWeb UI version**: 0.0.0
> - **Operating system**: Windows / MacOS / Linux
> - **Installed via**: installer / snap / binaries / from source
> - **Fully synchronized**: no / yes
> - **Network**: ethereum / ropsten / kovan / ...
> - **I tried to restart both Parity UI and Parity Ethereum client**: no / yes
> - **I tried to restart both EnergyWeb UI and Parity Ethereum client**: no / yes
_Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._

Binary file added assets/icon/EWF-Brandmark-white1024px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icon/EWF-Brandmark-white512px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions electron/config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"appId": "io.parity.ui",
"appId": "io.ewf.ui",
"directories": {
"buildResources": "./"
},
"linux": {
"category": "Utility",
"icon": "./assets/icon/small-white-512x512.png",
"icon": "./assets/icon/EWF-Brandmark-white512px.png",
"target": [
"AppImage",
"snap",
Expand All @@ -15,7 +15,7 @@
},
"mac": {
"category": "public.app-category.productivity",
"icon": "./assets/icon/small-white-512x512.png",
"icon": "./assets/icon/EWF-Brandmark-white512px.png",
"target": [
"pkg"
]
Expand All @@ -29,11 +29,11 @@
"allowAnywhere": false,
"allowCurrentUserHome": false
},
"productName": "Parity UI",
"productName": "EnergyWeb UI",
"publish": "github",
"win": {
"icon": "./assets/icon/small-white-512x512.png",
"publisherName": "Parity Technologies (UK) Ltd.",
"icon": "./assets/icon/EWF-Brandmark-white512px.png",
"publisherName": "Energy Web DevHub GmbH",
"target": "nsis"
}
}
2 changes: 1 addition & 1 deletion electron/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function createWindow () {
const sanitizedUrl = details.url.replace(/'/, '');

if (!webContents.isDestroyed()) {
webContents.executeJavaScript(`console.warn('Parity UI blocked a request to access ${sanitizedUrl}')`);
webContents.executeJavaScript(`console.warn('EnergyWeb UI blocked a request to access ${sanitizedUrl}')`);
}

callback({ cancel: true });
Expand Down
8 changes: 4 additions & 4 deletions electron/installers/windows/installer.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
; https://www.electron.build/configuration/nsis#how-do-change-the-default-installation-directory-to-custom
!macro preInit
SetRegView 64
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI"
SetRegView 32
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\EnergyWeb UI"
!macroend
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "parity-ui",
"version": "0.4.2",
"description": "The Electron app for Parity UI",
"name": "energyweb-ui",
"version": "0.4.3",
"description": "The Electron app for EnergyWeb UI",
"main": ".build/electron.js",
"jsnext:main": ".build/electron.js",
"author": {
Expand All @@ -22,7 +22,9 @@
},
"keywords": [
"Ethereum",
"Parity"
"Parity",
"EWF",
"Tobalaba"
],
"parity": {
"channel": "v1.11.11"
Expand Down
6 changes: 3 additions & 3 deletions scripts/parity-ui.desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=parity-ui
Comment=The Electron app for Parity UI
Exec=parity-ui
Name=energyweb-ui
Comment=The Electron app for EnergyWeb UI
Exec=energyweb-ui
Terminal=true
2 changes: 1 addition & 1 deletion src/Connection/connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class Connection extends Component {
<div className={ styles.info }>
<FormattedMessage
id='connection.incorrectVersion'
defaultMessage='We found parity version {version} running. Parity UI requires parity >=1.10 to run. Please visit {link} to install Parity 1.10 first.'
defaultMessage='We found parity version {version} running. EnergyWeb UI requires parity >=1.11 to run. Please visit {link} to install Parity 1.11 first.'
values={ {
link: <a href='#' onClick={ this.handleOpenWebsite }>https://parity.io</a>,
version: `${major}.${minor}.${patch}`
Expand Down
2 changes: 1 addition & 1 deletion webpack/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ module.exports = {

new HtmlWebpackPlugin({
csp: rendererCsp.join(' '),
title: 'Parity UI',
title: 'EnergyWeb UI',
filename: 'index.html',
template: './index.parity.ejs',
favicon: FAVICON,
Expand Down

0 comments on commit 3f4cfa8

Please sign in to comment.