From e6dfb9dfd6c6797a152fea5a4233c8763b90df39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20F=C3=A9lix?= Date: Wed, 13 Nov 2019 10:54:24 +0000 Subject: [PATCH] fix: reorganize imports --- new-lamassu-admin/package-lock.json | 18 ++++++++---------- new-lamassu-admin/package.json | 1 - .../components/date-range-picker/Calendar.js | 5 ++++- .../date-range-picker/DateRangePicker.js | 4 ++-- .../src/components/date-range-picker/Tile.js | 1 + .../src/components/inputs/base/RadioGroup.js | 8 ++++++-- new-lamassu-admin/src/pages/ServerLogs.js | 4 ++-- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/new-lamassu-admin/package-lock.json b/new-lamassu-admin/package-lock.json index 1c9e6540..9807e7b0 100644 --- a/new-lamassu-admin/package-lock.json +++ b/new-lamassu-admin/package-lock.json @@ -8045,6 +8045,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dev": true, "requires": { "es5-ext": "^0.10.50", "type": "^1.0.1" @@ -8860,6 +8861,7 @@ "version": "0.10.51", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz", "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==", + "dev": true, "requires": { "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", @@ -8876,6 +8878,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, "requires": { "d": "1", "es5-ext": "^0.10.35", @@ -8892,6 +8895,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz", "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==", + "dev": true, "requires": { "d": "^1.0.1", "es5-ext": "^0.10.51" @@ -14707,14 +14711,6 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, - "moment-range": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/moment-range/-/moment-range-4.0.2.tgz", - "integrity": "sha512-n8sceWwSTjmz++nFHzeNEUsYtDqjgXgcOBzsHi+BoXQU2FW+eU92LUaK8gqOiSu5PG57Q9sYj1Fz4LRDj4FtKA==", - "requires": { - "es6-symbol": "^3.1.0" - } - }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -14824,7 +14820,8 @@ "next-tick": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true }, "nice-try": { "version": "1.0.5", @@ -21960,7 +21957,8 @@ "type": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", + "dev": true }, "type-check": { "version": "0.3.2", diff --git a/new-lamassu-admin/package.json b/new-lamassu-admin/package.json index a44911c9..813a6ba2 100644 --- a/new-lamassu-admin/package.json +++ b/new-lamassu-admin/package.json @@ -15,7 +15,6 @@ "jss-plugin-extend": "^10.0.0", "lodash": "4.17.15", "moment": "2.24.0", - "moment-range": "^4.0.2", "qrcode.react": "0.9.3", "react": "^16.10.2", "react-dom": "^16.10.2", diff --git a/new-lamassu-admin/src/components/date-range-picker/Calendar.js b/new-lamassu-admin/src/components/date-range-picker/Calendar.js index a71355d8..3d37b64c 100644 --- a/new-lamassu-admin/src/components/date-range-picker/Calendar.js +++ b/new-lamassu-admin/src/components/date-range-picker/Calendar.js @@ -2,10 +2,13 @@ import React, { useState } from 'react' import moment from 'moment' import { toInteger } from 'lodash/fp' import { makeStyles } from '@material-ui/core/styles' -import Tile from './Tile' + import { ReactComponent as Arrow } from '../../styling/icons/arrow/month_change.svg' import { primaryColor, zircon, fontSecondary } from '../../styling/variables' import typographyStyles from '../typography/styles' + +import Tile from './Tile' + const { label2 } = typographyStyles const styles = { diff --git a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js index a7eefda1..e8e03432 100644 --- a/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js +++ b/new-lamassu-admin/src/components/date-range-picker/DateRangePicker.js @@ -3,11 +3,11 @@ import classnames from 'classnames' import { makeStyles } from '@material-ui/core/styles' import Calendar from './Calendar' + import { ReactComponent as Arrow } from '../../styling/icons/arrow/download_logs.svg' - import { primaryColor, offColor, zircon } from '../../styling/variables' - import typographyStyles from '../typography/styles' + const { info1, label, label3 } = typographyStyles const dateContainerStyles = { diff --git a/new-lamassu-admin/src/components/date-range-picker/Tile.js b/new-lamassu-admin/src/components/date-range-picker/Tile.js index c0132a8b..1de62976 100644 --- a/new-lamassu-admin/src/components/date-range-picker/Tile.js +++ b/new-lamassu-admin/src/components/date-range-picker/Tile.js @@ -1,6 +1,7 @@ import React from 'react' import classnames from 'classnames' import { makeStyles } from '@material-ui/core/styles' + import { primaryColor, spring2, spring3, fontSecondary, disabledColor } from '../../styling/variables' const styles = { diff --git a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js b/new-lamassu-admin/src/components/inputs/base/RadioGroup.js index cbec62a3..ec5598c6 100644 --- a/new-lamassu-admin/src/components/inputs/base/RadioGroup.js +++ b/new-lamassu-admin/src/components/inputs/base/RadioGroup.js @@ -1,8 +1,12 @@ import React from 'react' import classnames from 'classnames' import { withStyles } from '@material-ui/styles' -import FormControlLabel from '@material-ui/core/FormControlLabel' -import { Radio as MaterialRadio, RadioGroup as MaterialRadioGroup } from '@material-ui/core' +import { + Radio as MaterialRadio, + RadioGroup as MaterialRadioGroup, + FormControlLabel +} from '@material-ui/core' + import { secondaryColor } from '../../../styling/variables' const GreenRadio = withStyles({ diff --git a/new-lamassu-admin/src/pages/ServerLogs.js b/new-lamassu-admin/src/pages/ServerLogs.js index 6f06d9ae..98ef6789 100644 --- a/new-lamassu-admin/src/pages/ServerLogs.js +++ b/new-lamassu-admin/src/pages/ServerLogs.js @@ -16,12 +16,12 @@ import DateRangePicker from '../components/date-range-picker/DateRangePicker' import Popover from '../components/Popover' import { ReactComponent as Download } from '../styling/icons/button/download/zodiac.svg' import { ReactComponent as DownloadActive } from '../styling/icons/button/download/white.svg' - import { primaryColor, comet } from '../styling/variables' +import typographyStyles from '../components/typography/styles' + import styles from './Logs.styles' import logPageHeaderStyles from './LogPageHeader.styles' -import typographyStyles from '../components/typography/styles' const { regularLabel, h4 } = typographyStyles const { tableWrapper } = styles const { titleAndButtonsContainer, buttonsWrapper } = logPageHeaderStyles