From b98cbe9975bb8441e2546d1e2f6838efba98f8b3 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Fri, 18 Sep 2020 04:44:49 -0700
Subject: [PATCH] Updates to routes

* The shortcode will only be pulled from here
* Add an editable key to enable/disable editing the grid
* Fix type erros with props.match
---
 src/components/WeaponGrid/WeaponGrid.tsx      | 29 ++++++++++++++-----
 .../WeaponGridMainhand/WeaponGridMainhand.css |  2 +-
 .../WeaponGridMainhand/WeaponGridMainhand.tsx | 12 ++++++--
 .../WeaponGridUnit/WeaponGridUnit.css         |  2 +-
 .../WeaponGridUnit/WeaponGridUnit.tsx         | 12 ++++++--
 src/routes/New/New.tsx                        |  2 +-
 src/routes/Party/Party.tsx                    | 27 ++++++++++-------
 src/types/WeaponGridProps.d.ts                |  1 +
 8 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/components/WeaponGrid/WeaponGrid.tsx b/src/components/WeaponGrid/WeaponGrid.tsx
index 53ea1246..ee8ca6c1 100644
--- a/src/components/WeaponGrid/WeaponGrid.tsx
+++ b/src/components/WeaponGrid/WeaponGrid.tsx
@@ -14,9 +14,14 @@ interface GridWeapon {
     weapon: Weapon
 }
 
+interface Props {
+    shortcode: string
+    editable: boolean
+}
+
 type GridArray = { [key: number]: Weapon } 
 
