Skip to content

Commit 1c89a01

Browse files
TheTrunkTheTrunk
committed
rebase
1 parent a1c0e05 commit 1c89a01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1474
-2904
lines changed

‎.browserslistrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
> 1%
2+
last 2 versions

‎.eslintignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/ZelFront/dist/
44
/ZelFront/*.js
55
/ZelFront/test/unit/coverage/
6-
/config/userconfig.js
6+
/config/userconfig.js
7+
/lib/

‎.eslintrc.js

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
1-
// https://eslint.org/docs/user-guide/configuring
2-
31
module.exports = {
42
root: true,
5-
parserOptions: {
6-
parser: 'babel-eslint'
7-
},
83
env: {
9-
browser: true,
4+
node: true,
105
},
116
extends: [
12-
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
13-
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
147
'plugin:vue/essential',
15-
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
16-
'standard'
8+
'@vue/airbnb',
179
],
18-
// required to lint *.vue files
19-
plugins: [
20-
'vue'
21-
],
22-
// add your custom rules here
2310
rules: {
24-
// allow async-await
25-
'generator-star-spacing': 'off',
26-
// allow debugger during development
27-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
28-
"space-before-function-paren": ["error", {
29-
"anonymous": "always",
30-
"named": "never",
31-
"asyncArrow": "always"
32-
}],
33-
"no-var": "error",
34-
"linebreak-style": ["error", "unix"]
35-
}
36-
}
11+
"max-len": [
12+
"error",
13+
{
14+
"code": 300,
15+
"ignoreUrls": true,
16+
"ignoreTrailingComments": true
17+
}
18+
],
19+
"no-console": "off",
20+
"import/extensions": [
21+
"error",
22+
"never",
23+
],
24+
"import/no-unresolved": [ // FIXME
25+
"error",
26+
"never",
27+
],
28+
},
29+
parserOptions: {
30+
parser: 'babel-eslint',
31+
},
32+
overrides: [
33+
{
34+
files: [
35+
'**/__tests__/*.{j,t}s?(x)',
36+
],
37+
env: {
38+
mocha: true,
39+
},
40+
},
41+
],
42+
};

‎.postcssrc.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎LICENSE

Lines changed: 0 additions & 661 deletions
This file was deleted.

‎ZelBack/server.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// ZelBack configuration
2-
const config = require('config')
3-
const app = require('./src/lib/server.js')
4-
const log = require('./src/lib/log')
2+
const config = require('config');
3+
const app = require('./src/lib/server.js');
4+
const log = require('./src/lib/log');
55

66
app.listen(config.server.localport, () => {
7-
log.info(`ZelBack listening on port ${config.server.localport}!`)
8-
})
7+
log.info(`ZelBack listening on port ${config.server.localport}!`);
8+
});

‎ZelBack/src/lib/log.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module.exports = {
22
error(...args) {
3-
console.error(...args)
3+
console.error(...args);
44
},
55

66
warn(...args) {
7-
console.warn(...args)
7+
console.warn(...args);
88
},
99

1010
info(...args) {
11-
console.log(...args)
11+
console.log(...args);
1212
},
1313

1414
debug(...args) {
15-
console.log(...args)
16-
}
17-
}
15+
console.log(...args);
16+
},
17+
};

‎ZelBack/src/lib/server.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
const express = require('express')
2-
const enableWs = require('express-ws')
3-
const bodyParser = require('body-parser')
4-
const cors = require('cors')
5-
const morgan = require('morgan')
1+
const express = require('express');
2+
const enableWs = require('express-ws');
3+
const bodyParser = require('body-parser');
4+
const cors = require('cors');
5+
const morgan = require('morgan');
66

7-
const app = express()
8-
enableWs(app)
9-
app.use(morgan('combined'))
10-
app.use(bodyParser.json())
11-
app.use(cors())
7+
const app = express();
8+
enableWs(app);
9+
app.use(morgan('combined'));
10+
app.use(bodyParser.json());
11+
app.use(cors());
1212

13-
require('../routes')(app)
13+
require('../routes')(app);
1414

15-
module.exports = app
15+
module.exports = app;

‎ZelBack/src/routes.js

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
const zelcashService = require('./services/zelcashService')
2-
const zelidService = require('./services/zelidService')
3-
const zelnodeService = require('./services/zelnodeService')
1+
const zelcashService = require('./services/zelcashService');
2+
const zelidService = require('./services/zelidService');
3+
const zelnodeService = require('./services/zelnodeService');
44

55
module.exports = (app) => {
66
// GET PUBLIC methods
77
app.get('/getinfo', (req, res) => {
8-
zelcashService.getInfo(req, res)
9-
})
8+
zelcashService.getInfo(req, res);
9+
});
1010
app.get('/getzelnodestatus', (req, res) => {
11-
zelcashService.getZelnNodeStatus(req, res)
12-
})
11+
zelcashService.getZelnNodeStatus(req, res);
12+
});
1313
app.get('/zelid/loginphrase', (req, res) => {
14-
zelidService.loginPhrase(req, res)
15-
})
14+
zelidService.loginPhrase(req, res);
15+
});
1616

1717
// GET PROTECTED API - User level
1818
app.get('/zelid/logoutcurrentsession', (req, res) => {
19-
zelidService.logoutCurrentSession(req, res)
20-
})
19+
zelidService.logoutCurrentSession(req, res);
20+
});
2121
app.get('/zelid/logoutallsessions', (req, res) => {
22-
zelidService.logoutAllSessions(req, res)
23-
})
22+
zelidService.logoutAllSessions(req, res);
23+
});
2424

2525
// GET PROTECTED API - ZelNode Owner
2626
app.get('/zelid/loggedusers', (req, res) => {
27-
zelidService.loggedUsers(req, res)
28-
})
27+
zelidService.loggedUsers(req, res);
28+
});
2929
app.get('/zelid/activeloginphrases', (req, res) => {
30-
zelidService.activeLoginPhrases(req, res)
31-
})
30+
zelidService.activeLoginPhrases(req, res);
31+
});
3232
app.get('/zelid/logoutallusers', (req, res) => {
33-
zelidService.logoutAllUsers(req, res)
34-
})
33+
zelidService.logoutAllUsers(req, res);
34+
});
3535
// GET PROTECTED API - ZelTeam
3636
app.get('/zelnode/updateflux', (req, res) => {
37-
zelnodeService.updateFlux(req, res)
38-
})
37+
zelnodeService.updateFlux(req, res);
38+
});
3939

4040
// POST PUBLIC methods route
4141
app.post('/zelid/verifylogin', (req, res) => {
42-
zelidService.verifyLogin(req, res)
43-
})
42+
zelidService.verifyLogin(req, res);
43+
});
4444

4545
// WebSockets PUBLIC
4646
app.ws('/ws/zelid/:loginphrase', (ws, req) => {
47-
zelidService.wsRespondLoginPhrase(ws, req)
48-
})
49-
}
47+
zelidService.wsRespondLoginPhrase(ws, req);
48+
});
49+
};

‎ZelBack/src/services/zelcashService.js

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
const zelcashrpc = require('zelcashrpc')
2-
const fullnode = require('fullnode')
1+
const zelcashrpc = require('zelcashrpc');
2+
const fullnode = require('fullnode');
33

44
async function getInfo(req, res) {
5-
const config = new fullnode.Config()
6-
const rpcuser = config.rpcuser() || 'rpcuser'
7-
const rpcpassword = config.rpcpassword() || 'rpcpassowrd'
8-
const rpcport = config.rpcport() || 16124
5+
const config = new fullnode.Config();
6+
const rpcuser = config.rpcuser() || 'rpcuser';
7+
const rpcpassword = config.rpcpassword() || 'rpcpassowrd';
8+
const rpcport = config.rpcport() || 16124;
99

1010
const client = new zelcashrpc.Client({
1111
port: rpcport,
1212
user: rpcuser,
1313
pass: rpcpassword,
14-
timeout: 60000
15-
})
14+
timeout: 60000,
15+
});
1616

1717
const response = {
1818
status: 'success',
19-
data: 'Welcome to ZelNode network!'
20-
}
19+
data: 'Welcome to ZelNode network!',
20+
};
2121

2222
try {
23-
const data = await client.getInfo()
24-
response.status = 'success'
25-
response.data = data
23+
const data = await client.getInfo();
24+
response.status = 'success';
25+
response.data = data;
2626
} catch (err) {
27-
response.status = 'error'
28-
response.data = err
27+
response.status = 'error';
28+
response.data = err;
2929
}
3030

31-
return res.json(response)
31+
return res.json(response);
3232
}
3333

3434
async function getZelnNodeStatus(req, res) {
35-
const config = new fullnode.Config()
36-
const rpcuser = config.rpcuser() || 'rpcuser'
37-
const rpcpassword = config.rpcpassword() || 'rpcpassowrd'
38-
const rpcport = config.rpcport() || 16124
35+
const config = new fullnode.Config();
36+
const rpcuser = config.rpcuser() || 'rpcuser';
37+
const rpcpassword = config.rpcpassword() || 'rpcpassowrd';
38+
const rpcport = config.rpcport() || 16124;
3939

4040
const client = new zelcashrpc.Client({
4141
port: rpcport,
4242
user: rpcuser,
4343
pass: rpcpassword,
44-
timeout: 60000
45-
})
44+
timeout: 60000,
45+
});
4646

4747
const response = {
4848
status: 'success',
49-
data: 'Welcome to ZelNode network!'
50-
}
49+
data: 'Welcome to ZelNode network!',
50+
};
5151

5252
try {
53-
const data = await client.getzelnodestatus()
54-
response.status = 'success'
55-
response.data = data
53+
const data = await client.getzelnodestatus();
54+
response.status = 'success';
55+
response.data = data;
5656
} catch (err) {
57-
response.status = 'error'
58-
response.data = err
57+
response.status = 'error';
58+
response.data = err;
5959
}
6060

61-
return res.json(response)
61+
return res.json(response);
6262
}
6363

6464
module.exports = {
6565
getInfo,
66-
getZelnNodeStatus
67-
}
66+
getZelnNodeStatus,
67+
};

0 commit comments

Comments
 (0)