diff --git a/package.json b/package.json index b4c5322..dd1e25e 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,8 @@ "version": "0.1.0", "private": true, "dependencies": { + "@material-ui/core": "^4.12.3", + "@material-ui/lab": "^4.0.0-alpha.60", "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^12.1.2", "@testing-library/user-event": "^13.5.0", diff --git a/src/history.js b/src/history.js index a512ce6..5a67c01 100755 --- a/src/history.js +++ b/src/history.js @@ -1,11 +1,17 @@ -import { createBrowserHistory } from 'history'; - -// Run our app under the /base URL. -const history = createBrowserHistory(), - push = history.push; -history.push = (path) => { - const base = new URL(document.querySelector("base") ? document.querySelector("base").href : ""); - push(base.pathname + path); -}; - -export default history; \ No newline at end of file +import { createBrowserHistory } from 'history'; + +/* +// Run our app under the /base URL. +const history = createBrowserHistory(), + push = history.push; +history.push = (path) => { + const base = new URL(document.querySelector("base") ? document.querySelector("base").href : ""); + push(base.pathname + path); +}; +*/ + +export default history = createBrowserHistory({ + basename: process.env.PUBLIC_URL +}); + +//export default history; \ No newline at end of file diff --git a/src/index.js b/src/index.js index e1be483..7a1ba6f 100644 --- a/src/index.js +++ b/src/index.js @@ -1,15 +1,50 @@ -import React from "react"; -import { render } from "react-dom"; -import { BrowserRouter } from "react-router-dom"; -import App from "./App.js"; +import React from 'react'; +import ReactDOM from 'react-dom'; +import './index.css'; +import App from './App'; +import reportWebVitals from './reportWebVitals'; -if (process.env.NODE_ENV !== 'production') { - console.log('DEVELOPMENT mode!'); -} +ReactDOM.render( + + + , + document.getElementById('root') +); -render( - - - , - document.getElementById("root") -) \ No newline at end of file +// If you want to start measuring performance in your app, pass a function +// to log results (for example: reportWebVitals(console.log)) +// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals +reportWebVitals(); +/* +-import React from "react"; +-import { render } from "react-dom"; +-import { BrowserRouter } from "react-router-dom"; +-import App from "./App.js"; ++import React from 'react'; ++import ReactDOM from 'react-dom'; ++import './index.css'; ++import App from './App'; ++import reportWebVitals from './reportWebVitals'; + +-if (process.env.NODE_ENV !== 'production') { +- console.log('DEVELOPMENT mode!'); +-} ++ReactDOM.render( ++ ++ ++ , ++ document.getElementById('root') ++); + +-render( +- +- +- , +- document.getElementById("root") +-) +\ No newline at end of file ++// If you want to start measuring performance in your app, pass a function ++// to log results (for example: reportWebVitals(console.log)) ++// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals ++reportWebVitals(); +*/ \ No newline at end of file