-const WeaponGrid = (props: {}) => {
+const WeaponGrid = (props: Props) => {
     const [partyId, setPartyId] = useState<string>()
     const [shortcode, setShortcode] = useState<string>()
 
@@ -26,10 +31,8 @@ const WeaponGrid = (props: {}) => {
     const numWeapons: number = 9
 
     useEffect(() => {
-        const shortcode = props.match.params.hash
-
-        if (shortcode) {
-            fetchGrid(shortcode)
+        if (props.shortcode) {
+            fetchGrid(props.shortcode)
         } else {
             // There is no need to fetch a weapon
         }
@@ -141,12 +144,24 @@ const WeaponGrid = (props: {}) => {
 
     return (
         <div className="WeaponGrid">
-            <WeaponGridMainhand key="grid_mainhand" onReceiveData={receiveMainhand} position={0} weapon={mainhand} />
+            <WeaponGridMainhand 
+                editable={props.editable}
+                key="grid_mainhand" 
+                onReceiveData={receiveMainhand} 
+                position={0} 
+                weapon={mainhand}
+            />
 
             <ul id="grid_weapons">
                 {
                     Array.from(Array(numWeapons)).map((x, i) => {
-                        return <WeaponGridUnit key={`grid_unit_${i}`} onReceiveData={receiveWeapon} position={i} weapon={weapons[i]} />
+                        return <WeaponGridUnit 
+                            editable={props.editable}
+                            key={`grid_unit_${i}`} 
+                            onReceiveData={receiveWeapon} 
+                            position={i} 
+                            weapon={weapons[i]}
+                        />
                     })
                 }
             </ul>
diff --git a/src/components/WeaponGridMainhand/WeaponGridMainhand.css b/src/components/WeaponGridMainhand/WeaponGridMainhand.css
index bed958c8..a14187b8 100644
--- a/src/components/WeaponGridMainhand/WeaponGridMainhand.css
+++ b/src/components/WeaponGridMainhand/WeaponGridMainhand.css
@@ -12,7 +12,7 @@
     width: 200px;
 }
 
-.WeaponGridMainhand:hover {
+.WeaponGridMainhand.editable:hover {
     border: 1px solid rgba(0, 0, 0, 0.1);
     box-shadow: rgba(0, 0, 0, 0.14) 0px 0px 14px;
     cursor: pointer;
diff --git a/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx
index a5f1c1f4..1f042a90 100644
--- a/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx
+++ b/src/components/WeaponGridMainhand/WeaponGridMainhand.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect } from 'react'
+import classnames from 'classnames'
 import SearchModal from '~components/SearchModal/SearchModal'
 import { useModal as useModal } from '~utils/useModal'
 
@@ -20,11 +21,18 @@ function WeaponGridMainhand(props: WeaponGridProps) {
         imgSrc = mainhandImages[weapon.granblue_id]
     }
 
+    const openModalIfEditable = (props.editable) ? openModal : () => {}
+
+    const classes = classnames({
+        WeaponGridMainhand: true,
+        'editable': props.editable
+    })
+
     return (
         <div>
-            <div className="WeaponGridMainhand" onClick={openModal}>
+            <div className={classes} onClick={openModalIfEditable}>
                 <img className="grid_image" src={imgSrc} />
-                <span className='icon'><Plus /></span>
+                { (props.editable) ? <span className='icon'><Plus /></span> : '' }
             </div>
             {open ? (
                 <SearchModal 
diff --git a/src/components/WeaponGridUnit/WeaponGridUnit.css b/src/components/WeaponGridUnit/WeaponGridUnit.css
index b27063f9..5946b16d 100644
--- a/src/components/WeaponGridUnit/WeaponGridUnit.css
+++ b/src/components/WeaponGridUnit/WeaponGridUnit.css
@@ -13,7 +13,7 @@
     width: 160px;
 }
 
-.WeaponGridUnit:hover {
+.WeaponGridUnit.editable:hover {
     border: 1px solid rgba(0, 0, 0, 0.1);
     box-shadow: rgba(0, 0, 0, 0.14) 0px 0px 14px;
     cursor: pointer;
diff --git a/src/components/WeaponGridUnit/WeaponGridUnit.tsx b/src/components/WeaponGridUnit/WeaponGridUnit.tsx
index d46af19a..4c1b40e8 100644
--- a/src/components/WeaponGridUnit/WeaponGridUnit.tsx
+++ b/src/components/WeaponGridUnit/WeaponGridUnit.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import classnames from 'classnames'
 import SearchModal from '~components/SearchModal/SearchModal'
 import { useModal as useModal } from '~utils/useModal'
 
@@ -16,11 +17,18 @@ function WeaponGridUnit(props: WeaponGridProps) {
         imgSrc = gridImages[weapon.granblue_id]
     }
 
+    const openModalIfEditable = (props.editable) ? openModal : () => {}
+
+    const classes = classnames({
+        WeaponGridUnit: true,
+        'editable': props.editable
+    })
+
     return (
         <li>
-            <div className="WeaponGridUnit" onClick={openModal}>
+            <div className={classes} onClick={openModalIfEditable}>
                 <img className="grid_image" src={imgSrc} />
-                <span className='icon'><Plus /></span>
+                { (props.editable) ? <span className='icon'><Plus /></span> : '' }
             </div>
             {open ? (
                 <SearchModal 
diff --git a/src/routes/New/New.tsx b/src/routes/New/New.tsx
index 3472e15d..69454554 100644
--- a/src/routes/New/New.tsx
+++ b/src/routes/New/New.tsx
@@ -3,7 +3,7 @@ import SearchModal from '../../components/SearchModal/SearchModal'
 import WeaponGrid from '../../components/WeaponGrid/WeaponGrid'
 
 const New = () => (
-    <WeaponGrid key="weapon_grid"/>
+    <WeaponGrid key="weapon_grid" editable={true} />
 )
 
 export default New
\ No newline at end of file
diff --git a/src/routes/Party/Party.tsx b/src/routes/Party/Party.tsx
index 2c4551a6..2f52be9a 100644
--- a/src/routes/Party/Party.tsx
+++ b/src/routes/Party/Party.tsx
@@ -1,17 +1,24 @@
 import React from 'react'
-import { withRouter } from 'react-router'
+import { RouteComponentProps, withRouter } from 'react-router'
 
 import WeaponGrid from '../../components/WeaponGrid/WeaponGrid'
 
-class Party extends React.Component {
-    render() {
-        var hash = this.props.match.params.hash
-        return (
-            <div>
-                <WeaponGrid />
-            </div>
-        )
-    }
+interface RouterProps {
+    hash: string
+}
+
+interface PartyProps extends RouteComponentProps<RouterProps> {
+
+}
+
+const Party: React.FC<PartyProps> = ({ match }) => {
+    const shortcode = match.params.hash || ''
+
+    return (
+        <div>
+            <WeaponGrid shortcode={shortcode} editable={false} />
+        </div>
+    )
 }
 
 export default withRouter(Party)
\ No newline at end of file
diff --git a/src/types/WeaponGridProps.d.ts b/src/types/WeaponGridProps.d.ts
index 6c408df6..b38ed193 100644
--- a/src/types/WeaponGridProps.d.ts
+++ b/src/types/WeaponGridProps.d.ts
@@ -2,4 +2,5 @@ interface WeaponGridProps {
     onReceiveData: (Weapon, number) => void
     weapon: Weapon | undefined
     position: number
+    editable: boolean
 }
\ No newline at end of file