Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lwf port #2

Merged
merged 9 commits into from
Jan 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def fail(reason) {

/* comment out the next line to allow concurrent builds on the same branch */
properties([disableConcurrentBuilds(), pipelineTriggers([])])
node('oxy-nano') {
node('lwf-nano') {
try {
stage ('Checkout and Start Oxycoin Core') {
stage ('Checkout and Start LWF Core') {
try {
deleteDir()
checkout scm
Expand Down Expand Up @@ -68,7 +68,7 @@ node('oxy-nano') {
'''
} catch (err) {
echo "Error: ${err}"
fail('Stopping build: Oxycoin Core failed to start')
fail('Stopping build: LWF Core failed to start')
}
}

Expand Down Expand Up @@ -136,7 +136,7 @@ node('oxy-nano') {
stage ('Run E2E Tests') {
try {
ansiColor('xterm') {
withCredentials([string(credentialsId: 'oxy-nano-testnet-passphrase', variable: 'TESTNET_PASSPHRASE')]) {
withCredentials([string(credentialsId: 'lwf-nano-testnet-passphrase', variable: 'TESTNET_PASSPHRASE')]) {
sh '''
N=${EXECUTOR_NUMBER:-0}; N=$((N+1))

Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Oxy-Nano
# LWF-Nano

## Development

```
git clone https://github.com/oxycoin/oxy-nano.git
cd oxy-nano
git clone https://github.com/lwfcoin/lwf-nano.git
cd lwf-nano
npm install
npm run dev
```
Expand Down Expand Up @@ -87,14 +87,15 @@ npm run pack

## License

Copyright © 2017-2018 LWF
Copyright © 2017-2018 Oxycoin
Copyright © 2016-2017 Lisk Foundation

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the [GNU General Public License](https://github.com/oxycoin/oxy-nano/tree/master/LICENSE) along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the [GNU General Public License](https://github.com/lwfcoin/lwf-nano/tree/master/LICENSE) along with this program. If not, see <http://www.gnu.org/licenses/>.

***

Expand Down
Binary file added app/assets/lwf.icns
Binary file not shown.
Binary file added app/assets/lwf.ico
Binary file not shown.
Binary file added app/assets/lwf.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 removed app/assets/oxy.icns
Binary file not shown.
Binary file removed app/assets/oxy.ico
Binary file not shown.
Binary file removed app/assets/oxy.png
Binary file not shown.
4 changes: 2 additions & 2 deletions app/dev-app-update.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
owner: Oxycoin
repo: oxy-nano
owner: lwfcoin
repo: lwf-nano
provider: github
12 changes: 6 additions & 6 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "oxy-nano",
"version": "1.3.0",
"description": "Oxy Nano",
"name": "lwf-nano",
"version": "1.3.1",
"description": "LWF Nano",
"main": "./build/main.js",
"author":{
"name": "Oxycoin",
"email": "info@oxy.io"
"author": {
"name": "LWF Logistics S.a.r.l-s",
"email": "info@lwf.io"
}
}
4 changes: 2 additions & 2 deletions app/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ app.on('window-all-closed', () => {

// This will override the values defined in the app’s .plist file (macOS)
if (process.platform === 'darwin') {
const copyright = `Copyright © 2017 - ${new Date().getFullYear()} Oxycoin`;
app.setAboutPanelOptions({ applicationName: 'Oxy Nano', copyright });
const copyright = `Copyright © 2017 - ${new Date().getFullYear()} LWF Logistics S.a.r.l-s`;
app.setAboutPanelOptions({ applicationName: 'LWF Nano', copyright });
}

app.on('activate', () => {
Expand Down
26 changes: 13 additions & 13 deletions app/src/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ const addAboutMenuForMac = ({ template, name }) => {
};

const addAboutMenuForNonMac = ({ template, electron }) => {
const copyright = `Copyright © 2017 - ${new Date().getFullYear()} Oxycoin`;
const copyright = `Copyright © 2017 - ${new Date().getFullYear()} LWF Logistics S.a.r.l-s`;
template[template.length - 1].submenu.push({
label: i18n.t('About'),
click(item, focusedWindow) {
if (focusedWindow) {
const options = {
buttons: ['OK'],
icon: `${__dirname}/assets/images/oxy.png`,
message: `${i18n.t('Oxy Nano')}\n${i18n.t('Version')} ${electron.app.getVersion()}\n${copyright}`,
icon: `${__dirname}/assets/images/LWF.png`,
message: `${i18n.t('LWF Nano')}\n${i18n.t('Version')} ${electron.app.getVersion()}\n${copyright}`,
};
electron.dialog.showMessageBox(focusedWindow, options, () => {});
}
Expand Down Expand Up @@ -116,31 +116,31 @@ const menu = {
label: i18n.t('Help'),
submenu: [
{
label: i18n.t('Oxycoin Website'),
click: menu.onClickLink.bind(null, electron, 'https://oxycoin.io'),
label: i18n.t('LWF Website'),
click: menu.onClickLink.bind(null, electron, 'https://lwf.io'),
},
{
label: i18n.t('Oxycoin Chat'),
click: menu.onClickLink.bind(null, electron, 'https://oxycoin.slack.com'),
label: i18n.t('LWF Chat'),
click: menu.onClickLink.bind(null, electron, 'https://lwfcoin.slack.com'),
},
{
label: i18n.t('Oxycoin Explorer'),
click: menu.onClickLink.bind(null, electron, 'https://explorer.oxycoin.io'),
label: i18n.t('LWF Explorer'),
click: menu.onClickLink.bind(null, electron, 'https://explorer.lwf.io'),
},
{
label: i18n.t('Oxycoin Forum'),
click: menu.onClickLink.bind(null, electron, 'https://oxycoin.proboards.com'),
label: i18n.t('LWF Forum'),
click: menu.onClickLink.bind(null, electron, 'https://lwfcoin.slack.com'),
},
{
type: 'separator',
},
{
label: i18n.t('Report Issue...'),
click: menu.onClickLink.bind(null, electron, 'https://oxycoin.io/contact.php'),
click: menu.onClickLink.bind(null, electron, 'https://github.com/lwfcoin/lwf-nano/issues'),
},
{
label: i18n.t('What\'s New...'),
click: menu.onClickLink.bind(null, electron, 'https://github.com/oxycoin/oxy-nano/releases'),
click: menu.onClickLink.bind(null, electron, 'https://github.com/lwfcoin/lwf-nano/releases'),
},
],
},
Expand Down
10 changes: 5 additions & 5 deletions app/src/menu.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ describe('MenuBuilder', () => {
setApplicationMenu: spy(),
buildFromTemplate: template => (template),
},
app: { getName: () => ('Oxy Nano'), getVersion: () => ('some version') },
app: { getName: () => ('LWF Nano'), getVersion: () => ('some version') },
};
});

it('Builds the electron about menu when os is mac', () => {
process.platform = 'darwin';
const template = menu.build(electron);
expect(template[0].label).to.equal('Oxy Nano');
expect(template[0].label).to.equal('LWF Nano');
expect(template[0].submenu[0].role).to.equal('about');
expect(template[0].submenu[0].label).to.equal('About');
expect(template[0].submenu[1].role).to.equal('quit');
Expand All @@ -37,11 +37,11 @@ describe('MenuBuilder', () => {
expect(submenu[submenu.length - 1].label).to.equal('About');

// make sure the mac about menu was not added
expect(template[0].label).to.not.equal('Oxy Nano');
expect(template[0].label).to.not.equal('LWF Nano');
});

it('Should open link on click', () => {
menu.onClickLink(electron, 'https://oxycoin.io');
expect(electron.shell.openExternal).to.have.been.calledWith('https://oxycoin.io');
menu.onClickLink(electron, 'https://lwf.io');
expect(electron.shell.openExternal).to.have.been.calledWith('https://lwf.io');
});
});
2 changes: 1 addition & 1 deletion app/src/modules/win.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ describe('Electron Browser Window Wrapper', () => {
buildFromTemplate: () => (electron.Menu),
popup: spy(),
},
app: { getName: () => ('Oxy Nano'), getVersion: () => ('some version') },
app: { getName: () => ('LWF Nano'), getVersion: () => ('some version') },
};

afterEach(() => {
Expand Down
Binary file modified build/icon.icns
Binary file not shown.
Binary file modified build/icon.ico
Binary file not shown.
34 changes: 17 additions & 17 deletions i18n/locales/de/common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
" Make sure that you are using the latest version of Oxy Nano.": "Stelle sicher, dass du die neuste Version von Oxy Nano benutzt.",
" Make sure that you are using the latest version of LWF Nano.": "Stelle sicher, dass du die neuste Version von LWF Nano benutzt.",
"Vote_noun": "Abstimmung",
"Vote_verb": "Abstimmen",
"About": "Über",
Expand Down Expand Up @@ -48,29 +48,29 @@
"Failed to connect to node {{address}}": "Verbindung zum Node {{address}} fehlgeschlagen",
"Failed to connect: Node {{address}} is not active": "Verbindung fehlgeschlagen: Node {{address}} ist nicht aktiv",
"Fee": "Gebühr",
"Fee: {{amount}} OXY": "Gebühr: {{amount}} OXY",
"Fee: {{fee}} OXY": "Gebühr: {{fee}} OXY",
"Fee: {{amount}} LWF": "Gebühr: {{amount}} LWF",
"Fee: {{fee}} LWF": "Gebühr: {{fee}} LWF",
"Forget": "Vergessen",
"Forging": "Forging",
"From / To": "Von / An",
"Help": "Hilfe",
"Hide passphrase": "Passphrase ausblenden",
"Insufficient funds": "Nicht genügend Guthaben",
"Insufficient funds for {{amount}} OXY fee": "Nicht genügend Guthaben für {{amount}} OXY Gebühren",
"Insufficient funds for {{amount}} LWF fee": "Nicht genügend Guthaben für {{amount}} LWF Gebühren",
"Invalid": "Ungültig",
"OXY Earned": "OXY verdient",
"OXY received": "OXY erhalten",
"LWF Earned": "LWF verdient",
"LWF received": "LWF erhalten",
"Language": "Sprache",
"Last 24 hours": "Die letzten 24 Stunden",
"Last {{count}} days": "Letzter {{count}} Tag",
"Last {{count}} days_plural": "Die letzten {{count}} Tage",
"Later": "Später",
"Oxycoin Address": "Oxycoin Adresse",
"Oxycoin Chat": "Oxycoin Chat",
"Oxycoin Explorer": "Oxycoin Explorer",
"Oxycoin Forum": "Oxycoin Forum",
"Oxycoin Nano": "Oxycoin Nano",
"Oxycoin Website": "Oxycoin Webseite",
"LWF Address": "LWF Adresse",
"LWF Chat": "LWF Chat",
"LWF Explorer": "LWF Explorer",
"LWF Forum": "LWF Forum",
"LWF Nano": "LWF Nano",
"LWF Website": "LWF Webseite",
"Login": "Einloggen",
"Losing access to this passphrase will mean no funds can be sent from this account.": "Das Verlieren der Passphrase führt dazu, dass kein Geld mehr von diesem Konto versendet werden kann.",
"Mainnet": "Mainnet",
Expand Down Expand Up @@ -117,7 +117,7 @@
"Public key : ": "Public Key:",
"Quit": "Beenden",
"Rank": "Rang",
"Receive OXY": "OXY erhalten",
"Receive LWF": "LWF erhalten",
"Recipient Address": "Empfängeradresse",
"Recipient PublicKey": "Public Key des Empfängers ",
"Redo": "Wiederholen",
Expand All @@ -144,8 +144,8 @@
"Select a network": "Wähle ein Netzwerk",
"Select all": "Alles auswählen",
"Send": "Senden",
"Send OXY from Blockchain Application": "OXY von einer Blockchain Anwendung verschicken",
"Send OXY to Blockchain Application": "OXY an eine Blockchain Anwendung schicken",
"Send LWF from Blockchain Application": "LWF von einer Blockchain Anwendung verschicken",
"Send LWF to Blockchain Application": "LWF an eine Blockchain Anwendung schicken",
"Send to this address": "Zu dieser Adresse senden",
"Sender PublicKey": "Public Key des Senders",
"Set maximum amount": "Übernehme den maximalen Betrag",
Expand Down Expand Up @@ -205,8 +205,8 @@
"You have already registered as a delegate.": "Du bist bereits als Delegierter registriert.",
"You have not forged any blocks yet": "Du hast noch keine Blöcke geforged",
"You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.": "Um Blöcke forgen (erstellen) zu können, musst du Delegierter werden. Wenn du dich schon als Delegierter registriert hast, wurde deine Registrierung noch nicht verarbeitet.",
"You've received {{value}} OXY.": "Du hast {{value}} OXY erhalten.",
"Your transaction of {{amount}} OXY to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Deine Transaktion von {{amount}} OXY zu {{recipientAddress}} wurde akzeptiert und wird in wenigen Sekunden verarbeitet.",
"You've received {{value}} LWF.": "Du hast {{value}} LWF erhalten.",
"Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Deine Transaktion von {{amount}} LWF zu {{recipientAddress}} wurde akzeptiert und wird in wenigen Sekunden verarbeitet.",
"Your votes were successfully submitted. It can take several seconds before they are processed.": "Deine Stimmen wurden erfolgreich abgegeben. Es kann einige Sekunden dauern, bis sie verarbeitet sind.",
"Zero not allowed": "Null ist nicht erlaubt",
"confirmation": "Bestätigung",
Expand Down
34 changes: 17 additions & 17 deletions i18n/locales/en/common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
" Make sure that you are using the latest version of Oxy Nano.": " Make sure that you are using the latest version of Oxy Nano.",
" Make sure that you are using the latest version of Lisk Nano.": " Make sure that you are using the latest version of Lisk Nano.",
"About": "About",
"Account saved": "Account saved",
"Account was successfully forgotten.": "Account was successfully forgotten.",
Expand Down Expand Up @@ -46,29 +46,29 @@
"Failed to connect to node {{address}}": "Failed to connect to node {{address}}",
"Failed to connect: Node {{address}} is not active": "Failed to connect: Node {{address}} is not active",
"Fee": "Fee",
"Fee: {{amount}} OXY": "Fee: {{amount}} OXY",
"Fee: {{fee}} OXY": "Fee: {{fee}} OXY",
"Fee: {{amount}} LWF": "Fee: {{amount}} LWF",
"Fee: {{fee}} LWF": "Fee: {{fee}} LWF",
"Forget": "Forget",
"Forging": "Forging",
"From / To": "From / To",
"Help": "Help",
"Hide passphrase": "Hide passphrase",
"Insufficient funds": "Insufficient funds",
"Insufficient funds for {{amount}} OXY fee": "Insufficient funds for {{amount}} OXY fee",
"Insufficient funds for {{amount}} LWF fee": "Insufficient funds for {{amount}} LWF fee",
"Invalid": "Invalid",
"OXY Earned": "OXY Earned",
"OXY received": "OXY received",
"LWF Address": "LWF Address",
"LWF Chat": "LWF Chat",
"LWF Earned": "LWF Earned",
"LWF Explorer": "LWF Explorer",
"LWF Forum": "LWF Forum",
"LWF Nano": "LWF Nano",
"LWF Website": "LWF Website",
"LWF received": "LWF received",
"Language": "Language",
"Last 24 hours": "Last 24 hours",
"Last {{count}} days": "Last {{count}} day",
"Last {{count}} days_plural": "Last {{count}} days",
"Later": "Later",
"Oxycoin Address": "Oxycoin Address",
"Oxycoin Chat": "Oxycoin Chat",
"Oxycoin Explorer": "Oxycoin Explorer",
"Oxycoin Forum": "Oxycoin Forum",
"Oxycoin Nano": "Oxycoin Nano",
"Oxycoin Website": "Oxycoin Website",
"Login": "Login",
"Losing access to this passphrase will mean no funds can be sent from this account.": "Losing access to this passphrase will mean no funds can be sent from this account.",
"Mainnet": "Mainnet",
Expand Down Expand Up @@ -114,7 +114,7 @@
"Public Key": "Public Key",
"Quit": "Quit",
"Rank": "Rank",
"Receive OXY": "Receive OXY",
"Receive LWF": "Receive LWF",
"Recipient Address": "Recipient Address",
"Recipient PublicKey": "Recipient PublicKey",
"Redo": "Redo",
Expand All @@ -141,8 +141,8 @@
"Select a network": "Select a network",
"Select all": "Select all",
"Send": "Send",
"Send OXY from Blockchain Application": "Send OXY from Blockchain Application",
"Send OXY to Blockchain Application": "Send OXY to Blockchain Application",
"Send Lisk from Blockchain Application": "Send Lisk from Blockchain Application",
"Send Lisk to Blockchain Application": "Send Lisk to Blockchain Application",
"Send to this address": "Send to this address",
"Sender PublicKey": "Sender PublicKey",
"Set maximum amount": "Set maximum amount",
Expand Down Expand Up @@ -203,8 +203,8 @@
"You have already registered as a delegate.": "You have already registered as a delegate.",
"You have not forged any blocks yet": "You have not forged any blocks yet",
"You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.": "You need to become a delegate to start forging. If you already registered to become a delegate, your registration hasn't been processed, yet.",
"You've received {{value}} OXY.": "You've received {{value}} OXY.",
"Your transaction of {{amount}} OXY to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Your transaction of {{amount}} OXY to {{recipientAddress}} was accepted and will be processed in a few seconds.",
"You've received {{value}} LWF.": "You've received {{value}} LWF.",
"Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.": "Your transaction of {{amount}} LWF to {{recipientAddress}} was accepted and will be processed in a few seconds.",
"Your votes were successfully submitted. It can take several seconds before they are processed.": "Your votes were successfully submitted. It can take several seconds before they are processed.",
"Zero not allowed": "Zero not allowed",
"confirmation": "confirmation",
Expand Down
Loading