Skip to content
Snippets Groups Projects
Commit e435770d authored by Nico Vermaas's avatar Nico Vermaas
Browse files

minor layout improvements

parent c4df8320
No related branches found
No related tags found
1 merge request!5merging esap-gui 0.6.4
import React from 'react'; import React from 'react';
import { getBackendUrl, GetBackendHost} from '../utils/web' import { getBackendUrl, GetBackendHost} from '../utils/web'
import Configuration from './Configuration'; import Configuration from './Configuration';
import { GetBaseName } from '../utils/config'
export function About() { export function About() {
...@@ -14,14 +15,8 @@ export function About() { ...@@ -14,14 +15,8 @@ export function About() {
</p> </p>
<p> <p>
<ul> <ul>
<li> ESAP Gateway: <li> GUI basename : {GetBaseName()} </li>
<a className="App-link" <li> ESAP Gateway: <a className="App-link" href={GetBackendHost()} target="_blank" rel="noopener noreferrer"> {GetBackendHost()}</a></li>
href={GetBackendHost()}
target="_blank"
rel="noopener noreferrer"
> {GetBackendHost()}
</a>
</li>
</ul> </ul>
</p> </p>
<p> <p>
...@@ -29,22 +24,8 @@ export function About() { ...@@ -29,22 +24,8 @@ export function About() {
</p> </p>
<p> <p>
<ul> <ul>
<li> <li><a className="App-link" href="https://git.astron.nl/vermaas/adex-gui" target="_blank" rel="noopener noreferrer"> ADEX / ESAP-GUI</a></li>
<a className="App-link" <li><a className="App-link" href="https://git.astron.nl/vermaas/esap-gateway" target="_blank" rel="noopener noreferrer"> ESAP-gateway (API)</a></li>
href="https://git.astron.nl/vermaas/adex-gui"
target="_blank"
rel="noopener noreferrer"
> ADEX / ESAP-GUI
</a>
</li>
<li>
<a className="App-link"
href="https://git.astron.nl/vermaas/esap-gateway"
target="_blank"
rel="noopener noreferrer"
> ESAP-gateway (API)
</a>
</li>
</ul> </ul>
</p> </p>
<Configuration host = {getBackendUrl} /> <Configuration host = {getBackendUrl} />
......
...@@ -40,7 +40,6 @@ function Main () { ...@@ -40,7 +40,6 @@ function Main () {
// basename defines which path is is added before the routing urls. // basename defines which path is is added before the routing urls.
<Router basename={basename}> <Router basename={basename}>
<div> <div>
{basename}
<NavigationBar/> <NavigationBar/>
{/* {/*
...@@ -80,7 +79,7 @@ function Main () { ...@@ -80,7 +79,7 @@ function Main () {
</Switch> </Switch>
</div> </div>
<footer><small>ASTRON - version 0.6.3 - 24 mar 2020</small></footer> <footer><small>ASTRON - version 0.6.3 - 26 mar 2020</small></footer>
</Router> </Router>
); );
} }
......
...@@ -22,10 +22,8 @@ export function NavigationBar() { ...@@ -22,10 +22,8 @@ export function NavigationBar() {
return ( return (
<Navbar bg="dark" variant="dark"> <Navbar bg="dark" variant="dark">
<img alt='' src={GetLogo()} height="40" className="d-inline-block align-top"/>
<Navbar.Brand href={basename}> <Navbar.Brand href={basename}>&nbsp;{GetTitle()}
<img alt='' src={GetLogo()} width="100" height="40" className="d-inline-block align-top"/>
{GetTitle()}
</Navbar.Brand> </Navbar.Brand>
<Nav className="mr-auto"> <Nav className="mr-auto">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment