feat(ott-37): added simple routing

keep-around/af30b88d367751c9e05a735e4a0467a96238ef47
mirlan.maksitaliev 6 years ago
parent 8fbcefcf10
commit f0d2370d5c
  1. 6
      package.json
  2. 1
      src/config/pages.tsx
  3. 31
      src/features/App/index.tsx
  4. 3
      src/features/Register/index.tsx

@ -13,9 +13,12 @@
"build-storybook": "build-storybook -s public" "build-storybook": "build-storybook -s public"
}, },
"dependencies": { "dependencies": {
"history": "^4.10.1",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"react": "^16.13.1", "react": "^16.13.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1", "react-scripts": "3.4.1",
"styled-components": "^5.1.1" "styled-components": "^5.1.1"
}, },
@ -32,11 +35,14 @@
"@testing-library/jest-dom": "^4.2.4", "@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2", "@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2", "@testing-library/user-event": "^7.1.2",
"@types/history": "^4.7.6",
"@types/jest": "^24.0.0", "@types/jest": "^24.0.0",
"@types/lodash": "^4.14.154", "@types/lodash": "^4.14.154",
"@types/node": "^12.0.0", "@types/node": "^12.0.0",
"@types/react": "^16.9.0", "@types/react": "^16.9.0",
"@types/react-dom": "^16.9.0", "@types/react-dom": "^16.9.0",
"@types/react-router": "^5.1.7",
"@types/react-router-dom": "^5.1.5",
"@types/styled-components": "^5.1.0", "@types/styled-components": "^5.1.0",
"commitizen": "^4.1.2", "commitizen": "^4.1.2",
"eslint": "6.8.0", "eslint": "6.8.0",

@ -1,3 +1,4 @@
export const PAGES = { export const PAGES = {
login: '/login', login: '/login',
register: '/register',
} }

@ -1,12 +1,33 @@
import React from 'react' import React from 'react'
import {
Router,
Route,
Redirect,
} from 'react-router-dom'
import { createBrowserHistory } from 'history'
import { GlobalStyles } from 'features/GlobalStyles'
import { Theme } from 'features/Theme' import { Theme } from 'features/Theme'
import { Login } from 'features/Login' import { Login } from 'features/Login'
import { GlobalStyles } from 'features/GlobalStyles' import { Register } from 'features/Register'
import { PAGES } from 'config'
const history = createBrowserHistory()
export const App = () => ( export const App = () => (
<Theme> <Router history={history}>
<GlobalStyles /> <Theme>
<Login /> <GlobalStyles />
</Theme>
<Route path={PAGES.login}>
<Login />
</Route>
<Route path={PAGES.register}>
<Register />
</Route>
<Redirect to={PAGES.login} />
</Theme>
</Router>
) )

@ -0,0 +1,3 @@
import React from 'react'
export const Register = () => <div>Registration page</div>
Loading…
Cancel
Save