diff --git a/examples/create-react-app/README.md b/examples/create-react-app/README.md index e8271af1af..01b8c593fe 100644 --- a/examples/create-react-app/README.md +++ b/examples/create-react-app/README.md @@ -6,10 +6,8 @@ This project was bootstrapped with [Create React App](https://github.com/faceboo This example will setup an example Create React App + ReactMD app that has the following features: -- [jsconfig.json](./jsconfig.json) to allow absolute imports instead of relative imports from the `"src"` directory - - `import MyComponent from "components/MyComponent"` instead of `import MyComponent from "../../components/MyComponent"` - [\_everything.scss](./src/_everything.scss) to override the default `react-md` theme and feature toggles -- a reusable [Layout.jsx](./src/components/Layout/Layout.jsx) that: +- a reusable [Layout.js](./src/components/Layout/Layout.js) that: - updates all the icons to use `SVGIcon`s instead of `FontIcon`s - initializes the `Layout` component from `react-md` with navigation items - uses [react-router-dom](https://www.npmjs.com/package/react-router-dom) as the routing library diff --git a/examples/create-react-app/jsconfig.json b/examples/create-react-app/jsconfig.json deleted file mode 100644 index 5f7d4a278d..0000000000 --- a/examples/create-react-app/jsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": "src", - "rootDir": "src" - } -} diff --git a/examples/create-react-app/package.json b/examples/create-react-app/package.json index 67b972c5b9..f39f7d0047 100644 --- a/examples/create-react-app/package.json +++ b/examples/create-react-app/package.json @@ -15,7 +15,7 @@ "react": "^17.0.1", "react-dom": "^17.0.1", "react-md": "latest", - "react-router-dom": "^5.2.0", + "react-router-dom": "^6.0.2", "react-scripts": "4.0.3", "sass": "^1.37.5", "web-vitals": "^2.1.0" diff --git a/examples/create-react-app/src/App.js b/examples/create-react-app/src/App.js new file mode 100644 index 0000000000..f5a1abee75 --- /dev/null +++ b/examples/create-react-app/src/App.js @@ -0,0 +1,16 @@ +import { Routes, Route } from 'react-router-dom'; + +import Layout from './components/Layout'; +import Home from './components/Home'; +import Route1 from './components/Route1'; + +export default function App() { + return ( + + + } /> + } /> + + + ); +} diff --git a/examples/create-react-app/src/App.jsx b/examples/create-react-app/src/App.jsx deleted file mode 100644 index 87c89beed8..0000000000 --- a/examples/create-react-app/src/App.jsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Route, Switch } from 'react-router-dom'; - -import Layout from 'components/Layout'; -import Home from 'components/Home'; -import Route1 from 'components/Route1'; - -export default function App() { - return ( - - - - - - - ); -} diff --git a/examples/create-react-app/src/components/Home.jsx b/examples/create-react-app/src/components/Home.js similarity index 100% rename from examples/create-react-app/src/components/Home.jsx rename to examples/create-react-app/src/components/Home.js diff --git a/examples/create-react-app/src/components/Layout/Layout.jsx b/examples/create-react-app/src/components/Layout/Layout.js similarity index 100% rename from examples/create-react-app/src/components/Layout/Layout.jsx rename to examples/create-react-app/src/components/Layout/Layout.js diff --git a/examples/create-react-app/src/components/Layout/navItems.jsx b/examples/create-react-app/src/components/Layout/navItems.js similarity index 100% rename from examples/create-react-app/src/components/Layout/navItems.jsx rename to examples/create-react-app/src/components/Layout/navItems.js diff --git a/examples/create-react-app/src/components/Route1.jsx b/examples/create-react-app/src/components/Route1.js similarity index 100% rename from examples/create-react-app/src/components/Route1.jsx rename to examples/create-react-app/src/components/Route1.js diff --git a/examples/create-react-app/src/index.jsx b/examples/create-react-app/src/index.js similarity index 82% rename from examples/create-react-app/src/index.jsx rename to examples/create-react-app/src/index.js index 44f3e2eec3..4bdc3199cc 100644 --- a/examples/create-react-app/src/index.jsx +++ b/examples/create-react-app/src/index.js @@ -1,13 +1,14 @@ -import ReactDOM from 'react-dom'; import './index.scss'; +import ReactDOM from 'react-dom'; +import { BrowserRouter } from 'react-router-dom'; + import App from './App'; -import { BrowserRouter as Router } from 'react-router-dom'; import reportWebVitals from './reportWebVitals'; ReactDOM.render( - + - , + , document.getElementById('root') );