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] 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"));