Merge branch 'develop' into 'master'

Started Web interface. #4

See merge request !16

src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java

@@ -10,8 +10,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.core.env.Environment;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -20,7 +18,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @author BEAUVAIS ANTOINE
  */
 @Configuration
-@EnableWebMvc
 @PropertySources(
         @PropertySource("/apikey.properties")
 )
@@ -76,14 +73,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
      */
     public static final String MAPPING_LOGIN = "/login";
     
-    /*
-    // TODO: Define default servlet.
-    @Override
-    public void configureDefaultServletHandling(
-            DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }*/
-    
     /**
      * Adds interceptors to the application.
      * 

src/main/java/fr/unistra/sil/erp/back/controller/web/LoginController.java

@@ -23,10 +23,12 @@ public class LoginController {
      * Logic for handling login.
      * 
      * TODO: Actual implementation.
+     * @return the name of the template to use.
      */
     @GetMapping(MAPPING_LOGIN)
-    public void login()
+    public String login()
     {
+        return "login";
     }
     
 }

src/main/java/fr/unistra/sil/erp/back/controller/web/RootController.java

+/*
+ * CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL-B
+ * https://cecill.info/licences/Licence_CeCILL-B_V1-fr.html
+ */
+package fr.unistra.sil.erp.back.controller.web;
+
+/**
+ * Controller for the root page.
+ * 
+ * The root page will typically redirect to the 
+ * main interface.
+ * 
+ * @author BEAUVAIS ANTOINE
+ */
+public class RootController {
+    
+    
+    
+}

src/main/java/fr/unistra/sil/erp/back/package-info.java

@@ -10,7 +10,8 @@
  * <li>Web interface for regular Human-Machine Interface (HMI) interactions.
  * </ul>
  * 
- * Notice: Only the API is currently implemented (partially) for now.
+ * Currently, the RESTful API is partly implemented and the Web interface 
+ * has only just been started.
  * 
  * @version 0.0.1
  * @author BEAUVAIS ANTOINE

src/main/java/overview.html

@@ -15,5 +15,6 @@ https://cecill.info/licences/Licence_CeCILL-B_V1-fr.html
         <li>a Web interface for managing the software and data.</li>
     </ul>
 
-    <p>Currently, only the RESTful API is partially implemented.</p>
+    <p>Currently, the RESTful API is partly implemented and the Web interface 
+        has only just been started.</p>
 </body>
\ No newline at end of file

src/main/resources/application.properties

-
+spring.mvc.static-path-pattern=/static/**

src/main/resources/messages.properties

@@ -8,3 +8,11 @@ web.ui.login.username=Username
 web.ui.login.password=Password
 #Login page: Button's label.
 web.ui.login.submit=Log in
+#Product.
+web.ui.product=Product
+#Products (plural).
+web.ui.products=Products
+#Financial registry.
+web.ui.registry=Registry
+#Documents.
+web.ui.property.documents=Documents

src/main/resources/messages_en.properties

@@ -8,3 +8,11 @@ web.ui.login.username=Username
 web.ui.login.password=Password
 #Login page: Button's label.
 web.ui.login.submit=Log in
+#Product.
+web.ui.product=Product
+#Products (plural).
+web.ui.products=Products
+#Financial registry.
+web.ui.registry=Registry
+#Documents.
+web.ui.property.documents=Documents

src/main/resources/messages_fr.properties

@@ -8,3 +8,11 @@ web.ui.login.username=Nom d'utilisateur
 web.ui.login.password=Mot de passe
 #Login page: Button's label.
 web.ui.login.submit=Se connecter
+#Product.
+web.ui.product=Produit
+#Products (plural).
+web.ui.products=Produits
+#Financial registry.
+web.ui.registry=Registre
+#Documents.
+web.ui.property.documents=Documents

src/main/resources/static/main.css

+ /* Add a black background color to the top navigation */
+ .topnav {
+    background-color: #333;
+    overflow: hidden;
+}
+
+/* Style the links inside the navigation bar */
+.topnav a {
+    float: left;
+    display: block;
+    color: #f2f2f2;
+    text-align: center;
+    padding: 14px 16px;
+    text-decoration: none;
+    font-size: 17px;
+}
+
+/* Change the color of links on hover */
+.topnav a:hover {
+    background-color: #ddd;
+    color: black;
+}
+
+/* Add an active class to highlight the current page */
+.topnav a.active {
+    background-color: #04AA6D;
+    color: white;
+}
+
+/* Hide the link that should open and close the topnav on small screens */
+.topnav .icon {
+    display: none;
+}
+
+/* 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.icon {
+        float: right;
+        display: block;
+    }
+}
+
+/* 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 a.icon {
+        position: absolute;
+        right: 0;
+        top: 0;
+    }
+    .topnav.responsive a {
+        float: none;
+        display: block;
+        text-align: left;
+    }
+}
\ No newline at end of file

src/main/resources/templates/fragments/head.html

+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="sharedHead (pageName)">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <link rel="stylesheet" href="/static/main.css">
+    <title th:text="${pageName} +  ' - ' + #{application.name}"></title>
+</head>
+
+<body>
+
+</body>
+</html>

src/main/resources/templates/fragments/navbar.html

+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head></head>
+<body>
+    <div class="topnav" id="topNavBar" th:fragment="topNavBar">
+        <a href="/" th:text="#{application.name}"></a>
+        <a href="#products" class="active" th:text="#{web.ui.products}"></a>
+        <a href="#registry" th:text="#{web.ui.registry}"></a>
+        <a href="#documents" th:text="#{web.ui.documents}"></a>
+        <a href="javascript:void(0);" class="icon" onclick="toggleNavBar()">☰</a>
+    </div>
+</body>
+</html>
\ No newline at end of file

src/main/resources/templates/fragments/navbarGuest.html

+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head></head>
+<body>
+    <div class="topnav" id="topNavBar" th:fragment="topNavBar">
+        <a href="/" th:text="#{application.name}"></a>
+        <a href="javascript:void(0);" class="icon" onclick="toggleNavBar()">☰</a>
+    </div>
+</body>
+</html>
\ No newline at end of file

src/main/resources/templates/login.html

 <!DOCTYPE html>
-<html lang="fr" xmlns:th="http://www.thymeleaf.org">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title th:text="#{web.ui.login.login} +  ' - ' + #{application.name}"></title>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head th:replace="fragments/head :: sharedHead (pageName=#{web.ui.login.login})">
     </head>
 
     <body>
+        <div th:replace="fragments/navbarGuest :: topNavBar"></div>
         <h1 th:text="#{web.ui.login.login}"></h1>
         <p>TODO</p>
     </body>