Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#578consistent header and footer #601

Merged
merged 14 commits into from
Jun 11, 2024
Merged

#578consistent header and footer #601

merged 14 commits into from
Jun 11, 2024

Conversation

erinz2020
Copy link
Contributor

@erinz2020 erinz2020 commented Jun 10, 2024

Fixes #578 and #579

  1. react and jsp pages now have consistent header and footer
  2. clicking at logout button will log user out and navigate to login page
  3. update servletResponseTemplate.htm and servletUtilities.java to keep consistent with new header

@erinz2020 erinz2020 requested a review from naknomum June 10, 2024 20:58
@TanyaStere42
Copy link
Member

@erinz2020 can you add "fixes #578 and fixes #579" in your PR description so this links to those issues?

notifications = Collaboration.getNotificationsWidgetHtml(request, myShepherd);
if (request.getUserPrincipal() != null && !loggingOut) {
user = myShepherd.getUser(request);
username = (user != null) ? user.getUsername() : null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be best to wrap this whole section in if (user != null) { .... rather than test for username separately, since we also should have one for the line below: if (user.getUserImage()...) is not checking for null user.

Copy link
Member

@naknomum naknomum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good. definitely a lot going on!
i put in one note about a missed null value check that should probably be fixed, but i think that is it.

Copy link
Member

@naknomum naknomum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

@naknomum
Copy link
Member

looks good. definitely a lot going on! i put in one note about a missed null value check that should probably be fixed, but i think that is it.

ignoring this since we are moving beyond this.

@naknomum naknomum merged commit c4e4d23 into master Jun 11, 2024
2 checks passed
@naknomum naknomum deleted the new_jsp_header branch June 11, 2024 17:38
Rodhlann pushed a commit to Rodhlann/Wildbook that referenced this pull request Dec 6, 2024
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.

consistent footer between jsp and react Consistent header between jsp and react
3 participants