Merge pull request #272 from kleros/fix/remove-cors-proxy

Remove CORS proxy

Author: greenlucid

.env.example

@@ -23,13 +23,6 @@ REACT_APP_TX_BATCHER_ADDRESSES={"5":"0x394E870A068E9C623aC6Bc51d53cc4a040420e8e"
 REACT_APP_SUBGRAPH_URL={"1":"https://api.thegraph.com/subgraphs/name/kleros/curate","5":"https://api.thegraph.com/subgraphs/name/greenlucid/curate-goerli","42":"https://api.thegraph.com/subgraphs/name/eccentricexit/light-curate-kovan-ii","100":"https://api.thegraph.com/subgraphs/name/eccentricexit/curate-xdai-ii","421611":"https://api.thegraph.com/subgraphs/name/greenlucid/curate-arbitrum-rinkeby"}
 REACT_APP_REJECT_ALL_POLICY_URI="/ipfs/QmZ7RVU7re1g8nXDbAFMHV99pyie3dn4cY7Ga2X4h8mDpV/reject-all-policy.pdf"
 
-# Twitter client
-REACT_APP_BEARER_TOKEN=
-
-# CORS Proxy
-# Do not include / at the end.
-REACT_APP_CORS_PROXY_URL=https://curate-cors.herokuapp.com
-
 # All fields below this line are optional -------------
 
 REACT_APP_WALLETCONNECT_BRIDGE_URL=https://bridge.walletconnect.org

src/components/display-selector.js

@@ -3,7 +3,6 @@ import { Typography, Avatar, Checkbox } from 'antd'
 import styled from 'styled-components/macro'
 import PropTypes from 'prop-types'
 import GTCRAddress from './gtcr-address'
-import TwitterUser from './twitter-user'
 import { ItemTypes } from '@kleros/gtcr-encoder'
 import { ZERO_ADDRESS } from '../utils/string'
 import RichAddress from './rich-address'
@@ -68,8 +67,6 @@ const DisplaySelector = ({ type, value, linkImage, allowedFileTypes }) => {
           <Typography.Text>{value}</Typography.Text>
         </a>
       )
-    case ItemTypes.TWITTER_USER_ID:
-      return <TwitterUser userID={value} />
     default:
       return (
         <Typography.Paragraph>

src/components/input-selector.js

@@ -8,7 +8,6 @@ import { ItemTypes } from '@kleros/gtcr-encoder'
 import CustomInput from './custom-input.js'
 import ipfsPublish from '../utils/ipfs-publish.js'
 import { sanitize } from '../utils/string.js'
-import TwitterUserInput from './twitter-input.js'
 import AddressInput from './address-input.js'
 import RichAddressInput from './rich-address-input.js'
 
@@ -216,14 +215,6 @@ const InputSelector = ({
           </StyledUpload>
         </>
       )
-    case ItemTypes.TWITTER_USER_ID:
-      return (
-        <TwitterUserInput
-          name={name}
-          label={label}
-          setFieldValue={setFieldValue}
-        />
-      )
     default:
       throw new Error(`Unhandled input type ${type}`)
   }

src/components/item-card-content.js

@@ -32,8 +32,7 @@ const ItemCardContent = ({ item, chainId, tcrAddress }) => (
           col =>
             col.isIdentifier ||
             col.type === ItemTypes.IMAGE ||
-            col.type === ItemTypes.FILE ||
-            col.type === ItemTypes.TWITTER_USER_ID
+            col.type === ItemTypes.FILE
         )
         .map((column, j) => (
           <StyledItemCol key={j}>

src/components/light-item-card-content.js

@@ -32,8 +32,7 @@ const LightItemCardContent = ({ item, chainId, tcrAddress }) => (
           col =>
             col.isIdentifier ||
             col.type === ItemTypes.IMAGE ||
-            col.type === ItemTypes.FILE ||
-            col.type === ItemTypes.TWITTER_USER_ID
+            col.type === ItemTypes.FILE
         )
         .map((column, j) => (
           <StyledItemCol key={j}>

src/components/twitter-input.js

@@ -19,10 +19,13 @@ import * as yup from 'yup'
 import styled from 'styled-components/macro'
 import CustomInput from 'components/custom-input'
 import ItemDetailsCard from 'components/item-details-card'
-import { ItemTypes } from '@kleros/gtcr-encoder'
+import { ItemTypes as AllItemTypes } from '@kleros/gtcr-encoder'
 import { STATUS_CODE } from 'utils/item-status'
+import objectWithoutKey from 'utils/object-without-key'
 
-const { IMAGE, FILE, GTCR_ADDRESS, TWITTER_USER_ID, LONG_TEXT } = ItemTypes
+const ItemTypes = objectWithoutKey(AllItemTypes, 'TWITTER_USER_ID')
+
+const { IMAGE, FILE, GTCR_ADDRESS, LONG_TEXT } = ItemTypes
 
 const StyledAlert = styled(Alert)`
   margin-bottom: 42px;
@@ -220,8 +223,7 @@ const ItemParams = ({
                           columns[index].isIdentifier) &&
                         columns[index].type !== LONG_TEXT &&
                         columns[index].type !== IMAGE &&
-                        columns[index].type !== FILE &&
-                        columns[index].type !== TWITTER_USER_ID ? ( // Image, file, twitter user and long text cannot be identifiers.
+                        columns[index].type !== FILE ? ( // Image, file and long text cannot be identifiers.
                           <Col span={3}>
                             <Field name={`columns[${index}].isIdentifier`}>
                               {({ field }) => (

src/components/twitter-user.js

@@ -19,10 +19,13 @@ import * as yup from 'yup'
 import styled from 'styled-components/macro'
 import CustomInput from 'components/custom-input'
 import ItemDetailsCard from 'components/item-details-card'
-import { ItemTypes } from '@kleros/gtcr-encoder'
+import { ItemTypes as AllItemTypes } from '@kleros/gtcr-encoder'
 import { STATUS_CODE } from 'utils/item-status'
+import objectWithoutKey from 'utils/object-without-key'
 
-const { IMAGE, FILE, GTCR_ADDRESS, TWITTER_USER_ID, LONG_TEXT } = ItemTypes
+const ItemTypes = objectWithoutKey(AllItemTypes, 'TWITTER_USER_ID')
+
+const { IMAGE, FILE, GTCR_ADDRESS, LONG_TEXT } = AllItemTypes
 
 const StyledAlert = styled(Alert)`
   margin-bottom: 42px;
@@ -220,8 +223,7 @@ const ItemParams = ({
                           columns[index].isIdentifier) &&
                         columns[index].type !== LONG_TEXT &&
                         columns[index].type !== IMAGE &&
-                        columns[index].type !== FILE &&
-                        columns[index].type !== TWITTER_USER_ID ? ( // Image, file, twitter user and long text cannot be identifiers.
+                        columns[index].type !== FILE ? ( // Image, file and long text cannot be identifiers.
                           <Col span={3}>
                             <Field name={`columns[${index}].isIdentifier`}>
                               {({ field }) => (

src/pages/factory-classic/item-params.js

@@ -0,0 +1,9 @@
+// i don't want to have to import lodash just for this
+
+const objectWithoutKey = (object, key) => {
+  // eslint-disable-next-line no-unused-vars
+  const { [key]: nothing, ...otherKeys } = object
+  return otherKeys
+}
+
+export default objectWithoutKey