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

fix: standardize caps

Browse source
This commit is contained in:
Nikola Ubavic 2022-12-13 11:32:59 +01:00 • committed by Rafael
parent a29f3fc13c
commit 72eb851731
24 changed files with 61 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
new-lamassu-admin/src/components/editableTable/Header.js
View file

@ -9,7 +9,7 @@ import {
TDoubleLevelHead,
ThDoubleLevel
} from 'src/components/fake-table/Table'
import { startCase } from 'src/utils/string'
import { sentenceCase } from 'src/utils/string'
import TableCtx from './Context'
@ -99,7 +99,7 @@ const Header = () => {
<>{attachOrderedByToComplexHeader(header) ?? header}</>
) : (
<span className={orderClasses}>
{!R.isNil(display) ? display : startCase(name)}{' '}
{!R.isNil(display) ? display : sentenceCase(name)}{' '}
{!R.isNil(orderedBy) && R.equals(name, orderedBy.code) && '-'}
</span>
)}

2
new-lamassu-admin/src/components/machineActions/MachineActions.js
View file

@ -187,7 +187,7 @@ const MachineActions = memo(({ machine, onActionSuccess }) => {
display: 'Restart services for'
})
}}>
Restart Services
Restart services
</ActionButton>
{machine.model === 'aveiro' && (
<ActionButton

2
new-lamassu-admin/src/pages/Cashout/WizardStep.js
View file

@ -134,7 +134,7 @@ const WizardStep = ({
to zero. Make sure you physically put cash inside the cash
cassettes to allow the machine to dispense it to your users. If
you already did, make sure you set the correct cash cassette bill
count for this machine on your Cash Boxes & Cassettes tab under
count for this machine on your Cash boxes & cassettes tab under
Maintenance.
</P>
<Info2 className={classes.title}>Default Commissions</Info2>

4
new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js
View file

@ -37,7 +37,7 @@ const SHOW_ALL = {
const ORDER_OPTIONS = [
{
code: 'machine',
display: 'Machine Name'
display: 'Machine name'
},
{
code: 'cryptoCurrencies',
@ -53,7 +53,7 @@ const ORDER_OPTIONS = [
},
{
code: 'fixedFee',
display: 'Fixed Fee'
display: 'Fixed fee'
},
{
code: 'minimumTx',

2
new-lamassu-admin/src/pages/Customers/CustomersList.js
View file

@ -36,7 +36,7 @@ const CustomersList = ({
view: getName
},
{
header: 'Total TXs',
header: 'Total Txs',
width: 126,
textAlign: 'right',
view: it => `${Number.parseInt(it.totalTxs)}`

2
new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js
View file

@ -26,7 +26,7 @@ const CustomerSidebar = ({ isSelected, onClick }) => {
},
{
code: 'customerData',
display: 'Customer Data',
display: 'Customer data',
Icon: CustomerDataIcon,
InverseIcon: CustomerDataReversedIcon
},

2
new-lamassu-admin/src/pages/Funding.js
View file

@ -164,7 +164,7 @@ const Funding = () => {
{funding.length && (
<div className={classes.total}>
<Label1 className={classes.totalTitle}>
Total Crypto Balance
Total crypto balance
</Label1>
<Info1 noMargin>
{getConfirmedTotal(funding)}

2
new-lamassu-admin/src/pages/MachineLogs.js
View file

@ -111,7 +111,7 @@ const Logs = () => {
<>
<div className={classes.titleWrapper}>
<div className={classes.titleAndButtonsContainer}>
<Title>Machine Logs</Title>
<Title>Machine logs</Title>
{logsResponse && (
<div className={classes.buttonsWrapper}>
<LogsDowloaderPopover

2
new-lamassu-admin/src/pages/Maintenance/CashUnits.js
View file

@ -204,7 +204,7 @@ const CashCassettes = () => {
!dataLoading && (
<>
<TitleSection
title="Cash Boxes & Cassettes"
title="Cash boxes & cassettes"
buttons={[
{
text: 'Cash box history',

2
new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
View file

@ -158,7 +158,7 @@ const CashboxHistory = ({ machines, currency, timezone }) => {
},
{
name: 'billCount',
header: 'Bill Count',
header: 'Bill count',
width: 115,
textAlign: 'left',
input: NumberInput,

4
new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js
View file

@ -92,7 +92,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess, timezone }) => {
<Item xs>
<Container className={classes.row}>
<Item xs={2}>
<Label>Machine Model</Label>
<Label>Machine model</Label>
<span>{modelPrettifier[machine.model]}</span>
</Item>
<Item xs={4}>
@ -126,7 +126,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess, timezone }) => {
</span>
</Item>
<Item xs={2}>
<Label>Packet Loss</Label>
<Label>Packet loss</Label>
<span>
{machine.packetLoss
? new BigNumber(machine.packetLoss).toFixed(3).toString() +

6
new-lamassu-admin/src/pages/Maintenance/MachineStatus.js
View file

@ -74,7 +74,7 @@ const MachineStatus = () => {
const elements = [
{
header: 'Machine Name',
header: 'Machine name',
width: 250,
size: 'sm',
textAlign: 'left',
@ -111,7 +111,7 @@ const MachineStatus = () => {
: 'unknown'
},
{
header: 'Software Version',
header: 'Software version',
width: 200,
size: 'sm',
textAlign: 'left',
@ -134,7 +134,7 @@ const MachineStatus = () => {
<>
<div className={classes.titleWrapper}>
<div className={classes.titleAndButtonsContainer}>
<Title>Machine Status</Title>
<Title>Machine status</Title>
</div>
<div className={classes.headerLabels}>
<div>

4
new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js
View file

@ -32,7 +32,7 @@ const CryptoBalanceAlerts = ({ section, fieldWidth }) => {
section={section}
decoration={currency}
className={classes.cryptoBalanceAlertsForm}
title="Default (Low Balance)"
title="Default (Low balance)"
label="Alert me under"
editing={isEditing(LOW_BALANCE_KEY)}
disabled={isDisabled(LOW_BALANCE_KEY)}
@ -49,7 +49,7 @@ const CryptoBalanceAlerts = ({ section, fieldWidth }) => {
save={save}
decoration={currency}
className={classes.cryptoBalanceAlertsSecondForm}
title="Default (High Balance)"
title="Default (High balance)"
label="Alert me over"
editing={isEditing(HIGH_BALANCE_KEY)}
disabled={isDisabled(HIGH_BALANCE_KEY)}

6
new-lamassu-admin/src/pages/Notifications/sections/Setup.js
View file

@ -12,7 +12,7 @@ import {
} from 'src/components/fake-table/Table'
import { Switch } from 'src/components/inputs'
import { fromNamespace, toNamespace } from 'src/utils/config'
import { startCase } from 'src/utils/string'
import { sentenceCase } from 'src/utils/string'
import NotificationsCtx from '../NotificationsContext'
@ -62,7 +62,7 @@ const Row = ({
return (
<Tr>
<Td width={channelSize}>
{shouldUpperCase ? R.toUpper(namespace) : startCase(namespace)}
{shouldUpperCase ? R.toUpper(namespace) : sentenceCase(namespace)}
</Td>
<Cell name="balance" disabled={disabled} />
<Cell name="transactions" disabled={disabled} />
@ -127,7 +127,7 @@ const Setup = ({ wizard, forceDisable }) => {
<Th width={channelSize - widthAdjust}>Channel</Th>
{Object.keys(sizes).map(it => (
<Th key={it} width={sizes[it] - widthAdjust} textAlign="center">
{startCase(it)}
{sentenceCase(it)}
</Th>
))}
</THead>

4
new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js
View file

@ -136,7 +136,7 @@ const ContactInfo = ({ wizard }) => {
const fields = [
{
name: 'name',
label: 'Full name',
label: 'Company name',
value: info.name ?? '',
component: TextInput
},
@ -160,7 +160,7 @@ const ContactInfo = ({ wizard }) => {
},
{
name: 'companyNumber',
label: 'Company number',
label: 'Company registration number',
value: info.companyNumber ?? '',
component: TextInput
}

2
new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js
View file

@ -109,7 +109,7 @@ const ReceiptPrinting = memo(({ wizard }) => {
},
{
name: 'companyNumber',
display: 'Company number'
display: 'Company registration number'
},
{
name: 'machineLocation',

2
new-lamassu-admin/src/pages/Services/Services.js
View file

@ -103,7 +103,7 @@ const Services = () => {
return (
<div className={classes.wrapper}>
<TitleSection title="3rd Party Services" />
<TitleSection title="3rd Party services" />
<Grid container spacing={4}>
{R.values(schemas).map(schema => (
<Grid item key={schema.code}>

2
new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
View file

@ -108,7 +108,7 @@ const SessionManagement = () => {
return (
<>
<TitleSection title="Session Management" />
<TitleSection title="Session management" />
<DataTable
loading={loading}
elements={elements}

2
new-lamassu-admin/src/pages/UserManagement/UserManagement.js
View file

@ -241,7 +241,7 @@ const Users = () => {
return (
<>
<TitleSection title="User Management" />
<TitleSection title="User management" />
<Box
marginBottom={3}
marginTop={-5}

2
new-lamassu-admin/src/pages/Wallet/Wallet.js
View file

@ -115,7 +115,7 @@ const Wallet = ({ name: SCREEN_KEY }) => {
<>
<div className={classes.header}>
<TitleSection
title="Wallet Settings"
title="Wallet settings"
buttons={[
{
text: 'Advanced settings',

10
new-lamassu-admin/src/pages/Wallet/helper.js
View file

@ -108,7 +108,7 @@ const getAdvancedWalletElements = () => {
},
{
name: 'allowTransactionBatching',
header: `Allow BTC Transaction Batching`,
header: `Allow BTC transaction batching`,
size: 'sm',
stripe: true,
width: 260,
@ -119,7 +119,7 @@ const getAdvancedWalletElements = () => {
},
{
name: 'feeMultiplier',
header: `BTC Miner's Fee`,
header: `BTC Miner's fee`,
size: 'sm',
stripe: true,
width: 250,
@ -179,7 +179,7 @@ const getAdvancedWalletElementsOverrides = (
},
{
name: 'feeMultiplier',
header: `Miner's Fee`,
header: `Miner's fee`,
size: 'sm',
stripe: true,
width: 250,
@ -280,7 +280,7 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => {
},
{
name: 'zeroConf',
header: 'Confidence Checking',
header: 'Confidence checking',
size: 'sm',
stripe: true,
view: (it, row) => {
@ -304,7 +304,7 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => {
},
{
name: 'zeroConfLimit',
header: '0-conf Limit',
header: '0-conf limit',
size: 'sm',
stripe: true,
view: (it, row) =>

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

@ -49,7 +49,7 @@ const getLamassuRoutes = () => [
children: [
{
key: 'cash_units',
label: 'Cash Units',
label: 'Cash units',
route: '/maintenance/cash-units',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: CashUnits
@ -63,14 +63,14 @@ const getLamassuRoutes = () => [
},
{
key: 'logs',
label: 'Machine Logs',
label: 'Machine logs',
route: '/maintenance/logs',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: MachineLogs
},
{
key: 'machine-status',
label: 'Machine Status',
label: 'Machine status',
route: '/maintenance/machine-status',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: MachineStatus
@ -130,7 +130,7 @@ const getLamassuRoutes = () => [
},
{
key: 'services',
label: '3rd Party Services',
label: '3rd Party services',
route: '/settings/3rd-party-services',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: Services
@ -144,9 +144,9 @@ const getLamassuRoutes = () => [
},
{
key: namespaces.OPERATOR_INFO,
label: 'Operator Info',
label: 'Operator info',
route: '/settings/operator-info',
title: 'Operator Information',
title: 'Operator information',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
get component() {
return () => (
@ -232,7 +232,7 @@ const getLamassuRoutes = () => [
key: 'loyalty',
label: 'Loyalty',
route: '/compliance/loyalty',
title: 'Loyalty Panel',
title: 'Loyalty panel',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
get component() {
return () => (
@ -247,14 +247,14 @@ const getLamassuRoutes = () => [
children: [
{
key: 'individual-discounts',
label: 'Individual Discounts',
label: 'Individual discounts',
route: '/compliance/loyalty/individual-discounts',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: IndividualDiscounts
},
{
key: 'promo-codes',
label: 'Promo Codes',
label: 'Promo codes',
route: '/compliance/loyalty/codes',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: PromoCodes
@ -280,14 +280,14 @@ const getLamassuRoutes = () => [
children: [
{
key: 'user-management',
label: 'User Management',
label: 'User management',
route: '/system/user-management',
allowedRoles: [ROLES.SUPERUSER],
component: UserManagement
},
{
key: 'session-management',
label: 'Session Management',
label: 'Session management',
route: '/system/session-management',
allowedRoles: [ROLES.SUPERUSER],
component: SessionManagement

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

@ -56,14 +56,14 @@ const getPazuzRoutes = () => [
},
{
key: 'logs',
label: 'Machine Logs',
label: 'Machine logs',
route: '/maintenance/logs',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: MachineLogs
},
{
key: 'machine-status',
label: 'Machine Status',
label: 'Machine status',
route: '/maintenance/machine-status',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: MachineStatus
@ -123,9 +123,9 @@ const getPazuzRoutes = () => [
},
{
key: namespaces.OPERATOR_INFO,
label: 'Operator Info',
label: 'Operator info',
route: '/settings/operator-info',
title: 'Operator Information',
title: 'Operator information',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
get component() {
return () => (
@ -232,7 +232,7 @@ const getPazuzRoutes = () => [
},
{
key: 'promo-codes',
label: 'Promo Codes',
label: 'Promo codes',
route: '/compliance/loyalty/codes',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: PromoCodes
@ -290,14 +290,14 @@ const getPazuzRoutes = () => [
children: [
{
key: 'user-management',
label: 'User Management',
label: 'User management',
route: '/system/user-management',
allowedRoles: [ROLES.SUPERUSER],
component: UserManagement
},
{
key: 'session-management',
label: 'Session Management',
label: 'Session management',
route: '/system/session-management',
allowedRoles: [ROLES.SUPERUSER],
component: SessionManagement

10
new-lamassu-admin/src/utils/string.js
View file

@ -26,7 +26,15 @@ const startCase = R.compose(
splitOnUpper
)
const sentenceCase = R.compose(onlyFirstToUpper, S.joinWith(' '), splitOnUpper)
const singularOrPlural = (amount, singularStr, pluralStr) =>
parseInt(amount) === 1 ? singularStr : pluralStr
export { startCase, onlyFirstToUpper, formatLong, singularOrPlural }
export {
startCase,
onlyFirstToUpper,
formatLong,
singularOrPlural,
sentenceCase
}