From 550cc4cdf34b34339ef1bb5f8f7f76f2510c36ab Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 27 Sep 2018 10:35:22 +0400
Subject: [PATCH 1/2] some refactor

---
 src/main/java/ru/ulstu/configuration/MvcConfiguration.java | 1 +
 src/main/resources/templates/default.html                  | 2 +-
 src/main/resources/templates/index.html                    | 2 +-
 src/main/resources/templates/{ => papers}/AlyonaTest.html  | 0
 src/main/resources/templates/{ => papers}/myPaper.html     | 0
 src/main/resources/templates/{ => papers}/paper.html       | 0
 src/main/resources/templates/{ => papers}/papers.html      | 4 ++--
 7 files changed, 5 insertions(+), 4 deletions(-)
 rename src/main/resources/templates/{ => papers}/AlyonaTest.html (100%)
 rename src/main/resources/templates/{ => papers}/myPaper.html (100%)
 rename src/main/resources/templates/{ => papers}/paper.html (100%)
 rename src/main/resources/templates/{ => papers}/papers.html (92%)

diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java
index bbe0885..14e6337 100644
--- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java
+++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java
@@ -11,6 +11,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
     public void addViewControllers(ViewControllerRegistry registry) {
         registry.addViewController("/{articlename:\\w+}");
         //registry.addViewController("/admin/{articlename:\\w+}");
+        registry.addViewController("/papers/{articlename:\\w+}");
         registry.addRedirectViewController("/", "/index");
         registry.addRedirectViewController("/default", "/index");
     }
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html
index b7fb7da..6754c32 100644
--- a/src/main/resources/templates/default.html
+++ b/src/main/resources/templates/default.html
@@ -84,7 +84,7 @@
 </footer>
 
 <!-- Custom scripts for this template -->
-<script src="js/agency.js"></script>
+<script src="/js/agency.js"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 94bb3de..fe62bbc 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -18,7 +18,7 @@
         </div>
         <div class="row">
             <div class="col-md-4 col-sm-6 portfolio-item">
-                <a class="portfolio-link" href="./papers">
+                <a class="portfolio-link" href="./papers/papers">
                     <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/AlyonaTest.html b/src/main/resources/templates/papers/AlyonaTest.html
similarity index 100%
rename from src/main/resources/templates/AlyonaTest.html
rename to src/main/resources/templates/papers/AlyonaTest.html
diff --git a/src/main/resources/templates/myPaper.html b/src/main/resources/templates/papers/myPaper.html
similarity index 100%
rename from src/main/resources/templates/myPaper.html
rename to src/main/resources/templates/papers/myPaper.html
diff --git a/src/main/resources/templates/paper.html b/src/main/resources/templates/papers/paper.html
similarity index 100%
rename from src/main/resources/templates/paper.html
rename to src/main/resources/templates/papers/paper.html
diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers/papers.html
similarity index 92%
rename from src/main/resources/templates/papers.html
rename to src/main/resources/templates/papers/papers.html
index a31200f..3f6a8fa 100644
--- a/src/main/resources/templates/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -19,8 +19,8 @@
         </div>
     </section>
 
