Skip to content

Dockerfile + logout redirect to home + vertical roles list in the header#60

Open
hormiai76 wants to merge 24 commits intoispyb:mainfrom
hormiai76:develop
Open

Dockerfile + logout redirect to home + vertical roles list in the header#60
hormiai76 wants to merge 24 commits intoispyb:mainfrom
hormiai76:develop

Conversation

@hormiai76
Copy link
Copy Markdown
Collaborator

List of changes

  • First working release of the Dockerfile+docker-compose (still to be improved. We use traefik as proxy at MAXIV)
  • JAVA label removed in the login page if you use the legacy part, the beamline managers asked me if we can remove it because the users will not understand what it is
  • Redirect to the home page after logout so the breadcrumbs is reset
  • User roles are show in vertical instead of horizontal way. I have several roles and it was hard to read them in the previous version
  • the docker folder will be used in my next dockerfile release.

@netlify
Copy link
Copy Markdown

netlify bot commented Mar 15, 2023

Deploy Preview for py-ispyb ready!

Name Link
🔨 Latest commit 9a763ab
🔍 Latest deploy log https://app.netlify.com/sites/py-ispyb/deploys/6474ad98f9b6e200074e8fc9
😎 Deploy Preview https://deploy-preview-60--py-ispyb.netlify.app/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@hormiai76 hormiai76 changed the title Develop Dockerfile + logout redirect to home + vertical roles list in the header Mar 15, 2023
@mgaonach
Copy link
Copy Markdown
Collaborator

Looks good, thanks!
Is the dockerfile ready to use? Did you solve the problem in #59 ?

@antolinos
Copy link
Copy Markdown
Collaborator

I agree with feedback from scientists.
References to JAVA in the UI have to be removed:
image

Besides, ESRF-py is not of the interest of the users. I would simplify by
Select your technique: SSX, MX, EM

@mgaonach
Copy link
Copy Markdown
Collaborator

@hormiai76
Is this ready for merge?

A few comments:

  • You can add the MAXIV config to the netlify config file, if you want to be able to connect in the automatic deployment (https://py-ispyb.netlify.app) and to the pull request previews (for instance https://deploy-preview-60--py-ispyb.netlify.app/) for this one.
  • Looks like the readme file was replaced by a placeholder readme from gitlab.
  • a .gitlab-ci.yml file also got pushed. Do you need to keep it?

@mgaonach
Copy link
Copy Markdown
Collaborator

I agree with feedback from scientists. References to JAVA in the UI have to be removed: image

Besides, ESRF-py is not of the interest of the users. I would simplify by Select your technique: SSX, MX, EM

Yes, it would make sense. This ESRF-py is only comming from the configuration though, so nothing to change here, and the Username JAVA is already removed by this PR.

@hormiai76
Copy link
Copy Markdown
Collaborator Author

hormiai76 commented Mar 31, 2023

@hormiai76 Is this ready for merge?

A few comments:

  • You can add the MAXIV config to the netlify config file, if you want to be able to connect in the automatic deployment (https://py-ispyb.netlify.app) and to the pull request previews (for instance https://deploy-preview-60--py-ispyb.netlify.app/) for this one.
  • Looks like the readme file was replaced by a placeholder readme from gitlab.
  • a .gitlab-ci.yml file also got pushed. Do you need to keep it?

the .gitlab-ci.yml it's only needed here... I will put in my gitignore file so next time I will not push it on github but only in our internal repository.
For the readme I didn't change it so proably it was a mistake I did before the merge request. discart my changes in the readme file of course.
I will add MAXIV in the netlify on Monday

@hormiai76
Copy link
Copy Markdown
Collaborator Author

I will add the netify in another MR I need to push this week

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants