romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#42 merge dev into 42

Browse Source
This commit is contained in:
T-Midnight 2019-04-04 09:44:51 +04:00
parent 566b7821d1
commit 99a8550696
7 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/application.properties
View File

@ -1,7 +1,7 @@
# Server Settings # Server Settings
spring.main.banner-mode=off spring.main.banner-mode=off
server.port=8443 server.port=8443
server.http.port=8888 server.http.port=8080
spring.http.multipart.maxFileSize=20MB spring.http.multipart.maxFileSize=20MB
spring.http.multipart.maxRequestSize=20MB spring.http.multipart.maxRequestSize=20MB
# Thymeleaf Settings # Thymeleaf Settings
@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
# JPA Settings # JPA Settings
spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
spring.datasource.username=postgres spring.datasource.username=postgres
spring.datasource.password=superuser spring.datasource.password=postgres
spring.datasource.driverclassName=org.postgresql.Driver spring.datasource.driverclassName=org.postgresql.Driver
spring.jpa.hibernate.ddl-auto=validate spring.jpa.hibernate.ddl-auto=validate
# Liquibase Settings # Liquibase Settings

2
src/main/resources/templates/index.html
View File

@ -88,7 +88,7 @@
</div> </div>
</div> </div>
<div class="col-md-4 col-sm-6 portfolio-item"> <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">
<div class="portfolio-hover-content"> <div class="portfolio-hover-content">
<i class="fa fa-arrow-right fa-3x"></i> <i class="fa fa-arrow-right fa-3x"></i>

2
src/main/resources/templates/students/dashboard.html
View File

@ -16,7 +16,7 @@
<div class="row justify-content-center" id="dashboard"> <div class="row justify-content-center" id="dashboard">
<div th:replace="students/fragments/taskDashboardFragment"/> <div th:replace="students/fragments/taskDashboardFragment"/>
<!--<th:block th:each="task : ${tasks}">--> <!--<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>--> <!--</th:block>-->
</div> </div>
</div> </div>

6
src/main/resources/templates/students/fragments/taskLineFragment.html
View File

@ -7,11 +7,11 @@
<div class="row text-left task-row" style="background-color: white;"> <div class="row text-left task-row" style="background-color: white;">
<div class="col"> <div class="col">
<span th:replace="students/fragments/taskStatusFragment"/> <span th:replace="students/fragments/taskStatusFragment"/>
<a th:href="@{'task?id='+ 1}"> <a th:href="@{'task?id='+ 1}">
<span class="h6" >Первая хадач</span> <span class="h6">Первая хадач</span>
<span class="text-muted">Курсовая работа</span> <span class="text-muted">Курсовая работа</span>
</a> </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}" <a class="remove-task pull-right d-none" th:href="@{'/students/delete/'+1}"
data-confirm="Удалить задачу?"> data-confirm="Удалить задачу?">
<i class="fa fa-trash" aria-hidden="true"></i> <i class="fa fa-trash" aria-hidden="true"></i>

2
src/main/resources/templates/students/fragments/taskNavigationFragment.html
View File

@ -16,7 +16,7 @@
<div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3"> <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" <a href="./task" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle"
aria-hidden="true"></i> aria-hidden="true"></i>
Добавить задачу</a> Добавить задачу</a>
</div> </div>

18
src/main/resources/templates/students/task.html
View File

@ -1,9 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" <html lang="en"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" 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> <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"/> <link rel="stylesheet" href="../css/tasks.css"/>
</head> </head>
<body> <body>
@ -44,12 +45,13 @@
<div class="form-group"> <div class="form-group">
<label for="tags">Теги:</label> <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>
<div class="form-group"> <div class="form-group">
<label>Дедлайны задачи:</label> <label>Дедлайны задачи:</label>
<div class="row"> <div class="row">
<input type="hidden" /> <input type="hidden"/>
<div class="col-6"> <div class="col-6">
<input type="date" class="form-control" name="deadline"/> <input type="date" class="form-control" name="deadline"/>
</div> </div>
@ -64,16 +66,18 @@
</div> </div>
</div> </div>
<div class="form-group"> <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>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="form-group"> <div class="form-group">
<button id="sendMessageButton" name="save" class="btn btn-success text-uppercase" <button id="sendMessageButton" name="save" class="btn btn-success text-uppercase"
type="submit"> type="submit">
Сохранить Сохранить
</button> </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> </button>
</div> </div>

38
src/main/resources/templates/students/tasks.html
View File

@ -27,30 +27,30 @@
<div class="col-md-3 col-sm-12"> <div class="col-md-3 col-sm-12">
<div class="filter"> <div class="filter">
<h5>Фильтр:</h5> <h5>Фильтр:</h5>
<select class="form-control" id="status" <select class="form-control" id="status"
onchange="this.form.submit();"> onchange="this.form.submit();">
<option value="">Все статусы</option> <option value="">Все статусы</option>
<!--<option th:each="author: ${allAuthors}" th:value="${author.id}"--> <!--<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>--> <!--</option>-->
</select> </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>
</div> </div>