-    <script src="js/core.js"></script>
-    <script src="js/papers.js"></script>
+    <script src="/js/core.js"></script>
+    <script src="/js/papers.js"></script>
     <script>
         $( document ).ready(function() {
             showPapers($("#paper-list"));

From a3668ddcd31c948dcc16b92cb40321c3d8e4a529 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 27 Sep 2018 12:11:25 +0400
Subject: [PATCH 2/2] move pages

---
 src/main/resources/public/css/agency.css      |   9 ++
 .../templates/papers/AlyonaTest.html          |  42 -----
 .../resources/templates/papers/dashboard.html | 152 ++++++++++++++++++
 .../resources/templates/papers/myPaper.html   |  20 ---
 .../resources/templates/papers/papers.html    |   2 +-
 5 files changed, 162 insertions(+), 63 deletions(-)
 delete mode 100644 src/main/resources/templates/papers/AlyonaTest.html
 create mode 100644 src/main/resources/templates/papers/dashboard.html

diff --git a/src/main/resources/public/css/agency.css b/src/main/resources/public/css/agency.css
index 43f29c0..b978b4b 100644
--- a/src/main/resources/public/css/agency.css
+++ b/src/main/resources/public/css/agency.css
@@ -704,3 +704,12 @@ ul.social-buttons li a {
 ul.social-buttons li a:active, ul.social-buttons li a:focus, ul.social-buttons li a:hover {
   background-color: #fed136;
 }
+
+.dashboard-card {
+  background: #ffffff none repeat scroll 0 0;
+  margin: 15px;
+  padding: 20px;
+  border: 0 solid #e7e7e7;
+  border-radius: 5px;
+  box-shadow: 0 5px 20px rgba(0, 0, 0, 0.05);
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/AlyonaTest.html b/src/main/resources/templates/papers/AlyonaTest.html
deleted file mode 100644
index 6350a2b..0000000
--- a/src/main/resources/templates/papers/AlyonaTest.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="default">
-<head>
-</head>
-<body>
-
-<div class="container" layout:fragment="content">
-    <section id="papers">
-        <div class="container">
-            <div class="row" id="paper-list">
-                <div class="col-lg-12 text-center">
-                    <h2 class="section-heading text-uppercase">Тестовая страница</h2>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <!-- Bootstrap core JavaScript -->
-    <script src="vendor/jquery/jquery.min.js"></script>
-    <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-
-    <!-- Plugin JavaScript -->
-    <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
-
-    <!-- Contact form JavaScript -->
-    <script src="js/jqBootstrapValidation.js"></script>
-    <script src="js/contact_me.js"></script>
-
-    <!-- Custom scripts for this template -->
-    <script src="js/agency.js"></script>
-    <script src="js/core.js"></script>
-    <script src="js/papers.js"></script>
-    <script>
-        showPapers($("#paper-list"));
-        // only for demo
-        //addPaper("название", "DRAFT", "comment", false);
-    </script>
-</div>
-
-</body>
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/dashboard.html b/src/main/resources/templates/papers/dashboard.html
new file mode 100644
index 0000000..b4e18d7
--- /dev/null
+++ b/src/main/resources/templates/papers/dashboard.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default">
+<head>
+</head>
+<body>
+
+<div class="container" layout:fragment="content">
+    <!-- Services -->
+    <section id="services">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-12 text-center">
+                    <h2 class="section-heading text-uppercase">Dashboard</h2>
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+                    <div class="row">
+                        <div class="col-2">
+                                <span class="fa-stack fa-1x">
+                                  <i class="fa fa-circle fa-stack-2x text-primary"></i>
+                                  <i class="fa fa-file-text-o fa-stack-1x fa-inverse"></i>
+                                </span>
+                        </div>
+                        <div class="col col-10 text-right">
+                            <h7 class="service-heading">Название статьи</h7>
+                            <p class="text-muted">Список авторов И.О.</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/papers/myPaper.html b/src/main/resources/templates/papers/myPaper.html
index d129d60..14fc771 100644
--- a/src/main/resources/templates/papers/myPaper.html
+++ b/src/main/resources/templates/papers/myPaper.html
@@ -16,26 +16,6 @@
             </div>
         </div>
     </section>
-
-    <!-- Bootstrap core JavaScript -->
-    <script src="vendor/jquery/jquery.min.js"></script>
-    <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-
-    <!-- Plugin JavaScript -->
-    <script src="vendor/jquery-easing/jquery.easing.min.js"></script>
-
-    <!-- Contact form JavaScript -->
-    <script src="js/jqBootstrapValidation.js"></script>
-    <script src="js/contact_me.js"></script>
-
-    <!-- Custom scripts for this template -->
-    <script src="js/agency.js"></script>
-    <script src="js/core.js"></script>
-    <script src="js/papers.js"></script>
-    <script>
-        showPapers($("#paper-list"));
-
-    </script>
 </div>
 </body>
 
diff --git a/src/main/resources/templates/papers/papers.html b/src/main/resources/templates/papers/papers.html
index 3f6a8fa..5a77e98 100644
--- a/src/main/resources/templates/papers/papers.html
+++ b/src/main/resources/templates/papers/papers.html
@@ -12,7 +12,7 @@
             <div class="row" id="paper-list">
                 <div class="col-lg-12 text-center">
                     <h2 class="section-heading text-uppercase">Статьи</h2>
-                    <a href="./AlyonaTest"><h5>Перейти на тестовую страницу Алёны</h5></a>
+                    <a href="./dashboard"><h5>Перейти на тестовую страницу Алёны</h5></a>
                     <a href="./myPaper"><h4>Ссылка на пустую страницу</h4></a>
                 </div>
             </div>