From 99a8550696c6c8dd627db26c59109a9762718645 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Thu, 4 Apr 2019 09:44:51 +0400
Subject: [PATCH] #42 merge dev into 42

---
 src/main/resources/application.properties     |  4 +-
 src/main/resources/templates/index.html       |  2 +-
 .../templates/students/dashboard.html         |  2 +-
 .../students/fragments/taskLineFragment.html  |  6 +--
 .../fragments/taskNavigationFragment.html     |  2 +-
 .../resources/templates/students/task.html    | 18 +++++----
 .../resources/templates/students/tasks.html   | 38 +++++++++----------
 7 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 78e009e..fb1b116 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 # Server Settings
 spring.main.banner-mode=off
 server.port=8443
-server.http.port=8888
+server.http.port=8080
 spring.http.multipart.maxFileSize=20MB
 spring.http.multipart.maxRequestSize=20MB
 # Thymeleaf Settings
@@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
 # JPA Settings
 spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=superuser
+spring.datasource.password=postgres
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 2d86945..6e43ba0 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -88,7 +88,7 @@
                 </div>
             </div>
             <div class="col-md-4 col-sm-6 portfolio-item">
-                <a class="portfolio-link"  href="./students/tasks">
+                <a class="portfolio-link" href="./students/tasks">
                     <div class="portfolio-hover">
                         <div class="portfolio-hover-content">
                             <i class="fa fa-arrow-right fa-3x"></i>
diff --git a/src/main/resources/templates/students/dashboard.html b/src/main/resources/templates/students/dashboard.html
index 94ea121..c0c2f0e 100644
--- a/src/main/resources/templates/students/dashboard.html
+++ b/src/main/resources/templates/students/dashboard.html
@@ -16,7 +16,7 @@
             <div class="row justify-content-center" id="dashboard">
                 <div th:replace="students/fragments/taskDashboardFragment"/>
                 <!--<th:block th:each="task : ${tasks}">-->
-                    <!--<div th:replace="students/fragments/taskDashboardFragment :: taskDashboard(task=${task})"/>-->
+                <!--<div th:replace="students/fragments/taskDashboardFragment :: taskDashboard(task=${task})"/>-->
                 <!--</th:block>-->
             </div>
         </div>
diff --git a/src/main/resources/templates/students/fragments/taskLineFragment.html b/src/main/resources/templates/students/fragments/taskLineFragment.html
index 79ad5d7..27ea98a 100644
--- a/src/main/resources/templates/students/fragments/taskLineFragment.html
+++ b/src/main/resources/templates/students/fragments/taskLineFragment.html
@@ -7,11 +7,11 @@
 <div class="row text-left task-row" style="background-color: white;">
     <div class="col">
         <span th:replace="students/fragments/taskStatusFragment"/>
-        <a  th:href="@{'task?id='+ 1}">
-            <span class="h6" >Первая хадач</span>
+        <a th:href="@{'task?id='+ 1}">
+            <span class="h6">Первая хадач</span>
             <span class="text-muted">Курсовая работа</span>
         </a>
-        <input class="id-class" type="hidden" th:value="1" />
+        <input class="id-class" type="hidden" th:value="1"/>
         <a class="remove-task pull-right d-none" th:href="@{'/students/delete/'+1}"
            data-confirm="Удалить задачу?">
             <i class="fa fa-trash" aria-hidden="true"></i>
diff --git a/src/main/resources/templates/students/fragments/taskNavigationFragment.html b/src/main/resources/templates/students/fragments/taskNavigationFragment.html
index 717930d..fed183f 100644
--- a/src/main/resources/templates/students/fragments/taskNavigationFragment.html
+++ b/src/main/resources/templates/students/fragments/taskNavigationFragment.html
@@ -16,7 +16,7 @@
 
     <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
         <a href="./task" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle"
-                                                                       aria-hidden="true"></i>
+                                                                 aria-hidden="true"></i>
             Добавить задачу</a>
 
     </div>
diff --git a/src/main/resources/templates/students/task.html b/src/main/resources/templates/students/task.html
index 533c8f6..22b27e6 100644
--- a/src/main/resources/templates/students/task.html
+++ b/src/main/resources/templates/students/task.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html lang="en"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="default"  xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
+      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
 <head>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.css"/>
+    <link rel="stylesheet"
+          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.css"/>
     <link rel="stylesheet" href="../css/tasks.css"/>
 </head>
 <body>
@@ -44,12 +45,13 @@
 
                                 <div class="form-group">
                                     <label for="tags">Теги:</label>
-                                    <input class="form-control" data-role="tagsinput" placeholder="Теги задачи" id="tags"/>
+                                    <input class="form-control" data-role="tagsinput" placeholder="Теги задачи"
+                                           id="tags"/>
                                 </div>
                                 <div class="form-group">
                                     <label>Дедлайны задачи:</label>
                                     <div class="row">
-                                        <input type="hidden" />
+                                        <input type="hidden"/>
                                         <div class="col-6">
                                             <input type="date" class="form-control" name="deadline"/>
                                         </div>
@@ -64,16 +66,18 @@
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary" value="Добавить
+                                    <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
+                                           value="Добавить
                                     дедлайн"/>
                                 </div>
-                            <div class="clearfix"></div>
+                                <div class="clearfix"></div>
                                 <div class="form-group">
                                     <button id="sendMessageButton" name="save" class="btn btn-success text-uppercase"
                                             type="submit">
                                         Сохранить
                                     </button>
-                                    <button id="cancelButton" class="btn btn-default text-uppercase" href="/students/tasks">
+                                    <button id="cancelButton" class="btn btn-default text-uppercase"
+                                            href="/students/tasks">
                                         Отмена
                                     </button>
                                 </div>
diff --git a/src/main/resources/templates/students/tasks.html b/src/main/resources/templates/students/tasks.html
index 076f7ba..acb726c 100644
--- a/src/main/resources/templates/students/tasks.html
+++ b/src/main/resources/templates/students/tasks.html
@@ -27,30 +27,30 @@
                     <div class="col-md-3 col-sm-12">
                         <div class="filter">
                             <h5>Фильтр:</h5>
-                            <select class="form-control"   id="status"
+                            <select class="form-control" id="status"
                                     onchange="this.form.submit();">
                                 <option value="">Все статусы</option>
                                 <!--<option th:each="author: ${allAuthors}" th:value="${author.id}"-->
-                                        <!--th:text="${author.lastName}">lastName-->
+                                <!--th:text="${author.lastName}">lastName-->
+                                <!--</option>-->
+                            </select>
+                            <select class="form-control" id="tags"
+                                    onchange="this.form.submit();">
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <option value="">Все типы</option>
+                                <!--<option th:each="year: ${allYears}" th:value="${year}"-->
+                                <!--th:text="${year}">year-->
                                 <!--</option>-->
                             </select>
-                                <select class="form-control" id="tags"
-                                        onchange="this.form.submit();">
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <option value="">Все типы</option>
-                                    <!--<option th:each="year: ${allYears}" th:value="${year}"-->
-                                            <!--th:text="${year}">year-->
-                                    <!--</option>-->
-                                </select>
 
                         </div>
                     </div>