Merge f8c1c8e into a40d701

actuallyReallyAlex · Aug 24, 2019 · d70bed8 · d70bed8
2 parents a40d701 + f8c1c8e
commit d70bed8
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 79 deletions.
diff --git a/src/__tests__/__snapshots__/App.test.js.snap b/src/__tests__/__snapshots__/App.test.js.snap
@@ -57,7 +57,7 @@ exports[`<App /> Should render the <App /> component. 1`] = `
         <span
           class="StyledText-sc-1sadyjn-0 bnqisW"
         >
-          Space
+          Volume
         </span>
         <div
           class="StyledBox__StyledBoxGap-sc-13pk1d4-1 iChEkS"

diff --git a/src/__tests__/components/ItemDisplayInput.test.js b/src/__tests__/components/ItemDisplayInput.test.js
@@ -3,15 +3,15 @@ import { fireEvent } from '@testing-library/react'
 import ItemDisplayInput from '../../components/ItemDisplayInput'
 
 const item = {
-  name: 'Test Item',
-  space: 1,
-  value: 1,
-  id: '0',
   destination: {
     name: 'Test Planet 2',
     value: 50
   },
-  quantity: 10
+  id: '0',
+  name: 'Test Item',
+  quantity: 10,
+  value: 1,
+  volume: 1
 }
 
 describe('<ItemDisplayInput />', () => {

diff --git a/src/__tests__/views/__snapshots__/planets.js.snap b/src/__tests__/views/__snapshots__/planets.js.snap
@@ -43,7 +43,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -133,7 +133,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -223,7 +223,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -313,7 +313,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -403,7 +403,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -528,7 +528,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -577,7 +577,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -626,7 +626,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -675,7 +675,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -724,7 +724,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -808,7 +808,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -857,7 +857,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -906,7 +906,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -955,7 +955,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div
@@ -1004,7 +1004,7 @@ exports[`<PlanetsView /> Should render the <PlanetsView /> component. 1`] = `
           <span
             class="StyledText-sc-1sadyjn-0 fWSbXS"
           >
-            Space: 1
+            Volume: 1
           </span>
         </div>
         <div

diff --git a/src/__tests__/views/planets.js b/src/__tests__/views/planets.js
@@ -11,15 +11,15 @@ const customState = {
     cargo: {
       items: [
         {
-          name: 'Test Item',
-          space: 1,
-          quantity: 1,
-          value: 1,
-          id: '0',
           destination: {
             name: 'Test Planet 2',
             value: 50
-          }
+          },
+          id: '0',
+          name: 'Test Item',
+          quantity: 1,
+          value: 1,
+          volume: 1
         }
       ],
       volumeRemaining: 4

diff --git a/src/__tests__/views/ship.js b/src/__tests__/views/ship.js
@@ -10,15 +10,15 @@ const customState = {
     cargo: {
       items: [
         {
-          name: 'Test Item',
-          space: 1,
-          value: 1,
-          id: '0',
-          quantity: 1,
           destination: {
             name: 'Test Planet 2',
             value: 50
-          }
+          },
+          id: '0',
+          name: 'Test Item',
+          quantity: 1,
+          volume: 1,
+          value: 1
         }
       ],
       volumeRemaining: 4

diff --git a/src/components/ContractsDisplay.js b/src/components/ContractsDisplay.js
@@ -11,8 +11,8 @@ const ContractsDisplay = ({ contracts }) => {
         <Box direction="row" key={contract.id} gap="small">
           <Text weight="bold">Item Type</Text>
           <Text>{contract.itemType}</Text>
-          <Text weight="bold">Space</Text>
-          <Text>{contract.space}</Text>
+          <Text weight="bold">Volume</Text>
+          <Text>{contract.volume}</Text>
           <Text weight="bold">Value</Text>
           <Text>{contract.value}</Text>
         </Box>

diff --git a/src/components/ItemDisplay.js b/src/components/ItemDisplay.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux'
 import ItemDisplayInput from './ItemDisplayInput'
 
 const ItemDisplay = ({ item, location, shipLocationValue }) => {
-  const { destination, id, name, quantity, space, value } = item
+  const { destination, id, name, quantity, volume, value } = item
 
   return (
     <Box
@@ -23,7 +23,7 @@ const ItemDisplay = ({ item, location, shipLocationValue }) => {
         <Text>Quantity: {quantity}</Text>
       </Box>
       <Box pad="medium">
-        <Text>Space: {space}</Text>
+        <Text>Volume: {volume}</Text>
       </Box>
       <Box pad="medium">
         <Text>Value: {value}</Text>

diff --git a/src/constants.js b/src/constants.js
@@ -8,62 +8,62 @@ export const views = {
 
 const spaceJunk = {
   name: 'Space Junk',
-  space: 1,
-  value: 1
+  value: 1,
+  volume: 0.1
 }
 
 const ore = {
   name: 'Ore',
-  space: 1,
-  value: 2
+  value: 2,
+  volume: 1
 }
 
 const plasma = {
   name: 'Plasma',
-  space: 1,
-  value: 3
+  value: 3,
+  volume: 0.4
 }
 
 const antibiotics = {
   name: 'Antibiotics',
-  space: 1,
-  value: 2
+  value: 2,
+  volume: 0.1
 }
 
 const tobacco = {
   name: 'Tobacco',
-  space: 1,
-  value: 3
+  value: 3,
+  volume: 0.2
 }
 
 const soil = {
   name: 'Soil',
-  space: 2,
-  value: 1
+  volume: 2,
+  value: 0.5
 }
 
 const ammunition = {
   name: 'Ammunition',
-  space: 1,
-  value: 3
+  value: 3,
+  volume: 0.8
 }
 
 const glass = {
   name: 'Glass',
-  space: 1,
-  value: 1
+  value: 1,
+  volume: 1
 }
 
 const silver = {
   name: 'Silver',
-  space: 1,
-  value: 4
+  value: 4,
+  volume: 0.5
 }
 
 const gold = {
   name: 'Gold',
-  space: 1,
-  valu: 5
+  value: 5,
+  volume: 0.5
 }
 
 export const itemList = [
@@ -3804,7 +3804,7 @@ export const planets = [
   'Cicero',
   'Cichocki',
   'Ciconia',
-  'Cieletespace',
+  'Cieletevolume',
   'Cielobuio',
   'Cilek',
   'Cilla',
@@ -18330,8 +18330,8 @@ export const planets = [
   'Sova',
   'Soyounchoi',
   'Soyuz-Apollo',
-  'Spacesora',
-  'Spacewatch',
+  'volumesora',
+  'volumewatch',
   'Spadolini',
   'Spahr',
   'Spalatin',