From ae367797bb3bca70ec690dc885006d08ef0f2003 Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Wed, 10 Jan 2024 20:08:05 +0300
Subject: [PATCH] Mock book page

---
 .../ru/redrise/marinesco/BookController.java  | 34 ++++++++++++++++
 .../ru/redrise/marinesco/RootController.java  | 12 +++++-
 .../marinesco/library/AthorByIdConverter.java | 21 ++++++++++
 .../marinesco/library/GenreByIdConverter.java | 21 ++++++++++
 .../marinesco/library/InpxScanner.java        |  3 ++
 src/main/resources/static/styles/styles.css   |  4 ++
 src/main/resources/templates/book.html        | 40 +++++++++++++++++++
 src/main/resources/templates/root.html        |  9 ++++-
 8 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/ru/redrise/marinesco/BookController.java
 create mode 100644 src/main/java/ru/redrise/marinesco/library/AthorByIdConverter.java
 create mode 100644 src/main/java/ru/redrise/marinesco/library/GenreByIdConverter.java
 create mode 100644 src/main/resources/templates/book.html

diff --git a/src/main/java/ru/redrise/marinesco/BookController.java b/src/main/java/ru/redrise/marinesco/BookController.java
new file mode 100644
index 0000000..63d46aa
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/BookController.java
@@ -0,0 +1,34 @@
+package ru.redrise.marinesco;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import lombok.extern.slf4j.Slf4j;
+import ru.redrise.marinesco.data.InpEntryRepository;
+import ru.redrise.marinesco.library.Author;
+import ru.redrise.marinesco.library.InpEntry;
+
+@Slf4j
+@Controller
+@RequestMapping("/book")
+public class BookController {
+    InpEntryRepository inpEntryRepository;
+
+    public BookController(InpEntryRepository inpEntryRepository){
+        this.inpEntryRepository = inpEntryRepository;
+    }
+
+    @GetMapping("/{bookId}")
+    public String getPage(@PathVariable("bookId") Long bookId, Model model) {
+        InpEntry book = inpEntryRepository.findById(bookId).orElse(null);
+        if (book == null){
+            model.addAttribute("Error", "Not found");
+            return "book";
+        }
+        model.addAttribute("book", book);
+        return "book";
+    }
+}
diff --git a/src/main/java/ru/redrise/marinesco/RootController.java b/src/main/java/ru/redrise/marinesco/RootController.java
index 21757ce..db3ba4d 100644
--- a/src/main/java/ru/redrise/marinesco/RootController.java
+++ b/src/main/java/ru/redrise/marinesco/RootController.java
@@ -2,12 +2,20 @@ package ru.redrise.marinesco;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 @Controller
+@RequestMapping("/")
 public class RootController {
 
-    @GetMapping("/")
-    public String home(){
+    @GetMapping
+    public String getPage(@ModelAttribute("search") String text) {
+        // TODO: SEARCH PAGE + CONTROLLER
+        log.info(text);
         return "root";
     }
 }
diff --git a/src/main/java/ru/redrise/marinesco/library/AthorByIdConverter.java b/src/main/java/ru/redrise/marinesco/library/AthorByIdConverter.java
new file mode 100644
index 0000000..abe6f3c
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/library/AthorByIdConverter.java
@@ -0,0 +1,21 @@
+package ru.redrise.marinesco.library;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import ru.redrise.marinesco.data.AuthorRepository;
+
+@Component
+public class AthorByIdConverter implements Converter<Long, Author>{
+
+    private AuthorRepository authorRepository;
+
+    public AthorByIdConverter(AuthorRepository authorRepository){
+        this.authorRepository = authorRepository;
+    }
+
+    @Override
+    public Author convert(Long id) {
+        return authorRepository.findById(id).orElse(null);
+    }   
+}
\ No newline at end of file
diff --git a/src/main/java/ru/redrise/marinesco/library/GenreByIdConverter.java b/src/main/java/ru/redrise/marinesco/library/GenreByIdConverter.java
new file mode 100644
index 0000000..1e134c8
--- /dev/null
+++ b/src/main/java/ru/redrise/marinesco/library/GenreByIdConverter.java
@@ -0,0 +1,21 @@
+package ru.redrise.marinesco.library;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+import ru.redrise.marinesco.data.GenreRepository;
+
+@Component
+public class GenreByIdConverter implements Converter<String, Genre>{
+
+    private GenreRepository genreRepository;
+
+    public GenreByIdConverter(GenreRepository genreRepository){
+        this.genreRepository = genreRepository;
+    }
+
+    @Override
+    public Genre convert(String id) {
+        return genreRepository.findById(id).orElse(null);
+    }   
+}
\ No newline at end of file
diff --git a/src/main/java/ru/redrise/marinesco/library/InpxScanner.java b/src/main/java/ru/redrise/marinesco/library/InpxScanner.java
index f2febcf..4b715e6 100644
--- a/src/main/java/ru/redrise/marinesco/library/InpxScanner.java
+++ b/src/main/java/ru/redrise/marinesco/library/InpxScanner.java
@@ -133,6 +133,9 @@ public class InpxScanner implements Runnable {
     }
 
     private void parseInp(File inpxFile) throws Exception {
+        log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
+        log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
+        log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
         boolean breaker = false;
 
         try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(inpxFile))) {
diff --git a/src/main/resources/static/styles/styles.css b/src/main/resources/static/styles/styles.css
index 0ebad29..823cccb 100644
--- a/src/main/resources/static/styles/styles.css
+++ b/src/main/resources/static/styles/styles.css
@@ -8,6 +8,10 @@
 	src: url('/styles/Arimo-VariableFont_wght.ttf');
 }
 
