1 files changed, 60 insertions, 1 deletions

diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
index 5e6a0d0e..9c35f1c2 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
@@ -25,6 +25,13 @@ import com.juick.service.CloudflareCache;
 import com.juick.service.TagService;
 import com.juick.service.UserService;
 import com.juick.www.HelpService;
+import com.mitchellbosecke.pebble.PebbleEngine;
+import com.mitchellbosecke.pebble.extension.FormatterExtension;
+import com.mitchellbosecke.pebble.loader.ClasspathLoader;
+import com.mitchellbosecke.pebble.loader.Loader;
+import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
+import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
+import org.apache.commons.codec.CharEncoding;
 import org.commonmark.ext.autolink.AutolinkExtension;
 import org.commonmark.node.Link;
 import org.commonmark.parser.Parser;
@@ -34,17 +41,23 @@ import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.core.Ordered;
+import org.springframework.http.CacheControl;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.resource.PathResourceResolver;
 
 import javax.inject.Inject;
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by aalexeev on 11/22/16.
  */
 @Configuration
 @EnableCaching
-@Import({WwwServletConfiguration.class, BaseWebConfiguration.class, WebSecurityConfig.class, SapeConfiguration.class, SearchConfiguration.class,
+@Import({ BaseWebConfiguration.class, WebSecurityConfig.class, SapeConfiguration.class, SearchConfiguration.class,
         DataConfiguration.class, StorageConfiguration.class, XMPPConfiguration.class})
 public class WwwAppConfiguration implements WebMvcConfigurer {
     @Inject
@@ -84,5 +97,51 @@ public class WwwAppConfiguration implements WebMvcConfigurer {
     public CloudflareCache cloudflareCache() {
         return new CloudflareCache();
     }
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
+        registry.addResourceHandler(
+                "/scripts*.js*",
+                "/style*.css*",
+                "/*.png",
+                "/favicon.ico")
+                .addResourceLocations("classpath:/")
+                .setCacheControl(CacheControl.maxAge(30, TimeUnit.DAYS).mustRevalidate().cachePublic())
+                .resourceChain(true)
+                .addResolver(new PathResourceResolver());
+
+        registry.addResourceHandler("/static/**")
+                .addResourceLocations("/static/")
+                .setCacheControl(CacheControl.maxAge(30, TimeUnit.DAYS).mustRevalidate().cachePublic());
+    }
+    @Bean
+    public Loader templateLoader() {
+        return new ClasspathLoader();
+    }
+
+    @Bean
+    public SpringExtension springExtension() {
+        return new SpringExtension();
+    }
+
+    @Bean
+    public PebbleEngine pebbleEngine() {
+        return new PebbleEngine.Builder()
+                .loader(this.templateLoader())
+                .extension(springExtension())
+                .extension(new FormatterExtension())
+                .strictVariables(true)
+                .build();
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        PebbleViewResolver viewResolver = new PebbleViewResolver();
+        viewResolver.setPrefix("templates");
+        viewResolver.setSuffix(".html");
+        viewResolver.setPebbleEngine(pebbleEngine());
+        viewResolver.setCharacterEncoding(CharEncoding.UTF_8);
+        return viewResolver;
+    }
 
 }