Skip to content

Commit

Permalink
Merge 440e8f8 into 6b405b0
Browse files Browse the repository at this point in the history
  • Loading branch information
mboudet committed Apr 26, 2023
2 parents 6b405b0 + 440e8f8 commit f6e630c
Show file tree
Hide file tree
Showing 6 changed files with 3,281 additions and 1,898 deletions.
5 changes: 5 additions & 0 deletions askomics/react/src/navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@ export default class AskoNavbar extends Component {
let links
let askLink
let aboutLink
let overviewLink

// if wait is false
if (!this.props.waitForStart) {
askLink = (
<NavItem><Link className="nav-link" to="/"><i className="fas fa-play"></i> Ask!</Link></NavItem>
)

overviewLink = (
<NavItem><Link className="nav-link" to="/overview"><i className="fas fa-network-wired"></i> Abstraction</Link></NavItem>
)
let contactLink
if (this.props.config.contactMessage){
contactLink = (
Expand Down Expand Up @@ -112,6 +116,7 @@ export default class AskoNavbar extends Component {
<Collapse navbar>
<Nav className="ml-auto" navbar>
{askLink}
{overviewLink}
{links}
</Nav>
</Collapse>
Expand Down
2 changes: 2 additions & 0 deletions askomics/react/src/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Results from './routes/results/results'
import AskoNavbar from './navbar'
import AskoFooter from './footer'
import Contact from './contact'
import Overview from './routes/overview/overview'

import 'react-bootstrap-table-next/dist/react-bootstrap-table2.min.css'
import 'bootstrap/dist/css/bootstrap.min.css'
Expand Down Expand Up @@ -130,6 +131,7 @@ export default class Routes extends Component {
<Route path="/prefixes" exact component={() => (<Prefixes config={this.state.config} waitForStart={this.state.waiting} setStateNavbar={p => this.setState(p)} />)} />
<Route path="/ontologies" exact component={() => (<Ontologies config={this.state.config} waitForStart={this.state.waiting} setStateNavbar={p => this.setState(p)} />)} />
<Route path="/query" exact component={Query} />
<Route path="/overview" exact component={ () => (<Overview config={this.state.config} waitForStart={this.state.waiting} setStateNavbar={p => this.setState(p)} />)} />
<Route path="/form" exact component={FormQuery} />
<Route path="/form_edit" exact component={FormEditQuery} />
<Route path="/results" exact component={() => (<Results config={this.state.config} waitForStart={this.state.waiting} />)} />
Expand Down

0 comments on commit f6e630c

Please sign in to comment.