+html{
+	line-height: 1.5;
+}
+
 body {
 	font-family: Arimo;
 	background-color: #212121;
diff --git a/src/main/resources/templates/book.html b/src/main/resources/templates/book.html
new file mode 100644
index 0000000..ed58289
--- /dev/null
+++ b/src/main/resources/templates/book.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <title>Marinesco</title>
+    <link rel="icon" href="/favicon.svg" type="image/svg+xml">
+    <link rel="alternate icon" href="/favicon.png" type="image/png">
+    <link rel="stylesheet" th:href="@{/styles/styles.css}" />
+</head>
+
+<body>
+    <div class="page">
+        <div th:replace="~{fragments/header :: 'header'}"></div>
+        <div class="container base">
+            <span class="validationError" th:if="${Error} != null" th:text="${Error}"></span>
+            <div th:if="${book} != null">
+                <br /><span th:text="${'Title: ' + book.title}"></span>
+                <br /><span>Authors: </span>
+                <div th:each="author : ${book.authors}">
+                    <span th:text="${'  * ' + author.authorName}"></span>
+                </div>
+                <br /><span>Genres: </span>
+                <div th:each="genre : ${book.genres}">
+                    <span th:text="${'  * ' + genre.genreId + ' — ' + genre.humanReadableDescription}"></span>
+                </div>
+                <br /><span th:if="${book.series} != null" th:text="${'Series: ' + book.series}"></span>
+                <br /><span th:if="${book.serNo} != null" th:text="${'Series # : ' + book.serNo}"></span>
+                <br /><span th:text="${'Format: ' + book.fileExtension}"></span>
+                <br /><span th:if="${book.addedDate} != null" th:text="${'Added : ' + book.addedDate}"></span>
+                <br /><span th:text="${'Size: ' + book.fileSize + ' bytes'}"></span>
+                <p>
+                    <a th:href="'/'" th:text="Download"></a>
+                </p>
+            </div>
+        </div>
+    </div>
+    <div th:replace="~{fragments/footer :: 'footer'}"></div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/root.html b/src/main/resources/templates/root.html
index d850e53..954dc0c 100644
--- a/src/main/resources/templates/root.html
+++ b/src/main/resources/templates/root.html
@@ -4,7 +4,7 @@
 <head>
     <title>Marinesco</title>
     <link rel="icon" href="/favicon.svg" type="image/svg+xml">
-	<link rel="alternate icon" href="/favicon.png" type="image/png">
+    <link rel="alternate icon" href="/favicon.png" type="image/png">
     <link rel="stylesheet" th:href="@{/styles/styles.css}" />
 </head>
 
@@ -16,7 +16,14 @@
             <br /><a href="/profile">/profile</a>
             <br /><a href="/manage_users">/manage_users</a>
             <br /><a href="/settings">/settings</a>
+            <br /><a href="/book/59992766">/book/59992766</a>
             <br /><a href="/h2">H2</a>
+            <br />
+            <br />
+            <form action='' method='get'>
+                <input type='text' name='search'>
+                <button class="sign" type='submit'>Search</button>
+            </form>
         </div>
     </div>
     <div th:replace="~{fragments/footer :: 'footer'}"></div>