From d70b473abafbdb44a5b3e391d99e09b92fec2ac3 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Fri, 18 Sep 2020 00:15:14 -0700 Subject: [PATCH] Some minor cleanup Mostly moving imports to absolute paths --- src/components/Header/Header.tsx | 10 +++++----- src/components/LoginModal/LoginModal.tsx | 2 +- src/components/Overlay/Overlay.tsx | 2 +- src/components/SearchModal/SearchModal.tsx | 8 ++++---- src/components/SignupModal/SignupModal.tsx | 6 +++--- src/components/UnauthMenu/UnauthMenu.tsx | 8 ++++---- src/components/WeaponGrid/WeaponGrid.tsx | 4 ++-- .../WeaponGridMainhand/WeaponGridMainhand.tsx | 9 +++++---- src/components/WeaponGridUnit/WeaponGridUnit.tsx | 9 +++++---- src/components/WeaponLabelIcon/WeaponLabelIcon.tsx | 3 ++- src/components/WeaponResult/WeaponResult.tsx | 9 ++++----- 11 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index c3f11813..9925164a 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -1,13 +1,13 @@ -import React, { useRef, useState } from 'react' +import React from 'react' import { Link } from 'react-router-dom' +import Button from 'components/Button/Button' +import UnauthMenu from 'components/UnauthMenu/UnauthMenu' + import './Header.css' -import Button from '../Button/Button' -import UnauthMenu from '../UnauthMenu/UnauthMenu' - class Header extends React.Component { - constructor(props) { + constructor(props: any) { super(props) this.copyToClipboard = this.copyToClipboard.bind(this) } diff --git a/src/components/LoginModal/LoginModal.tsx b/src/components/LoginModal/LoginModal.tsx index 4c2e1955..a182cdec 100644 --- a/src/components/LoginModal/LoginModal.tsx +++ b/src/components/LoginModal/LoginModal.tsx @@ -4,7 +4,7 @@ import Portal from '../../Portal' import Modal from '../Modal/Modal' import Overlay from '../Overlay/Overlay' -const LoginModal = ({ close }) => { +const LoginModal = (close: () => null ) => { return (
diff --git a/src/components/Overlay/Overlay.tsx b/src/components/Overlay/Overlay.tsx index 18f7e0e8..a63021ce 100644 --- a/src/components/Overlay/Overlay.tsx +++ b/src/components/Overlay/Overlay.tsx @@ -1,7 +1,7 @@ import React from 'react' import './Overlay.css' -const Overlay = ({ onClick }) => ( +const Overlay = (onClick: OnClickEvent) => (
) diff --git a/src/components/SearchModal/SearchModal.tsx b/src/components/SearchModal/SearchModal.tsx index 26874132..f7125082 100644 --- a/src/components/SearchModal/SearchModal.tsx +++ b/src/components/SearchModal/SearchModal.tsx @@ -1,9 +1,9 @@ import React from 'react' -import Portal from '../../Portal' +import Portal from 'Portal' -import Modal from '../Modal/Modal' -import Overlay from '../Overlay/Overlay' -import WeaponResult from '../WeaponResult/WeaponResult' +import Modal from 'components/Modal/Modal' +import Overlay from 'components/Overlay/Overlay' +import WeaponResult from 'components/WeaponResult/WeaponResult' import './SearchModal.css' diff --git a/src/components/SignupModal/SignupModal.tsx b/src/components/SignupModal/SignupModal.tsx index aba50542..fb2e14b3 100644 --- a/src/components/SignupModal/SignupModal.tsx +++ b/src/components/SignupModal/SignupModal.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Portal from '../../Portal' +import Portal from 'Portal' -import Modal from '../Modal/Modal' -import Overlay from '../Overlay/Overlay' +import Modal from 'components/Modal/Modal' +import Overlay from 'components/Overlay/Overlay' const SignupModal = ({ close }) => { return ( diff --git a/src/components/UnauthMenu/UnauthMenu.tsx b/src/components/UnauthMenu/UnauthMenu.tsx index 3f67d14b..6c531009 100644 --- a/src/components/UnauthMenu/UnauthMenu.tsx +++ b/src/components/UnauthMenu/UnauthMenu.tsx @@ -1,11 +1,11 @@ import React from 'react' import './UnauthMenu.css' -import LoginModal from '../LoginModal/LoginModal' -import SignupModal from '../SignupModal/SignupModal' +import LoginModal from 'components/LoginModal/LoginModal' +import SignupModal from 'components/SignupModal/SignupModal' -import { useModal as useSignupModal } from '../../useModal' -import { useModal as useLoginModal } from '../../useModal' +import { useModal as useSignupModal } from 'useModal' +import { useModal as useLoginModal } from 'useModal' function UnauthMenu() { const { open: signupOpen, openModal: openSignupModal, closeModal: closeSignupModal } = useSignupModal() diff --git a/src/components/WeaponGrid/WeaponGrid.tsx b/src/components/WeaponGrid/WeaponGrid.tsx index 136d7f27..313fa4bd 100644 --- a/src/components/WeaponGrid/WeaponGrid.tsx +++ b/src/components/WeaponGrid/WeaponGrid.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useState } from 'react' import { withRouter } from 'react-router' -import WeaponGridMainhand from '../WeaponGridMainhand/WeaponGridMainhand' -import WeaponGridUnit from '../WeaponGridUnit/WeaponGridUnit' +import WeaponGridMainhand from 'components/WeaponGridMainhand/WeaponGridMainhand' +import WeaponGridUnit from 'components/WeaponGridUnit/WeaponGridUnit' import './WeaponGrid.css' diff --git a/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx index fb2a4b1c..01b5b5bd 100644 --- a/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx +++ b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx @@ -1,10 +1,11 @@ import React, { useEffect } from 'react' -import SearchModal from '../SearchModal/SearchModal' -import { useModal as useModal } from '../../useModal' +import SearchModal from 'components/SearchModal/SearchModal' +import { useModal as useModal } from 'useModal' + +import mainhandImages from 'images/mainhand/*.jpg' +import Plus from '../../../assets/plus.svg' import './WeaponGridMainhand.css' -import mainhandImages from '../../images/mainhand/*.jpg' -import Plus from '../../../assets/plus.svg' function WeaponGridMainhand(props: WeaponGridProps) { const { open, openModal, closeModal } = useModal() diff --git a/src/components/WeaponGridUnit/WeaponGridUnit.tsx b/src/components/WeaponGridUnit/WeaponGridUnit.tsx index 968e6735..19348e50 100644 --- a/src/components/WeaponGridUnit/WeaponGridUnit.tsx +++ b/src/components/WeaponGridUnit/WeaponGridUnit.tsx @@ -1,10 +1,11 @@ import React from 'react' -import SearchModal from '../SearchModal/SearchModal' -import { useModal as useModal } from '../../useModal' +import SearchModal from 'components/SearchModal/SearchModal' +import { useModal as useModal } from 'useModal' + +import gridImages from 'images/grid/*.jpg' +import Plus from '../../../assets/plus.svg' import './WeaponGridUnit.css' -import gridImages from '../../images/grid/*.jpg' -import Plus from '../../../assets/plus.svg' function WeaponGridUnit(props: WeaponGridProps) { const { open, openModal, closeModal } = useModal() diff --git a/src/components/WeaponLabelIcon/WeaponLabelIcon.tsx b/src/components/WeaponLabelIcon/WeaponLabelIcon.tsx index 6df5e4ef..a8ac86bd 100644 --- a/src/components/WeaponLabelIcon/WeaponLabelIcon.tsx +++ b/src/components/WeaponLabelIcon/WeaponLabelIcon.tsx @@ -1,4 +1,5 @@ import React from 'react' + import './WeaponLabelIcon.css' interface Props { @@ -13,4 +14,4 @@ class WeaponLabelIcon extends React.Component { } } -export default WeaponLabelIcon \ No newline at end of file +export default WeaponLabelIcon diff --git a/src/components/WeaponResult/WeaponResult.tsx b/src/components/WeaponResult/WeaponResult.tsx index 4c9c2f88..58fe00e3 100644 --- a/src/components/WeaponResult/WeaponResult.tsx +++ b/src/components/WeaponResult/WeaponResult.tsx @@ -1,11 +1,10 @@ import React from 'react' +import WeaponLabelIcon from 'components/WeaponLabelIcon/WeaponLabelIcon' + +import gridImages from 'images/grid/*.jpg' + import './WeaponResult.css' -import '../WeaponLabelIcon/WeaponLabelIcon' -import WeaponLabelIcon from '../WeaponLabelIcon/WeaponLabelIcon' - -import gridImages from '../../images/grid/*.jpg' - interface Props { data: Weapon onClick: () => void