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

Merge branch 'dev-nico' into 'master'

Dev nico

See merge request astron-sdc/esap-gui!46
parents dfd107ba 86638137
No related branches found
No related tags found
2 merge requests!50Master,!46Dev nico
Pipeline #16304 passed
......@@ -32,8 +32,8 @@ deploy-esap-gui:
- chmod 644 ~/.ssh/known_hosts
script:
- echo "Deploying to server"
- scp -r build/static/* vermaas@dop814.astron.nl:~/shared/static
- scp -r build/* vermaas@dop814.astron.nl:~/shared/public_html/esap-gui
- scp -r build/static/* sdc@dop814.astron.nl:~/shared/static
- scp -r build/* sdc@dop814.astron.nl:~/shared/public_html/esap-gui
- echo "Deployed"
when: manual
only:
......
......@@ -30,7 +30,7 @@ function setProfileState(api_host,
})
.catch((error) => {
alert(error)
alert('GlobalContext.setProfileState:' + error)
// when the token is no longer valid, .get with credentials will fail
// mark the user as being logged out
localStorage.removeItem('esap_logged_in')
......
......@@ -87,7 +87,7 @@ export default function Routes() {
</Switch>
<footer><small>esap-gui version 2 aug 2021 - 7:00</small></footer>
<footer><small>esap-gui version 13 aug 2021 - 13:00</small></footer>
</Router>
);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment