diff --git a/jambotron-ui/public/Firefly_jambo-tron-118290.ico b/jambotron-ui/public/Firefly_jambo-tron-118290.ico new file mode 100644 index 0000000..7a97d40 Binary files /dev/null and b/jambotron-ui/public/Firefly_jambo-tron-118290.ico differ diff --git a/src/main/java/com/jambotronGroup/jambotron/configuretions/MvcConfig.java b/src/main/java/com/jambotronGroup/jambotron/configuretions/MvcConfig.java index facdcb8..260f19b 100644 --- a/src/main/java/com/jambotronGroup/jambotron/configuretions/MvcConfig.java +++ b/src/main/java/com/jambotronGroup/jambotron/configuretions/MvcConfig.java @@ -12,6 +12,8 @@ public class MvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/public/**").addResourceLocations(resourceLocations); + //registry.addResourceHandler("/public/**").addResourceLocations(resourceLocations); + // registry.addResourceHandler("/media/**").addResourceLocations("resources/main/public/media/"); + } } diff --git a/src/main/java/com/jambotronGroup/jambotron/configuretions/NotFoundHandler.java b/src/main/java/com/jambotronGroup/jambotron/configuretions/NotFoundHandler.java index 2965bbd..101b6d1 100644 --- a/src/main/java/com/jambotronGroup/jambotron/configuretions/NotFoundHandler.java +++ b/src/main/java/com/jambotronGroup/jambotron/configuretions/NotFoundHandler.java @@ -14,6 +14,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.nio.charset.Charset; +/* @ControllerAdvice public class NotFoundHandler { @@ -32,4 +33,4 @@ public class NotFoundHandler { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("There was an error completing the action."); } } -} \ No newline at end of file +}*/ diff --git a/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java b/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java index 8b50eaa..1d1df36 100644 --- a/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java +++ b/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java @@ -105,6 +105,8 @@ public class WebSecurityConfig {// extends WebSecurityConfigurerAdapter { .authorizeHttpRequests(auth -> auth.requestMatchers("/api/auth/**").permitAll() .requestMatchers("/*", "/home", "/resources/**").permitAll() + .requestMatchers("/resources/public/media/**").permitAll() + .requestMatchers("/media/**").permitAll() .requestMatchers("/api/test/**").permitAll() .requestMatchers("/api/tutorials").permitAll()