Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ESAP GUI
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ASTRON SDC
ESCAPE WP5
ESAP GUI
Commits
d2eb66c1
Commit
d2eb66c1
authored
3 years ago
by
Nico Vermaas
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev-nico' into 'master'
Dev nico See merge request astron-sdc/esap-gui!46
parents
dfd107ba
86638137
No related branches found
Branches containing commit
No related tags found
2 merge requests
!50
Master
,
!46
Dev nico
Pipeline
#16304
passed
3 years ago
Stage: build
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
src/contexts/GlobalContext.js
+1
-1
1 addition, 1 deletion
src/contexts/GlobalContext.js
src/routes/Routes.js
+1
-1
1 addition, 1 deletion
src/routes/Routes.js
with
4 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
2
View file @
d2eb66c1
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
src/contexts/GlobalContext.js
+
1
−
1
View file @
d2eb66c1
...
...
@@ -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
'
)
...
...
This diff is collapsed.
Click to expand it.
src/routes/Routes.js
+
1
−
1
View file @
d2eb66c1
...
...
@@ -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
>
);
}
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