desu/marinesco
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct UI

Browse source
This commit is contained in:
Dmitry Isaenko 2024-01-15 21:04:28 +03:00
parent 8f2828ea63
commit abec14663e
9 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/ru/redrise/marinesco/RootController.java
View file

@ -5,17 +5,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Controller @Controller
@RequestMapping("/") @RequestMapping("/")
public class RootController { public class RootController {
@GetMapping @GetMapping
public String getPage(@ModelAttribute("search") String text) { public String getPage(@ModelAttribute("search") String text) {
// TODO: SEARCH PAGE + CONTROLLER
log.info(text);
return "root"; return "root";
} }
} }

4
src/main/java/ru/redrise/marinesco/AuthorController.java → src/main/java/ru/redrise/marinesco/library/AuthorController.java
View file

@ -1,4 +1,4 @@
package ru.redrise.marinesco; package ru.redrise.marinesco.library;
import java.util.List; import java.util.List;
@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import ru.redrise.marinesco.data.AuthorRepository; import ru.redrise.marinesco.data.AuthorRepository;
import ru.redrise.marinesco.data.BookRepository; import ru.redrise.marinesco.data.BookRepository;
import ru.redrise.marinesco.library.Author;
import ru.redrise.marinesco.library.Book;
@Controller @Controller
@RequestMapping("/author") @RequestMapping("/author")

3
src/main/java/ru/redrise/marinesco/BookController.java → src/main/java/ru/redrise/marinesco/library/BookController.java
View file

@ -1,4 +1,4 @@
package ru.redrise.marinesco; package ru.redrise.marinesco.library;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import ru.redrise.marinesco.data.BookRepository; import ru.redrise.marinesco.data.BookRepository;
import ru.redrise.marinesco.library.Book;
@Controller @Controller
@RequestMapping("/book") @RequestMapping("/book")

7
src/main/java/ru/redrise/marinesco/library/InpxScanner.java
View file

