Task #78 - wicket BasePage updates

payneteasy · Jan 18, 2024 · 6458153 · 6458153
1 parent 9154273
commit 6458153
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/SrvlogUIApplication.java b/srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/SrvlogUIApplication.java
@@ -13,6 +13,8 @@
 import org.apache.wicket.core.util.crypt.KeyInSessionSunJceCryptFactory;
 import org.apache.wicket.csp.CSPDirective;
 import org.apache.wicket.csp.CSPDirectiveSrcValue;
+import org.apache.wicket.markup.head.ResourceAggregator;
+import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.IRequestMapper;
 import org.apache.wicket.request.Url;
@@ -33,11 +35,6 @@ protected void init() {
         super.init();
         //TODO think what to do with wicket csp
         getCspSettings().blocking().disabled();
-        /*getCspSettings().blocking().clear()
-                .add(CSPDirective.DEFAULT_SRC, CSPDirectiveSrcValue.NONE)
-                .add(CSPDirective.SCRIPT_SRC, CSPDirectiveSrcValue.SELF)
-                .add(CSPDirective.IMG_SRC, CSPDirectiveSrcValue.SELF)
-                .add(CSPDirective.FONT_SRC, CSPDirectiveSrcValue.SELF);*/
 
         getSecuritySettings().setCryptFactory(new KeyInSessionSunJceCryptFactory());
         IRequestMapper cryptoMapper = new CryptoMapper(getRootRequestMapper(), this);
@@ -69,6 +66,12 @@ protected void init() {
         mountPage("terminal", TerminalPage.class);
 
         mountPage("login", LoginPage.class);
+
+        getHeaderResponseDecorators().add(
+                response -> new ResourceAggregator(
+                        new JavaScriptFilteredIntoFooterHeaderResponse(response, "footer-container")
+                )
+        );
     }
 
 //    @Override

diff --git a/srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/page/BasePage.html b/srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/page/BasePage.html
@@ -1,7 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
     <wicket:head>
         <title>Srvlog log collector</title>
-        <link href="css/main.css" rel="stylesheet">
     </wicket:head>
 <body>
 <div class="container-fluid">

diff --git a/srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/page/BasePage.java b/srvlog-web/src/main/java/com/payneteasy/srvlog/wicket/page/BasePage.java
@@ -4,13 +4,19 @@
 import com.payneteasy.srvlog.wicket.page.detailed.FirewallAlertDataPage;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Page;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.CssReferenceHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.springframework.security.access.annotation.Secured;
 
@@ -35,6 +41,9 @@ public BasePage() {
     public BasePage(PageParameters pageParameters, Class<? extends Page> pageClass) {
         this.pageClass = pageClass;
 
+
+
+
         //BAR MENU
         addBarLink("dashboard", DashboardPage.class);
         addBarLink("logs", LogMonitorPage.class);
@@ -83,6 +92,11 @@ protected void onRender() {
         super.onRender();
     }
 
+    @Override
+    public void renderHead(IHeaderResponse response) {
+        response.render(CssHeaderItem.forReference(new CssResourceReference(getClass(), "main.css")));
+    }
+
     private void addBarLink(String linkId, Class<? extends Page> pageClass){
         WebMarkupContainer webMarkupContainer = new WebMarkupContainer(linkId+"-container");
         BookmarkablePageLink<Page> bookmarkablePageLink = new BookmarkablePageLink<Page>(linkId, pageClass);

diff --git a/...n/webapp/css/bootstrap-responsive.min.css → .../wicket/page/bootstrap-responsive.min.css b/...n/webapp/css/bootstrap-responsive.min.css → .../wicket/page/bootstrap-responsive.min.css
diff --git a/...web/src/main/webapp/css/bootstrap.min.css → ...easy/srvlog/wicket/page/bootstrap.min.css b/...web/src/main/webapp/css/bootstrap.min.css → ...easy/srvlog/wicket/page/bootstrap.min.css
diff --git a/srvlog-web/src/main/webapp/css/main.css → ...om/payneteasy/srvlog/wicket/page/main.css b/srvlog-web/src/main/webapp/css/main.css → ...om/payneteasy/srvlog/wicket/page/main.css