React template follow-up backport (#52)
This commit is contained in:
Родитель
bb161e0460
Коммит
74e05a19dc
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -41,6 +41,9 @@
|
||||||
"nan": "^2.15.0",
|
"nan": "^2.15.0",
|
||||||
"typescript": "^4.6.3"
|
"typescript": "^4.6.3"
|
||||||
},
|
},
|
||||||
|
"overrides": {
|
||||||
|
"autoprefixer": "10.4.5"
|
||||||
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"css-what": "^5.0.1",
|
"css-what": "^5.0.1",
|
||||||
"nth-check": "^3.0.1"
|
"nth-check": "^3.0.1"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import { Collapse, Container, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
|
import { Collapse, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
////#if (IndividualLocalAuth)
|
////#if (IndividualLocalAuth)
|
||||||
import { LoginMenu } from './api-authorization/LoginMenu';
|
import { LoginMenu } from './api-authorization/LoginMenu';
|
||||||
|
@ -27,28 +27,26 @@ export class NavMenu extends Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<header>
|
<header>
|
||||||
<Navbar className="navbar-expand-sm navbar-toggleable-sm ng-white border-bottom box-shadow mb-3" light>
|
<Navbar className="navbar-expand-sm navbar-toggleable-sm ng-white border-bottom box-shadow mb-3" container light>
|
||||||
<Container>
|
<NavbarBrand tag={Link} to="/">Company.WebApplication1</NavbarBrand>
|
||||||
<NavbarBrand tag={Link} to="/">Company.WebApplication1</NavbarBrand>
|
<NavbarToggler onClick={this.toggleNavbar} className="mr-2" />
|
||||||
<NavbarToggler onClick={this.toggleNavbar} className="mr-2" />
|
<Collapse className="d-sm-inline-flex flex-sm-row-reverse" isOpen={!this.state.collapsed} navbar>
|
||||||
<Collapse className="d-sm-inline-flex flex-sm-row-reverse" isOpen={!this.state.collapsed} navbar>
|
<ul className="navbar-nav flex-grow">
|
||||||
<ul className="navbar-nav flex-grow">
|
<NavItem>
|
||||||
<NavItem>
|
<NavLink tag={Link} className="text-dark" to="/">Home</NavLink>
|
||||||
<NavLink tag={Link} className="text-dark" to="/">Home</NavLink>
|
</NavItem>
|
||||||
</NavItem>
|
<NavItem>
|
||||||
<NavItem>
|
<NavLink tag={Link} className="text-dark" to="/counter">Counter</NavLink>
|
||||||
<NavLink tag={Link} className="text-dark" to="/counter">Counter</NavLink>
|
</NavItem>
|
||||||
</NavItem>
|
<NavItem>
|
||||||
<NavItem>
|
<NavLink tag={Link} className="text-dark" to="/fetch-data">Fetch data</NavLink>
|
||||||
<NavLink tag={Link} className="text-dark" to="/fetch-data">Fetch data</NavLink>
|
</NavItem>
|
||||||
</NavItem>
|
|
||||||
////#if (IndividualLocalAuth)
|
////#if (IndividualLocalAuth)
|
||||||
<LoginMenu>
|
<LoginMenu>
|
||||||
</LoginMenu>
|
</LoginMenu>
|
||||||
////#endif
|
////#endif
|
||||||
</ul>
|
</ul>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</Container>
|
|
||||||
</Navbar>
|
</Navbar>
|
||||||
</header>
|
</header>
|
||||||
);
|
);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче