From 9820abe11c0c037f50bb2f7ddbb0bd19646264dc Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 7 Apr 2017 10:29:52 +0300
Subject: juick-www: merge juick-spring-www i18n, drop thymeleaf

---
 .../com/juick/www/controllers/HelpController.java  | 67 ----------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 juick-spring-www/src/main/java/com/juick/www/controllers/HelpController.java

(limited to 'juick-spring-www/src/main/java/com/juick/www/controllers/HelpController.java')

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/HelpController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/HelpController.java
deleted file mode 100644
index 3387f821..00000000
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/HelpController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.juick.www.controllers;
-
-import com.juick.server.util.HttpNotFoundException;
-import com.juick.util.UserUtils;
-import com.juick.www.HelpService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
-
-/**
- * Created by aalexeev on 11/21/16.
- */
-@Controller
-public class HelpController {
-    @Inject
-    private HelpService helpService;
-
-    @RequestMapping({"/help", "/help/{langOrPage}", "/help/{lang}/{page}"})
-    public String showHelp(
-            Locale locale,
-            @PathVariable("lang") Optional<String> langParam,
-            @PathVariable("page") Optional<String> pageParam,
-            @PathVariable("langOrPage") Optional<String> langOrPageParam,
-            Model model) throws IOException, URISyntaxException {
-
-        String page = pageParam.orElse("index");
-        String lang = langParam.orElse(locale.getLanguage());
-
-        String navigation = null;
-
-        if (langOrPageParam.isPresent()) {
-            String langOrPage = langOrPageParam.get();
-
-            if (helpService.canBeLang(langOrPage)) {
-                navigation = helpService.getHelp("navigation", langOrPage);
-                if (navigation != null)
-                    lang = langOrPage;
-            }
-
-            if (navigation == null && helpService.canBePage(langOrPage))
-                page = langOrPage;
-        }
-
-        String content = helpService.getHelp(page, lang);
-        if (content == null && !Objects.equals("index", page))
-            content = helpService.getHelp("index", lang);
-
-        if (navigation == null)
-            navigation = helpService.getHelp("navigation", lang);
-
-        if (content == null || navigation == null)
-            throw new HttpNotFoundException();
-
-        model.addAttribute("help_nav", navigation);
-        model.addAttribute("help_data", content);
-
-        return "views/help";
-    }
-}
-- 
cgit v1.2.3