Merge branch 'develop'

e67d93fc · GAYDAMAKHA MIKHAIL · 7f2e46d2 · c74ae974 · e67d93fc · e67d93fc
Commit e67d93fc authored 3 years ago by GAYDAMAKHA MIKHAIL
--- a/src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java
+++ b/src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java
@@ -7,9 +7,7 @@ package fr.unistra.sil.erp.back;
 import fr.unistra.sil.erp.back.interceptor.api.ApiAuthenticationInterceptor;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.Environment;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;

 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -119,6 +117,11 @@ public class WebMvcConfig implements WebMvcConfigurer {
        cr.addMapping("/**").allowedOrigins("*").allowedMethods("*");
    }

+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+    }
+
    /**
     * SQL Connection object.
     */

--- a/src/main/java/fr/unistra/sil/erp/back/controller/web/WebRegistryController.java
+++ b/src/main/java/fr/unistra/sil/erp/back/controller/web/WebRegistryController.java
@@ -42,7 +42,7 @@ public class WebRegistryController {
     * @return the view.
     */
    @GetMapping(WEB_MAPPING_REGISTRY)
-    public String regisry(Model model) {
+    public String registry(Model model) {
        try {
            List<RegistryEntry> lr = repository.getRegistry();
            model.addAttribute("registry", lr);

--- a/src/main/resources/static/main.css
+++ b/src/main/resources/static/main.css
- /* Add a black background color to the top navigation */
- .topnav {
+/* Add a black background color to the top navigation */
+.topnav {
    background-color: #333;
    overflow: hidden;
 }
@@ -34,7 +34,10 @@

 /* When the screen is less than 600 pixels wide, hide all links, except for the first one ("Home"). Show the link that contains should open and close the topnav (.icon) */
 @media screen and (max-width: 600px) {
-    .topnav a:not(:first-child) {display: none;}
+    .topnav a:not(:first-child) {
+        display: none;
+    }
+
    .topnav a.icon {
        float: right;
        display: block;
@@ -43,15 +46,19 @@

 /* The "responsive" class is added to the topnav with JavaScript when the user clicks on the icon. This class makes the topnav look good on small screens (display the links vertically instead of horizontally) */
 @media screen and (max-width: 600px) {
-    .topnav.responsive {position: relative;}
+    .topnav.responsive {
+        position: relative;
+    }
+
    .topnav.responsive a.icon {
        position: absolute;
        right: 0;
        top: 0;
    }
+
    .topnav.responsive a {
        float: none;
        display: block;
        text-align: left;
    }
-}
\ No newline at end of file
+}
--- a/src/main/resources/templates/fragments/head.html
+++ b/src/main/resources/templates/fragments/head.html
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" lang="FR">
 <head th:fragment="sharedHead (pageName)">
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="stylesheet" href="/static/main.css">
+    <link th:href="@{/static/css/main.css}" type="text/css" rel="stylesheet">
    <title th:text="${pageName} +  ' - ' + #{application.name}"></title>
 </head>