From bc0646982f4c1686918048e4eedc5c9bcf647f27 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 7 Mar 2022 17:26:00 +0400
Subject: [PATCH] add first news

---
 .../ru/ulstu/controller/IndexController.java  |  8 ++++-
 src/main/java/ru/ulstu/model/News.java        | 34 +++++++++++++++++++
 src/main/resources/messages.properties        |  1 +
 src/main/resources/messages_en.properties     |  1 +
 src/main/resources/messages_ru.properties     |  1 +
 src/main/resources/templates/default.html     |  6 ++--
 src/main/resources/templates/index.html       |  4 +++
 7 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/model/News.java

diff --git a/src/main/java/ru/ulstu/controller/IndexController.java b/src/main/java/ru/ulstu/controller/IndexController.java
index 948d571..ee6e1df 100644
--- a/src/main/java/ru/ulstu/controller/IndexController.java
+++ b/src/main/java/ru/ulstu/controller/IndexController.java
@@ -9,14 +9,20 @@ package ru.ulstu.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import ru.ulstu.model.News;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.GregorianCalendar;
+import java.util.List;
 
 @Controller
 public class IndexController {
 
     @GetMapping("/")
-    public String index(Model model) throws IOException {
+    public String index(Model model) {
+        model.addAttribute("news", List.of(new News("Открытие семинара", new GregorianCalendar(2022, 4, 1).getTime(),
+                "На кафере \"Информационные системы\" Ульяновского государственного технического университета состоится открытие постоянно действующего семинара \"Анализ данных и процессов\". Семинар планируется проводить ежемесячно.")));
         return "index";
     }
 }
diff --git a/src/main/java/ru/ulstu/model/News.java b/src/main/java/ru/ulstu/model/News.java
new file mode 100644
index 0000000..e71af80
--- /dev/null
+++ b/src/main/java/ru/ulstu/model/News.java
@@ -0,0 +1,34 @@
+package ru.ulstu.model;
+
+import java.util.Date;
+
+public class News {
+    private final static int MAX_NEWS_TEXT_PREVIEW_LENGTH = 100;
+    private final String title;
+    private final Date date;
+    private final String text;
+
+    public News(String title, Date date, String text) {
+        this.title = title;
+        this.date = date;
+        this.text = text;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public String getPreview() {
+        return text.length() > MAX_NEWS_TEXT_PREVIEW_LENGTH
+                ? text.substring(0, MAX_NEWS_TEXT_PREVIEW_LENGTH) + "..."
+                : text;
+    }
+}
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 17fc2d4..717215a 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -4,4 +4,5 @@
 #
 #
 messages.app-name=C?????? �?????? ?????? ? ?????????�. ?????
+messages.logo-title=C?????? �?????? ?????? ? ?????????�
 messages.menu.home=Main
\ No newline at end of file
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 00d957c..7d1e461 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -4,4 +4,5 @@
 #
 #
 messages.app-name=Seminar "Analysis of data and processes". UlSTU
+messages.logo-title=Seminar "Analysis of data and processes"
 messages.menu.home=Main
\ No newline at end of file
diff --git a/src/main/resources/messages_ru.properties b/src/main/resources/messages_ru.properties
index c8cc3ea..114125e 100644
--- a/src/main/resources/messages_ru.properties
+++ b/src/main/resources/messages_ru.properties
@@ -4,4 +4,5 @@
 #
 #
 messages.app-name=Cеминар «Анализ данных и процессов». УлГТУ
+messages.logo-title=Cеминар «Анализ данных и процессов»
 messages.menu.home=На главную
\ No newline at end of file
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index eefca36..6af1759 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -10,7 +10,7 @@
 <head>
     <meta charset="UTF-8"/>
     <title th:text="#{messages.app-name}">app-name</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
     <script type="text/javascript" src="/webjars/jquery/3.6.0/jquery.min.js"></script>
     <script type="text/javascript" src="/webjars/bootstrap/4.6.0/js/bootstrap.bundle.min.js"></script>
     <script type="text/javascript" src="/webjars/bootstrap-select/1.13.8/js/bootstrap-select.min.js"></script>
@@ -21,8 +21,8 @@
 <body>
 <nav class="navbar navbar-expand-lg navbar-light bg-white">
     <a class="navbar-brand" href="/">
-        <img src="img/logo.svg" width="180" height="60" alt="">
-        <div class="navbar-text" th:text="#{messages.app-name}"></div>
+        <img src="img/logo.svg" width="50px">
+        <div class="navbar-text" th:text="#{messages.logo-title}" style="font-size: 16px"></div>
     </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 7fe0321..37800d1 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -13,5 +13,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
 </head>
 <div class="container" layout:fragment="content">
+    <div th:each="n : ${news}">
+        <h5 th:text="${n.title}"/>
+        <div th:text="${n.preview}"></div>
+    </div>
 </div>
 </html>