lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: small admin fixes

Browse source
This commit is contained in:
Taranto 2020-02-26 09:31:58 +00:00 • committed by Josh Harvey
parent bde27cce4c
commit b1b8b82260
5 changed files with 41 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/new-lamassu-register
View file

@ -20,7 +20,7 @@ login.generateOTP(name).then(otp => {
if (domain === 'localhost') { if (domain === 'localhost') {
console.log(`https://${domain}:3000/register?otp=${otp}`) console.log(`https://${domain}:3000/register?otp=${otp}`)
} else { } else {
console.log(`https://${domain}?otp=${otp}`) console.log(`https://${domain}/register?otp=${otp}`)
} }
process.exit(0) process.exit(0)

5
lib/new-admin/admin-server.js
View file

@ -1,4 +1,5 @@
const fs = require('fs') const fs = require('fs')
const path = require('path')
const express = require('express') const express = require('express')
const https = require('https') const https = require('https')
const cors = require('cors') const cors = require('cors')
@ -24,6 +25,7 @@ if (!hostname) {
const app = express() const app = express()
app.use(helmet({ noCache: true })) app.use(helmet({ noCache: true }))
app.use(cookieParser()) app.use(cookieParser())
app.use(express.static(path.resolve(__dirname, '..', '..', 'public')))
const apolloServer = new ApolloServer({ const apolloServer = new ApolloServer({
typeDefs, typeDefs,
@ -80,6 +82,9 @@ app.get('/api/register', (req, res, next) => {
}) })
}) })
// Everything not on graphql or api/register is redirected to the front-end
app.get('*', (req, res) => res.sendFile(path.resolve('client', 'build', 'index.html')))
const certOptions = { const certOptions = {
key: fs.readFileSync(options.keyPath), key: fs.readFileSync(options.keyPath),
cert: fs.readFileSync(options.certPath) cert: fs.readFileSync(options.certPath)

49
new-lamassu-admin/package-lock.json generated
View file

@ -6906,8 +6906,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -6928,14 +6927,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -6950,20 +6947,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -7080,8 +7074,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -7093,7 +7086,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -7108,7 +7100,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -7116,14 +7107,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -7142,7 +7131,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -7223,8 +7211,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -7236,7 +7223,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -7322,8 +7308,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -7359,7 +7344,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -7379,7 +7363,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -7423,14 +7406,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
@ -25314,7 +25295,6 @@
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -25483,7 +25463,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -25491,8 +25470,7 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
@ -25605,8 +25583,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",

12
new-lamassu-admin/src/pages/AuthRegister.js
View file

@ -1,17 +1,17 @@
import React from 'react'
import { useLocation, useHistory } from 'react-router-dom'
import useAxios from '@use-hooks/axios' import useAxios from '@use-hooks/axios'
function useQuery() { import React from 'react'
return new URLSearchParams(useLocation().search)
} import { useLocation, useHistory } from 'react-router-dom'
const useQuery = () => new URLSearchParams(useLocation().search)
const AuthRegister = () => { const AuthRegister = () => {
const history = useHistory() const history = useHistory()
const query = useQuery() const query = useQuery()
useAxios({ useAxios({
url: `https://localhost:8070/api/register?otp=${query.get('otp')}`, url: `/api/register?otp=${query.get('otp')}`,
method: 'GET', method: 'GET',
options: { options: {
withCredentials: true withCredentials: true

16
new-lamassu-admin/src/routing/routes.js
View file

@ -1,18 +1,29 @@
import * as R from 'ramda' import * as R from 'ramda'
import React from 'react' import React from 'react'
import { Route, Redirect, Switch } from 'react-router-dom' import { Route, Redirect, Switch } from 'react-router-dom'
import AuthRegister from 'src/pages/AuthRegister' import AuthRegister from 'src/pages/AuthRegister'
import Commissions from 'src/pages/Commissions' import Commissions from 'src/pages/Commissions'
import Funding from 'src/pages/Funding' import Funding from 'src/pages/Funding'
import Locales from 'src/pages/Locales' import Locales from 'src/pages/Locales'
import MachineLogs from 'src/pages/MachineLogs' import MachineLogs from 'src/pages/MachineLogs'
import OperatorInfo from 'src/pages/OperatorInfo/OperatorInfo' import OperatorInfo from 'src/pages/OperatorInfo/OperatorInfo'
import ServerLogs from 'src/pages/ServerLogs' import ServerLogs from 'src/pages/ServerLogs'
import Services from 'src/pages/Services/Services' import Services from 'src/pages/Services/Services'
import Transactions from 'src/pages/Transactions/Transactions' import Transactions from 'src/pages/Transactions/Transactions'
import Customers from '../pages/Customers' import Customers from '../pages/Customers'
import MachineStatus from '../pages/maintenance/MachineStatus' import MachineStatus from '../pages/maintenance/MachineStatus'
const tree = [ const tree = [
@ -101,6 +112,11 @@ const Routes = () => (
exact exact
component={() => <Redirect to={firstChild('maintenance')} />} component={() => <Redirect to={firstChild('maintenance')} />}
/> />
<Route
path="/compliance"
exact
component={() => <Redirect to={firstChild('compliance')} />}
/>
<Route path="/settings/commissions" component={Commissions} /> <Route path="/settings/commissions" component={Commissions} />
<Route path="/settings/locale" component={Locales} /> <Route path="/settings/locale" component={Locales} />
<Route path="/settings/3rd-party-services" component={Services} /> <Route path="/settings/3rd-party-services" component={Services} />