Skip to content

Commit

Permalink
i18n
Browse files Browse the repository at this point in the history
  • Loading branch information
Artur Mostowski authored and Vulwsztyn committed Oct 30, 2021
1 parent 7e55624 commit 833d1d4
Show file tree
Hide file tree
Showing 12 changed files with 242 additions and 162 deletions.
171 changes: 75 additions & 96 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
"dayjs": "^1.10.4",
"highcharts": "^9.0.1",
"highcharts-react-official": "^3.0.0",
"i18next": "^21.3.3",
"i18next-browser-languagedetector": "^6.1.2",
"node-sass": "4.14.1",
"react": "17.0.1",
"react-bootstrap": "1.4.0",
"react-dom": "17.0.1",
"react-ga": "^3.2.0",
"react-i18next": "^11.12.0",
"react-icons": "^3.11.0",
"react-router-dom": "5.2.0",
"react-scripts": "4.0.0",
"web-vitals": "0.2.4"
},
Expand Down
23 changes: 3 additions & 20 deletions src/components/Root.js
Original file line number Diff line number Diff line change
@@ -1,30 +1,13 @@
import React from 'react'
import TopBar from './TopBar'
import Restrictions from './restrictions/Restrictions'
import Landing from './statistics/Landing'
import {
HashRouter,
Switch,
Route
} from 'react-router-dom'

function Root() {

return (
<HashRouter basename='/'>
<>
<TopBar />
<Switch>
<Route path={process.env.PUBLIC_URL + '/restrictions'}>
<Restrictions />
</Route>
<Route path={process.env.PUBLIC_URL + '/statistics'}>
<Landing />
</Route>
<Route path={process.env.PUBLIC_URL + '/'}>
<Landing />
</Route>
</Switch>
</HashRouter>
<Landing />
</>
)
}

Expand Down
7 changes: 2 additions & 5 deletions src/components/TopBar.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import React from 'react'
import {React} from 'react'
import { Navbar } from 'react-bootstrap'

function TopBar() {

return (
<Navbar bg='primary' variant='dark' >
<Navbar.Brand href='/'>info-covid.pl</Navbar.Brand>
{/* <Nav className='w-100 justify-content-end'>
<Link className='nav-link' to='/'>Statystyki</Link>
<Link className='nav-link' to='/restrictions'>Obostrzenia</Link>
</Nav> */}
</Navbar>
)
}
Expand Down
Loading

0 comments on commit 833d1d4

Please sign in to comment.