From eb73ed02b052310ca1ba2cec7e595805cebd5c74 Mon Sep 17 00:00:00 2001
From: shams mosowi <shams.mosowi@gmail.com>
Date: Fri, 27 Sep 2019 17:37:26 +1000
Subject: [PATCH] csv

---
 package.json                                      | 4 ----
 src/components/{ExcelImport.tsx => ImportCSV.tsx} | 4 ++--
 src/components/Table/index.tsx                    | 2 ++
 src/views/TablesView.tsx                          | 3 ---
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename src/components/{ExcelImport.tsx => ImportCSV.tsx} (94%)

diff --git a/package.json b/package.json
index 2746855f..1a3819b1 100644
--- a/package.json
+++ b/package.json
@@ -20,11 +20,7 @@
     "@types/react-router-dom": "^4.3.5",
     "@types/react-sortable-hoc": "^0.6.5",
     "@types/react-virtualized": "^9.21.4",
-<<<<<<< HEAD
-    "@types/xlsx": "^0.0.36",
-=======
     "algoliasearch": "^3.34.0",
->>>>>>> 388c726eacf3bd64f948944e2771b63a8afddedc
     "array-move": "^2.1.0",
     "attr-accept": "^1.1.3",
     "convert-csv-to-json": "^0.0.15",
diff --git a/src/components/ExcelImport.tsx b/src/components/ImportCSV.tsx
similarity index 94%
rename from src/components/ExcelImport.tsx
rename to src/components/ImportCSV.tsx
index dcaf4081..36aa9aea 100644
--- a/src/components/ExcelImport.tsx
+++ b/src/components/ImportCSV.tsx
@@ -13,7 +13,7 @@ import {
 } from "@material-ui/core";
 
 // TODO: Create an interface for props
-export default function ImportExcel(props: any) {
+export default function ImportCSV(props: any) {
   const { classes, columnName, updateColumn } = props;
   const [open, setOpen] = React.useState(false);
   const onDrop = useCallback(async acceptedFiles => {
@@ -63,7 +63,7 @@ export default function ImportExcel(props: any) {
           <div {...getRootProps()}>
             <input {...getInputProps()} />
 
-            <p>Drag 'n' drop .xlsx here, or click to select file</p>
+            <p>Drag 'n' drop .csv here, or click to select file</p>
           </div>
         </DialogContent>
         <DialogActions>
diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index 90e2837e..d96e35dd 100644
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -18,6 +18,7 @@ import {
 } from "./grid-fns";
 
 import { CLOUD_FUNCTIONS } from "firebase/callables";
+import ImportCSV from "components/ImportCSV";
 const deleteAlgoliaRecord = functions.httpsCallable(
   CLOUD_FUNCTIONS.deleteAlgoliaRecord
 );
@@ -157,6 +158,7 @@ function Table(props: any) {
           }}
         />
         <Button onClick={tableActions.row.add}>Add Row</Button>
+        <ImportCSV />
         <ColumnEditor
           handleClose={handleCloseHeader}
           anchorEl={anchorEl}
diff --git a/src/views/TablesView.tsx b/src/views/TablesView.tsx
index 12405279..b14d1eaf 100644
--- a/src/views/TablesView.tsx
+++ b/src/views/TablesView.tsx
@@ -13,7 +13,6 @@ import {
 
 import useSettings from "../hooks/useSettings";
 import useRouter from "../hooks/useRouter";
-import ImportExcel from "components/ExcelImport";
 
 const useStyles = makeStyles(() =>
   createStyles({
@@ -70,8 +69,6 @@ const TablesView = (props: any) => {
             </Card>
           ))
         : "TODO: card skeleton"}
-
-      <ImportExcel />
     </Grid>
   );
 };