From 8f0f6399a75f19cac05270473bd746c931702233 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Fri, 18 Sep 2020 00:43:52 -0700 Subject: [PATCH] Fix cleanup I did it wrong --- jsconfig.json | 5 +++++ src/components/App/App.tsx | 4 ++-- src/components/Header/Header.tsx | 4 ++-- src/components/LoginModal/LoginModal.tsx | 6 +++--- src/{ => components}/Main/Main.tsx | 6 +++--- src/components/SearchModal/SearchModal.tsx | 8 ++++---- src/components/SignupModal/SignupModal.tsx | 6 +++--- src/components/UnauthMenu/UnauthMenu.tsx | 8 ++++---- src/components/WeaponGrid/WeaponGrid.tsx | 14 ++++++-------- .../WeaponGridMainhand/WeaponGridMainhand.tsx | 14 ++++++++++---- src/components/WeaponGridUnit/WeaponGridUnit.tsx | 8 ++++---- src/components/WeaponResult/WeaponResult.tsx | 4 ++-- src/index.tsx | 2 +- src/{ => utils}/Portal.tsx | 0 src/{ => utils}/useModal.ts | 0 15 files changed, 49 insertions(+), 40 deletions(-) create mode 100644 jsconfig.json rename src/{ => components}/Main/Main.tsx (82%) rename src/{ => utils}/Portal.tsx (100%) rename src/{ => utils}/useModal.ts (100%) diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 00000000..7e1baff4 --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,5 @@ +{ + "compilerOptions": { + "baseUrl": "src" + } +} \ No newline at end of file diff --git a/src/components/App/App.tsx b/src/components/App/App.tsx index 950251b1..b2f67034 100644 --- a/src/components/App/App.tsx +++ b/src/components/App/App.tsx @@ -1,8 +1,8 @@ import React from 'react' import './App.css' -import Header from 'components/Header/Header' -import Main from 'Main/Main' +import Header from '~components/Header/Header' +import Main from '~components/Main/Main' function App() { return ( diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 9925164a..aa49953d 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -1,8 +1,8 @@ import React from 'react' import { Link } from 'react-router-dom' -import Button from 'components/Button/Button' -import UnauthMenu from 'components/UnauthMenu/UnauthMenu' +import Button from '~components/Button/Button' +import UnauthMenu from '~components/UnauthMenu/UnauthMenu' import './Header.css' diff --git a/src/components/LoginModal/LoginModal.tsx b/src/components/LoginModal/LoginModal.tsx index a182cdec..2a4fd4e8 100644 --- a/src/components/LoginModal/LoginModal.tsx +++ b/src/components/LoginModal/LoginModal.tsx @@ -1,8 +1,8 @@ import React from 'react' -import Portal from '../../Portal' +import Portal from '~utils/Portal' -import Modal from '../Modal/Modal' -import Overlay from '../Overlay/Overlay' +import Modal from '~components/Modal/Modal' +import Overlay from '~components/Overlay/Overlay' const LoginModal = (close: () => null ) => { return ( diff --git a/src/Main/Main.tsx b/src/components/Main/Main.tsx similarity index 82% rename from src/Main/Main.tsx rename to src/components/Main/Main.tsx index 025d3f69..b769a6f1 100644 --- a/src/Main/Main.tsx +++ b/src/components/Main/Main.tsx @@ -1,9 +1,9 @@ import React from 'react' import { Switch, Route } from 'react-router-dom' -import New from '../routes/New/New' -import Party from '../routes/Party/Party' -import Parties from '../routes/Parties/Parties' +import New from '~routes/New/New' +import Party from '~routes/Party/Party' +import Parties from '~routes/Parties/Parties' // The Main component renders one of the three provided // Routes (provided that one matches). Both the /roster diff --git a/src/components/SearchModal/SearchModal.tsx b/src/components/SearchModal/SearchModal.tsx index f7125082..bf860f1c 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 '~utils/Portal' -import Modal from 'components/Modal/Modal' -import Overlay from 'components/Overlay/Overlay' -import WeaponResult from 'components/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 fb2e14b3..aa1a2c20 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 '~utils/Portal' -import Modal from 'components/Modal/Modal' -import Overlay from 'components/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 6c531009..bc1f9dec 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 'components/LoginModal/LoginModal' -import SignupModal from 'components/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 '~utils/useModal' +import { useModal as useLoginModal } from '~utils/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 313fa4bd..c0ba4315 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 'components/WeaponGridMainhand/WeaponGridMainhand' -import WeaponGridUnit from 'components/WeaponGridUnit/WeaponGridUnit' +import WeaponGridMainhand from '~components/WeaponGridMainhand/WeaponGridMainhand' +import WeaponGridUnit from '~components/WeaponGridUnit/WeaponGridUnit' import './WeaponGrid.css' @@ -15,8 +15,6 @@ interface GridWeapon { type GridArray = { [key: number]: Weapon } -const endpoint = process.env.SIERO_API ? process.env.SIERO_API : 'http://127.0.0.1:3000/api/v1' - const WeaponGrid = (props: null) => { const [partyId, setPartyId] = useState() const [shortcode, setShortcode] = useState() @@ -43,7 +41,7 @@ const WeaponGrid = (props: null) => { method: 'GET' } - return fetch(`${endpoint}/party/${shortcode}`, options) + return fetch(`http://127.0.0.1:3000/api/v1/party/${shortcode}`, options) .then(response => response.json()) .then(data => { const grid = data.party.grid @@ -120,7 +118,7 @@ const WeaponGrid = (props: null) => { method: 'POST' } - return fetch(`${endpoint}/api/v1/party`, options) + return fetch('http://127.0.0.1:3000/api/v1/party', options) .then(response => response.json()) } @@ -140,7 +138,7 @@ const WeaponGrid = (props: null) => { body: body } - fetch(`${endpoint}/api/v1/weapons`, options) + fetch('http://127.0.0.1:3000/api/v1/weapons', options) .then(data => { console.log(data) }) @@ -161,7 +159,7 @@ const WeaponGrid = (props: null) => { body: body } - fetch(`${endpoint}/api/v1/weapons`, options) + fetch('http://127.0.0.1:3000/api/v1/weapons', options) .then(data => { console.log(data) }) diff --git a/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx index 01b5b5bd..a5f1c1f4 100644 --- a/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx +++ b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react' -import SearchModal from 'components/SearchModal/SearchModal' -import { useModal as useModal } from 'useModal' +import SearchModal from '~components/SearchModal/SearchModal' +import { useModal as useModal } from '~utils/useModal' -import mainhandImages from 'images/mainhand/*.jpg' +import mainhandImages from '../../images/mainhand/*.jpg' import Plus from '../../../assets/plus.svg' import './WeaponGridMainhand.css' @@ -14,10 +14,16 @@ function WeaponGridMainhand(props: WeaponGridProps) { console.log('Mainhand weapon prop was updated.') }, [props.weapon]) + let imgSrc + if (props.weapon) { + const weapon = props.weapon! + imgSrc = mainhandImages[weapon.granblue_id] + } + return (
- +
{open ? ( diff --git a/src/components/WeaponGridUnit/WeaponGridUnit.tsx b/src/components/WeaponGridUnit/WeaponGridUnit.tsx index fededbb0..d46af19a 100644 --- a/src/components/WeaponGridUnit/WeaponGridUnit.tsx +++ b/src/components/WeaponGridUnit/WeaponGridUnit.tsx @@ -1,8 +1,8 @@ import React from 'react' -import SearchModal from 'components/SearchModal/SearchModal' -import { useModal as useModal } from 'useModal' +import SearchModal from '~components/SearchModal/SearchModal' +import { useModal as useModal } from '~utils/useModal' -import gridImages from 'images/grid/*.jpg' +import gridImages from '../../images/grid/*.jpg' import Plus from '../../../assets/plus.svg' import './WeaponGridUnit.css' @@ -10,7 +10,7 @@ import './WeaponGridUnit.css' function WeaponGridUnit(props: WeaponGridProps) { const { open, openModal, closeModal } = useModal() - let imgSrc = '' + let imgSrc if (props.weapon) { const weapon = props.weapon! imgSrc = gridImages[weapon.granblue_id] diff --git a/src/components/WeaponResult/WeaponResult.tsx b/src/components/WeaponResult/WeaponResult.tsx index 58fe00e3..65d097d9 100644 --- a/src/components/WeaponResult/WeaponResult.tsx +++ b/src/components/WeaponResult/WeaponResult.tsx @@ -1,7 +1,7 @@ import React from 'react' -import WeaponLabelIcon from 'components/WeaponLabelIcon/WeaponLabelIcon' +import WeaponLabelIcon from '~components/WeaponLabelIcon/WeaponLabelIcon' -import gridImages from 'images/grid/*.jpg' +import gridImages from '../../images/grid/*.jpg' import './WeaponResult.css' diff --git a/src/index.tsx b/src/index.tsx index ceed3ad7..9e117da6 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -2,7 +2,7 @@ import React from 'react' import ReactDOM from 'react-dom' import { BrowserRouter } from 'react-router-dom' -import App from 'components/App/App' +import App from './components/App/App' ReactDOM.render(( diff --git a/src/Portal.tsx b/src/utils/Portal.tsx similarity index 100% rename from src/Portal.tsx rename to src/utils/Portal.tsx diff --git a/src/useModal.ts b/src/utils/useModal.ts similarity index 100% rename from src/useModal.ts rename to src/utils/useModal.ts