diff --git a/new-lamassu-admin/index.html b/new-lamassu-admin/index.html index a570b1e1..c920f860 100644 --- a/new-lamassu-admin/index.html +++ b/new-lamassu-admin/index.html @@ -15,6 +15,6 @@
- + diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json index 6f6186c7..6ccb5790 100644 --- a/new-lamassu-admin/package.json +++ b/new-lamassu-admin/package.json @@ -83,12 +83,6 @@ "pre-commit": "lint-staged" } }, - "lint-staged": { - "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [ - "eslint --fix", - "git add" - ] - }, "scripts": { "start": "vite --force", "build": "vite build", diff --git a/new-lamassu-admin/src/App.js b/new-lamassu-admin/src/App.jsx similarity index 100% rename from new-lamassu-admin/src/App.js rename to new-lamassu-admin/src/App.jsx index 7b4581dd..ede8f396 100644 --- a/new-lamassu-admin/src/App.js +++ b/new-lamassu-admin/src/App.jsx @@ -17,16 +17,16 @@ import { useHistory, BrowserRouter as Router } from 'react-router-dom' - -import AppContext from 'src/AppContext' import Header from 'src/components/layout/Header' import Sidebar from 'src/components/layout/Sidebar' import TitleSection from 'src/components/layout/TitleSection' import { tree, hasSidebar, Routes, getParent } from 'src/routing/routes' +import ApolloProvider from 'src/utils/apollo' + +import AppContext from 'src/AppContext' import global from 'src/styling/global' import theme from 'src/styling/theme' import { backgroundColor, mainWidth } from 'src/styling/variables' -import ApolloProvider from 'src/utils/apollo' if (process.env.NODE_ENV !== 'production') { // const whyDidYouRender = require('@welldone-software/why-did-you-render') diff --git a/new-lamassu-admin/src/components/Carousel.js b/new-lamassu-admin/src/components/Carousel.jsx similarity index 99% rename from new-lamassu-admin/src/components/Carousel.js rename to new-lamassu-admin/src/components/Carousel.jsx index 52ce046e..333b280c 100644 --- a/new-lamassu-admin/src/components/Carousel.js +++ b/new-lamassu-admin/src/components/Carousel.jsx @@ -3,7 +3,6 @@ import React, { memo } from 'react' import ReactCarousel from 'react-material-ui-carousel' import LeftArrow from 'src/styling/icons/arrow/carousel-left-arrow.svg?react' import RightArrow from 'src/styling/icons/arrow/carousel-right-arrow.svg?react' - import { URI } from 'src/utils/apollo' const useStyles = makeStyles({ diff --git a/new-lamassu-admin/src/components/Chip.js b/new-lamassu-admin/src/components/Chip.jsx similarity index 100% rename from new-lamassu-admin/src/components/Chip.js rename to new-lamassu-admin/src/components/Chip.jsx diff --git a/new-lamassu-admin/src/components/CollapsibleCard.js b/new-lamassu-admin/src/components/CollapsibleCard.jsx similarity index 100% rename from new-lamassu-admin/src/components/CollapsibleCard.js rename to new-lamassu-admin/src/components/CollapsibleCard.jsx diff --git a/new-lamassu-admin/src/components/ConfirmDialog.js b/new-lamassu-admin/src/components/ConfirmDialog.jsx similarity index 100% rename from new-lamassu-admin/src/components/ConfirmDialog.js rename to new-lamassu-admin/src/components/ConfirmDialog.jsx index d4ac0870..0d849ed1 100644 --- a/new-lamassu-admin/src/components/ConfirmDialog.js +++ b/new-lamassu-admin/src/components/ConfirmDialog.jsx @@ -6,11 +6,11 @@ import { InputLabel } from '@material-ui/core' import React, { memo, useState } from 'react' +import { H4, P } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import { Button, IconButton } from 'src/components/buttons' import { TextInput } from 'src/components/inputs' -import { H4, P } from 'src/components/typography' import { spacer } from 'src/styling/variables' import ErrorMessage from './ErrorMessage' diff --git a/new-lamassu-admin/src/components/DeleteDialog.js b/new-lamassu-admin/src/components/DeleteDialog.jsx similarity index 95% rename from new-lamassu-admin/src/components/DeleteDialog.js rename to new-lamassu-admin/src/components/DeleteDialog.jsx index e2b5845a..2ee5c1ac 100644 --- a/new-lamassu-admin/src/components/DeleteDialog.js +++ b/new-lamassu-admin/src/components/DeleteDialog.jsx @@ -5,10 +5,10 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H4, P } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import { Button, IconButton } from 'src/components/buttons' -import { H4, P } from 'src/components/typography' import { spacer } from 'src/styling/variables' import ErrorMessage from './ErrorMessage' diff --git a/new-lamassu-admin/src/components/ErrorMessage.js b/new-lamassu-admin/src/components/ErrorMessage.jsx similarity index 100% rename from new-lamassu-admin/src/components/ErrorMessage.js rename to new-lamassu-admin/src/components/ErrorMessage.jsx diff --git a/new-lamassu-admin/src/components/ImagePopper.js b/new-lamassu-admin/src/components/ImagePopper.jsx similarity index 100% rename from new-lamassu-admin/src/components/ImagePopper.js rename to new-lamassu-admin/src/components/ImagePopper.jsx index cb65861c..a9291131 100644 --- a/new-lamassu-admin/src/components/ImagePopper.js +++ b/new-lamassu-admin/src/components/ImagePopper.jsx @@ -1,10 +1,10 @@ import { makeStyles, ClickAwayListener } from '@material-ui/core' import classnames from 'classnames' import React, { memo, useState } from 'react' +import Popper from 'src/components/Popper' import ZoomIconInverse from 'src/styling/icons/circle buttons/search/white.svg?react' import ZoomIcon from 'src/styling/icons/circle buttons/search/zodiac.svg?react' -import Popper from 'src/components/Popper' import { FeatureButton } from 'src/components/buttons' import imagePopperStyles from './ImagePopper.styles' diff --git a/new-lamassu-admin/src/components/InfoMessage.js b/new-lamassu-admin/src/components/InfoMessage.jsx similarity index 99% rename from new-lamassu-admin/src/components/InfoMessage.js rename to new-lamassu-admin/src/components/InfoMessage.jsx index 7be6bd42..e0baa4fa 100644 --- a/new-lamassu-admin/src/components/InfoMessage.js +++ b/new-lamassu-admin/src/components/InfoMessage.jsx @@ -1,8 +1,7 @@ import { Box, makeStyles } from '@material-ui/core' import React from 'react' -import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' - import { Label1 } from 'src/components/typography' +import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' const useStyles = makeStyles({ message: ({ width }) => ({ diff --git a/new-lamassu-admin/src/components/InformativeDialog.js b/new-lamassu-admin/src/components/InformativeDialog.jsx similarity index 100% rename from new-lamassu-admin/src/components/InformativeDialog.js rename to new-lamassu-admin/src/components/InformativeDialog.jsx index d3efe4ca..47959cff 100644 --- a/new-lamassu-admin/src/components/InformativeDialog.js +++ b/new-lamassu-admin/src/components/InformativeDialog.jsx @@ -1,9 +1,9 @@ import { Dialog, DialogContent, makeStyles } from '@material-ui/core' import React, { memo } from 'react' +import { H1 } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import { IconButton } from 'src/components/buttons' -import { H1 } from 'src/components/typography' import { spacer } from 'src/styling/variables' const useStyles = makeStyles({ diff --git a/new-lamassu-admin/src/components/LogsDownloaderPopper.js b/new-lamassu-admin/src/components/LogsDownloaderPopper.jsx similarity index 100% rename from new-lamassu-admin/src/components/LogsDownloaderPopper.js rename to new-lamassu-admin/src/components/LogsDownloaderPopper.jsx diff --git a/new-lamassu-admin/src/components/Modal.js b/new-lamassu-admin/src/components/Modal.jsx similarity index 100% rename from new-lamassu-admin/src/components/Modal.js rename to new-lamassu-admin/src/components/Modal.jsx index 17c0ca2a..296b9c87 100644 --- a/new-lamassu-admin/src/components/Modal.js +++ b/new-lamassu-admin/src/components/Modal.jsx @@ -1,10 +1,10 @@ import { makeStyles, Modal as MaterialModal, Paper } from '@material-ui/core' import classnames from 'classnames' import React from 'react' +import { H1, H4 } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import { IconButton } from 'src/components/buttons' -import { H1, H4 } from 'src/components/typography' const styles = { modal: { diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx similarity index 99% rename from new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js rename to new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx index 23d428a1..49208fe3 100644 --- a/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.js +++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationCenter.jsx @@ -3,14 +3,13 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState, useEffect } from 'react' +import ActionButton from 'src/components/buttons/ActionButton' +import { H5 } from 'src/components/typography' import NotificationIconZodiac from 'src/styling/icons/menu/notification-zodiac.svg?react' import ClearAllIconInverse from 'src/styling/icons/stage/spring/empty.svg?react' import ClearAllIcon from 'src/styling/icons/stage/zodiac/empty.svg?react' import ShowUnreadIcon from 'src/styling/icons/stage/zodiac/full.svg?react' -import ActionButton from 'src/components/buttons/ActionButton' -import { H5 } from 'src/components/typography' - import styles from './NotificationCenter.styles' import NotificationRow from './NotificationRow' diff --git a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx similarity index 99% rename from new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js rename to new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx index 293a6437..a5b454b3 100644 --- a/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.js +++ b/new-lamassu-admin/src/components/NotificationCenter/NotificationRow.jsx @@ -3,12 +3,11 @@ import classnames from 'classnames' import prettyMs from 'pretty-ms' import * as R from 'ramda' import React from 'react' +import { Label1, Label2, TL2 } from 'src/components/typography' import Wrench from 'src/styling/icons/action/wrench/zodiac.svg?react' import Transaction from 'src/styling/icons/arrow/transaction.svg?react' import WarningIcon from 'src/styling/icons/warning-icon/tomato.svg?react' -import { Label1, Label2, TL2 } from 'src/components/typography' - import styles from './NotificationCenter.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/components/Popper.js b/new-lamassu-admin/src/components/Popper.jsx similarity index 100% rename from new-lamassu-admin/src/components/Popper.js rename to new-lamassu-admin/src/components/Popper.jsx diff --git a/new-lamassu-admin/src/components/PromptWhenDirty.js b/new-lamassu-admin/src/components/PromptWhenDirty.jsx similarity index 100% rename from new-lamassu-admin/src/components/PromptWhenDirty.js rename to new-lamassu-admin/src/components/PromptWhenDirty.jsx diff --git a/new-lamassu-admin/src/components/SearchBox.js b/new-lamassu-admin/src/components/SearchBox.jsx similarity index 99% rename from new-lamassu-admin/src/components/SearchBox.js rename to new-lamassu-admin/src/components/SearchBox.jsx index bb6bfb0a..b4974123 100644 --- a/new-lamassu-admin/src/components/SearchBox.js +++ b/new-lamassu-admin/src/components/SearchBox.jsx @@ -4,9 +4,8 @@ import { makeStyles } from '@material-ui/core/styles' import MAutocomplete from '@material-ui/lab/Autocomplete' import classnames from 'classnames' import React, { memo, useState } from 'react' -import SearchIcon from 'src/styling/icons/circle buttons/search/zodiac.svg?react' - import { P } from 'src/components/typography' +import SearchIcon from 'src/styling/icons/circle buttons/search/zodiac.svg?react' import styles from './SearchBox.styles' diff --git a/new-lamassu-admin/src/components/SearchFilter.js b/new-lamassu-admin/src/components/SearchFilter.jsx similarity index 100% rename from new-lamassu-admin/src/components/SearchFilter.js rename to new-lamassu-admin/src/components/SearchFilter.jsx index 7f084ced..c3195d1d 100644 --- a/new-lamassu-admin/src/components/SearchFilter.js +++ b/new-lamassu-admin/src/components/SearchFilter.jsx @@ -1,12 +1,12 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import Chip from 'src/components/Chip' +import { P, Label3 } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import FilterIcon from 'src/styling/icons/button/filter/white.svg?react' import ReverseFilterIcon from 'src/styling/icons/button/filter/zodiac.svg?react' -import Chip from 'src/components/Chip' import { ActionButton } from 'src/components/buttons' -import { P, Label3 } from 'src/components/typography' import { onlyFirstToUpper, singularOrPlural } from 'src/utils/string' import { chipStyles, styles } from './SearchFilter.styles' diff --git a/new-lamassu-admin/src/components/Stage.js b/new-lamassu-admin/src/components/Stage.jsx similarity index 100% rename from new-lamassu-admin/src/components/Stage.js rename to new-lamassu-admin/src/components/Stage.jsx diff --git a/new-lamassu-admin/src/components/Status.js b/new-lamassu-admin/src/components/Status.jsx similarity index 100% rename from new-lamassu-admin/src/components/Status.js rename to new-lamassu-admin/src/components/Status.jsx diff --git a/new-lamassu-admin/src/components/Stepper.js b/new-lamassu-admin/src/components/Stepper.jsx similarity index 100% rename from new-lamassu-admin/src/components/Stepper.js rename to new-lamassu-admin/src/components/Stepper.jsx diff --git a/new-lamassu-admin/src/components/Subtitle.js b/new-lamassu-admin/src/components/Subtitle.jsx similarity index 100% rename from new-lamassu-admin/src/components/Subtitle.js rename to new-lamassu-admin/src/components/Subtitle.jsx diff --git a/new-lamassu-admin/src/components/TableLabel.js b/new-lamassu-admin/src/components/TableLabel.jsx similarity index 100% rename from new-lamassu-admin/src/components/TableLabel.js rename to new-lamassu-admin/src/components/TableLabel.jsx diff --git a/new-lamassu-admin/src/components/Title.js b/new-lamassu-admin/src/components/Title.jsx similarity index 100% rename from new-lamassu-admin/src/components/Title.js rename to new-lamassu-admin/src/components/Title.jsx diff --git a/new-lamassu-admin/src/components/Tooltip.js b/new-lamassu-admin/src/components/Tooltip.jsx similarity index 98% rename from new-lamassu-admin/src/components/Tooltip.js rename to new-lamassu-admin/src/components/Tooltip.jsx index 77fed2c2..1748c501 100644 --- a/new-lamassu-admin/src/components/Tooltip.js +++ b/new-lamassu-admin/src/components/Tooltip.jsx @@ -1,9 +1,8 @@ import { makeStyles, ClickAwayListener } from '@material-ui/core' import * as R from 'ramda' import React, { useState, memo } from 'react' -import HelpIcon from 'src/styling/icons/action/help/zodiac.svg?react' - import Popper from 'src/components/Popper' +import HelpIcon from 'src/styling/icons/action/help/zodiac.svg?react' const useStyles = makeStyles({ transparentButton: { @@ -103,7 +102,7 @@ const HoverableTooltip = memo(({ parentElements, children, width }) => { diff --git a/new-lamassu-admin/src/components/Uptime.js b/new-lamassu-admin/src/components/Uptime.jsx similarity index 100% rename from new-lamassu-admin/src/components/Uptime.js rename to new-lamassu-admin/src/components/Uptime.jsx diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx similarity index 100% rename from new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js rename to new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx index 4e9bbe62..1b4ddbf1 100644 --- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js +++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.jsx @@ -3,17 +3,17 @@ import classnames from 'classnames' import { useFormikContext, Form, Formik, Field as FormikField } from 'formik' import * as R from 'ramda' import React, { useState, memo } from 'react' +import PromptWhenDirty from 'src/components/PromptWhenDirty' +import { H4 } from 'src/components/typography' import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import FalseIcon from 'src/styling/icons/table/false.svg?react' import TrueIcon from 'src/styling/icons/table/true.svg?react' import * as Yup from 'yup' -import PromptWhenDirty from 'src/components/PromptWhenDirty' import { Link, IconButton } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs/formik' import { Table, TableBody, TableRow, TableCell } from 'src/components/table' -import { H4 } from 'src/components/typography' import { booleanPropertiesTableStyles } from './BooleanPropertiesTable.styles' diff --git a/new-lamassu-admin/src/components/buttons/ActionButton.js b/new-lamassu-admin/src/components/buttons/ActionButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/ActionButton.js rename to new-lamassu-admin/src/components/buttons/ActionButton.jsx diff --git a/new-lamassu-admin/src/components/buttons/AddButton.js b/new-lamassu-admin/src/components/buttons/AddButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/AddButton.js rename to new-lamassu-admin/src/components/buttons/AddButton.jsx diff --git a/new-lamassu-admin/src/components/buttons/Button.js b/new-lamassu-admin/src/components/buttons/Button.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/Button.js rename to new-lamassu-admin/src/components/buttons/Button.jsx diff --git a/new-lamassu-admin/src/components/buttons/DeleteButton.js b/new-lamassu-admin/src/components/buttons/DeleteButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/DeleteButton.js rename to new-lamassu-admin/src/components/buttons/DeleteButton.jsx diff --git a/new-lamassu-admin/src/components/buttons/FeatureButton.js b/new-lamassu-admin/src/components/buttons/FeatureButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/FeatureButton.js rename to new-lamassu-admin/src/components/buttons/FeatureButton.jsx diff --git a/new-lamassu-admin/src/components/buttons/IDButton.js b/new-lamassu-admin/src/components/buttons/IDButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/IDButton.js rename to new-lamassu-admin/src/components/buttons/IDButton.jsx index 15c55602..a43aeb82 100644 --- a/new-lamassu-admin/src/components/buttons/IDButton.js +++ b/new-lamassu-admin/src/components/buttons/IDButton.jsx @@ -2,8 +2,8 @@ import { ClickAwayListener } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React, { useState, memo } from 'react' - import Popover from 'src/components/Popper' + import typographyStyles from 'src/components/typography/styles' import { subheaderColor, diff --git a/new-lamassu-admin/src/components/buttons/IconButton.js b/new-lamassu-admin/src/components/buttons/IconButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/IconButton.js rename to new-lamassu-admin/src/components/buttons/IconButton.jsx diff --git a/new-lamassu-admin/src/components/buttons/Link.js b/new-lamassu-admin/src/components/buttons/Link.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/Link.js rename to new-lamassu-admin/src/components/buttons/Link.jsx diff --git a/new-lamassu-admin/src/components/buttons/SimpleButton.js b/new-lamassu-admin/src/components/buttons/SimpleButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/SimpleButton.js rename to new-lamassu-admin/src/components/buttons/SimpleButton.jsx diff --git a/new-lamassu-admin/src/components/buttons/SubpageButton.js b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx similarity index 99% rename from new-lamassu-admin/src/components/buttons/SubpageButton.js rename to new-lamassu-admin/src/components/buttons/SubpageButton.jsx index 8e66deb5..f98b6d75 100644 --- a/new-lamassu-admin/src/components/buttons/SubpageButton.js +++ b/new-lamassu-admin/src/components/buttons/SubpageButton.jsx @@ -1,9 +1,8 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React, { memo, useState } from 'react' -import CancelIconInverse from 'src/styling/icons/button/cancel/white.svg?react' - import { H4 } from 'src/components/typography' +import CancelIconInverse from 'src/styling/icons/button/cancel/white.svg?react' import subpageButtonStyles from './SubpageButton.styles' diff --git a/new-lamassu-admin/src/components/buttons/SupportLinkButton.js b/new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx similarity index 100% rename from new-lamassu-admin/src/components/buttons/SupportLinkButton.js rename to new-lamassu-admin/src/components/buttons/SupportLinkButton.jsx diff --git a/new-lamassu-admin/src/components/date-range-picker/Calendar.js b/new-lamassu-admin/src/components/date-range-picker/Calendar.jsx similarity index 100% rename from new-lamassu-admin/src/components/date-range-picker/Calendar.js rename to new-lamassu-admin/src/components/date-range-picker/Calendar.jsx diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx similarity index 100% rename from new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js rename to new-lamassu-admin/src/components/date-range-picker/DateRangePicker.jsx diff --git a/new-lamassu-admin/src/components/date-range-picker/Tile.js b/new-lamassu-admin/src/components/date-range-picker/Tile.jsx similarity index 100% rename from new-lamassu-admin/src/components/date-range-picker/Tile.js rename to new-lamassu-admin/src/components/date-range-picker/Tile.jsx diff --git a/new-lamassu-admin/src/components/editableProperty/EditableProperty.js b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx similarity index 100% rename from new-lamassu-admin/src/components/editableProperty/EditableProperty.js rename to new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx index c22a451b..28852792 100644 --- a/new-lamassu-admin/src/components/editableProperty/EditableProperty.js +++ b/new-lamassu-admin/src/components/editableProperty/EditableProperty.jsx @@ -1,11 +1,11 @@ import { makeStyles } from '@material-ui/core/styles' import React, { useState, memo } from 'react' +import { H4, P } from 'src/components/typography' import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import { Link } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import { H4, P } from 'src/components/typography' import { editablePropertyStyles } from './EditableProperty.styles' diff --git a/new-lamassu-admin/src/components/editableTable/Header.js b/new-lamassu-admin/src/components/editableTable/Header.jsx similarity index 100% rename from new-lamassu-admin/src/components/editableTable/Header.js rename to new-lamassu-admin/src/components/editableTable/Header.jsx index 2c422e43..a6ef6143 100644 --- a/new-lamassu-admin/src/components/editableTable/Header.js +++ b/new-lamassu-admin/src/components/editableTable/Header.jsx @@ -2,13 +2,13 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import * as R from 'ramda' import React, { useContext } from 'react' - import { Td, THead, TDoubleLevelHead, ThDoubleLevel } from 'src/components/fake-table/Table' + import { sentenceCase } from 'src/utils/string' import TableCtx from './Context' diff --git a/new-lamassu-admin/src/components/editableTable/NamespacedTable.js b/new-lamassu-admin/src/components/editableTable/NamespacedTable.jsx similarity index 100% rename from new-lamassu-admin/src/components/editableTable/NamespacedTable.js rename to new-lamassu-admin/src/components/editableTable/NamespacedTable.jsx diff --git a/new-lamassu-admin/src/components/editableTable/Row.js b/new-lamassu-admin/src/components/editableTable/Row.jsx similarity index 96% rename from new-lamassu-admin/src/components/editableTable/Row.js rename to new-lamassu-admin/src/components/editableTable/Row.jsx index d54892f6..67aa6a6f 100644 --- a/new-lamassu-admin/src/components/editableTable/Row.js +++ b/new-lamassu-admin/src/components/editableTable/Row.jsx @@ -3,17 +3,17 @@ import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' import React, { useContext, useState } from 'react' +import { DeleteDialog } from 'src/components/DeleteDialog' +import { Td, Tr } from 'src/components/fake-table/Table' +import { Label2 } from 'src/components/typography' import DisabledDeleteIcon from 'src/styling/icons/action/delete/disabled.svg?react' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' import DisabledEditIcon from 'src/styling/icons/action/edit/disabled.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import StripesSvg from 'src/styling/icons/stripes.svg?react' -import { DeleteDialog } from 'src/components/DeleteDialog' import { Link, IconButton } from 'src/components/buttons' -import { Td, Tr } from 'src/components/fake-table/Table' import { Switch } from 'src/components/inputs' -import { Label2 } from 'src/components/typography' import TableCtx from './Context' import styles from './Row.styles' diff --git a/new-lamassu-admin/src/components/editableTable/Table.js b/new-lamassu-admin/src/components/editableTable/Table.jsx similarity index 98% rename from new-lamassu-admin/src/components/editableTable/Table.js rename to new-lamassu-admin/src/components/editableTable/Table.jsx index a5e66733..cbdbc7cd 100644 --- a/new-lamassu-admin/src/components/editableTable/Table.js +++ b/new-lamassu-admin/src/components/editableTable/Table.jsx @@ -2,13 +2,13 @@ import { makeStyles } from '@material-ui/core' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useState, useEffect } from 'react' -import { v4 } from 'uuid' - import PromptWhenDirty from 'src/components/PromptWhenDirty' -import Link from 'src/components/buttons/Link.js' -import { AddButton } from 'src/components/buttons/index.js' +import Link from 'src/components/buttons/Link' import { TBody, Table } from 'src/components/fake-table/Table' import { Info2, TL1 } from 'src/components/typography' +import { v4 } from 'uuid' + +import { AddButton } from 'src/components/buttons/index' import TableCtx from './Context' import Header from './Header' diff --git a/new-lamassu-admin/src/components/fake-table/Table.js b/new-lamassu-admin/src/components/fake-table/Table.jsx similarity index 100% rename from new-lamassu-admin/src/components/fake-table/Table.js rename to new-lamassu-admin/src/components/fake-table/Table.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/Autocomplete.js rename to new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx index e5f9b941..84c4e1a1 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.jsx @@ -3,9 +3,9 @@ import MAutocomplete from '@material-ui/lab/Autocomplete' import sort from 'match-sorter' import * as R from 'ramda' import React from 'react' - import { HoverableTooltip } from 'src/components/Tooltip' import { P } from 'src/components/typography' + import { errorColor, orangeYellow, spring4 } from 'src/styling/variables' import TextInput from './TextInput' diff --git a/new-lamassu-admin/src/components/inputs/base/Checkbox.js b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/Checkbox.js rename to new-lamassu-admin/src/components/inputs/base/Checkbox.jsx index 4cba0aaf..c70cc699 100644 --- a/new-lamassu-admin/src/components/inputs/base/Checkbox.js +++ b/new-lamassu-admin/src/components/inputs/base/Checkbox.jsx @@ -3,9 +3,9 @@ import { makeStyles } from '@material-ui/core/styles' import CheckBoxIcon from '@material-ui/icons/CheckBox' import CheckBoxOutlineBlankIcon from '@material-ui/icons/CheckBoxOutlineBlank' import React from 'react' +import { Label2, Info3 } from 'src/components/typography' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' -import { Label2, Info3 } from 'src/components/typography' import { fontSize2, fontSize3, diff --git a/new-lamassu-admin/src/components/inputs/base/CodeInput.js b/new-lamassu-admin/src/components/inputs/base/CodeInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/CodeInput.js rename to new-lamassu-admin/src/components/inputs/base/CodeInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/Dropdown.js b/new-lamassu-admin/src/components/inputs/base/Dropdown.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/Dropdown.js rename to new-lamassu-admin/src/components/inputs/base/Dropdown.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/NumberInput.js b/new-lamassu-admin/src/components/inputs/base/NumberInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/NumberInput.js rename to new-lamassu-admin/src/components/inputs/base/NumberInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/RadioGroup.js rename to new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx index 4d11f4ed..48520a68 100644 --- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js +++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.jsx @@ -6,8 +6,8 @@ import { } from '@material-ui/core' import classnames from 'classnames' import React from 'react' - import { Label1 } from 'src/components/typography' + import { offColor } from 'src/styling/variables' const styles = { label: { diff --git a/new-lamassu-admin/src/components/inputs/base/SecretInput.js b/new-lamassu-admin/src/components/inputs/base/SecretInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/SecretInput.js rename to new-lamassu-admin/src/components/inputs/base/SecretInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/Select.js b/new-lamassu-admin/src/components/inputs/base/Select.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/Select.js rename to new-lamassu-admin/src/components/inputs/base/Select.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/Switch.js b/new-lamassu-admin/src/components/inputs/base/Switch.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/Switch.js rename to new-lamassu-admin/src/components/inputs/base/Switch.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/TextInput.js b/new-lamassu-admin/src/components/inputs/base/TextInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/TextInput.js rename to new-lamassu-admin/src/components/inputs/base/TextInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.js b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.js rename to new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx index bbd48ff0..72193ce2 100644 --- a/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.js +++ b/new-lamassu-admin/src/components/inputs/base/ToggleButtonGroup.jsx @@ -2,8 +2,8 @@ import { makeStyles } from '@material-ui/core' import { ToggleButtonGroup as MUIToggleButtonGroup } from '@material-ui/lab' import ToggleButton from '@material-ui/lab/ToggleButton' import React from 'react' - import { H4, P } from 'src/components/typography' + import { backgroundColor, comet } from 'src/styling/variables' const styles = { noTextTransform: { diff --git a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js rename to new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx index 68755b53..58bb8cf6 100644 --- a/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.js +++ b/new-lamassu-admin/src/components/inputs/cashbox/Cashbox.jsx @@ -1,9 +1,9 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React from 'react' - import Chip from 'src/components/Chip' import { Info2, Label1, Label2 } from 'src/components/typography' + import { numberToFiatAmount } from 'src/utils/number' import { cashboxStyles, gridStyles } from './Cashbox.styles' diff --git a/new-lamassu-admin/src/components/inputs/formik/Autocomplete.js b/new-lamassu-admin/src/components/inputs/formik/Autocomplete.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/Autocomplete.js rename to new-lamassu-admin/src/components/inputs/formik/Autocomplete.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.js b/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx similarity index 99% rename from new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.js rename to new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx index 6a275f42..f5016e67 100644 --- a/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.js +++ b/new-lamassu-admin/src/components/inputs/formik/CashCassetteInput.jsx @@ -1,7 +1,6 @@ import { makeStyles } from '@material-ui/core' import classNames from 'classnames' import React, { memo, useState } from 'react' - import { CashOut } from 'src/components/inputs/cashbox/Cashbox' import { NumberInput } from '../base' diff --git a/new-lamassu-admin/src/components/inputs/formik/Checkbox.js b/new-lamassu-admin/src/components/inputs/formik/Checkbox.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/Checkbox.js rename to new-lamassu-admin/src/components/inputs/formik/Checkbox.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/Dropdown.js b/new-lamassu-admin/src/components/inputs/formik/Dropdown.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/Dropdown.js rename to new-lamassu-admin/src/components/inputs/formik/Dropdown.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/NumberInput.js b/new-lamassu-admin/src/components/inputs/formik/NumberInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/NumberInput.js rename to new-lamassu-admin/src/components/inputs/formik/NumberInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.js b/new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.js rename to new-lamassu-admin/src/components/inputs/formik/PhoneNumberInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/RadioGroup.js b/new-lamassu-admin/src/components/inputs/formik/RadioGroup.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/RadioGroup.js rename to new-lamassu-admin/src/components/inputs/formik/RadioGroup.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/SecretInput.js b/new-lamassu-admin/src/components/inputs/formik/SecretInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/SecretInput.js rename to new-lamassu-admin/src/components/inputs/formik/SecretInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/TextInput.js b/new-lamassu-admin/src/components/inputs/formik/TextInput.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/TextInput.js rename to new-lamassu-admin/src/components/inputs/formik/TextInput.jsx diff --git a/new-lamassu-admin/src/components/inputs/formik/ToggleButtonGroup.js b/new-lamassu-admin/src/components/inputs/formik/ToggleButtonGroup.jsx similarity index 100% rename from new-lamassu-admin/src/components/inputs/formik/ToggleButtonGroup.js rename to new-lamassu-admin/src/components/inputs/formik/ToggleButtonGroup.jsx diff --git a/new-lamassu-admin/src/components/layout/Header.js b/new-lamassu-admin/src/components/layout/Header.jsx similarity index 100% rename from new-lamassu-admin/src/components/layout/Header.js rename to new-lamassu-admin/src/components/layout/Header.jsx index f86cd554..9cceb438 100644 --- a/new-lamassu-admin/src/components/layout/Header.js +++ b/new-lamassu-admin/src/components/layout/Header.jsx @@ -7,14 +7,14 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { memo, useState, useEffect, useRef } from 'react' import { NavLink, useHistory } from 'react-router-dom' +import ActionButton from 'src/components/buttons/ActionButton' +import { H4 } from 'src/components/typography' import AddIconReverse from 'src/styling/icons/button/add/white.svg?react' import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' import Logo from 'src/styling/icons/menu/logo.svg?react' import NotificationIcon from 'src/styling/icons/menu/notification.svg?react' import NotificationCenter from 'src/components/NotificationCenter' -import ActionButton from 'src/components/buttons/ActionButton' -import { H4 } from 'src/components/typography' import AddMachine from 'src/pages/AddMachine' import styles from './Header.styles' diff --git a/new-lamassu-admin/src/components/layout/Section.js b/new-lamassu-admin/src/components/layout/Section.jsx similarity index 99% rename from new-lamassu-admin/src/components/layout/Section.js rename to new-lamassu-admin/src/components/layout/Section.jsx index e42c9366..6f0e9302 100644 --- a/new-lamassu-admin/src/components/layout/Section.js +++ b/new-lamassu-admin/src/components/layout/Section.jsx @@ -1,6 +1,5 @@ import { makeStyles } from '@material-ui/core' import React from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Subtitle from 'src/components/Subtitle' diff --git a/new-lamassu-admin/src/components/layout/Sidebar.js b/new-lamassu-admin/src/components/layout/Sidebar.jsx similarity index 99% rename from new-lamassu-admin/src/components/layout/Sidebar.js rename to new-lamassu-admin/src/components/layout/Sidebar.jsx index bde27688..d1a6db5e 100644 --- a/new-lamassu-admin/src/components/layout/Sidebar.js +++ b/new-lamassu-admin/src/components/layout/Sidebar.jsx @@ -1,12 +1,11 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React from 'react' +import { P } from 'src/components/typography' import CompleteStageIconZodiac from 'src/styling/icons/stage/zodiac/complete.svg?react' import CurrentStageIconZodiac from 'src/styling/icons/stage/zodiac/current.svg?react' import EmptyStageIconZodiac from 'src/styling/icons/stage/zodiac/empty.svg?react' -import { P } from 'src/components/typography' - import styles from './Sidebar.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/components/layout/TitleSection.js b/new-lamassu-admin/src/components/layout/TitleSection.jsx similarity index 100% rename from new-lamassu-admin/src/components/layout/TitleSection.js rename to new-lamassu-admin/src/components/layout/TitleSection.jsx index cf7459c9..563bb275 100644 --- a/new-lamassu-admin/src/components/layout/TitleSection.js +++ b/new-lamassu-admin/src/components/layout/TitleSection.jsx @@ -2,12 +2,12 @@ import { makeStyles, Box } from '@material-ui/core' import classnames from 'classnames' import * as R from 'ramda' import React from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Title from 'src/components/Title' -import { SubpageButton } from 'src/components/buttons' import { Info1, Label1 } from 'src/components/typography' +import { SubpageButton } from 'src/components/buttons' + import styles from './TitleSection.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.js b/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx similarity index 100% rename from new-lamassu-admin/src/components/machineActions/DiagnosticsModal.js rename to new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx index c46aa79b..9a2fd34d 100644 --- a/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.js +++ b/new-lamassu-admin/src/components/machineActions/DiagnosticsModal.jsx @@ -4,12 +4,12 @@ import { subMinutes } from 'date-fns' import FileSaver from 'file-saver' import gql from 'graphql-tag' import React, { useState, useEffect } from 'react' - import Modal from 'src/components/Modal' -import { Button } from 'src/components/buttons' import { H3, P } from 'src/components/typography' import { URI } from 'src/utils/apollo' +import { Button } from 'src/components/buttons' + import { diagnosticsModal } from './MachineActions.styles' const useStyles = makeStyles(diagnosticsModal) diff --git a/new-lamassu-admin/src/components/machineActions/MachineActions.js b/new-lamassu-admin/src/components/machineActions/MachineActions.jsx similarity index 99% rename from new-lamassu-admin/src/components/machineActions/MachineActions.js rename to new-lamassu-admin/src/components/machineActions/MachineActions.jsx index 63b74390..76fb7296 100644 --- a/new-lamassu-admin/src/components/machineActions/MachineActions.js +++ b/new-lamassu-admin/src/components/machineActions/MachineActions.jsx @@ -2,6 +2,9 @@ import { useMutation, useLazyQuery } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import React, { memo, useState } from 'react' +import { ConfirmDialog } from 'src/components/ConfirmDialog' +import ActionButton from 'src/components/buttons/ActionButton' +import { H3 } from 'src/components/typography' import EditReversedIcon from 'src/styling/icons/button/edit/white.svg?react' import EditIcon from 'src/styling/icons/button/edit/zodiac.svg?react' import RebootReversedIcon from 'src/styling/icons/button/reboot/white.svg?react' @@ -11,10 +14,6 @@ import ShutdownIcon from 'src/styling/icons/button/shut down/zodiac.svg?react' import UnpairReversedIcon from 'src/styling/icons/button/unpair/white.svg?react' import UnpairIcon from 'src/styling/icons/button/unpair/zodiac.svg?react' -import { ConfirmDialog } from 'src/components/ConfirmDialog' -import ActionButton from 'src/components/buttons/ActionButton' -import { H3 } from 'src/components/typography' - import DiagnosticsModal from './DiagnosticsModal' import { machineActionsStyles } from './MachineActions.styles' diff --git a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx similarity index 100% rename from new-lamassu-admin/src/components/single-row-table/SingleRowTable.js rename to new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx index 291f3378..ccb22539 100644 --- a/new-lamassu-admin/src/components/single-row-table/SingleRowTable.js +++ b/new-lamassu-admin/src/components/single-row-table/SingleRowTable.jsx @@ -1,9 +1,6 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import React from 'react' -import EditIcon from 'src/styling/icons/action/edit/white.svg?react' - -import { IconButton } from 'src/components/buttons' import { Table, THead, @@ -12,6 +9,9 @@ import { Th, Tr } from 'src/components/fake-table/Table' +import EditIcon from 'src/styling/icons/action/edit/white.svg?react' + +import { IconButton } from 'src/components/buttons' import styles from './SingleRowTable.styles' diff --git a/new-lamassu-admin/src/components/table/EditCell.js b/new-lamassu-admin/src/components/table/EditCell.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/EditCell.js rename to new-lamassu-admin/src/components/table/EditCell.jsx diff --git a/new-lamassu-admin/src/components/table/EmptyTable.js b/new-lamassu-admin/src/components/table/EmptyTable.jsx similarity index 99% rename from new-lamassu-admin/src/components/table/EmptyTable.js rename to new-lamassu-admin/src/components/table/EmptyTable.jsx index de10adf1..b755c746 100644 --- a/new-lamassu-admin/src/components/table/EmptyTable.js +++ b/new-lamassu-admin/src/components/table/EmptyTable.jsx @@ -1,9 +1,8 @@ import { makeStyles } from '@material-ui/core' import classNames from 'classnames' import React, { memo } from 'react' -import EmptyTableIcon from 'src/styling/icons/table/empty-table.svg?react' - import { H4 } from 'src/components/typography' +import EmptyTableIcon from 'src/styling/icons/table/empty-table.svg?react' const styles = { emptyTable: { diff --git a/new-lamassu-admin/src/components/table/Table.js b/new-lamassu-admin/src/components/table/Table.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/Table.js rename to new-lamassu-admin/src/components/table/Table.jsx diff --git a/new-lamassu-admin/src/components/table/TableBody.js b/new-lamassu-admin/src/components/table/TableBody.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/TableBody.js rename to new-lamassu-admin/src/components/table/TableBody.jsx diff --git a/new-lamassu-admin/src/components/table/TableCell.js b/new-lamassu-admin/src/components/table/TableCell.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/TableCell.js rename to new-lamassu-admin/src/components/table/TableCell.jsx diff --git a/new-lamassu-admin/src/components/table/TableHead.js b/new-lamassu-admin/src/components/table/TableHead.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/TableHead.js rename to new-lamassu-admin/src/components/table/TableHead.jsx diff --git a/new-lamassu-admin/src/components/table/TableHeader.js b/new-lamassu-admin/src/components/table/TableHeader.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/TableHeader.js rename to new-lamassu-admin/src/components/table/TableHeader.jsx diff --git a/new-lamassu-admin/src/components/table/TableRow.js b/new-lamassu-admin/src/components/table/TableRow.jsx similarity index 100% rename from new-lamassu-admin/src/components/table/TableRow.js rename to new-lamassu-admin/src/components/table/TableRow.jsx diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.jsx similarity index 100% rename from new-lamassu-admin/src/components/tables/DataTable.js rename to new-lamassu-admin/src/components/tables/DataTable.jsx index eb217e32..30b18758 100644 --- a/new-lamassu-admin/src/components/tables/DataTable.js +++ b/new-lamassu-admin/src/components/tables/DataTable.jsx @@ -8,9 +8,6 @@ import { CellMeasurer, CellMeasurerCache } from 'react-virtualized' -import ExpandClosedIcon from 'src/styling/icons/action/expand/closed.svg?react' -import ExpandOpenIcon from 'src/styling/icons/action/expand/open.svg?react' - import { Table, TBody, @@ -19,8 +16,11 @@ import { Td, Th } from 'src/components/fake-table/Table' -import { EmptyTable } from 'src/components/table' import { H4 } from 'src/components/typography' +import ExpandClosedIcon from 'src/styling/icons/action/expand/closed.svg?react' +import ExpandOpenIcon from 'src/styling/icons/action/expand/open.svg?react' + +import { EmptyTable } from 'src/components/table' import styles from './DataTable.styles' diff --git a/new-lamassu-admin/src/components/tables/Stripes.js b/new-lamassu-admin/src/components/tables/Stripes.jsx similarity index 99% rename from new-lamassu-admin/src/components/tables/Stripes.js rename to new-lamassu-admin/src/components/tables/Stripes.jsx index 8b6976a5..6f84869e 100644 --- a/new-lamassu-admin/src/components/tables/Stripes.js +++ b/new-lamassu-admin/src/components/tables/Stripes.jsx @@ -1,7 +1,6 @@ import React from 'react' -import StripesSvg from 'src/styling/icons/stripes.svg?react' - import { Td } from 'src/components/fake-table/Table' +import StripesSvg from 'src/styling/icons/stripes.svg?react' const Stripes = ({ width }) => ( diff --git a/new-lamassu-admin/src/components/typography/index.js b/new-lamassu-admin/src/components/typography/index.jsx similarity index 100% rename from new-lamassu-admin/src/components/typography/index.js rename to new-lamassu-admin/src/components/typography/index.jsx diff --git a/new-lamassu-admin/src/index.js b/new-lamassu-admin/src/index.jsx similarity index 100% rename from new-lamassu-admin/src/index.js rename to new-lamassu-admin/src/index.jsx diff --git a/new-lamassu-admin/src/pages/AddMachine/AddMachine.js b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx similarity index 100% rename from new-lamassu-admin/src/pages/AddMachine/AddMachine.js rename to new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx index e0b61c27..49a112b8 100644 --- a/new-lamassu-admin/src/pages/AddMachine/AddMachine.js +++ b/new-lamassu-admin/src/pages/AddMachine/AddMachine.jsx @@ -7,6 +7,9 @@ import gql from 'graphql-tag' import QRCode from 'qrcode.react' import * as R from 'ramda' import React, { memo, useState, useEffect, useRef } from 'react' +import Title from 'src/components/Title' +import Sidebar from 'src/components/layout/Sidebar' +import { Info2, P } from 'src/components/typography' import CameraIcon from 'src/styling/icons/ID/photo/zodiac.svg?react' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import CompleteStageIconSpring from 'src/styling/icons/stage/spring/complete.svg?react' @@ -16,11 +19,8 @@ import EmptyStageIconZodiac from 'src/styling/icons/stage/zodiac/empty.svg?react import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' import * as Yup from 'yup' -import Title from 'src/components/Title' import { Button } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import Sidebar from 'src/components/layout/Sidebar' -import { Info2, P } from 'src/components/typography' import { primaryColor } from 'src/styling/variables' import styles from './styles' diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.js b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/Analytics.js rename to new-lamassu-admin/src/pages/Analytics/Analytics.jsx index 11602b25..0282a126 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.js +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.jsx @@ -7,13 +7,13 @@ import { subDays, format, add, startOfWeek } from 'date-fns/fp' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import TitleSection from 'src/components/layout/TitleSection' +import { Info2, P } from 'src/components/typography' import DownIcon from 'src/styling/icons/dashboard/down.svg?react' import EqualIcon from 'src/styling/icons/dashboard/equal.svg?react' import UpIcon from 'src/styling/icons/dashboard/up.svg?react' import { Select } from 'src/components/inputs' -import TitleSection from 'src/components/layout/TitleSection' -import { Info2, P } from 'src/components/typography' import { fromNamespace } from 'src/utils/config' import { numberToFiatAmount } from 'src/utils/number' import { DAY, WEEK, MONTH } from 'src/utils/time' diff --git a/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.js b/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Analytics/components/LegendEntry.js rename to new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx index d079e760..1222db8e 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.js +++ b/new-lamassu-admin/src/pages/Analytics/components/LegendEntry.jsx @@ -1,6 +1,5 @@ import { makeStyles } from '@material-ui/core/styles' import React from 'react' - import { P } from 'src/components/typography' import styles from '../Analytics.styles' diff --git a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.js b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.js rename to new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx index 363a7ef0..cd5633ac 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.js +++ b/new-lamassu-admin/src/pages/Analytics/components/tooltips/GraphTooltip.jsx @@ -2,10 +2,10 @@ import { Paper } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import React, { memo } from 'react' +import { Info2, Label3, P } from 'src/components/typography' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import { Info2, Label3, P } from 'src/components/typography' import { numberToFiatAmount } from 'src/utils/number' import { singularOrPlural } from 'src/utils/string' import { formatDate, formatDateNonUtc } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.js b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.js rename to new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx index 4b3926af..56b436cc 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.js +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/HourOfDayWrapper.jsx @@ -3,9 +3,9 @@ import { makeStyles } from '@material-ui/core/styles' import { getTimezoneOffset } from 'date-fns-tz' import * as R from 'ramda' import React, { useState } from 'react' +import { H2 } from 'src/components/typography' import { Select } from 'src/components/inputs' -import { H2 } from 'src/components/typography' import { MINUTE } from 'src/utils/time' import styles from '../../Analytics.styles' diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.js b/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.js rename to new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx index 6efaaf40..b14bb2fe 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.js +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/OverTimeWrapper.jsx @@ -1,9 +1,9 @@ import { Box } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import React, { useState } from 'react' +import { H2 } from 'src/components/typography' import { Select, Switch } from 'src/components/inputs' -import { H2 } from 'src/components/typography' import { primaryColor } from 'src/styling/variables' import styles from '../../Analytics.styles' diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.js b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.js rename to new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx index 5d55a87e..14353f77 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.js +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/TopMachinesWrapper.jsx @@ -2,7 +2,6 @@ import { Box } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import React, { useState } from 'react' - import { H2 } from 'src/components/typography' import styles from '../../Analytics.styles' diff --git a/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.js b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.js rename to new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx index 6257934f..78a221a5 100644 --- a/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.js +++ b/new-lamassu-admin/src/pages/Analytics/components/wrappers/VolumeOverTimeWrapper.jsx @@ -1,9 +1,9 @@ import { Box } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import React, { useState } from 'react' +import { H2 } from 'src/components/typography' import { Select, Switch } from 'src/components/inputs' -import { H2 } from 'src/components/typography' import { neon, java } from 'src/styling/variables' import styles from '../../Analytics.styles' diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/Graph.js b/new-lamassu-admin/src/pages/Analytics/graphs/Graph.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/graphs/Graph.js rename to new-lamassu-admin/src/pages/Analytics/graphs/Graph.jsx diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.js rename to new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.jsx diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.js rename to new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.jsx diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeLineGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeLineGraph.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/graphs/OverTimeLineGraph.js rename to new-lamassu-admin/src/pages/Analytics/graphs/OverTimeLineGraph.jsx diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.js rename to new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.jsx diff --git a/new-lamassu-admin/src/pages/AuthRegister.js b/new-lamassu-admin/src/pages/AuthRegister.jsx similarity index 100% rename from new-lamassu-admin/src/pages/AuthRegister.js rename to new-lamassu-admin/src/pages/AuthRegister.jsx diff --git a/new-lamassu-admin/src/pages/Authentication/Input2FAState.js b/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/Input2FAState.js rename to new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx index e1778b35..3a6df987 100644 --- a/new-lamassu-admin/src/pages/Authentication/Input2FAState.js +++ b/new-lamassu-admin/src/pages/Authentication/Input2FAState.jsx @@ -4,11 +4,11 @@ import { Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useContext, useState } from 'react' import { useHistory } from 'react-router-dom' +import { TL1, P } from 'src/components/typography' import AppContext from 'src/AppContext' import { Button } from 'src/components/buttons' import { CodeInput } from 'src/components/inputs/base' -import { TL1, P } from 'src/components/typography' import styles from './shared.styles' import { STATES } from './states' diff --git a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/InputFIDOState.js rename to new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx index 4352a492..4f560a7f 100644 --- a/new-lamassu-admin/src/pages/Authentication/InputFIDOState.js +++ b/new-lamassu-admin/src/pages/Authentication/InputFIDOState.jsx @@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useState, useContext } from 'react' import { useHistory } from 'react-router-dom' +import { H2, Label2, P } from 'src/components/typography' import * as Yup from 'yup' import AppContext from 'src/AppContext' import { Button } from 'src/components/buttons' import { Checkbox, TextInput } from 'src/components/inputs/formik' -import { H2, Label2, P } from 'src/components/typography' import styles from './shared.styles' diff --git a/new-lamassu-admin/src/pages/Authentication/Login.js b/new-lamassu-admin/src/pages/Authentication/Login.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/Login.js rename to new-lamassu-admin/src/pages/Authentication/Login.jsx diff --git a/new-lamassu-admin/src/pages/Authentication/LoginCard.js b/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Authentication/LoginCard.js rename to new-lamassu-admin/src/pages/Authentication/LoginCard.jsx index e656e0ac..571167e4 100644 --- a/new-lamassu-admin/src/pages/Authentication/LoginCard.js +++ b/new-lamassu-admin/src/pages/Authentication/LoginCard.jsx @@ -1,9 +1,8 @@ import Paper from '@material-ui/core/Paper' import { makeStyles } from '@material-ui/core/styles' import React, { useReducer } from 'react' -import Logo from 'src/styling/icons/menu/logo.svg?react' - import { H5 } from 'src/components/typography' +import Logo from 'src/styling/icons/menu/logo.svg?react' import Input2FAState from './Input2FAState' import InputFIDOState from './InputFIDOState' diff --git a/new-lamassu-admin/src/pages/Authentication/LoginState.js b/new-lamassu-admin/src/pages/Authentication/LoginState.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/LoginState.js rename to new-lamassu-admin/src/pages/Authentication/LoginState.jsx index 63272ba2..d03b4fbf 100644 --- a/new-lamassu-admin/src/pages/Authentication/LoginState.js +++ b/new-lamassu-admin/src/pages/Authentication/LoginState.jsx @@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useContext } from 'react' import { useHistory } from 'react-router-dom' +import { Label3, P } from 'src/components/typography' import * as Yup from 'yup' import AppContext from 'src/AppContext' import { Button } from 'src/components/buttons' import { Checkbox, SecretInput, TextInput } from 'src/components/inputs/formik' -import { Label3, P } from 'src/components/typography' import styles from './shared.styles' diff --git a/new-lamassu-admin/src/pages/Authentication/Register.js b/new-lamassu-admin/src/pages/Authentication/Register.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/Register.js rename to new-lamassu-admin/src/pages/Authentication/Register.jsx index 139e2bcc..c6982ad1 100644 --- a/new-lamassu-admin/src/pages/Authentication/Register.js +++ b/new-lamassu-admin/src/pages/Authentication/Register.jsx @@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useReducer } from 'react' import { useLocation, useHistory } from 'react-router-dom' +import { H2, Label3, P } from 'src/components/typography' import Logo from 'src/styling/icons/menu/logo.svg?react' import * as Yup from 'yup' import { Button } from 'src/components/buttons' import { SecretInput } from 'src/components/inputs/formik' -import { H2, Label3, P } from 'src/components/typography' import styles from './shared.styles' diff --git a/new-lamassu-admin/src/pages/Authentication/Reset2FA.js b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/Reset2FA.js rename to new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx index b01a149f..6717b755 100644 --- a/new-lamassu-admin/src/pages/Authentication/Reset2FA.js +++ b/new-lamassu-admin/src/pages/Authentication/Reset2FA.jsx @@ -6,11 +6,11 @@ import gql from 'graphql-tag' import QRCode from 'qrcode.react' import React, { useReducer, useState } from 'react' import { useLocation, useHistory } from 'react-router-dom' +import { H2, Label2, Label3, P } from 'src/components/typography' import Logo from 'src/styling/icons/menu/logo.svg?react' import { ActionButton, Button } from 'src/components/buttons' import { CodeInput } from 'src/components/inputs/base' -import { H2, Label2, Label3, P } from 'src/components/typography' import { primaryColor } from 'src/styling/variables' import styles from './shared.styles' diff --git a/new-lamassu-admin/src/pages/Authentication/ResetPassword.js b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/ResetPassword.js rename to new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx index 83013c70..0b6c6111 100644 --- a/new-lamassu-admin/src/pages/Authentication/ResetPassword.js +++ b/new-lamassu-admin/src/pages/Authentication/ResetPassword.jsx @@ -5,12 +5,12 @@ import { Field, Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useState } from 'react' import { useLocation, useHistory } from 'react-router-dom' +import { H2, Label3, P } from 'src/components/typography' import Logo from 'src/styling/icons/menu/logo.svg?react' import * as Yup from 'yup' import { Button } from 'src/components/buttons' import { SecretInput } from 'src/components/inputs/formik/' -import { H2, Label3, P } from 'src/components/typography' import styles from './shared.styles' diff --git a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.js b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Authentication/Setup2FAState.js rename to new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx index 68233c99..40a6a3e9 100644 --- a/new-lamassu-admin/src/pages/Authentication/Setup2FAState.js +++ b/new-lamassu-admin/src/pages/Authentication/Setup2FAState.jsx @@ -5,11 +5,11 @@ import gql from 'graphql-tag' import QRCode from 'qrcode.react' import React, { useContext, useState } from 'react' import { useHistory } from 'react-router-dom' +import { Label3, P } from 'src/components/typography' import AppContext from 'src/AppContext' import { ActionButton, Button } from 'src/components/buttons' import { CodeInput } from 'src/components/inputs/base' -import { Label3, P } from 'src/components/typography' import { primaryColor } from 'src/styling/variables' import styles from './shared.styles' diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Blacklist/Blacklist.js rename to new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx index 034cfa7b..9b7c6d02 100644 --- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js +++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.jsx @@ -4,15 +4,15 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { HelpTooltip } from 'src/components/Tooltip' +import TitleSection from 'src/components/layout/TitleSection' +import { H2, Label2, P, Info3, Info2 } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white.svg?react' import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react' -import { HelpTooltip } from 'src/components/Tooltip' import { Link, Button, IconButton } from 'src/components/buttons' import { Switch } from 'src/components/inputs' -import TitleSection from 'src/components/layout/TitleSection' -import { H2, Label2, P, Info3, Info2 } from 'src/components/typography' import { fromNamespace, toNamespace } from 'src/utils/config' import styles from './Blacklist.styles' diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js rename to new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx index cd5422c7..ef44756f 100644 --- a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js +++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.jsx @@ -2,6 +2,9 @@ import { makeStyles } from '@material-ui/core/styles' import { Form, Formik, Field } from 'formik' import * as R from 'ramda' import React, { useState } from 'react' +import ErrorMessage from 'src/components/ErrorMessage' +import Modal from 'src/components/Modal' +import DataTable from 'src/components/tables/DataTable' import DisabledDeleteIcon from 'src/styling/icons/action/delete/disabled.svg?react' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' @@ -9,11 +12,8 @@ import DefaultIconReverse from 'src/styling/icons/button/retry/white.svg?react' import DefaultIcon from 'src/styling/icons/button/retry/zodiac.svg?react' import * as Yup from 'yup' -import ErrorMessage from 'src/components/ErrorMessage' -import Modal from 'src/components/Modal' import { ActionButton, IconButton, Button } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import DataTable from 'src/components/tables/DataTable' import styles from './Blacklist.styles' diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js rename to new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx index 5e9eb95a..bc741297 100644 --- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js +++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.jsx @@ -3,13 +3,13 @@ import { makeStyles } from '@material-ui/core/styles' import { Formik, Form, Field } from 'formik' import * as R from 'ramda' import React from 'react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' +import { H3 } from 'src/components/typography' +import * as Yup from 'yup' + import { Link } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import { H3 } from 'src/components/typography' import styles from './Blacklist.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Blacklist/BlacklistTable.js rename to new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx index 36bb961d..df1b64f8 100644 --- a/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.js +++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistTable.jsx @@ -1,12 +1,12 @@ import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import React, { useState } from 'react' -import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' - import { DeleteDialog } from 'src/components/DeleteDialog' -import { IconButton } from 'src/components/buttons' import DataTable from 'src/components/tables/DataTable' import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' +import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' + +import { IconButton } from 'src/components/buttons' import styles from './Blacklist.styles' diff --git a/new-lamassu-admin/src/pages/Cashout/Cashout.js b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Cashout/Cashout.js rename to new-lamassu-admin/src/pages/Cashout/Cashout.jsx index a07fc000..0353b220 100644 --- a/new-lamassu-admin/src/pages/Cashout/Cashout.js +++ b/new-lamassu-admin/src/pages/Cashout/Cashout.jsx @@ -3,14 +3,14 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' - import { HelpTooltip } from 'src/components/Tooltip' +import TitleSection from 'src/components/layout/TitleSection' +import { P, Label2 } from 'src/components/typography' + import { SupportLinkButton } from 'src/components/buttons' import { NamespacedTable as EditableTable } from 'src/components/editableTable' import { Switch } from 'src/components/inputs' -import TitleSection from 'src/components/layout/TitleSection' import { EmptyTable } from 'src/components/table' -import { P, Label2 } from 'src/components/typography' import { fromNamespace, toNamespace } from 'src/utils/config' import Wizard from './Wizard' diff --git a/new-lamassu-admin/src/pages/Cashout/Wizard.js b/new-lamassu-admin/src/pages/Cashout/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Cashout/Wizard.js rename to new-lamassu-admin/src/pages/Cashout/Wizard.jsx index c6cac4c1..839ae18c 100644 --- a/new-lamassu-admin/src/pages/Cashout/Wizard.js +++ b/new-lamassu-admin/src/pages/Cashout/Wizard.jsx @@ -1,8 +1,8 @@ import * as R from 'ramda' import React, { useState } from 'react' +import Modal from 'src/components/Modal' import * as Yup from 'yup' -import Modal from 'src/components/Modal' import { Autocomplete } from 'src/components/inputs/formik' import denominations from 'src/utils/bill-denominations' import { getBillOptions } from 'src/utils/bill-options' diff --git a/new-lamassu-admin/src/pages/Cashout/WizardSplash.js b/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Cashout/WizardSplash.js rename to new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx index 598afdb6..0360ce66 100644 --- a/new-lamassu-admin/src/pages/Cashout/WizardSplash.js +++ b/new-lamassu-admin/src/pages/Cashout/WizardSplash.jsx @@ -1,9 +1,9 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H1, P, Info2 } from 'src/components/typography' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' import { Button } from 'src/components/buttons' -import { H1, P, Info2 } from 'src/components/typography' import { neon, spacer } from 'src/styling/variables' const styles = { diff --git a/new-lamassu-admin/src/pages/Cashout/WizardStep.js b/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Cashout/WizardStep.js rename to new-lamassu-admin/src/pages/Cashout/WizardStep.jsx index 247a752e..b654e479 100644 --- a/new-lamassu-admin/src/pages/Cashout/WizardStep.js +++ b/new-lamassu-admin/src/pages/Cashout/WizardStep.jsx @@ -1,13 +1,13 @@ import { makeStyles } from '@material-ui/core' import { Formik, Form, Field } from 'formik' import React from 'react' -import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' - import ErrorMessage from 'src/components/ErrorMessage' import Stepper from 'src/components/Stepper' +import { Info2, H4, P, Info1, Label1 } from 'src/components/typography' +import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' + import { Button } from 'src/components/buttons' import { NumberInput } from 'src/components/inputs/formik' -import { Info2, H4, P, Info1, Label1 } from 'src/components/typography' import cassetteOne from 'src/styling/icons/cassettes/cashout-cassette-1.svg' import cassetteTwo from 'src/styling/icons/cassettes/cashout-cassette-2.svg' import tejo3CassetteOne from 'src/styling/icons/cassettes/tejo/3-cassettes/3-cassettes-open-1-left.svg' diff --git a/new-lamassu-admin/src/pages/Commissions/Commissions.js b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Commissions/Commissions.js rename to new-lamassu-admin/src/pages/Commissions/Commissions.jsx index eb52a8f5..1bd9f753 100644 --- a/new-lamassu-admin/src/pages/Commissions/Commissions.js +++ b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx @@ -3,13 +3,13 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { HelpTooltip } from 'src/components/Tooltip' +import TitleSection from 'src/components/layout/TitleSection' import ReverseListingViewIcon from 'src/styling/icons/circle buttons/listing-view/white.svg?react' import ListingViewIcon from 'src/styling/icons/circle buttons/listing-view/zodiac.svg?react' import OverrideLabelIcon from 'src/styling/icons/status/spring2.svg?react' -import { HelpTooltip } from 'src/components/Tooltip' import { SupportLinkButton } from 'src/components/buttons' -import TitleSection from 'src/components/layout/TitleSection' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { P } from '../../components/typography' diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.js rename to new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.jsx index 40aa7a00..e96c03c3 100644 --- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.js +++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsDetails.jsx @@ -1,7 +1,5 @@ import * as R from 'ramda' import React, { useState, memo } from 'react' - -import { Table as EditableTable } from 'src/components/editableTable' import Section from 'src/components/layout/Section' import { mainFields, @@ -13,6 +11,8 @@ import { getOrder } from 'src/pages/Commissions/helper' +import { Table as EditableTable } from 'src/components/editableTable' + const CommissionsDetails = memo( ({ config, locale, currency, data, error, save, saveOverrides }) => { const [isEditingDefault, setEditingDefault] = useState(false) diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js rename to new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx index ebf4f82e..7a1d77b8 100644 --- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js +++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx @@ -1,9 +1,6 @@ import { makeStyles } from '@material-ui/core' import * as R from 'ramda' import React, { memo, useState } from 'react' - -import { Table as EditableTable } from 'src/components/editableTable' -import { Select } from 'src/components/inputs' import { overridesDefaults, getCommissions, @@ -11,6 +8,9 @@ import { commissionsList } from 'src/pages/Commissions/helper' +import { Table as EditableTable } from 'src/components/editableTable' +import { Select } from 'src/components/inputs' + const styles = { headerLine: { display: 'flex', diff --git a/new-lamassu-admin/src/pages/Commissions/helper.js b/new-lamassu-admin/src/pages/Commissions/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Commissions/helper.js rename to new-lamassu-admin/src/pages/Commissions/helper.jsx diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.js b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/CustomerData.js rename to new-lamassu-admin/src/pages/Customers/CustomerData.jsx index 8ce7b6c5..13a0ce65 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerData.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx @@ -2,6 +2,8 @@ import Grid from '@material-ui/core/Grid' import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import { useState, React } from 'react' +import ImagePopper from 'src/components/ImagePopper' +import { H3, Info3 } from 'src/components/typography' import CardIcon from 'src/styling/icons/ID/card/comet.svg?react' import PhoneIcon from 'src/styling/icons/ID/phone/comet.svg?react' import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react' @@ -10,20 +12,18 @@ import CustomerListViewReversedIcon from 'src/styling/icons/circle buttons/custo import CustomerListViewIcon from 'src/styling/icons/circle buttons/customer-list-view/zodiac.svg?react' import OverviewReversedIcon from 'src/styling/icons/circle buttons/overview/white.svg?react' import OverviewIcon from 'src/styling/icons/circle buttons/overview/zodiac.svg?react' +import { URI } from 'src/utils/apollo' import * as Yup from 'yup' -import ImagePopper from 'src/components/ImagePopper' import { FeatureButton } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import { H3, Info3 } from 'src/components/typography' import { OVERRIDE_AUTHORIZED, OVERRIDE_REJECTED } from 'src/pages/Customers/components/propertyCard' -import { URI } from 'src/utils/apollo' import { onlyFirstToUpper } from 'src/utils/string' -import styles from './CustomerData.styles.js' +import styles from './CustomerData.styles' import { EditableCard } from './components' import { customerDataElements, @@ -31,7 +31,7 @@ import { formatDates, tryFormatDate, getFormattedPhone -} from './helper.js' +} from './helper' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Customers/CustomerNotes.js b/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/CustomerNotes.js rename to new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx index b7f055ba..82b00226 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerNotes.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerNotes.jsx @@ -1,7 +1,6 @@ import { makeStyles } from '@material-ui/core' import * as R from 'ramda' import { React, useState } from 'react' - import { H3 } from 'src/components/typography' import styles from './CustomerNotes.styles' diff --git a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.js b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/CustomerPhotos.js rename to new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx index 598bc093..3495dbdb 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerPhotos.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerPhotos.jsx @@ -2,10 +2,9 @@ import { makeStyles, Paper } from '@material-ui/core' import { format } from 'date-fns/fp' import * as R from 'ramda' import { React, useState } from 'react' -import CameraIcon from 'src/styling/icons/ID/photo/comet.svg?react' - import { InformativeDialog } from 'src/components/InformativeDialog' import { Label2, H3 } from 'src/components/typography' +import CameraIcon from 'src/styling/icons/ID/photo/comet.svg?react' import { URI } from 'src/utils/apollo' import styles from './CustomerPhotos.styles' diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/CustomerProfile.js rename to new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx index 7ec1f53e..946e52a0 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx @@ -12,6 +12,8 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { memo, useState } from 'react' import { useHistory, useParams } from 'react-router-dom' +import ErrorMessage from 'src/components/ErrorMessage' +import { Label1, Label2, H2, Info3 } from 'src/components/typography' import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react' import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react' @@ -20,10 +22,8 @@ import BlockIcon from 'src/styling/icons/button/block/zodiac.svg?react' import DataReversedIcon from 'src/styling/icons/button/data/white.svg?react' import DataIcon from 'src/styling/icons/button/data/zodiac.svg?react' -import ErrorMessage from 'src/components/ErrorMessage' import { Button, IconButton, ActionButton } from 'src/components/buttons' import { Switch } from 'src/components/inputs' -import { Label1, Label2, H2, Info3 } from 'src/components/typography' import { OVERRIDE_AUTHORIZED, OVERRIDE_REJECTED diff --git a/new-lamassu-admin/src/pages/Customers/Customers.js b/new-lamassu-admin/src/pages/Customers/Customers.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/Customers.js rename to new-lamassu-admin/src/pages/Customers/Customers.jsx index 14bb068a..60a2862e 100644 --- a/new-lamassu-admin/src/pages/Customers/Customers.js +++ b/new-lamassu-admin/src/pages/Customers/Customers.jsx @@ -4,13 +4,13 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' import { useHistory } from 'react-router-dom' +import SearchBox from 'src/components/SearchBox' +import SearchFilter from 'src/components/SearchFilter' +import TitleSection from 'src/components/layout/TitleSection' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import SearchBox from 'src/components/SearchBox' -import SearchFilter from 'src/components/SearchFilter' import { Link } from 'src/components/buttons' -import TitleSection from 'src/components/layout/TitleSection' import baseStyles from 'src/pages/Logs.styles' import { fromNamespace, namespaces } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Customers/CustomersList.js b/new-lamassu-admin/src/pages/Customers/CustomersList.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/CustomersList.js rename to new-lamassu-admin/src/pages/Customers/CustomersList.jsx index a352e6d0..a34303a6 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomersList.js +++ b/new-lamassu-admin/src/pages/Customers/CustomersList.jsx @@ -2,11 +2,10 @@ import { makeStyles } from '@material-ui/core/styles' import { format } from 'date-fns/fp' import * as R from 'ramda' import React from 'react' -import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' -import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' - import { MainStatus } from 'src/components/Status' import DataTable from 'src/components/tables/DataTable' +import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' +import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' import styles from './CustomersList.styles' import { getFormattedPhone, getName } from './helper' diff --git a/new-lamassu-admin/src/pages/Customers/Wizard.js b/new-lamassu-admin/src/pages/Customers/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/Wizard.js rename to new-lamassu-admin/src/pages/Customers/Wizard.jsx index 6f81b9de..39924da6 100644 --- a/new-lamassu-admin/src/pages/Customers/Wizard.js +++ b/new-lamassu-admin/src/pages/Customers/Wizard.jsx @@ -2,10 +2,10 @@ import { makeStyles } from '@material-ui/core' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useState, Fragment } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import Stepper from 'src/components/Stepper' + import { Button } from 'src/components/buttons' import { comet } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.js b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.js rename to new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx index 984d9d64..49447bbd 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.js +++ b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx @@ -3,13 +3,13 @@ import { Field, Form, Formik } from 'formik' import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber' import * as R from 'ramda' import React from 'react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' +import { H1 } from 'src/components/typography' +import * as Yup from 'yup' + import { Button } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import { H1 } from 'src/components/typography' import { spacer, primaryColor, fontPrimary } from 'src/styling/variables' const styles = { diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.js b/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.js rename to new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx index 86667a97..981baee7 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.js +++ b/new-lamassu-admin/src/pages/Customers/components/CustomInfoRequestsData.jsx @@ -3,15 +3,8 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import gql from 'graphql-tag' import React, { useState } from 'react' -import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react' -import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react' -import RejectReversedIcon from 'src/styling/icons/button/cancel/white.svg?react' -import RejectIcon from 'src/styling/icons/button/cancel/zodiac.svg?react' -import LinkIcon from 'src/styling/icons/month arrows/right.svg?react' - import Modal from 'src/components/Modal' import { MainStatus } from 'src/components/Status' -import { ActionButton } from 'src/components/buttons' import { Table, THead, @@ -21,6 +14,13 @@ import { TBody } from 'src/components/fake-table/Table' import { H3, Label1 } from 'src/components/typography' +import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react' +import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react' +import RejectReversedIcon from 'src/styling/icons/button/cancel/white.svg?react' +import RejectIcon from 'src/styling/icons/button/cancel/zodiac.svg?react' +import LinkIcon from 'src/styling/icons/month arrows/right.svg?react' + +import { ActionButton } from 'src/components/buttons' import { white, disabledColor } from 'src/styling/variables' import DetailsCard from '../../Triggers/CustomInfoRequests/DetailsCard' diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.js b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/components/CustomerDetails.js rename to new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx index 4234167a..a04feaf2 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.js +++ b/new-lamassu-admin/src/pages/Customers/components/CustomerDetails.jsx @@ -1,9 +1,8 @@ import { makeStyles, Box } from '@material-ui/core' import * as R from 'ramda' import React, { memo } from 'react' -import IdIcon from 'src/styling/icons/ID/card/zodiac.svg?react' - import { H2, Label1, P } from 'src/components/typography' +import IdIcon from 'src/styling/icons/ID/card/zodiac.svg?react' import mainStyles from '../CustomersList.styles' import { getFormattedPhone, getName } from '../helper' diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx similarity index 97% rename from new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js rename to new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx index def9ce0b..5b0441c1 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js +++ b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.jsx @@ -10,7 +10,7 @@ import OverviewIcon from 'src/styling/icons/customer-nav/overview/white.svg?reac import PhotosReversedIcon from 'src/styling/icons/customer-nav/photos/comet.svg?react' import Photos from 'src/styling/icons/customer-nav/photos/white.svg?react' -import styles from './CustomerSidebar.styles.js' +import styles from './CustomerSidebar.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.js b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/components/EditableCard.js rename to new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx index 7c270f66..5476dcde 100644 --- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx @@ -5,6 +5,10 @@ import { Form, Formik, Field as FormikField } from 'formik' import * as R from 'ramda' import { useState, React, useRef } from 'react' // import { HelpTooltip } from 'src/components/Tooltip' +import ErrorMessage from 'src/components/ErrorMessage' +import PromptWhenDirty from 'src/components/PromptWhenDirty' +import { MainStatus } from 'src/components/Status' +import { Label1, P, H3 } from 'src/components/typography' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' import DeleteReversedIcon from 'src/styling/icons/action/delete/white.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' @@ -17,11 +21,7 @@ import DataIcon from 'src/styling/icons/button/data/zodiac.svg?react' import ReplaceReversedIcon from 'src/styling/icons/button/replace/white.svg?react' import SaveReversedIcon from 'src/styling/icons/circle buttons/save/white.svg?react' -import ErrorMessage from 'src/components/ErrorMessage' -import PromptWhenDirty from 'src/components/PromptWhenDirty' -import { MainStatus } from 'src/components/Status' import { ActionButton } from 'src/components/buttons' -import { Label1, P, H3 } from 'src/components/typography' import { OVERRIDE_AUTHORIZED, OVERRIDE_REJECTED, @@ -29,7 +29,7 @@ import { } from 'src/pages/Customers/components/propertyCard' import { comet } from 'src/styling/variables' -import styles from './EditableCard.styles.js' +import styles from './EditableCard.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Customers/components/Field.js b/new-lamassu-admin/src/pages/Customers/components/Field.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/Field.js rename to new-lamassu-admin/src/pages/Customers/components/Field.jsx index f21a9f0b..ed15738d 100644 --- a/new-lamassu-admin/src/pages/Customers/components/Field.js +++ b/new-lamassu-admin/src/pages/Customers/components/Field.jsx @@ -1,8 +1,8 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React, { memo } from 'react' - import { Info3, Label1 } from 'src/components/typography' + import { comet } from 'src/styling/variables' const useStyles = makeStyles({ diff --git a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.js b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.js rename to new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx index 308fc62f..c57cbe17 100644 --- a/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.js +++ b/new-lamassu-admin/src/pages/Customers/components/FrontCameraPhoto.jsx @@ -2,7 +2,6 @@ import { Paper } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import React, { memo } from 'react' import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react' - import { URI } from 'src/utils/apollo' import mainStyles from '../CustomersList.styles' diff --git a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js rename to new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx index 19de8634..75e14519 100644 --- a/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/IdCardPhotoCard.jsx @@ -2,13 +2,13 @@ import { makeStyles, Box } from '@material-ui/core' import * as R from 'ramda' import React, { memo } from 'react' import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react' +import { URI } from 'src/utils/apollo' import { PropertyCard, OVERRIDE_AUTHORIZED, OVERRIDE_REJECTED } from 'src/pages/Customers/components/propertyCard' -import { URI } from 'src/utils/apollo' const useStyles = makeStyles({ idCardPhotoCard: { diff --git a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/IdDataCard.js rename to new-lamassu-admin/src/pages/Customers/components/IdDataCard.jsx diff --git a/new-lamassu-admin/src/pages/Customers/components/PhoneCard.js b/new-lamassu-admin/src/pages/Customers/components/PhoneCard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/PhoneCard.js rename to new-lamassu-admin/src/pages/Customers/components/PhoneCard.jsx diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.js b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/components/PhotosCard.js rename to new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx index 55327a3c..dd07c465 100644 --- a/new-lamassu-admin/src/pages/Customers/components/PhotosCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/PhotosCard.jsx @@ -3,10 +3,9 @@ import Paper from '@material-ui/core/Card' import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import React, { memo, useState } from 'react' -import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react' - import { InformativeDialog } from 'src/components/InformativeDialog' import { Info2 } from 'src/components/typography' +import CrossedCameraIcon from 'src/styling/icons/ID/photo/crossed-camera.svg?react' import { URI } from 'src/utils/apollo' import styles from './PhotosCard.styles' diff --git a/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.js b/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.js rename to new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx index cfc3901f..da4771c7 100644 --- a/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.js +++ b/new-lamassu-admin/src/pages/Customers/components/PhotosCarousel.jsx @@ -1,9 +1,9 @@ import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import React, { memo, useState } from 'react' - import { Carousel } from 'src/components/Carousel' import { Label1 } from 'src/components/typography' + import { formatDate } from 'src/utils/timezones' import CopyToClipboard from '../../Transactions/CopyToClipboard' diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/TransactionsList.js rename to new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx index 4ebe22d1..cd592d0d 100644 --- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js +++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.jsx @@ -4,11 +4,11 @@ import BigNumber from 'bignumber.js' import classnames from 'classnames' import * as R from 'ramda' import React from 'react' +import DataTable from 'src/components/tables/DataTable' +import { H3, H4, Label1, Label2, P } from 'src/components/typography' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import DataTable from 'src/components/tables/DataTable' -import { H3, H4, Label1, Label2, P } from 'src/components/typography' import { ifNotNull } from 'src/utils/nullCheck' import { formatDate } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Customers/components/Upload.js b/new-lamassu-admin/src/pages/Customers/components/Upload.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/Upload.js rename to new-lamassu-admin/src/pages/Customers/components/Upload.jsx index d4060752..17bce94f 100644 --- a/new-lamassu-admin/src/pages/Customers/components/Upload.js +++ b/new-lamassu-admin/src/pages/Customers/components/Upload.jsx @@ -3,10 +3,10 @@ import { useFormikContext } from 'formik' import * as R from 'ramda' import React, { useState, useCallback } from 'react' import { useDropzone } from 'react-dropzone' +import { Label3, H3 } from 'src/components/typography' import UploadPhotoIcon from 'src/styling/icons/button/photo/zodiac-resized.svg?react' import UploadFileIcon from 'src/styling/icons/button/upload-file/zodiac-resized.svg?react' -import { Label3, H3 } from 'src/components/typography' import { offColor, subheaderColor } from 'src/styling/variables' const useStyles = makeStyles({ diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.js b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.js rename to new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx index 2a781550..65388602 100644 --- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteCard.jsx @@ -1,9 +1,8 @@ import { makeStyles, Paper } from '@material-ui/core' import classNames from 'classnames' import { React } from 'react' -import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' - import { P } from 'src/components/typography' +import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' import styles from './NoteCard.styles' diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.js b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.js rename to new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx index eb832607..48d2818a 100644 --- a/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.js +++ b/new-lamassu-admin/src/pages/Customers/components/notes/NewNoteModal.jsx @@ -1,10 +1,10 @@ import { makeStyles } from '@material-ui/core/styles' import { Form, Formik, Field } from 'formik' import { React } from 'react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' +import * as Yup from 'yup' + import { Button } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.js b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.js rename to new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx index ba363aa4..3ce56ce3 100644 --- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteCard.jsx @@ -1,9 +1,9 @@ import { makeStyles, Paper } from '@material-ui/core' import * as R from 'ramda' import { React } from 'react' +import { H3, P } from 'src/components/typography' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' -import { H3, P } from 'src/components/typography' import { formatDate } from 'src/utils/timezones' import styles from './NoteCard.styles' diff --git a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.js b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.js rename to new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx index e6f41a1a..50da039c 100644 --- a/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.js +++ b/new-lamassu-admin/src/pages/Customers/components/notes/NoteEdit.jsx @@ -2,6 +2,7 @@ import { makeStyles, Paper } from '@material-ui/core' import { formatDurationWithOptions, intervalToDuration } from 'date-fns/fp' import { Form, Formik, Field } from 'formik' import { React, useRef } from 'react' +import { P } from 'src/components/typography' import CancelIconInverse from 'src/styling/icons/button/cancel/white.svg?react' import CancelIcon from 'src/styling/icons/button/cancel/zodiac.svg?react' import SaveIconInverse from 'src/styling/icons/circle buttons/save/white.svg?react' @@ -10,7 +11,6 @@ import * as Yup from 'yup' import { ActionButton } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import { P } from 'src/components/typography' import { toTimezone } from 'src/utils/timezones' import styles from './NoteCard.styles' diff --git a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.js b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.js rename to new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx index 00501715..46a1397c 100644 --- a/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/propertyCard/PropertyCard.jsx @@ -2,6 +2,8 @@ import { Paper } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React, { memo } from 'react' +import { MainStatus } from 'src/components/Status' +import { H3 } from 'src/components/typography' import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react' import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react' import RejectReversedIcon from 'src/styling/icons/button/cancel/white.svg?react' @@ -9,9 +11,7 @@ import RejectIcon from 'src/styling/icons/button/cancel/zodiac.svg?react' import EditReversedIcon from 'src/styling/icons/button/edit/white.svg?react' import EditIcon from 'src/styling/icons/button/edit/zodiac.svg?react' -import { MainStatus } from 'src/components/Status' import { ActionButton } from 'src/components/buttons' -import { H3 } from 'src/components/typography' import { propertyCardStyles } from './PropertyCard.styles' diff --git a/new-lamassu-admin/src/pages/Customers/helper.js b/new-lamassu-admin/src/pages/Customers/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Customers/helper.js rename to new-lamassu-admin/src/pages/Customers/helper.jsx index 84954b99..9f2f05a3 100644 --- a/new-lamassu-admin/src/pages/Customers/helper.js +++ b/new-lamassu-admin/src/pages/Customers/helper.jsx @@ -4,6 +4,7 @@ import { parse, isValid, format } from 'date-fns/fp' import { Field, useFormikContext } from 'formik' import { parsePhoneNumberFromString } from 'libphonenumber-js' import * as R from 'ramda' +import { H4 } from 'src/components/typography' import * as uuid from 'uuid' import * as Yup from 'yup' @@ -12,7 +13,6 @@ import { TextInput, Autocomplete } from 'src/components/inputs/formik' -import { H4 } from 'src/components/typography' import { errorColor } from 'src/styling/variables' import { MANUAL } from 'src/utils/constants' diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js rename to new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx index 7d6502e1..02a08b5d 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.js +++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/Alerts.jsx @@ -6,7 +6,6 @@ import classnames from 'classnames' import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' - import { cardState } from 'src/components/CollapsibleCard' import { Label1, H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js rename to new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx index be6b3c30..c0e8e70b 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.js +++ b/new-lamassu-admin/src/pages/Dashboard/Alerts/AlertsTable.jsx @@ -4,13 +4,12 @@ import ListItem from '@material-ui/core/ListItem' import * as R from 'ramda' import React from 'react' import { useHistory } from 'react-router-dom' +import { P } from 'src/components/typography/index' import Wrench from 'src/styling/icons/action/wrench/zodiac.svg?react' import CashBoxEmpty from 'src/styling/icons/cassettes/cashbox-empty.svg?react' import AlertLinkIcon from 'src/styling/icons/month arrows/right.svg?react' import WarningIcon from 'src/styling/icons/warning-icon/tomato.svg?react' -import { P } from 'src/components/typography/index' - import styles from './Alerts.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Dashboard/Dashboard.js b/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/Dashboard.js rename to new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx index c28abad8..d64c8b56 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Dashboard.js +++ b/new-lamassu-admin/src/pages/Dashboard/Dashboard.jsx @@ -5,12 +5,12 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' import { useHistory } from 'react-router-dom' +import TitleSection from 'src/components/layout/TitleSection' +import { H1, Info2, TL2, Label1 } from 'src/components/typography' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' import { Button } from 'src/components/buttons' -import TitleSection from 'src/components/layout/TitleSection' -import { H1, Info2, TL2, Label1 } from 'src/components/typography' import AddMachine from 'src/pages/AddMachine' import { errorColor } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.js b/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/Footer/Footer.js rename to new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx index 35df8284..914998fa 100644 --- a/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.js +++ b/new-lamassu-admin/src/pages/Dashboard/Footer/Footer.jsx @@ -6,10 +6,10 @@ import classnames from 'classnames' import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' +import { Label2 } from 'src/components/typography' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import { Label2 } from 'src/components/typography' import { fromNamespace } from 'src/utils/config' import styles from './Footer.styles' diff --git a/new-lamassu-admin/src/pages/Dashboard/LeftSide.js b/new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/LeftSide.js rename to new-lamassu-admin/src/pages/Dashboard/LeftSide.jsx diff --git a/new-lamassu-admin/src/pages/Dashboard/RightSide.js b/new-lamassu-admin/src/pages/Dashboard/RightSide.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Dashboard/RightSide.js rename to new-lamassu-admin/src/pages/Dashboard/RightSide.jsx index 4e9c8fe0..6a680427 100644 --- a/new-lamassu-admin/src/pages/Dashboard/RightSide.js +++ b/new-lamassu-admin/src/pages/Dashboard/RightSide.jsx @@ -3,7 +3,6 @@ import Grid from '@material-ui/core/Grid' import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React, { useState } from 'react' - import CollapsibleCard, { cardState } from 'src/components/CollapsibleCard' import { H4, Label1 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx index a3d4c1a5..a88abcf6 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/PercentageChart.jsx @@ -1,8 +1,8 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import React from 'react' - import { Label1 } from 'src/components/typography/index' + import { java, neon, white } from 'src/styling/variables' const styles = { diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefLineChart.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefLineChart.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefLineChart.js rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefLineChart.jsx diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.jsx diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.js rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.jsx index 0921fa3a..fef78ca2 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/InfoWithLabel.jsx @@ -1,5 +1,4 @@ import React from 'react' - import { Info1, Label1 } from 'src/components/typography/index' const InfoWithLabel = ({ info, label }) => { return ( diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx index 07f76fe4..e7054191 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Nav.jsx @@ -2,7 +2,6 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import * as R from 'ramda' import React, { useState } from 'react' - import { H4 } from 'src/components/typography' import styles from './SystemPerformance.styles' diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js rename to new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx index de46170c..0cc8b93e 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.jsx @@ -7,12 +7,12 @@ import { isAfter } from 'date-fns/fp' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { Label1, Label2, P } from 'src/components/typography/index' import PercentDownIcon from 'src/styling/icons/dashboard/down.svg?react' import PercentNeutralIcon from 'src/styling/icons/dashboard/equal.svg?react' import PercentUpIcon from 'src/styling/icons/dashboard/up.svg?react' import { EmptyTable } from 'src/components/table' -import { Label1, Label2, P } from 'src/components/typography/index' import { java, neon } from 'src/styling/variables' import { fromNamespace } from 'src/utils/config' import { DAY, WEEK, MONTH } from 'src/utils/time' diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js rename to new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx index 7b75a5e3..505be346 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/MachinesTable.jsx @@ -11,11 +11,11 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' import { useHistory } from 'react-router-dom' +import { Status } from 'src/components/Status' +import { Label2, TL2 } from 'src/components/typography' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' import MachineLinkIcon from 'src/styling/icons/month arrows/right.svg?react' -import { Status } from 'src/components/Status' -import { Label2, TL2 } from 'src/components/typography' // import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import { fromNamespace } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.js b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.js rename to new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx index 6d07636a..4243f22c 100644 --- a/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.js +++ b/new-lamassu-admin/src/pages/Dashboard/SystemStatus/SystemStatus.jsx @@ -6,7 +6,6 @@ import classnames from 'classnames' import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' - import { cardState as cardState_ } from 'src/components/CollapsibleCard' // import ActionButton from 'src/components/buttons/ActionButton' import { H4, TL2, Label1 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Funding.js b/new-lamassu-admin/src/pages/Funding.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Funding.js rename to new-lamassu-admin/src/pages/Funding.jsx index b8b2cc3e..80f47292 100644 --- a/new-lamassu-admin/src/pages/Funding.js +++ b/new-lamassu-admin/src/pages/Funding.jsx @@ -8,7 +8,6 @@ import gql from 'graphql-tag' import QRCode from 'qrcode.react' import * as R from 'ramda' import React, { useState } from 'react' - import TableLabel from 'src/components/TableLabel' import Title from 'src/components/Title' import { Tr, Td, THead, TBody, Table } from 'src/components/fake-table/Table' @@ -22,6 +21,7 @@ import { Label3 } from 'src/components/typography' import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' + import { primaryColor } from 'src/styling/variables' import styles from './Funding.styles' diff --git a/new-lamassu-admin/src/pages/Locales/Locales.js b/new-lamassu-admin/src/pages/Locales/Locales.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Locales/Locales.js rename to new-lamassu-admin/src/pages/Locales/Locales.jsx index 20be0836..7eb04348 100644 --- a/new-lamassu-admin/src/pages/Locales/Locales.js +++ b/new-lamassu-admin/src/pages/Locales/Locales.jsx @@ -3,16 +3,16 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' - import Modal from 'src/components/Modal' import { HelpTooltip } from 'src/components/Tooltip' -import { Link, SupportLinkButton } from 'src/components/buttons' -import { Table as EditableTable } from 'src/components/editableTable' import Section from 'src/components/layout/Section' import TitleSection from 'src/components/layout/TitleSection' import { P } from 'src/components/typography' import Wizard from 'src/pages/Wallet/Wizard' import { WalletSchema } from 'src/pages/Wallet/helper' + +import { Link, SupportLinkButton } from 'src/components/buttons' +import { Table as EditableTable } from 'src/components/editableTable' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { styles } from './Locales.styles' diff --git a/new-lamassu-admin/src/pages/Locales/helper.js b/new-lamassu-admin/src/pages/Locales/helper.js index 2c050694..b2ff2343 100644 --- a/new-lamassu-admin/src/pages/Locales/helper.js +++ b/new-lamassu-admin/src/pages/Locales/helper.js @@ -1,7 +1,7 @@ import * as R from 'ramda' +import Autocomplete from 'src/components/inputs/formik/Autocomplete' import * as Yup from 'yup' -import Autocomplete from 'src/components/inputs/formik/Autocomplete.js' import { labels as timezoneList } from 'src/utils/timezone-list' const getFields = (getData, names, onChange, auxElements = []) => { diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.js b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.js rename to new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx index 8ee1b689..775b54bf 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.js +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscountModal.jsx @@ -2,14 +2,14 @@ import { makeStyles } from '@material-ui/core/styles' import { Form, Formik, Field } from 'formik' import * as R from 'ramda' import React from 'react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import { HelpTooltip } from 'src/components/Tooltip' +import { H3, TL1, P } from 'src/components/typography' +import * as Yup from 'yup' + import { Button } from 'src/components/buttons' import { NumberInput, Autocomplete } from 'src/components/inputs/formik' -import { H3, TL1, P } from 'src/components/typography' import styles from './IndividualDiscount.styles' diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx similarity index 100% rename from new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js rename to new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx index 44907120..0d6d1608 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.jsx @@ -3,13 +3,13 @@ import { makeStyles, Box } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { DeleteDialog } from 'src/components/DeleteDialog' +import DataTable from 'src/components/tables/DataTable' +import { Label3, TL1 } from 'src/components/typography' import PhoneIdIcon from 'src/styling/icons/ID/phone/zodiac.svg?react' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' -import { DeleteDialog } from 'src/components/DeleteDialog' import { Link, Button, IconButton } from 'src/components/buttons' -import DataTable from 'src/components/tables/DataTable' -import { Label3, TL1 } from 'src/components/typography' import styles from './IndividualDiscount.styles' import IndividualDiscountModal from './IndividualDiscountModal' diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.js b/new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.jsx similarity index 100% rename from new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.js rename to new-lamassu-admin/src/pages/LoyaltyPanel/LoyaltyDiscounts.jsx diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.js b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx similarity index 100% rename from new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.js rename to new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx index b6cb8894..dbe0d8f2 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.js +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodes.jsx @@ -3,12 +3,12 @@ import { makeStyles, Box } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' -import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' - import { DeleteDialog } from 'src/components/DeleteDialog' -import { Link, Button, IconButton } from 'src/components/buttons' import DataTable from 'src/components/tables/DataTable' import { Label3, TL1 } from 'src/components/typography' +import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' + +import { Link, Button, IconButton } from 'src/components/buttons' import styles from './PromoCodes.styles' import PromoCodesModal from './PromoCodesModal' diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.js b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.js rename to new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx index 255bc547..1c2e1d20 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.js +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/PromoCodesModal.jsx @@ -2,14 +2,14 @@ import { makeStyles } from '@material-ui/core/styles' import { Form, Formik, Field } from 'formik' import * as R from 'ramda' import React from 'react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import { HelpTooltip } from 'src/components/Tooltip' +import { H3, TL1, P } from 'src/components/typography' +import * as Yup from 'yup' + import { Button } from 'src/components/buttons' import { TextInput, NumberInput } from 'src/components/inputs/formik' -import { H3, TL1, P } from 'src/components/typography' import styles from './PromoCodes.styles' diff --git a/new-lamassu-admin/src/pages/MachineLogs.js b/new-lamassu-admin/src/pages/MachineLogs.jsx similarity index 100% rename from new-lamassu-admin/src/pages/MachineLogs.js rename to new-lamassu-admin/src/pages/MachineLogs.jsx index 88bc6478..16d6e8d1 100644 --- a/new-lamassu-admin/src/pages/MachineLogs.js +++ b/new-lamassu-admin/src/pages/MachineLogs.jsx @@ -3,10 +3,11 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' - import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper' import Title from 'src/components/Title' import Sidebar from 'src/components/layout/Sidebar' +import { Info3, H4 } from 'src/components/typography' + import { Table, TableHead, @@ -15,7 +16,6 @@ import { TableBody, TableCell } from 'src/components/table' -import { Info3, H4 } from 'src/components/typography' import { formatDate } from 'src/utils/timezones' import styles from './Logs.styles' diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx index eb1b45b1..3cf970c6 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.jsx @@ -3,11 +3,11 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' - import DataTable from 'src/components/tables/DataTable' import CashUnitDetails from 'src/pages/Maintenance/CashUnitDetails' import Wizard from 'src/pages/Maintenance/Wizard/Wizard' import helper from 'src/pages/Maintenance/helper' + import { fromNamespace } from 'src/utils/config' import styles from './Cassettes.styles' diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/Commissions.jsx diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.jsx diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx index ae0e3be2..1be5ef28 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Details.jsx @@ -1,7 +1,7 @@ import { makeStyles } from '@material-ui/core/styles' import React from 'react' - import { Label3, P } from 'src/components/typography' + import { modelPrettifier } from 'src/utils/machine' import { formatDate } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx index 86965037..b3fb1a7f 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Overview.jsx @@ -2,11 +2,10 @@ import { makeStyles } from '@material-ui/core/styles' import BigNumber from 'bignumber.js' import { formatDistance } from 'date-fns' import React from 'react' - import { Status } from 'src/components/Status' import MachineActions from 'src/components/machineActions/MachineActions' import { H3, Label1, P } from 'src/components/typography' -import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard.js' +import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' import styles from '../Machines.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx index 7cbb08fe..615f1ca1 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/DataTable.jsx @@ -8,9 +8,6 @@ import { CellMeasurer, CellMeasurerCache } from 'react-virtualized' -import ExpandClosedIcon from 'src/styling/icons/action/expand/closed.svg?react' -import ExpandOpenIcon from 'src/styling/icons/action/expand/open.svg?react' - import { Table, TBody, @@ -19,8 +16,11 @@ import { Td, Th } from 'src/components/fake-table/Table' -import styles from 'src/components/tables/DataTable.styles' import { H4 } from 'src/components/typography' +import ExpandClosedIcon from 'src/styling/icons/action/expand/closed.svg?react' +import ExpandOpenIcon from 'src/styling/icons/action/expand/open.svg?react' + +import styles from 'src/components/tables/DataTable.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js rename to new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx index ed0e24a0..be6b0d99 100644 --- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js +++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.jsx @@ -5,10 +5,10 @@ import BigNumber from 'bignumber.js' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useEffect, useState } from 'react' +import DetailsRow from 'src/pages/Transactions/DetailsCard' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import DetailsRow from 'src/pages/Transactions/DetailsCard' import { mainStyles } from 'src/pages/Transactions/Transactions.styles' import { getStatus } from 'src/pages/Transactions/helper' import * as Customer from 'src/utils/customer' diff --git a/new-lamassu-admin/src/pages/Machines/MachineSidebar.js b/new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Machines/MachineSidebar.js rename to new-lamassu-admin/src/pages/Machines/MachineSidebar.jsx diff --git a/new-lamassu-admin/src/pages/Machines/Machines.js b/new-lamassu-admin/src/pages/Machines/Machines.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Machines/Machines.js rename to new-lamassu-admin/src/pages/Machines/Machines.jsx index 19042f83..dae49c38 100644 --- a/new-lamassu-admin/src/pages/Machines/Machines.js +++ b/new-lamassu-admin/src/pages/Machines/Machines.jsx @@ -8,7 +8,6 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' import { Link, useLocation, useHistory } from 'react-router-dom' - import { TL1, TL2, Label3 } from 'src/components/typography' import Cassettes from './MachineComponents/Cassettes' diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js rename to new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx index 29c7494c..4596c9d8 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitDetails.jsx @@ -1,10 +1,10 @@ import { makeStyles } from '@material-ui/core/styles' import * as R from 'ramda' import React from 'react' - import Chip from 'src/components/Chip' -import { CashOut } from 'src/components/inputs' import { Label1, TL2 } from 'src/components/typography' + +import { CashOut } from 'src/components/inputs' import { offDarkColor } from 'src/styling/variables' import { fromNamespace } from 'src/utils/config' import { getCashUnitCapacity, modelPrettifier } from 'src/utils/machine' diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.js b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Maintenance/CashUnits.js rename to new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx index 6a3bd20b..491cfe8e 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.jsx @@ -3,19 +3,19 @@ import { DialogActions, makeStyles, Box } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper' +import Modal from 'src/components/Modal' +import { HelpTooltip } from 'src/components/Tooltip' +import TitleSection from 'src/components/layout/TitleSection' +import DataTable from 'src/components/tables/DataTable' +import { P, Label1 } from 'src/components/typography' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import ReverseHistoryIcon from 'src/styling/icons/circle buttons/history/white.svg?react' import HistoryIcon from 'src/styling/icons/circle buttons/history/zodiac.svg?react' -import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper' -import Modal from 'src/components/Modal' -import { HelpTooltip } from 'src/components/Tooltip.js' import { IconButton, Button, SupportLinkButton } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import TitleSection from 'src/components/layout/TitleSection' import { EmptyTable } from 'src/components/table' -import DataTable from 'src/components/tables/DataTable' -import { P, Label1 } from 'src/components/typography' import { fromNamespace, toNamespace } from 'src/utils/config' import { MANUAL, AUTOMATIC } from 'src/utils/constants' import { onlyFirstToUpper } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.js b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx similarity index 97% rename from new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.js rename to new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx index 851f21b4..1a6c0e88 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashUnitsFooter.jsx @@ -2,14 +2,14 @@ import { makeStyles } from '@material-ui/core' import BigNumber from 'bignumber.js' import * as R from 'ramda' import React from 'react' +import { Info1, Info2, Info3 } from 'src/components/typography/index' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import { Info1, Info2, Info3 } from 'src/components/typography/index' import { fromNamespace } from 'src/utils/config' -import { numberToFiatAmount } from 'src/utils/number.js' +import { numberToFiatAmount } from 'src/utils/number' -import styles from './CashUnitsFooter.styles.js' +import styles from './CashUnitsFooter.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js rename to new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx index 6a200774..dff12942 100644 --- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js +++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.jsx @@ -6,11 +6,11 @@ import React from 'react' // import * as Yup from 'yup' // import { Link, IconButton } from 'src/components/buttons' // import { TextInput } from 'src/components/inputs' +import DataTable from 'src/components/tables/DataTable' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' import { NumberInput } from 'src/components/inputs/formik' -import DataTable from 'src/components/tables/DataTable' // import EditIconDisabled from 'src/styling/icons/action/edit/disabled.svg?react' // import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import { formatDate } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js rename to new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx index 13e79845..14e029d5 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.jsx @@ -6,6 +6,7 @@ import React from 'react' // import { Status } from 'src/components/Status' // import LinkIcon from 'src/styling/icons/button/link/zodiac.svg?react' import MachineActions from 'src/components/machineActions/MachineActions' + import { modelPrettifier } from 'src/utils/machine' import { formatDate } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/MachineStatus.js rename to new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx index 46ab3adc..a8b88dab 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.jsx @@ -5,13 +5,13 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' import { useHistory, useLocation } from 'react-router-dom' +import { MainStatus } from 'src/components/Status' +import Title from 'src/components/Title' +import DataTable from 'src/components/tables/DataTable' import MachineRedirectIcon from 'src/styling/icons/month arrows/right.svg?react' import WarningIcon from 'src/styling/icons/status/pumpkin.svg?react' import ErrorIcon from 'src/styling/icons/status/tomato.svg?react' -import { MainStatus } from 'src/components/Status' -import Title from 'src/components/Title' -import DataTable from 'src/components/tables/DataTable' import { mainStyles } from 'src/pages/Transactions/Transactions.styles' import MachineDetailsRow from './MachineDetailsCard' diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.js b/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.js rename to new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.jsx index c46f4a50..a42680e4 100644 --- a/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.js +++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/Wizard.jsx @@ -1,8 +1,8 @@ import * as R from 'ramda' import React, { useState } from 'react' +import Modal from 'src/components/Modal' import * as Yup from 'yup' -import Modal from 'src/components/Modal' import { MAX_NUMBER_OF_CASSETTES } from 'src/utils/constants' import { cashUnitCapacity, diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js rename to new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx index 853771a1..549b798b 100644 --- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js +++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.jsx @@ -1,9 +1,9 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H1, P, Info2 } from 'src/components/typography' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' import { Button } from 'src/components/buttons' -import { H1, P, Info2 } from 'src/components/typography' import filledCassettes from 'src/styling/icons/cassettes/both-filled.svg' import { comet } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js rename to new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx index 0c705727..38be9c83 100644 --- a/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js +++ b/new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.jsx @@ -3,15 +3,15 @@ import classnames from 'classnames' import { Formik, Form, Field } from 'formik' import * as R from 'ramda' import React from 'react' -import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' - import ErrorMessage from 'src/components/ErrorMessage' import Stepper from 'src/components/Stepper' import { HelpTooltip } from 'src/components/Tooltip' -import { Button } from 'src/components/buttons' import { Cashbox } from 'src/components/inputs/cashbox/Cashbox' -import { NumberInput, RadioGroup } from 'src/components/inputs/formik' import { Info2, H4, P, Info1 } from 'src/components/typography' +import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' + +import { Button } from 'src/components/buttons' +import { NumberInput, RadioGroup } from 'src/components/inputs/formik' import cashbox from 'src/styling/icons/cassettes/acceptor-left.svg' import cassetteOne from 'src/styling/icons/cassettes/dispenser-1.svg' import cassetteTwo from 'src/styling/icons/cassettes/dispenser-2.svg' diff --git a/new-lamassu-admin/src/pages/Maintenance/helper.js b/new-lamassu-admin/src/pages/Maintenance/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Maintenance/helper.js rename to new-lamassu-admin/src/pages/Maintenance/helper.jsx index dcac1383..ec721889 100644 --- a/new-lamassu-admin/src/pages/Maintenance/helper.js +++ b/new-lamassu-admin/src/pages/Maintenance/helper.jsx @@ -1,8 +1,8 @@ import * as R from 'ramda' +import { CashIn, CashOutLite } from 'src/components/inputs/cashbox/Cashbox' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import { IconButton } from 'src/components/buttons' -import { CashIn, CashOutLite } from 'src/components/inputs/cashbox/Cashbox' import { fromNamespace } from 'src/utils/config' import { getCashUnitCapacity } from 'src/utils/machine' diff --git a/new-lamassu-admin/src/pages/Notifications/Notifications.js b/new-lamassu-admin/src/pages/Notifications/Notifications.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/Notifications.js rename to new-lamassu-admin/src/pages/Notifications/Notifications.jsx index 5af5f934..cc0ef1c6 100644 --- a/new-lamassu-admin/src/pages/Notifications/Notifications.js +++ b/new-lamassu-admin/src/pages/Notifications/Notifications.jsx @@ -2,13 +2,13 @@ import { useQuery, useMutation } from '@apollo/react-hooks' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' - import Modal from 'src/components/Modal' import { HelpTooltip } from 'src/components/Tooltip' -import { SupportLinkButton } from 'src/components/buttons' import TitleSection from 'src/components/layout/TitleSection' import { P } from 'src/components/typography' import FormRenderer from 'src/pages/Services/FormRenderer' + +import { SupportLinkButton } from 'src/components/buttons' import twilioSchema from 'src/pages/Services/schemas/twilio' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/components/EditHeader.js rename to new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx index ea9c0e69..16aec872 100644 --- a/new-lamassu-admin/src/pages/Notifications/components/EditHeader.js +++ b/new-lamassu-admin/src/pages/Notifications/components/EditHeader.jsx @@ -1,10 +1,10 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H4 } from 'src/components/typography' import DisabledEditIcon from 'src/styling/icons/action/edit/disabled.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import { Link, IconButton } from 'src/components/buttons' -import { H4 } from 'src/components/typography' import styles from './EditHeader.styles' diff --git a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.js b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/components/EditableNumber.js rename to new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx index b04defbc..35917013 100644 --- a/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.js +++ b/new-lamassu-admin/src/pages/Notifications/components/EditableNumber.jsx @@ -2,9 +2,9 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import { useFormikContext, Field as FormikField } from 'formik' import React from 'react' +import { Label1, Info1, TL2 } from 'src/components/typography' import { NumberInput } from 'src/components/inputs/formik' -import { Label1, Info1, TL2 } from 'src/components/typography' import styles from './EditableNumber.styles' diff --git a/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.js b/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.js rename to new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.jsx index 37bd9c12..7772e316 100644 --- a/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.js +++ b/new-lamassu-admin/src/pages/Notifications/components/SingleFieldEditableNumber.jsx @@ -1,8 +1,8 @@ import { Form, Formik } from 'formik' import React, { useContext, useState } from 'react' +import PromptWhenDirty from 'src/components/PromptWhenDirty' import * as Yup from 'yup' -import PromptWhenDirty from 'src/components/PromptWhenDirty' import { transformNumber } from 'src/utils/number' import NotificationsCtx from '../NotificationsContext' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js rename to new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.jsx diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js rename to new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.jsx index c4957965..9580d718 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.jsx @@ -1,10 +1,10 @@ import * as R from 'ramda' import React, { useContext } from 'react' +import Autocomplete from 'src/components/inputs/formik/Autocomplete' import * as Yup from 'yup' import { Table as EditableTable } from 'src/components/editableTable' import { NumberInput } from 'src/components/inputs/formik' -import Autocomplete from 'src/components/inputs/formik/Autocomplete.js' import { CURRENCY_MAX } from 'src/utils/constants' import { transformNumber } from 'src/utils/number' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js rename to new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx index a4110989..b3461aab 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceAlerts.jsx @@ -2,10 +2,10 @@ import { makeStyles } from '@material-ui/core' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useContext } from 'react' -import * as Yup from 'yup' - import PromptWhenDirty from 'src/components/PromptWhenDirty' import { TL2 } from 'src/components/typography' +import * as Yup from 'yup' + import { transformNumber } from 'src/utils/number' import { Cashbox } from '../../../components/inputs/cashbox/Cashbox' @@ -13,7 +13,7 @@ import NotificationsCtx from '../NotificationsContext' import Header from '../components/EditHeader' import EditableNumber from '../components/EditableNumber' -import styles from './FiatBalanceAlerts.styles.js' +import styles from './FiatBalanceAlerts.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js rename to new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.jsx index 6769fc56..aa07a697 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.jsx @@ -1,10 +1,10 @@ import * as R from 'ramda' import React, { useContext } from 'react' +import Autocomplete from 'src/components/inputs/formik/Autocomplete' import * as Yup from 'yup' import { Table as EditableTable } from 'src/components/editableTable' import { NumberInput } from 'src/components/inputs/formik/' -import Autocomplete from 'src/components/inputs/formik/Autocomplete' import { fromNamespace } from 'src/utils/config' import { transformNumber } from 'src/utils/number' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/Setup.js b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/sections/Setup.js rename to new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx index cd512b9e..1fc28103 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/Setup.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/Setup.jsx @@ -1,7 +1,6 @@ import { makeStyles } from '@material-ui/core' import * as R from 'ramda' import React, { useContext } from 'react' - import { Table, THead, @@ -10,6 +9,7 @@ import { Td, Th } from 'src/components/fake-table/Table' + import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace } from 'src/utils/config' import { sentenceCase } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/ThirdPartyProvider.js b/new-lamassu-admin/src/pages/Notifications/sections/ThirdPartyProvider.jsx similarity index 96% rename from new-lamassu-admin/src/pages/Notifications/sections/ThirdPartyProvider.js rename to new-lamassu-admin/src/pages/Notifications/sections/ThirdPartyProvider.jsx index 6310dde9..ec1b92e9 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/ThirdPartyProvider.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/ThirdPartyProvider.jsx @@ -1,9 +1,9 @@ import * as R from 'ramda' import React, { useContext } from 'react' +import Autocomplete from 'src/components/inputs/formik/Autocomplete' import * as Yup from 'yup' import { Table as EditableTable } from 'src/components/editableTable' -import Autocomplete from 'src/components/inputs/formik/Autocomplete' import { toNamespace, fromNamespace } from 'src/utils/config' import NotificationsCtx from '../NotificationsContext' diff --git a/new-lamassu-admin/src/pages/Notifications/sections/TransactionAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/TransactionAlerts.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Notifications/sections/TransactionAlerts.js rename to new-lamassu-admin/src/pages/Notifications/sections/TransactionAlerts.jsx diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.js b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.js rename to new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx index cdda11ff..0de7ecc1 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar.jsx @@ -2,11 +2,11 @@ import { useQuery, useMutation } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import React, { memo } from 'react' - import { HelpTooltip } from 'src/components/Tooltip' +import { H4, P, Label2 } from 'src/components/typography' + import { BooleanPropertiesTable } from 'src/components/booleanPropertiesTable' import { Switch } from 'src/components/inputs' -import { H4, P, Label2 } from 'src/components/typography' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { SupportLinkButton } from '../../components/buttons' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js rename to new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx index cb17323e..6f4678f0 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.jsx @@ -5,17 +5,17 @@ import { Form, Formik, Field as FormikField } from 'formik' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import ErrorMessage from 'src/components/ErrorMessage' +import PromptWhenDirty from 'src/components/PromptWhenDirty' +import { HelpTooltip } from 'src/components/Tooltip' +import Switch from 'src/components/inputs/base/Switch' +import { P, H4, Info3, Label1, Label2, Label3 } from 'src/components/typography' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' import * as Yup from 'yup' -import ErrorMessage from 'src/components/ErrorMessage' -import PromptWhenDirty from 'src/components/PromptWhenDirty' -import { HelpTooltip } from 'src/components/Tooltip' import { Link, IconButton, SupportLinkButton } from 'src/components/buttons' -import Switch from 'src/components/inputs/base/Switch' import { TextInput } from 'src/components/inputs/formik' -import { P, H4, Info3, Label1, Label2, Label3 } from 'src/components/typography' import { fontSize5 } from 'src/styling/variables' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.js b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.js rename to new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx index c3ca3b53..83463219 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/MachineScreens.jsx @@ -3,9 +3,9 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { memo } from 'react' +import { H4, P, Label2 } from 'src/components/typography' import { Switch } from 'src/components/inputs' -import { H4, P, Label2 } from 'src/components/typography' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { global } from './OperatorInfo.styles' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js rename to new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx index f3c797f7..81bd7429 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.jsx @@ -3,11 +3,11 @@ import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import * as R from 'ramda' import React, { memo } from 'react' - import { HelpTooltip } from 'src/components/Tooltip' +import { H4, P, Label2 } from 'src/components/typography' + import { BooleanPropertiesTable } from 'src/components/booleanPropertiesTable' import { Switch } from 'src/components/inputs' -import { H4, P, Label2 } from 'src/components/typography' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { SupportLinkButton } from '../../components/buttons' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.js b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.js rename to new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx index 55ac7835..8ba3fb91 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNotices.jsx @@ -3,16 +3,16 @@ import { makeStyles, Paper } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { HelpTooltip } from 'src/components/Tooltip' +import DataTable from 'src/components/tables/DataTable' +import { H4, P, Label3 } from 'src/components/typography' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' import ExpandIconClosed from 'src/styling/icons/action/expand/closed.svg?react' import ExpandIconOpen from 'src/styling/icons/action/expand/open.svg?react' import WhiteLogo from 'src/styling/icons/menu/logo-white.svg?react' -import { HelpTooltip } from 'src/components/Tooltip' import { IconButton, SupportLinkButton } from 'src/components/buttons' import { Switch } from 'src/components/inputs' -import DataTable from 'src/components/tables/DataTable' -import { H4, P, Label3 } from 'src/components/typography' import { formatDate } from 'src/utils/timezones' import styles from './SMSNotices.styles' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.js b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.js rename to new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx index 9724565c..d3bd06e5 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/SMSNotices/SMSNoticesModal.jsx @@ -2,15 +2,15 @@ import { makeStyles, Chip } from '@material-ui/core' import { Form, Formik, Field } from 'formik' import * as R from 'ramda' import React from 'react' +import ErrorMessage from 'src/components/ErrorMessage' +import Modal from 'src/components/Modal' +import { Info2 } from 'src/components/typography' import DefaultIconReverse from 'src/styling/icons/button/retry/white.svg?react' import DefaultIcon from 'src/styling/icons/button/retry/zodiac.svg?react' import * as Yup from 'yup' -import ErrorMessage from 'src/components/ErrorMessage' -import Modal from 'src/components/Modal' import { ActionButton, Button } from 'src/components/buttons' import { TextInput } from 'src/components/inputs/formik' -import { Info2 } from 'src/components/typography' import { zircon } from 'src/styling/variables' import styles from './SMSNotices.styles' diff --git a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.js b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx similarity index 100% rename from new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.js rename to new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx index 00ebb3b4..10bea939 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/TermsConditions.jsx @@ -5,16 +5,16 @@ import { Form, Formik, Field as FormikField } from 'formik' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' -import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import PromptWhenDirty from 'src/components/PromptWhenDirty' import { HelpTooltip } from 'src/components/Tooltip' +import { H4, Info2, Info3, Label2, Label3, P } from 'src/components/typography' +import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' +import * as Yup from 'yup' + import { Link, IconButton, SupportLinkButton } from 'src/components/buttons' import { Switch } from 'src/components/inputs' import { TextInput } from 'src/components/inputs/formik' -import { H4, Info2, Info3, Label2, Label3, P } from 'src/components/typography' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { global, fieldStyles } from './OperatorInfo.styles' diff --git a/new-lamassu-admin/src/pages/ServerLogs.js b/new-lamassu-admin/src/pages/ServerLogs.jsx similarity index 100% rename from new-lamassu-admin/src/pages/ServerLogs.js rename to new-lamassu-admin/src/pages/ServerLogs.jsx index 3acff64b..0b436add 100644 --- a/new-lamassu-admin/src/pages/ServerLogs.js +++ b/new-lamassu-admin/src/pages/ServerLogs.jsx @@ -3,10 +3,11 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState, useRef } from 'react' - import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper' import Title from 'src/components/Title' import Uptime from 'src/components/Uptime' +import { Info3, H4 } from 'src/components/typography' + import { Select } from 'src/components/inputs' import { Table, @@ -16,7 +17,6 @@ import { TableBody, TableCell } from 'src/components/table' -import { Info3, H4 } from 'src/components/typography' import typographyStyles from 'src/components/typography/styles' import { offColor } from 'src/styling/variables' import { startCase } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/Services/FormRenderer.js b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Services/FormRenderer.js rename to new-lamassu-admin/src/pages/Services/FormRenderer.jsx index ac0c0a5c..80f1e4ce 100644 --- a/new-lamassu-admin/src/pages/Services/FormRenderer.js +++ b/new-lamassu-admin/src/pages/Services/FormRenderer.jsx @@ -3,8 +3,8 @@ import classnames from 'classnames' import { Formik, Form, FastField } from 'formik' import * as R from 'ramda' import React, { useState } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' + import { Button } from 'src/components/buttons' import { SecretInput } from 'src/components/inputs/formik' import { spacer } from 'src/styling/variables' diff --git a/new-lamassu-admin/src/pages/Services/Services.js b/new-lamassu-admin/src/pages/Services/Services.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Services/Services.js rename to new-lamassu-admin/src/pages/Services/Services.jsx index c1d5b408..4760f0fe 100644 --- a/new-lamassu-admin/src/pages/Services/Services.js +++ b/new-lamassu-admin/src/pages/Services/Services.jsx @@ -3,12 +3,12 @@ import { makeStyles, Grid } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' - import Modal from 'src/components/Modal' -import { SecretInput } from 'src/components/inputs/formik' import CheckboxInput from 'src/components/inputs/formik/Checkbox' import TitleSection from 'src/components/layout/TitleSection' import SingleRowTable from 'src/components/single-row-table/SingleRowTable' + +import { SecretInput } from 'src/components/inputs/formik' import { formatLong } from 'src/utils/string' import FormRenderer from './FormRenderer' diff --git a/new-lamassu-admin/src/pages/Services/schemas/elliptic.js b/new-lamassu-admin/src/pages/Services/schemas/elliptic.js index 287a8fa6..41d0d810 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/elliptic.js +++ b/new-lamassu-admin/src/pages/Services/schemas/elliptic.js @@ -1,8 +1,7 @@ -import * as Yup from 'yup' - import CheckboxFormik from 'src/components/inputs/formik/Checkbox' import NumberInputFormik from 'src/components/inputs/formik/NumberInput' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' +import * as Yup from 'yup' import { secretTest, leadingZerosTest } from './helper' diff --git a/new-lamassu-admin/src/pages/Services/schemas/inforu.js b/new-lamassu-admin/src/pages/Services/schemas/inforu.js index 848e44ae..a334afe6 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/inforu.js +++ b/new-lamassu-admin/src/pages/Services/schemas/inforu.js @@ -1,7 +1,6 @@ -import * as Yup from 'yup' - import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' import { secretTest } from './helper' diff --git a/new-lamassu-admin/src/pages/Services/schemas/infura.js b/new-lamassu-admin/src/pages/Services/schemas/infura.js index 3a4e27c3..8a18752b 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/infura.js +++ b/new-lamassu-admin/src/pages/Services/schemas/infura.js @@ -1,6 +1,5 @@ -import * as Yup from 'yup' - import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' export default { code: 'infura', diff --git a/new-lamassu-admin/src/pages/Services/schemas/mailgun.js b/new-lamassu-admin/src/pages/Services/schemas/mailgun.js index 80e1f615..b01b84b7 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/mailgun.js +++ b/new-lamassu-admin/src/pages/Services/schemas/mailgun.js @@ -1,6 +1,5 @@ -import * as Yup from 'yup' - import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' export default { code: 'mailgun', diff --git a/new-lamassu-admin/src/pages/Services/schemas/scorechain.js b/new-lamassu-admin/src/pages/Services/schemas/scorechain.js index 96d6675f..2ee4eb97 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/scorechain.js +++ b/new-lamassu-admin/src/pages/Services/schemas/scorechain.js @@ -1,8 +1,7 @@ -import * as Yup from 'yup' - import CheckboxFormik from 'src/components/inputs/formik/Checkbox' import NumberInputFormik from 'src/components/inputs/formik/NumberInput' import SecretInputFormik from 'src/components/inputs/formik/SecretInput' +import * as Yup from 'yup' import { secretTest, leadingZerosTest } from './helper' diff --git a/new-lamassu-admin/src/pages/Services/schemas/telnyx.js b/new-lamassu-admin/src/pages/Services/schemas/telnyx.js index 65db8ae7..ce11ed48 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/telnyx.js +++ b/new-lamassu-admin/src/pages/Services/schemas/telnyx.js @@ -1,7 +1,6 @@ -import * as Yup from 'yup' - import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' import { secretTest } from './helper' diff --git a/new-lamassu-admin/src/pages/Services/schemas/trongrid.js b/new-lamassu-admin/src/pages/Services/schemas/trongrid.js index 8edbd3e8..affc3989 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/trongrid.js +++ b/new-lamassu-admin/src/pages/Services/schemas/trongrid.js @@ -1,6 +1,5 @@ -import * as Yup from 'yup' - import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' export default { code: 'trongrid', diff --git a/new-lamassu-admin/src/pages/Services/schemas/twilio.js b/new-lamassu-admin/src/pages/Services/schemas/twilio.js index 4628edb3..756287a3 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/twilio.js +++ b/new-lamassu-admin/src/pages/Services/schemas/twilio.js @@ -1,7 +1,6 @@ -import * as Yup from 'yup' - import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' import { secretTest } from './helper' diff --git a/new-lamassu-admin/src/pages/Services/schemas/vonage.js b/new-lamassu-admin/src/pages/Services/schemas/vonage.js index 01bb4b20..fb95023a 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/vonage.js +++ b/new-lamassu-admin/src/pages/Services/schemas/vonage.js @@ -1,7 +1,6 @@ -import * as Yup from 'yup' - import SecretInputFormik from 'src/components/inputs/formik/SecretInput' import TextInputFormik from 'src/components/inputs/formik/TextInput' +import * as Yup from 'yup' import { secretTest } from './helper' diff --git a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx similarity index 100% rename from new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js rename to new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx index aa4635c4..cfc80b87 100644 --- a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js +++ b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.jsx @@ -2,12 +2,12 @@ import { useQuery, useMutation } from '@apollo/react-hooks' import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' +import TitleSection from 'src/components/layout/TitleSection' +import DataTable from 'src/components/tables/DataTable' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' import parser from 'ua-parser-js' import { IconButton } from 'src/components/buttons' -import TitleSection from 'src/components/layout/TitleSection' -import DataTable from 'src/components/tables/DataTable' import { formatDate } from 'src/utils/timezones' const GET_SESSIONS = gql` diff --git a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js rename to new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx index e3339e19..32ccb5b5 100644 --- a/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.js +++ b/new-lamassu-admin/src/pages/Transactions/CopyToClipboard.jsx @@ -3,9 +3,9 @@ import classnames from 'classnames' import * as R from 'ramda' import React, { useState, useEffect } from 'react' import { CopyToClipboard as ReactCopyToClipboard } from 'react-copy-to-clipboard' +import Popover from 'src/components/Popper' import CopyIcon from 'src/styling/icons/action/copy/copy.svg?react' -import Popover from 'src/components/Popper' import { comet } from 'src/styling/variables' import { cpcStyles } from './Transactions.styles' diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Transactions/DetailsCard.js rename to new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx index c4671a1f..e05a4ca2 100644 --- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.jsx @@ -9,6 +9,9 @@ import gql from 'graphql-tag' import JSZip from 'jszip' import * as R from 'ramda' import React, { memo, useState } from 'react' +import { ConfirmDialog } from 'src/components/ConfirmDialog' +import { HelpTooltip } from 'src/components/Tooltip' +import { P, Label1 } from 'src/components/typography' import CardIdInverseIcon from 'src/styling/icons/ID/card/white.svg?react' import CardIdIcon from 'src/styling/icons/ID/card/zodiac.svg?react' import PhoneIdInverseIcon from 'src/styling/icons/ID/phone/white.svg?react' @@ -21,18 +24,15 @@ import DownloadInverseIcon from 'src/styling/icons/button/download/white.svg?rea import Download from 'src/styling/icons/button/download/zodiac.svg?react' import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' +import { URI } from 'src/utils/apollo' -import { ConfirmDialog } from 'src/components/ConfirmDialog' -import { HelpTooltip } from 'src/components/Tooltip' import { IDButton, ActionButton } from 'src/components/buttons' -import { P, Label1 } from 'src/components/typography' import { primaryColor, subheaderColor, errorColor, offErrorColor } from 'src/styling/variables' -import { URI } from 'src/utils/apollo' import { SWEEPABLE_CRYPTOS } from 'src/utils/constants' import * as Customer from 'src/utils/customer' diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Transactions/Transactions.js rename to new-lamassu-admin/src/pages/Transactions/Transactions.jsx index e1970673..b8afa09a 100644 --- a/new-lamassu-admin/src/pages/Transactions/Transactions.js +++ b/new-lamassu-admin/src/pages/Transactions/Transactions.jsx @@ -6,18 +6,18 @@ import gql from 'graphql-tag' import * as R from 'ramda' import React, { useEffect, useState } from 'react' import { useHistory } from 'react-router-dom' -import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' -import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' -import CustomerLinkIcon from 'src/styling/icons/month arrows/right.svg?react' -import CustomerLinkWhiteIcon from 'src/styling/icons/month arrows/right_white.svg?react' - import LogsDowloaderPopover from 'src/components/LogsDownloaderPopper' import SearchBox from 'src/components/SearchBox' import SearchFilter from 'src/components/SearchFilter' import Title from 'src/components/Title' import { HelpTooltip } from 'src/components/Tooltip' -import { SupportLinkButton } from 'src/components/buttons' import DataTable from 'src/components/tables/DataTable' +import TxInIcon from 'src/styling/icons/direction/cash-in.svg?react' +import TxOutIcon from 'src/styling/icons/direction/cash-out.svg?react' +import CustomerLinkIcon from 'src/styling/icons/month arrows/right.svg?react' +import CustomerLinkWhiteIcon from 'src/styling/icons/month arrows/right_white.svg?react' + +import { SupportLinkButton } from 'src/components/buttons' import { errorColor } from 'src/styling/variables' import * as Customer from 'src/utils/customer' import { formatDate } from 'src/utils/timezones' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx index 4beec18c..079a6756 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.jsx @@ -4,13 +4,13 @@ import classnames from 'classnames' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { DeleteDialog } from 'src/components/DeleteDialog' +import DataTable from 'src/components/tables/DataTable' +import { Info1, Info3, P } from 'src/components/typography' import DeleteIcon from 'src/styling/icons/action/delete/enabled.svg?react' import EditIcon from 'src/styling/icons/action/edit/enabled.svg?react' -import { DeleteDialog } from 'src/components/DeleteDialog' import { IconButton, Button, Link } from 'src/components/buttons' -import DataTable from 'src/components/tables/DataTable' -import { Info1, Info3, P } from 'src/components/typography' import { fromNamespace, namespaces, toNamespace } from 'src/utils/config' import styles from './CustomInfoRequests.styles' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx index dda9bb4c..9d056395 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/DetailsCard.jsx @@ -1,7 +1,6 @@ import { makeStyles } from '@material-ui/core' import classnames from 'classnames' import React from 'react' - import { Label1, Info2 } from 'src/components/typography' const styles = { diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.jsx index 7427cc80..b9424717 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/ChooseType.jsx @@ -1,12 +1,12 @@ import { Field } from 'formik' import React from 'react' +import ToggleButtonGroup from 'src/components/inputs/formik/ToggleButtonGroup' +import { H4 } from 'src/components/typography' import Keyboard from 'src/styling/icons/compliance/keyboard.svg?react' import Keypad from 'src/styling/icons/compliance/keypad.svg?react' import List from 'src/styling/icons/compliance/list.svg?react' import * as Yup from 'yup' -import ToggleButtonGroup from 'src/components/inputs/formik/ToggleButtonGroup' -import { H4 } from 'src/components/typography' import { zircon } from 'src/styling/variables' const MakeIcon = IconSvg => ( diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.jsx index a9ef4593..1f0b9b14 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.jsx @@ -1,10 +1,9 @@ import { Field } from 'formik' import * as R from 'ramda' import React from 'react' -import * as Yup from 'yup' - import TextInputFormik from 'src/components/inputs/formik/TextInput' import { H4, P } from 'src/components/typography' +import * as Yup from 'yup' const NameOfRequirement = () => { return ( diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.jsx index c7f0de6d..e1ceaefe 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen1Information.jsx @@ -1,9 +1,8 @@ import { Field } from 'formik' import React from 'react' -import * as Yup from 'yup' - import TextInputFormik from 'src/components/inputs/formik/TextInput' import { H4, P } from 'src/components/typography' +import * as Yup from 'yup' const Screen1Information = () => { return ( diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.jsx index 0003dd1c..94d7b4bb 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/Screen2Information.jsx @@ -1,9 +1,8 @@ import { Field } from 'formik' import React from 'react' -import * as Yup from 'yup' - import TextInputFormik from 'src/components/inputs/formik/TextInput' import { H4, P } from 'src/components/typography' +import * as Yup from 'yup' const ScreenInformation = () => { return ( diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx index 4de7d43d..91f66b19 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/ChoiceList.jsx @@ -3,13 +3,12 @@ import classnames from 'classnames' import { Field, useFormikContext, FieldArray } from 'formik' import * as R from 'ramda' import React, { useEffect, useRef } from 'react' -import AddIconInverse from 'src/styling/icons/button/add/white.svg?react' -import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' - import Button from 'src/components/buttons/ActionButton' import RadioGroup from 'src/components/inputs/formik/RadioGroup' import TextInput from 'src/components/inputs/formik/TextInput' import { H4 } from 'src/components/typography' +import AddIconInverse from 'src/styling/icons/button/add/white.svg?react' +import AddIcon from 'src/styling/icons/button/add/zodiac.svg?react' import styles from './formStyles.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx index 7f68c8ee..49985224 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/NumericalEntry.jsx @@ -3,7 +3,6 @@ import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' import React from 'react' - import NumberInput from 'src/components/inputs/formik/NumberInput' import RadioGroup from 'src/components/inputs/formik/RadioGroup' import { TL1, H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx index 27bfb226..f5baec02 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/TextEntry.jsx @@ -3,7 +3,6 @@ import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' import React from 'react' - import RadioGroup from 'src/components/inputs/formik/RadioGroup' import TextInput from 'src/components/inputs/formik/TextInput' import { H4 } from 'src/components/typography' diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/TypeFields/index.jsx diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx index ddb020d9..e4d75857 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.jsx @@ -2,10 +2,10 @@ import { makeStyles } from '@material-ui/core' import { Form, Formik } from 'formik' import * as R from 'ramda' import React, { useState } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import Stepper from 'src/components/Stepper' + import { Button } from 'src/components/buttons' import ChooseType, { diff --git a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.js b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.js rename to new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx index 2392b884..17352b54 100644 --- a/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.js +++ b/new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/WizardSplash.jsx @@ -1,9 +1,9 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H1, P } from 'src/components/typography' import CustomReqLogo from 'src/styling/icons/compliance/custom-requirement.svg?react' import { Button } from 'src/components/buttons' -import { H1, P } from 'src/components/typography' const styles = { logo: { diff --git a/new-lamassu-admin/src/pages/Triggers/TriggerView.js b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/TriggerView.js rename to new-lamassu-admin/src/pages/Triggers/TriggerView.jsx index 5333184a..4034580a 100644 --- a/new-lamassu-admin/src/pages/Triggers/TriggerView.js +++ b/new-lamassu-admin/src/pages/Triggers/TriggerView.jsx @@ -3,11 +3,11 @@ import { makeStyles, Box } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { H2 } from 'src/components/typography' import { v4 } from 'uuid' import { Button } from 'src/components/buttons' import { Table as EditableTable } from 'src/components/editableTable' -import { H2 } from 'src/components/typography' import { fromNamespace, namespaces } from 'src/utils/config' import styles from './Triggers.styles' diff --git a/new-lamassu-admin/src/pages/Triggers/Triggers.js b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/Triggers.js rename to new-lamassu-admin/src/pages/Triggers/Triggers.jsx index 005f6186..075e5e9a 100644 --- a/new-lamassu-admin/src/pages/Triggers/Triggers.js +++ b/new-lamassu-admin/src/pages/Triggers/Triggers.jsx @@ -4,18 +4,18 @@ import classnames from 'classnames' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import Modal from 'src/components/Modal' +import { HelpTooltip } from 'src/components/Tooltip' +import TitleSection from 'src/components/layout/TitleSection' +import { P, Label2 } from 'src/components/typography' +import FormRenderer from 'src/pages/Services/FormRenderer' import ReverseCustomInfoIcon from 'src/styling/icons/circle buttons/filter/white.svg?react' import CustomInfoIcon from 'src/styling/icons/circle buttons/filter/zodiac.svg?react' import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white.svg?react' import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react' -import Modal from 'src/components/Modal' -import { HelpTooltip } from 'src/components/Tooltip' import { Link, SupportLinkButton } from 'src/components/buttons' import { Switch } from 'src/components/inputs' -import TitleSection from 'src/components/layout/TitleSection' -import { P, Label2 } from 'src/components/typography' -import FormRenderer from 'src/pages/Services/FormRenderer' import twilioSchema from 'src/pages/Services/schemas/twilio' import { fromNamespace, toNamespace } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Triggers/Wizard.js b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/Wizard.js rename to new-lamassu-admin/src/pages/Triggers/Wizard.jsx index 8b978410..4b0b0002 100644 --- a/new-lamassu-admin/src/pages/Triggers/Wizard.js +++ b/new-lamassu-admin/src/pages/Triggers/Wizard.jsx @@ -2,12 +2,12 @@ import { makeStyles } from '@material-ui/core' import { Form, Formik, useFormikContext } from 'formik' import * as R from 'ramda' import React, { useState, Fragment, useEffect } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import Stepper from 'src/components/Stepper' -import { Button } from 'src/components/buttons' import { H5, Info3 } from 'src/components/typography' + +import { Button } from 'src/components/buttons' import { comet } from 'src/styling/variables' import { singularOrPlural } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.js b/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.js rename to new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.jsx index 038a6825..9a4b9901 100644 --- a/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.js +++ b/new-lamassu-admin/src/pages/Triggers/components/AdvancedTriggers.jsx @@ -2,9 +2,9 @@ import { useMutation, useQuery } from '@apollo/react-hooks' import gql from 'graphql-tag' import * as R from 'ramda' import React, { memo, useState } from 'react' +import Section from 'src/components/layout/Section' import { Table as EditableTable } from 'src/components/editableTable' -import Section from 'src/components/layout/Section' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { diff --git a/new-lamassu-admin/src/pages/Triggers/components/helper.js b/new-lamassu-admin/src/pages/Triggers/components/helper.js index 1ab870b8..6e6814f3 100644 --- a/new-lamassu-admin/src/pages/Triggers/components/helper.js +++ b/new-lamassu-admin/src/pages/Triggers/components/helper.js @@ -1,8 +1,7 @@ import * as R from 'ramda' -import * as Yup from 'yup' - -import Autocomplete from 'src/components/inputs/formik/Autocomplete.js' +import Autocomplete from 'src/components/inputs/formik/Autocomplete' import { getView } from 'src/pages/Triggers/helper' +import * as Yup from 'yup' const buildAdvancedRequirementOptions = customInfoRequests => { const base = [ diff --git a/new-lamassu-admin/src/pages/Triggers/helper.js b/new-lamassu-admin/src/pages/Triggers/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Triggers/helper.js rename to new-lamassu-admin/src/pages/Triggers/helper.jsx index e767cfcf..ff4c8020 100644 --- a/new-lamassu-admin/src/pages/Triggers/helper.js +++ b/new-lamassu-admin/src/pages/Triggers/helper.jsx @@ -3,10 +3,10 @@ import classnames from 'classnames' import { Field, useFormikContext } from 'formik' import * as R from 'ramda' import React, { memo } from 'react' +import { H4, Label2, Label1, Info1, Info2 } from 'src/components/typography' import * as Yup from 'yup' import { NumberInput, RadioGroup, Dropdown } from 'src/components/inputs/formik' -import { H4, Label2, Label1, Info1, Info2 } from 'src/components/typography' import { errorColor } from 'src/styling/variables' import { transformNumber } from 'src/utils/number' import { onlyFirstToUpper } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.js b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/UserManagement.js rename to new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx index 1c551358..519491f7 100644 --- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.js +++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.jsx @@ -4,6 +4,8 @@ import { startAttestation } from '@simplewebauthn/browser' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useReducer, useState, useContext } from 'react' +import TitleSection from 'src/components/layout/TitleSection' +import DataTable from 'src/components/tables/DataTable' import WhiteKeyIcon from 'src/styling/icons/button/key/white.svg?react' import KeyIcon from 'src/styling/icons/button/key/zodiac.svg?react' import WhiteLockIcon from 'src/styling/icons/button/lock/white.svg?react' @@ -14,8 +16,6 @@ import UserRoleIcon from 'src/styling/icons/button/user-role/zodiac.svg?react' import AppContext from 'src/AppContext' import { ActionButton, Link } from 'src/components/buttons' import { Switch } from 'src/components/inputs' -import TitleSection from 'src/components/layout/TitleSection' -import DataTable from 'src/components/tables/DataTable' import { IP_CHECK_REGEX } from 'src/utils/constants' import styles from './UserManagement.styles' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx index 0c0ef7ac..ccc8937f 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/ChangeRoleModal.jsx @@ -2,12 +2,12 @@ import { useMutation } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import React, { useState } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' -import { Button } from 'src/components/buttons' import { Info2, P } from 'src/components/typography' +import { Button } from 'src/components/buttons' + import styles from '../UserManagement.styles' import Input2FAModal from './Input2FAModal' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx index e4f5ea73..444169aa 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/CreateUserModal.jsx @@ -4,14 +4,14 @@ import classnames from 'classnames' import { Field, Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useState } from 'react' -import * as Yup from 'yup' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' -import { Button } from 'src/components/buttons' -import { TextInput, RadioGroup } from 'src/components/inputs/formik' import { H1, H3, Info2, P, Mono } from 'src/components/typography' import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' +import * as Yup from 'yup' + +import { Button } from 'src/components/buttons' +import { TextInput, RadioGroup } from 'src/components/inputs/formik' import { urlResolver } from 'src/utils/urlResolver' import styles from '../UserManagement.styles' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx index 598b017a..adaa10d4 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/EnableUserModal.jsx @@ -2,12 +2,12 @@ import { useMutation } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import React, { useState } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' -import { Button } from 'src/components/buttons' import { Info2, P } from 'src/components/typography' +import { Button } from 'src/components/buttons' + import styles from '../UserManagement.styles' import Input2FAModal from './Input2FAModal' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx index cb167af1..1580abb0 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/FIDOModal.jsx @@ -1,10 +1,10 @@ import { makeStyles } from '@material-ui/core/styles' import React from 'react' - import Modal from 'src/components/Modal' -import { Button } from 'src/components/buttons' import { Info2, P } from 'src/components/typography' +import { Button } from 'src/components/buttons' + import styles from '../UserManagement.styles' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx index f64b32e9..f54389af 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/Input2FAModal.jsx @@ -3,11 +3,11 @@ import { makeStyles } from '@material-ui/core/styles' import { Form, Formik } from 'formik' import gql from 'graphql-tag' import React, { useState } from 'react' - import Modal from 'src/components/Modal' +import { Info2, P } from 'src/components/typography' + import { Button } from 'src/components/buttons' import { CodeInput } from 'src/components/inputs/base' -import { Info2, P } from 'src/components/typography' import styles from '../UserManagement.styles' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx index 370d58bf..ee72bcf1 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/Reset2FAModal.jsx @@ -2,11 +2,11 @@ import { useMutation } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import React, { useEffect, useState } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import { Info2, P, Mono } from 'src/components/typography' import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' + import { urlResolver } from 'src/utils/urlResolver' import styles from '../UserManagement.styles' diff --git a/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.js b/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx similarity index 100% rename from new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.js rename to new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx index 323867df..ec5c7d4a 100644 --- a/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.js +++ b/new-lamassu-admin/src/pages/UserManagement/modals/ResetPasswordModal.jsx @@ -2,11 +2,11 @@ import { useMutation } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core/styles' import gql from 'graphql-tag' import React, { useEffect, useState } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Modal from 'src/components/Modal' import { Info2, P, Mono } from 'src/components/typography' import CopyToClipboard from 'src/pages/Transactions/CopyToClipboard' + import { urlResolver } from 'src/utils/urlResolver' import styles from '../UserManagement.styles' diff --git a/new-lamassu-admin/src/pages/Wallet/AdvancedWallet.js b/new-lamassu-admin/src/pages/Wallet/AdvancedWallet.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wallet/AdvancedWallet.js rename to new-lamassu-admin/src/pages/Wallet/AdvancedWallet.jsx index fe35b026..4ee5134d 100644 --- a/new-lamassu-admin/src/pages/Wallet/AdvancedWallet.js +++ b/new-lamassu-admin/src/pages/Wallet/AdvancedWallet.jsx @@ -2,9 +2,9 @@ import { useQuery, useMutation } from '@apollo/react-hooks' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import Section from 'src/components/layout/Section' import { Table as EditableTable } from 'src/components/editableTable' -import Section from 'src/components/layout/Section' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' import { diff --git a/new-lamassu-admin/src/pages/Wallet/Wallet.js b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx similarity index 99% rename from new-lamassu-admin/src/pages/Wallet/Wallet.js rename to new-lamassu-admin/src/pages/Wallet/Wallet.jsx index 3145bbd3..6cb260e2 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wallet.js +++ b/new-lamassu-admin/src/pages/Wallet/Wallet.jsx @@ -3,22 +3,22 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import Modal from 'src/components/Modal' +import { HelpTooltip } from 'src/components/Tooltip' +import TitleSection from 'src/components/layout/TitleSection' +import FormRenderer from 'src/pages/Services/FormRenderer' import ReverseSettingsIcon from 'src/styling/icons/circle buttons/settings/white.svg?react' import SettingsIcon from 'src/styling/icons/circle buttons/settings/zodiac.svg?react' -import Modal from 'src/components/Modal' -import { HelpTooltip } from 'src/components/Tooltip' import { SupportLinkButton } from 'src/components/buttons' import { NamespacedTable as EditableTable } from 'src/components/editableTable' -import TitleSection from 'src/components/layout/TitleSection' -import FormRenderer from 'src/pages/Services/FormRenderer' import _schemas from 'src/pages/Services/schemas' import { fromNamespace, toNamespace } from 'src/utils/config' import { P } from '../../components/typography' import AdvancedWallet from './AdvancedWallet' -import styles from './Wallet.styles.js' +import styles from './Wallet.styles' import Wizard from './Wizard' import { WalletSchema, getElements } from './helper' diff --git a/new-lamassu-admin/src/pages/Wallet/Wizard.js b/new-lamassu-admin/src/pages/Wallet/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wallet/Wizard.js rename to new-lamassu-admin/src/pages/Wallet/Wizard.jsx index cf26394b..728e60fb 100644 --- a/new-lamassu-admin/src/pages/Wallet/Wizard.js +++ b/new-lamassu-admin/src/pages/Wallet/Wizard.jsx @@ -1,8 +1,8 @@ import * as R from 'ramda' import React, { useState } from 'react' +import Modal from 'src/components/Modal' import * as Yup from 'yup' -import Modal from 'src/components/Modal' import schema from 'src/pages/Services/schemas' import { toNamespace } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Wallet/WizardSplash.js b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wallet/WizardSplash.js rename to new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx index 0506978c..b33e9abd 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardSplash.js +++ b/new-lamassu-admin/src/pages/Wallet/WizardSplash.jsx @@ -1,5 +1,6 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H1, P } from 'src/components/typography' import BitcoinLogo from 'src/styling/logos/icon-bitcoin-colour.svg?react' import BitcoinCashLogo from 'src/styling/logos/icon-bitcoincash-colour.svg?react' import DashLogo from 'src/styling/logos/icon-dash-colour.svg?react' @@ -11,7 +12,6 @@ import TronLogo from 'src/styling/logos/icon-tron-colour.svg?react' import ZCashLogo from 'src/styling/logos/icon-zcash-colour.svg?react' import { Button } from 'src/components/buttons' -import { H1, P } from 'src/components/typography' const styles = { logo: { diff --git a/new-lamassu-admin/src/pages/Wallet/WizardStep.js b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wallet/WizardStep.js rename to new-lamassu-admin/src/pages/Wallet/WizardStep.jsx index 54d60429..861451ca 100644 --- a/new-lamassu-admin/src/pages/Wallet/WizardStep.js +++ b/new-lamassu-admin/src/pages/Wallet/WizardStep.jsx @@ -3,14 +3,14 @@ import classnames from 'classnames' import { Formik, Form, Field } from 'formik' import * as R from 'ramda' import React, { useReducer, useEffect } from 'react' - import ErrorMessage from 'src/components/ErrorMessage' import Stepper from 'src/components/Stepper' +import { H4, Info2 } from 'src/components/typography' +import FormRenderer from 'src/pages/Services/FormRenderer' + import { Button } from 'src/components/buttons' import { RadioGroup, Autocomplete } from 'src/components/inputs' import { NumberInput } from 'src/components/inputs/formik' -import { H4, Info2 } from 'src/components/typography' -import FormRenderer from 'src/pages/Services/FormRenderer' import schema from 'src/pages/Services/schemas' import { startCase } from 'src/utils/string' diff --git a/new-lamassu-admin/src/pages/Wallet/helper.js b/new-lamassu-admin/src/pages/Wallet/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wallet/helper.js rename to new-lamassu-admin/src/pages/Wallet/helper.jsx diff --git a/new-lamassu-admin/src/pages/Wizard/Wizard.js b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/Wizard.js rename to new-lamassu-admin/src/pages/Wizard/Wizard.jsx index b9ee1bb6..a5134b84 100644 --- a/new-lamassu-admin/src/pages/Wizard/Wizard.js +++ b/new-lamassu-admin/src/pages/Wizard/Wizard.jsx @@ -4,9 +4,9 @@ import classnames from 'classnames' import gql from 'graphql-tag' import React, { useState, useContext } from 'react' import { useHistory } from 'react-router-dom' +import { getWizardStep, STEPS } from 'src/pages/Wizard/helper' import AppContext from 'src/AppContext' -import { getWizardStep, STEPS } from 'src/pages/Wizard/helper' import { backgroundColor } from 'src/styling/variables' import Footer from './components/Footer' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Commissions.js b/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Commissions.js rename to new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx index ac3f184f..998393e5 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Commissions.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Commissions.jsx @@ -3,12 +3,12 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' - -import { Table as EditableTable } from 'src/components/editableTable' import Section from 'src/components/layout/Section' import TitleSection from 'src/components/layout/TitleSection' -import styles from 'src/pages/AddMachine/styles' import { mainFields, defaults, getSchema } from 'src/pages/Commissions/helper' + +import { Table as EditableTable } from 'src/components/editableTable' +import styles from 'src/pages/AddMachine/styles' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' const useStyles = makeStyles(styles) diff --git a/new-lamassu-admin/src/pages/Wizard/components/Footer.js b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Footer.js rename to new-lamassu-admin/src/pages/Wizard/components/Footer.jsx index dd8848f7..41a88813 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Footer.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Footer.jsx @@ -1,11 +1,11 @@ import { makeStyles, Drawer, Grid } from '@material-ui/core' import classnames from 'classnames' import React, { useState } from 'react' - import Modal from 'src/components/Modal' import Stepper from 'src/components/Stepper' -import { Button, Link } from 'src/components/buttons' import { P, H2, Info2 } from 'src/components/typography' + +import { Button, Link } from 'src/components/buttons' import { spacer } from 'src/styling/variables' const useStyles = makeStyles(() => ({ diff --git a/new-lamassu-admin/src/pages/Wizard/components/Locales.js b/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Locales.js rename to new-lamassu-admin/src/pages/Wizard/components/Locales.jsx index f95018c1..0a0e5b5f 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Locales.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Locales.jsx @@ -3,10 +3,10 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React from 'react' - -import { Table as EditableTable } from 'src/components/editableTable' import Section from 'src/components/layout/Section' import TitleSection from 'src/components/layout/TitleSection' + +import { Table as EditableTable } from 'src/components/editableTable' import styles from 'src/pages/AddMachine/styles' import { mainFields, diff --git a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.js b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Mailgun.js rename to new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx index 6da67a8a..c7ae849a 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Mailgun.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Mailgun.jsx @@ -2,14 +2,14 @@ import { useMutation, useQuery } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import React, { useState, useEffect } from 'react' +import { H4, Info3 } from 'src/components/typography' +import FormRenderer from 'src/pages/Services/FormRenderer' import InverseLinkIcon from 'src/styling/icons/action/external link/white.svg?react' import LinkIcon from 'src/styling/icons/action/external link/zodiac.svg?react' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' import { ActionButton } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import { H4, Info3 } from 'src/components/typography' -import FormRenderer from 'src/pages/Services/FormRenderer' import schema from 'src/pages/Services/schemas' import styles from 'src/pages/Wizard/Radio.styles' import { fromNamespace, toNamespace, namespaces } from 'src/utils/config' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Notifications.js b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Notifications.js rename to new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx index 1d9f5641..7454fd21 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Notifications.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Notifications.jsx @@ -1,11 +1,11 @@ import { makeStyles } from '@material-ui/core' import Grid from '@material-ui/core/Grid' import React, { useState } from 'react' - import Sidebar from 'src/components/layout/Sidebar' import TitleSection from 'src/components/layout/TitleSection' -import addMachineStyles from 'src/pages/AddMachine/styles' import Notifications from 'src/pages/Notifications/Notifications' + +import addMachineStyles from 'src/pages/AddMachine/styles' import { namespaces } from 'src/utils/config' import Mailgun from './Mailgun' diff --git a/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.js b/new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.js rename to new-lamassu-admin/src/pages/Wizard/components/OperatorInfo.jsx diff --git a/new-lamassu-admin/src/pages/Wizard/components/Twilio.js b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Twilio.js rename to new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx index e553290c..7107b726 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Twilio.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Twilio.jsx @@ -3,13 +3,13 @@ import { makeStyles, Box } from '@material-ui/core' import classnames from 'classnames' import gql from 'graphql-tag' import React, { useState } from 'react' - import InfoMessage from 'src/components/InfoMessage' import { HelpTooltip } from 'src/components/Tooltip' -import { Button, SupportLinkButton } from 'src/components/buttons' -import { RadioGroup } from 'src/components/inputs' import { H1, H4, P } from 'src/components/typography' import FormRenderer from 'src/pages/Services/FormRenderer' + +import { Button, SupportLinkButton } from 'src/components/buttons' +import { RadioGroup } from 'src/components/inputs' import twilio from 'src/pages/Services/schemas/twilio' import styles from './Wallet/Shared.styles' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx index 911762c8..64c58dbb 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/AllSet.jsx @@ -3,11 +3,11 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { P, H4 } from 'src/components/typography' +import { getElements, WalletSchema } from 'src/pages/Wallet/helper' import { Button } from 'src/components/buttons' import { NamespacedTable as EditableTable } from 'src/components/editableTable' -import { P, H4 } from 'src/components/typography' -import { getElements, WalletSchema } from 'src/pages/Wallet/helper' import { toNamespace, namespaces } from 'src/utils/config' import styles from './Shared.styles' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx index 16cf8fa9..74536e7a 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Blockcypher.jsx @@ -2,11 +2,11 @@ import { useMutation, useQuery } from '@apollo/react-hooks' import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import React, { useState } from 'react' +import { P, H4 } from 'src/components/typography' +import FormRenderer from 'src/pages/Services/FormRenderer' import { SupportLinkButton, Button } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import { P, H4 } from 'src/components/typography' -import FormRenderer from 'src/pages/Services/FormRenderer' import schema from 'src/pages/Services/schemas' import styles from './Shared.styles' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx index 734c9a95..6e3a1ca3 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseCoin.jsx @@ -3,12 +3,12 @@ import { makeStyles } from '@material-ui/core' import { Formik, Form, Field } from 'formik' import gql from 'graphql-tag' import React, { useState } from 'react' +import PromptWhenDirty from 'src/components/PromptWhenDirty' +import { H4 } from 'src/components/typography' import * as Yup from 'yup' -import PromptWhenDirty from 'src/components/PromptWhenDirty' import { Button } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs/formik' -import { H4 } from 'src/components/typography' import styles from './Shared.styles' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx index 112b722f..3167c12e 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseExchange.jsx @@ -4,12 +4,12 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { H4, Info3 } from 'src/components/typography' +import FormRenderer from 'src/pages/Services/FormRenderer' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' import { Button, SupportLinkButton } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import { H4, Info3 } from 'src/components/typography' -import FormRenderer from 'src/pages/Services/FormRenderer' import schema from 'src/pages/Services/schemas' import styles from './Shared.styles' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx index 1dc528f3..15d51d7e 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseTicker.jsx @@ -4,10 +4,10 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { H4 } from 'src/components/typography' import { Button } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import { H4 } from 'src/components/typography' import styles from './Shared.styles' import { getItems } from './getItems' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx index 2c5122e9..c23844e2 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/ChooseWallet.jsx @@ -3,12 +3,12 @@ import { makeStyles } from '@material-ui/core' import gql from 'graphql-tag' import * as R from 'ramda' import React, { useState } from 'react' +import { H4, Info3 } from 'src/components/typography' +import FormRenderer from 'src/pages/Services/FormRenderer' import WarningIcon from 'src/styling/icons/warning-icon/comet.svg?react' import { Button, SupportLinkButton } from 'src/components/buttons' import { RadioGroup } from 'src/components/inputs' -import { H4, Info3 } from 'src/components/typography' -import FormRenderer from 'src/pages/Services/FormRenderer' import schema from 'src/pages/Services/schemas' import bitgo from 'src/pages/Services/schemas/singlebitgo' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.js b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.js rename to new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx index 0a9c77af..b55ecf15 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Wallet/Wallet.jsx @@ -1,9 +1,9 @@ import { makeStyles } from '@material-ui/core' import * as R from 'ramda' import React, { useState } from 'react' - import Sidebar, { Stepper } from 'src/components/layout/Sidebar' import TitleSection from 'src/components/layout/TitleSection' + import styles from 'src/pages/AddMachine/styles' import AllSet from './AllSet' diff --git a/new-lamassu-admin/src/pages/Wizard/components/Welcome.js b/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/components/Welcome.js rename to new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx index 004aa08f..ebe87a41 100644 --- a/new-lamassu-admin/src/pages/Wizard/components/Welcome.js +++ b/new-lamassu-admin/src/pages/Wizard/components/Welcome.jsx @@ -1,8 +1,8 @@ import { makeStyles } from '@material-ui/core' import React from 'react' +import { H1, P } from 'src/components/typography' import { Button } from 'src/components/buttons' -import { H1, P } from 'src/components/typography' import { comet } from 'src/styling/variables' const styles = { diff --git a/new-lamassu-admin/src/pages/Wizard/helper.js b/new-lamassu-admin/src/pages/Wizard/helper.jsx similarity index 100% rename from new-lamassu-admin/src/pages/Wizard/helper.js rename to new-lamassu-admin/src/pages/Wizard/helper.jsx index d5809259..193caf12 100644 --- a/new-lamassu-admin/src/pages/Wizard/helper.js +++ b/new-lamassu-admin/src/pages/Wizard/helper.jsx @@ -1,9 +1,9 @@ import * as R from 'ramda' import React from 'react' - import { getSchema as CommissionsSchema } from 'src/pages/Commissions/helper' -import { LocaleSchema } from 'src/pages/Locales/helper' import { WalletSchema } from 'src/pages/Wallet/helper' + +import { LocaleSchema } from 'src/pages/Locales/helper' import { fromNamespace, namespaces } from 'src/utils/config' import Commissions from './components/Commissions' diff --git a/new-lamassu-admin/src/routing/PrivateRoute.js b/new-lamassu-admin/src/routing/PrivateRoute.jsx similarity index 100% rename from new-lamassu-admin/src/routing/PrivateRoute.js rename to new-lamassu-admin/src/routing/PrivateRoute.jsx diff --git a/new-lamassu-admin/src/routing/PublicRoute.js b/new-lamassu-admin/src/routing/PublicRoute.jsx similarity index 100% rename from new-lamassu-admin/src/routing/PublicRoute.js rename to new-lamassu-admin/src/routing/PublicRoute.jsx diff --git a/new-lamassu-admin/src/routing/lamassu.routes.js b/new-lamassu-admin/src/routing/lamassu.routes.jsx similarity index 100% rename from new-lamassu-admin/src/routing/lamassu.routes.js rename to new-lamassu-admin/src/routing/lamassu.routes.jsx index 1e037856..aed875c0 100644 --- a/new-lamassu-admin/src/routing/lamassu.routes.js +++ b/new-lamassu-admin/src/routing/lamassu.routes.jsx @@ -1,13 +1,6 @@ import React from 'react' import { Redirect } from 'react-router-dom' - -import Analytics from 'src/pages/Analytics' -import Blacklist from 'src/pages/Blacklist' -import Cashout from 'src/pages/Cashout' -import Commissions from 'src/pages/Commissions' -import { Customers, CustomerProfile } from 'src/pages/Customers' import Funding from 'src/pages/Funding' -import Locales from 'src/pages/Locales' import IndividualDiscounts from 'src/pages/LoyaltyPanel/IndividualDiscounts' import PromoCodes from 'src/pages/LoyaltyPanel/PromoCodes' import MachineLogs from 'src/pages/MachineLogs' @@ -24,9 +17,16 @@ import ServerLogs from 'src/pages/ServerLogs' import Services from 'src/pages/Services/Services' import SessionManagement from 'src/pages/SessionManagement/SessionManagement' import Transactions from 'src/pages/Transactions/Transactions' -import Triggers from 'src/pages/Triggers' import UserManagement from 'src/pages/UserManagement/UserManagement' import WalletSettings from 'src/pages/Wallet/Wallet' + +import Analytics from 'src/pages/Analytics' +import Blacklist from 'src/pages/Blacklist' +import Cashout from 'src/pages/Cashout' +import Commissions from 'src/pages/Commissions' +import { Customers, CustomerProfile } from 'src/pages/Customers' +import Locales from 'src/pages/Locales' +import Triggers from 'src/pages/Triggers' import { namespaces } from 'src/utils/config' import { ROLES } from './utils' diff --git a/new-lamassu-admin/src/routing/routes.js b/new-lamassu-admin/src/routing/routes.jsx similarity index 100% rename from new-lamassu-admin/src/routing/routes.js rename to new-lamassu-admin/src/routing/routes.jsx index 811777aa..33b13699 100644 --- a/new-lamassu-admin/src/routing/routes.js +++ b/new-lamassu-admin/src/routing/routes.jsx @@ -10,12 +10,12 @@ import { useHistory, useLocation } from 'react-router-dom' - -import AppContext from 'src/AppContext' import Login from 'src/pages/Authentication/Login' import Register from 'src/pages/Authentication/Register' import Reset2FA from 'src/pages/Authentication/Reset2FA' import ResetPassword from 'src/pages/Authentication/ResetPassword' + +import AppContext from 'src/AppContext' import Dashboard from 'src/pages/Dashboard' import Machines from 'src/pages/Machines' import Wizard from 'src/pages/Wizard' diff --git a/new-lamassu-admin/src/utils/apollo.js b/new-lamassu-admin/src/utils/apollo.jsx similarity index 100% rename from new-lamassu-admin/src/utils/apollo.js rename to new-lamassu-admin/src/utils/apollo.jsx diff --git a/new-lamassu-admin/vite.config.js b/new-lamassu-admin/vite.config.js index 8ea8f1fb..9af0936d 100644 --- a/new-lamassu-admin/vite.config.js +++ b/new-lamassu-admin/vite.config.js @@ -19,28 +19,12 @@ export default defineConfig({ }, optimizeDeps: { esbuildOptions: { - loader: { - '.js': 'jsx', - }, plugins: [ fixReactVirtualized, ], } }, plugins: [ - { - name: 'treat-js-files-as-jsx', - async transform (code, id) { - if (!id.match(/src\/.*\.js$/)) return null - - // Use the exposed transform from vite, instead of directly - // transforming with esbuild - return transformWithEsbuild(code, id, { - loader: 'jsx', - jsx: 'automatic', - }) - }, - }, react(), svgr(), ],