diff --git a/open-isle-cli/src/App.vue b/open-isle-cli/src/App.vue index 544fbd5e6..d29f19b10 100644 --- a/open-isle-cli/src/App.vue +++ b/open-isle-cli/src/App.vue @@ -26,7 +26,7 @@ export default { }, computed: { hideMenu() { - return ['/login', '/signup'].includes(this.$route.path) + return ['/login', '/signup', '/404'].includes(this.$route.path) } } } diff --git a/open-isle-cli/src/views/NotFoundPageView.vue b/open-isle-cli/src/views/NotFoundPageView.vue index 77a85310a..7a3390a38 100644 --- a/open-isle-cli/src/views/NotFoundPageView.vue +++ b/open-isle-cli/src/views/NotFoundPageView.vue @@ -1,7 +1,7 @@ @@ -17,9 +17,9 @@ export default { display: flex; flex-direction: column; align-items: center; - justify-content: center; height: calc(100vh - var(--header-height)); text-align: center; + background-color: var(--background-color); } .not-found-page h1 { diff --git a/src/main/java/com/openisle/controller/UserController.java b/src/main/java/com/openisle/controller/UserController.java index 1403fa58c..4b53d6236 100644 --- a/src/main/java/com/openisle/controller/UserController.java +++ b/src/main/java/com/openisle/controller/UserController.java @@ -1,5 +1,6 @@ package com.openisle.controller; +import com.openisle.exception.NotFoundException; import com.openisle.model.User; import com.openisle.service.*; import org.springframework.beans.factory.annotation.Value; @@ -80,7 +81,7 @@ public class UserController { @GetMapping("/{identifier}") public ResponseEntity getUser(@PathVariable("identifier") String identifier, Authentication auth) { - User user = userService.findByIdentifier(identifier).orElseThrow(); + User user = userService.findByIdentifier(identifier).orElseThrow(() -> new NotFoundException("User not found")); return ResponseEntity.ok(toDto(user, auth)); }