@ -134,22 +134,23 @@ public class InpxScanner implements Runnable {
} }
private void parseInp(File inpxFile) throws Exception { 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"); log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
log.warn("REMOVE TEMPORARY SOLUTION - BREAKER"); log.warn("REMOVE TEMPORARY SOLUTION - BREAKER");
boolean breaker = false; boolean breaker = false;
*/
try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(inpxFile))) { try (ZipInputStream zipInputStream = new ZipInputStream(new FileInputStream(inpxFile))) {
ZipEntry zipEntry = zipInputStream.getNextEntry(); ZipEntry zipEntry = zipInputStream.getNextEntry();
while (zipEntry != null) { while (zipEntry != null) {
if (zipEntry.getName().toLowerCase().endsWith(".inp")) { if (zipEntry.getName().toLowerCase().endsWith(".inp")) {
// * /*
if (breaker) { if (breaker) {
zipEntry = zipInputStream.getNextEntry(); zipEntry = zipInputStream.getNextEntry();
continue; continue;
} }
breaker = true;// breaker = true;
// */ // */
byte[] content = inpToByteArray(zipInputStream, zipEntry.getSize()); byte[] content = inpToByteArray(zipInputStream, zipEntry.getSize());
parseInpContent(content, zipEntry.getName()); parseInpContent(content, zipEntry.getName());

12
src/main/resources/static/styles/styles.css
View file

@ -156,12 +156,11 @@ header {
color: #74bfbd; color: #74bfbd;
} }
.header_entry_link:link { .header_entry_link:link,
color: #74bfbd;
}
.header_entry_link:visited { .header_entry_link:visited {
color: #74bfbd; color: #74bfbd;
} }
.header_entry_link:hover { .header_entry_link:hover {
color: #b6a795; color: #b6a795;
} }
@ -175,10 +174,6 @@ header {
margin-right: 10px; margin-right: 10px;
} }
a.entry {
text-decoration: none;
}
.header_title { .header_title {
font-size: 1.5em; font-size: 1.5em;
} }
@ -262,9 +257,6 @@ button:hover {
text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e; text-shadow: -1px -1px 0 #1e1e1e, 1px -1px 0 #1e1e1e, -1px 1px 0 #1e1e1e, 1px 1px 0 #1e1e1e;
color: #74bfbd; color: #74bfbd;
} }
.copy_link:hover {
color: #b6a795;
}
/* error */ /* error */
.error { .error {

2
src/main/resources/templates/book.html
View file

@ -21,7 +21,7 @@
<a th:href="${'/author/' + author.id}" th:text="${author.authorName}"></a> <a th:href="${'/author/' + author.id}" th:text="${author.authorName}"></a>
</div> </div>
<br /> <br />
<span th:each="genre : ${book.genres}" th:text="${(genre.humanReadableDescription == '' ? genre.genreId : genre.humanReadableDescription) + '&nbsp;&nbsp;'}"></span> <span th:each="genre : ${book.genres}" th:text="${((genre.humanReadableDescription == null || genre.humanReadableDescription == '') ? genre.genreId : genre.humanReadableDescription) + '&nbsp;&nbsp;'}"></span>
<p> <p>
<a th:href="${'/download/?container=' + book.container + '&file=' + book.fsFileName}" <a th:href="${'/download/?container=' + book.container + '&file=' + book.fsFileName}"
th:text="${'Download ' + book.fileExtension + ' (' + book.fileSizeForHumans + ')'}"></a> th:text="${'Download ' + book.fileExtension + ' (' + book.fileSizeForHumans + ')'}"></a>

6
src/main/resources/templates/fragments/footer.html
View file

@ -7,10 +7,8 @@
<body> <body>
<div class="footer" th:fragment="footer"> <div class="footer" th:fragment="footer">
<div class="container"> <div class="container">
<footer class="inner_footer"> <footer class="inner_footer copy_link">
<a class="entry" href="https://redrise.ru"> <a class="header_entry_link" href="https://redrise.ru">&copy; 2023-2024 Dmitry Isaenko</a>
<div class="copy_link">&copy; 2023-2024 Dmitry Isaenko</div>
</a>
</footer> </footer>
</div> </div>
</div> </div>

8
src/main/resources/templates/fragments/header.html
View file

@ -14,9 +14,7 @@
<div class="block_inner"> <div class="block_inner">
<ul class="ul_right_block"> <ul class="ul_right_block">
<li class="li_header_block"> <li class="li_header_block">
<a class="entry" href="/login" th:href="@{/login}"> <a class="header_entry header_entry_link" href="/login" th:href="@{/login}">Sign in</a>
<span class="header_entry header_entry_link">Sign in</span>
</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -53,9 +51,7 @@
<span class="header_entry">|</span> <span class="header_entry">|</span>
</li> </li>
<li class="li_header_block"> <li class="li_header_block">
<a class="entry" href="/logout"> <a class="header_entry header_entry_link" href="/logout">Logout</a>
<span class="header_entry header_entry_link">Logout</span>
</a>
<form style="visibility: hidden" id="form" method="post" action="#" th:action="@{/logout}"></form> <form style="visibility: hidden" id="form" method="post" action="#" th:action="@{/logout}"></form>
</li> </li>
</ul> </ul>

6
src/main/resources/templates/root.html
View file

@ -12,11 +12,7 @@
<div class="page"> <div class="page">
<div th:replace="~{fragments/header :: ${#authorization.expression('isAuthenticated()')} ? 'header-auth' : 'header-anon'}"></div> <div th:replace="~{fragments/header :: ${#authorization.expression('isAuthenticated()')} ? 'header-auth' : 'header-anon'}"></div>
<div class="container base"> <div class="container base">
<br /><a href="/book/59992766">/book/59992766</a> Welcome
<br /><a href="/author/1">/author/1</a>
<br /><a href="/h2">H2</a>
<br />
</div> </div>
</div> </div>
<div th:replace="~{fragments/footer :: 'footer'}"></div> <div th:replace="~{fragments/footer :: 'footer'}"></div>