diff --git a/.gitignore b/.gitignore index ed06c31..4d29575 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,23 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. -# macOS Speific Files -.DS_Store +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage -# Editor specific files -*.code-workspace +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local -# Working Directory for Create React App testing -# /webqueue2-cra-test/* \ No newline at end of file +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/webqueue2-cra-test/Dev Environment Setup Guide.md b/Dev Environment Setup Guide.md similarity index 100% rename from webqueue2-cra-test/Dev Environment Setup Guide.md rename to Dev Environment Setup Guide.md diff --git a/webqueue2-cra-test/Dev Logs.md b/Dev Logs.md similarity index 100% rename from webqueue2-cra-test/Dev Logs.md rename to Dev Logs.md diff --git a/webqueue2-cra-test/LICENSE b/LICENSE similarity index 100% rename from webqueue2-cra-test/LICENSE rename to LICENSE diff --git a/webqueue2-cra-test/README.md b/README.md similarity index 100% rename from webqueue2-cra-test/README.md rename to README.md diff --git a/webqueue2-cra-test/package-lock.json b/package-lock.json similarity index 100% rename from webqueue2-cra-test/package-lock.json rename to package-lock.json diff --git a/webqueue2-cra-test/package.json b/package.json similarity index 97% rename from webqueue2-cra-test/package.json rename to package.json index 4f97737..fca7beb 100644 --- a/webqueue2-cra-test/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", + "clsx": "^1.1.1", "history": "^5.0.0", "material-table": "^1.63.1", "react": "^16.13.1", diff --git a/webqueue2-cra-test/public/favicon.ico b/public/favicon.ico similarity index 100% rename from webqueue2-cra-test/public/favicon.ico rename to public/favicon.ico diff --git a/webqueue2-cra-test/public/index.html b/public/index.html similarity index 100% rename from webqueue2-cra-test/public/index.html rename to public/index.html diff --git a/webqueue2-cra-test/public/logo192.png b/public/logo192.png similarity index 100% rename from webqueue2-cra-test/public/logo192.png rename to public/logo192.png diff --git a/webqueue2-cra-test/public/logo512.png b/public/logo512.png similarity index 100% rename from webqueue2-cra-test/public/logo512.png rename to public/logo512.png diff --git a/webqueue2-cra-test/public/manifest.json b/public/manifest.json similarity index 100% rename from webqueue2-cra-test/public/manifest.json rename to public/manifest.json diff --git a/webqueue2-cra-test/public/robots.txt b/public/robots.txt similarity index 100% rename from webqueue2-cra-test/public/robots.txt rename to public/robots.txt diff --git a/src/App.js b/src/App.js new file mode 100644 index 0000000..ff90fa8 --- /dev/null +++ b/src/App.js @@ -0,0 +1,10 @@ +import React from "react"; +import ItemTable from "./ItemTable"; + +function App(){ + return ( + + ); +} + +export default App; \ No newline at end of file diff --git a/webqueue2-cra-test/src/ItemTable.js b/src/ItemTable.js similarity index 78% rename from webqueue2-cra-test/src/ItemTable.js rename to src/ItemTable.js index a720468..10f170e 100644 --- a/webqueue2-cra-test/src/ItemTable.js +++ b/src/ItemTable.js @@ -1,11 +1,9 @@ import React, { useState } from 'react'; import MaterialTable from "material-table"; -import OpenInBrowserIcon from '@material-ui/icons/OpenInBrowser'; -import Drawer from "@material-ui/core/Drawer"; -import Button from "@material-ui/core/Button"; -import ItemView from "./ItemView"; +import {useTheme} from "@material-ui/core/styles"; -function App() { +function ItemTable() { + const theme = useTheme(); const columns = [ { title: 'Queue', field: 'queue', filterPlaceholder: "Ex: \"ME\""}, @@ -49,56 +47,22 @@ function App() { {"queue": "LINUX", "itemNumber": 12, "from": "apigman", "for": "cs", "subject": "Same Problem but a 5th time", "status": "qc ok", "priority": "covid"}, ]; - const acitons = [ - { - "icon": OpenInBrowserIcon, - "tooltip": "Open Item", - onClick: (event, rowData) => { - console.log(rowData); - setActiveItem(rowData); - handleDrawerOpen(); - } - } - ] - const options = { "filtering": true, - // "actionsColumnIndex": -1, "paging": false, "search": false, "draggable": false, "padding": "dense", } - - const [itemViewOpen, setItemViewOpen] = useState(false); - const [activeItem, setActiveItem] = useState({}); - - const handleDrawerOpen = () => setItemViewOpen(true); - const handleDrawerClose = () => setItemViewOpen(false); return ( - <> - - - - - - - - + ); } -export default App; +export default ItemTable; diff --git a/webqueue2-cra-test/src/ItemView.js b/src/ItemView.js similarity index 100% rename from webqueue2-cra-test/src/ItemView.js rename to src/ItemView.js diff --git a/webqueue2-cra-test/src/index.js b/src/index.js similarity index 89% rename from webqueue2-cra-test/src/index.js rename to src/index.js index 292aeca..f143925 100644 --- a/webqueue2-cra-test/src/index.js +++ b/src/index.js @@ -3,6 +3,7 @@ import ReactDOM from 'react-dom'; import App from './App'; import * as serviceWorker from './serviceWorker'; import { createBrowserHistory } from 'history'; +import { CssBaseline } from '@material-ui/core'; export const history = createBrowserHistory({ basename: process.env.PUBLIC_URL @@ -10,6 +11,7 @@ export const history = createBrowserHistory({ ReactDOM.render( + , document.getElementById('root') diff --git a/webqueue2-cra-test/src/serviceWorker.js b/src/serviceWorker.js similarity index 100% rename from webqueue2-cra-test/src/serviceWorker.js rename to src/serviceWorker.js diff --git a/webqueue2-cra-test/.gitignore b/webqueue2-cra-test/.gitignore deleted file mode 100644 index 4d29575..0000000 --- a/webqueue2-cra-test/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* diff --git a/webqueue2-cra-test/src/App.js b/webqueue2-cra-test/src/App.js deleted file mode 100644 index e03f5e8..0000000 --- a/webqueue2-cra-test/src/App.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -import ItemTable from "./ItemTable"; - -function App() { - return -} - -export default App;