Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
ADEX GUI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nico Vermaas
ADEX GUI
Commits
e435770d
Commit
e435770d
authored
Mar 26, 2020
by
Nico Vermaas
Browse files
Options
Downloads
Patches
Plain Diff
minor layout improvements
parent
c4df8320
No related branches found
No related tags found
1 merge request
!5
merging esap-gui 0.6.4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/About.js
+5
-24
5 additions, 24 deletions
src/components/About.js
src/components/Main.js
+1
-2
1 addition, 2 deletions
src/components/Main.js
src/components/NavigationBar.js
+2
-4
2 additions, 4 deletions
src/components/NavigationBar.js
with
8 additions
and
30 deletions
src/components/About.js
+
5
−
24
View file @
e435770d
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
}
/
>
...
...
This diff is collapsed.
Click to expand it.
src/components/Main.js
+
1
−
2
View file @
e435770d
...
@@ -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
-
2
4
mar
2020
<
/small></
footer
>
<
footer
><
small
>
ASTRON
-
version
0.6
.
3
-
2
6
mar
2020
<
/small></
footer
>
<
/Router
>
<
/Router
>
);
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/components/NavigationBar.js
+
2
−
4
View file @
e435770d
...
@@ -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
"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment