-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.10.0' into 1428-add-hwWallet-unit-tests
- Loading branch information
Showing
221 changed files
with
7,166 additions
and
987 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,21 @@ | ||
{ | ||
"name": "lisk-hub", | ||
"version": "1.8.0-beta.1", | ||
"version": "1.9.0-rc.2", | ||
"description": "Lisk Hub", | ||
"main": "./build/main.js", | ||
"author": { | ||
"name": "Lisk Foundation", | ||
"email": "admin@lisk.io" | ||
}, | ||
"scripts": { | ||
"postinstall": "electron-rebuild --force" | ||
}, | ||
"dependencies": { | ||
"find-free-port": "2.0.0", | ||
"node-hid": "0.7.2", | ||
"usb": "1.3.3" | ||
}, | ||
"devDependencies": { | ||
"electron-rebuild": "1.8.2" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
const server = { | ||
// eslint-disable-next-line max-statements | ||
init: (port) => { | ||
const express = require('express'); // eslint-disable-line | ||
const Path = require('path'); | ||
const bodyParser = require('body-parser'); // eslint-disable-line | ||
|
||
if (process.env.LISK_HUB_URL) { | ||
return process.env.LISK_HUB_URL; | ||
} | ||
|
||
const app = express(); | ||
|
||
app.use(bodyParser.json()); | ||
app.use(bodyParser.urlencoded({ extended: true })); | ||
|
||
app.set('views', Path.join(__dirname, '.')); | ||
app.use(express.static(Path.join(__dirname, '.'))); | ||
|
||
app.get('*', (req, res) => res.sendFile(Path.join(__dirname, 'index.html'))); | ||
|
||
// catch 404 and forward to error handler | ||
app.use((req, res, next) => { | ||
const err = new Error('Not Found'); | ||
err.status = 404; | ||
next(err); | ||
}); | ||
app.listen(port); | ||
return `http://localhost:${port}/`; | ||
}, | ||
}; | ||
|
||
export default server; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.