Merge pull request #6 from tobiasake/master

New EI Frontend layout

Author: tobiasake

src/main/java/com/ericsson/ei/frontend/WebController.java

@@ -29,17 +29,69 @@ public class WebController {
 
     private String frontendServiceHost;
     private int frontendServicePort;
+    private String backendServerHost;
+    private int backendServerPort;
+
+    private String eiffelDocumentationUrls;
 
 
     @RequestMapping("/")
     public String greeting(Model model) {
 
+        String eiffelDocumentationUrlLinks = String.format("%s", eiffelDocumentationUrls);
+
+        model.addAttribute("eiffelDocumentationUrlLinks", eiffelDocumentationUrlLinks);  // inject in DOM for AJAX etc
+
+    	
+    	
+        return "index";
+    }
+    
+    @RequestMapping("/subscriptionpage.html")
+    public String subscription(Model model) {
+
         String frontendServiceUrl = String.format("http://%s:%d", frontendServiceHost, frontendServicePort);
 
         model.addAttribute("frontendServiceUrl", frontendServiceUrl);  // inject in DOM for AJAX etc
 
-        return "index";
+        return "subscription";
+    }
+    
+    @RequestMapping("/testRules.html")
+    public String testRules(Model model) {
+
+        return "testRules";
+    }
+    
+    @RequestMapping("/eiInfo.html")
+    public String eiInfo(Model model) {
+    	
+    	String frontendServiceUrl = String.format("http://%s:%d", frontendServiceHost, frontendServicePort);
+    	model.addAttribute("frontendServiceUrl", frontendServiceUrl);  // inject in DOM for AJAX etc
+    	String backendServerUrl = String.format("http://%s:%d", backendServerHost, backendServerPort);
+    	model.addAttribute("backendServerUrl", backendServerUrl);
+
+        return "eiInfo";
+    }
+    
+    @RequestMapping("/login.html")
+    public String login(Model model) {
+
+        return "login";
+    }
+    
+    @RequestMapping("/register.html")
+    public String register(Model model) {
+
+        return "register";
+    }
+    
+    @RequestMapping("/forgot-password.html")
+    public String forgotPassword(Model model) {
+
+        return "forgot-password";
     }
+    
 
     // Backend host and port (Getter & Setters), application.properties -> greeting.xxx
     public String getFrontendServiceHost() {
@@ -57,5 +109,28 @@ public int getFrontendServicePort() {
     public void setFrontendServicePort(int frontendServicePort) {
         this.frontendServicePort = frontendServicePort;
     }
+    
+    public String getBackendServerHost() {
+        return backendServerHost;
+    }
 
+    public void setBackendServerHost(String backendServerHost) {
+        this.backendServerHost = backendServerHost;
+    }
+
+    public int getBackendServerPort() {
+        return backendServerPort;
+    }
+
+    public void setBackendServerPort(int backendServerPort) {
+        this.backendServerPort = backendServerPort;
+    }
+
+    public String getEiffelDocumentationUrls() {
+        return eiffelDocumentationUrls;
+    }
+
+    public void setEiffelDocumentationUrls(String eiffelDocumentationUrls) {
+        this.eiffelDocumentationUrls = eiffelDocumentationUrls;
+    }
 }

src/main/resources/application.properties

@@ -15,6 +15,11 @@ ei.backendServerPort=8090
 ###### Subscription Template file ########
 ei.subscriptionFilePath=subscriptions/subscriptionsTemplate.json
 
+###### EI Documentation Link Url ##########
+ei.eiffelDocumentationUrls={ "EI GitHub": "https://github.com/Ericsson/eiffel-intelligence-frontend",\
+                             "Eiffel Github": "https://github.com/Ericsson/eiffel",\
+                             "Eiffel Github main page": "http://ericsson.github.io/eiffel" }
+
 #### LOGGING #########
 logging.level.root: INFO
 logging.level.org.springframework.web: DEBUG