Commit f22867e2 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Added registration link. Hard reload on version str cmp with git hash.

parent ae5bf9a6
Pipeline #52233 failed with stages
in 5 minutes and 17 seconds
......@@ -51,6 +51,7 @@ buildgui:
stage: build
script:
- cd gui
- ./version.sh
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
- docker build -t $FRONTEND_TEST_IMAGE .
- docker push $FRONTEND_TEST_IMAGE
......
{
"name": "nomad-fair-gui",
"version": "0.4.6",
"version": "nomad-gui-version-placeholder",
"private": true,
"dependencies": {
"@material-ui/core": "^3.9.0",
......
......@@ -4,7 +4,7 @@ import { withErrors } from './errors'
import { UploadRequest } from '@navjobs/upload'
import Swagger from 'swagger-client'
import { apiBase } from '../config'
import { Typography, withStyles } from '@material-ui/core'
import { Typography, withStyles, Link } from '@material-ui/core'
import LoginLogout from './LoginLogout'
import { Cookies, withCookies } from 'react-cookie'
import { compose } from 'recompose'
......@@ -455,12 +455,18 @@ class LoginRequiredUnstyled extends React.Component {
})
render() {
const {classes, isLoggingIn, onLoggedIn} = this.props
const {classes, isLoggingIn, onLoggedIn, message} = this.props
let loginMessage = ''
if (message) {
loginMessage = <Typography>
{this.props.message} Register for a Nomad Repository account <Link href='http://nomad-repository.eu:8080/NomadRepository-1.1/register/'>here</Link>.
</Typography>
}
return (
<div className={classes.root}>
<Typography>
{this.props.message || ''}
</Typography>
{loginMessage}
<LoginLogout onLoggedIn={onLoggedIn} variant="outlined" color="primary" isLoggingIn={isLoggingIn}/>
</div>
)
......
......@@ -61,7 +61,7 @@ class DomainProviderBase extends React.Component {
Keep in mind that there are limitations:
* You can only login with users that already exist in the Nomad Repository. If you
are new to Nomad, visit the [Nomad Repository GUI](https://repository.nomad-coe.eu/NomadRepository-1.1)
and create a user account there.
or register for a user account [here](http://nomad-repository.eu:8080/NomadRepository-1.1/register/).
* When you published your data here, it will still take a day to index. Therefore,
your data will not appear in the Nomad Repository immediately.
* The existing entries from the original Nomad do not appear in the search. We
......
......@@ -387,4 +387,4 @@ class Uploads extends React.Component {
}
}
export default compose(withApi(true, false, 'To upload data, you must have a nomad account and you must be logged in.'), withCookies, withStyles(Uploads.styles))(Uploads)
export default compose(withApi(true, false, 'To upload data, you must have a Nomad Repository account and you must be logged in.'), withCookies, withStyles(Uploads.styles))(Uploads)
#!/bin/sh
version=`git describe --tags`
sed -i -e "s/nomad-gui-version-placeholder/$version/g" package.json
rm package.json-e
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment