Browse Source

Merge Veronica's PR.

Ilya Lysko 4 years ago
parent
commit
f554aa677d
70 changed files with 17595 additions and 38 deletions
  1. 42 27
      AuthModule/src/main/java/Controller/StudentMovController.java
  2. 32 1
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css
  3. 96 0
      AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/mainWindowProject.jsp
  4. 19 0
      AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentChangeInfo.jsp
  5. 65 6
      AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp
  6. 104 0
      AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentProjects.jsp
  7. 5 0
      AuthModule/target/AuthModule/META-INF/MANIFEST.MF
  8. 6 0
      AuthModule/target/AuthModule/WEB-INF/applicationContext.xml
  9. 1339 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css
  10. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map
  11. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css
  12. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map
  13. 459 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css
  14. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map
  15. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css
  16. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map
  17. 9320 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css
  18. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map
  19. 6 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css
  20. 1 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map
  21. 343 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css
  22. 3535 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js
  23. 7 0
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js
  24. 32 0
      AuthModule/target/AuthModule/WEB-INF/dispatcher-servlet.xml
  25. 57 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp
  26. 58 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp
  27. 34 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp
  28. 78 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp
  29. 84 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp
  30. 60 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp
  31. 106 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp
  32. 96 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/mainWindowProject.jsp
  33. 19 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/studentChangeInfo.jsp
  34. 75 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp
  35. 104 0
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/studentProjects.jsp
  36. 55 0
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/adminBar.jsp
  37. 58 0
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/index.jsp
  38. 55 0
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/ownerBar.jsp
  39. 119 0
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/studentBar.jsp
  40. 82 0
      AuthModule/target/AuthModule/WEB-INF/views/moderatorViews/mainWindowProject.jsp
  41. 96 0
      AuthModule/target/AuthModule/WEB-INF/views/moderatorViews/startPageModerator.jsp
  42. 38 0
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/aboutPage.jsp
  43. 45 0
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/accessDeniedView.jsp
  44. 38 0
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/contactPage.jsp
  45. 45 0
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/errorView.jsp
  46. 57 0
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regAdminPage.jsp
  47. 56 0
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regClientPage.jsp
  48. 64 0
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regStudentPage.jsp
  49. 50 0
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/registration.jsp
  50. 45 0
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/registrationSuccess.jsp
  51. 52 0
      AuthModule/target/AuthModule/WEB-INF/web.xml
  52. 11 0
      DBModule/DBModule.iml
  53. 18 0
      DBModule/src/main/java/DAOImplement/StudentDao.java
  54. 21 4
      DBModule/src/main/java/HibernateEntities/StPrEntity.java
  55. 6 0
      DBModule/src/main/resources/StPrEntity.hbm.xml
  56. 45 0
      DBModule/target/classes/ClientsEntity.hbm.xml
  57. 18 0
      DBModule/target/classes/GroupsEntity.hbm.xml
  58. 20 0
      DBModule/target/classes/ModerListSkills.hbm.xml
  59. 39 0
      DBModule/target/classes/ModeratorsEntity.hbm.xml
  60. 26 0
      DBModule/target/classes/Project_mod_skillEntity.hbm.xml
  61. 17 0
      DBModule/target/classes/Project_skil_catEntity.hbm.xml
  62. 36 0
      DBModule/target/classes/ProjectsEntity.hbm.xml
  63. 14 0
      DBModule/target/classes/Skil_catEntity.hbm.xml
  64. 14 0
      DBModule/target/classes/Skil_listEntity.hbm.xml
  65. 20 0
      DBModule/target/classes/Skil_matchEntity.hbm.xml
  66. 18 0
      DBModule/target/classes/StPrEntity.hbm.xml
  67. 20 0
      DBModule/target/classes/StudentListSkills.hbm.xml
  68. 42 0
      DBModule/target/classes/StudentsEntity.hbm.xml
  69. 18 0
      DBModule/target/classes/UsersEntity.hbm.xml
  70. 48 0
      DBModule/target/classes/hibernate.cfg.xml

+ 42 - 27
AuthModule/src/main/java/Controller/StudentMovController.java

@@ -1,5 +1,4 @@
 package Controller;
-
 import HibernateEntities.ModeratorsEntity;
 import HibernateEntities.StudentsEntity;
 import ServiceEntites.AddInfEnt;
@@ -8,40 +7,56 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.servlet.ModelAndView;
-
+import javax.enterprise.inject.Model;
+import static DAOImplement.StudentDao.getStudentsProject;
 import static DAOImplement.StudentDao.updateStudent;
-
 /**
  * Created by kinetik on 06.03.17.
  */
 @Controller
 @SessionAttributes("Student")
 public class StudentMovController {
-
-    @RequestMapping(value = "/PCabinStudentControlerjj")
-    public ModelAndView studentInNextViewChecker(@ModelAttribute("Student") StudentsEntity student) {
-        ModelAndView studentFirstIn = new ModelAndView("inViews/firstInViews/studentFirstIn");
-        studentFirstIn.addObject("Student", student);
-        try {
-            if (student == null) {
-                return new ModelAndView("otherViews/accessDeniedView");
-            }
-            if (student.getStFirstIn() == null || student.getStFirstIn() == 0) {
-                student.setStFirstIn(1);
-                updateStudent(student);
-                studentFirstIn.addObject("addInf", new AddInfEnt());
-                return studentFirstIn;
-            }
-            return new ModelAndView("redirect:/PCabinStudent");
-        } catch (Exception ex) {
-            return new ModelAndView("otherViews/errorView");
-        }
-    }
-
-    @RequestMapping(value = "/PCabinStudentControl")
-    public ModelAndView studentCabinIn(@ModelAttribute("Student") StudentsEntity student) {
+//    @RequestMapping(value = "/PCabinStudentControlвв")
+//    public ModelAndView studentInNextViewChecker(@ModelAttribute("Student") StudentsEntity student) {
+//        ModelAndView studentFirstIn = new ModelAndView("inViews/firstInViews/studentFirstIn");
+//        studentFirstIn.addObject("Student", student);
+//        try {
+//            if (student == null) {
+//                return new ModelAndView("otherViews/accessDeniedView");
+//            }
+//            if (student.getStFirstIn() == null || student.getStFirstIn() == 0) {
+//                student.setStFirstIn(1);
+//                updateStudent(student);
+//                studentFirstIn.addObject("addInf", new AddInfEnt());
+//                return studentFirstIn;
+//            }
+//            return new ModelAndView("redirect:/PCabinStudent");
+//        } catch (Exception ex) {
+//            return new ModelAndView("otherViews/errorView");
+//        }
+//    }
+    @RequestMapping(value = "/PProfileStudent")
+    public ModelAndView safeStudentFuck (@ModelAttribute("Student") StudentsEntity student) {
         ModelAndView mv = new ModelAndView("inViews/persCabViews/studentPersCab");
         mv.addObject("Student", student);
         return mv;
     }
-}
+    @RequestMapping(value="/PCabinStudentControl")
+    public ModelAndView studentsProject(@ModelAttribute("Student") StudentsEntity student) {
+        ModelAndView studProj = new ModelAndView("inViews/persCabViews/studentProjects");
+        studProj.addObject("projects", getStudentsProject(student));
+        return studProj;
+    }
+    @RequestMapping(value="/PStudentsProjects")
+    public ModelAndView studentsProjects(@ModelAttribute("Projects") StudentsEntity student){
+        ModelAndView studPro = new ModelAndView("inViews/persCabViews/studentProjects");
+        studPro.addObject("projects", getStudentsProject(student));
+        return studPro;
+    }
+    @RequestMapping(value = "/PMainWindowProject")
+    public ModelAndView windowProject (@ModelAttribute("Project") StudentsEntity student) {
+        ModelAndView windProj = new ModelAndView("inViews/persCabViews/mainWindowProject");
+        windProj.addObject("Project", student);
+        return windProj;
+    }
+}

+ 32 - 1
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css

@@ -274,6 +274,7 @@ body > .container {
         background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
         background-size: 16px 80px;
     }
+}
 
     .header h1 {
         color: darkblue !important;
@@ -309,4 +310,34 @@ body > .container {
     td {
         background: #D8E6F3;
     }
-}
+    #wrap{
+        display: none;
+        opacity: 0.8;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        padding: 16px;
+        background-color: rgba(1, 1, 1, 0.725);
+        z-index: 100;
+        overflow: auto;
+    }
+    #window{
+        width: 400px;
+        height: 400px;
+        margin: 50px auto;
+        display: none;
+        background: #fff;
+        z-index: 200;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        padding: 16px;
+    }
+    .close{
+        margin-left: 364px;
+        cursor: pointer;
+    }

+ 96 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/mainWindowProject.jsp

@@ -0,0 +1,96 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 03.04.2017
+  Time: 11:05
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>My project</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+    <script
+            src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script
+            src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Student.stFamily}
+                ${Student.stFirstName}
+                ${Student.stSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+                <hr>
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Проектное меню</div>
+                        <li class=""> <a href="/PMainWindowProject">Информация</a></li>
+                        <div class="dropdown">   <li class="dropdown">
+                            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+                                Декомпозиция
+                                <b class="caret"></b>
+                            </a>                               <!--ИЗМЕНИ ВЫПАДАЮЩИЙ СПИСОООК-->
+                            <ul class="dropdown-menu">
+                                <li><a href="#">Задачи</a></li>
+                                <li><a href="#">Рассылка</a></li>
+                            </ul>
+                        </li>
+                            <li class=""><a href="#">Исполнение</a> </li>
+                            <li class=""><a href="#">Сборка</a> </li>
+                            <li class=""><a href="#">Сдача</a> </li>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 19 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentChangeInfo.jsp

@@ -0,0 +1,19 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 26.03.2017
+  Time: 19:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Student Info Change Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+</body>
+</html>

+ 65 - 6
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp

@@ -1,16 +1,75 @@
 <%--
   Created by IntelliJ IDEA.
-  User: kinetik
-  Date: 23.03.17
-  Time: 22:40
+  User: Вероника
+  Date: 23.03.2017
+  Time: 23:41
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Title</title>
+    <title> Personal Student Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
 </head>
 <body>
-<h1>${Student.stFamily}</h1>
+<nav class="navbar navbar-default navbar-right">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                Персональная информация
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""><a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с заказчиком</a></li>
+                        <li class=""><a href="#">Мои приглашения в проекты</a></li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a></li>
+                        <li class=""><a href="#">Сообщество</a></li>
+                        <li class=""><a href="#">Выход</a></li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <div class="personal-page-block">
+                    <b>Фамилия:</b> ${Student.stFamily} <br>
+                    <b>Имя:</b> ${Student.stFirstName} <br>
+                    <b>Отчество:</b> ${Student.stSecName} <br>
+                    <c:if test="${not empty Student.stBirthdate}">
+                    <b>Дата рождения:</b> ${Student.stBirthdate} <br>
+                    <br>
+                    <a href="/PStudentChangeInfo">Изменить</a>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
-</html>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 104 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentProjects.jsp

@@ -0,0 +1,104 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 26.03.2017
+  Time: 19:37
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<head>
+    <title> Personal Student Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Student.stFamily}
+                ${Student.stFirstName}
+                ${Student.stSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <form class="form-inline">
+                    <h4>Проектов</h4>
+                    <div class="shadow">
+                        <span class="badge badge-info">${fn:length(projects)}</span>
+                    </div>
+                </form>
+                <h5>Мои проекты</h5>
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th class="text-center">#</th>
+                        <th class="text-center">Название</th>
+                        <th class="text-center">Описание</th>
+                        <!-- <th class="text-center">Дата создания</th>
+                         <th class="text-center">Статус</th>
+                         <th class="text-center">Дата готовности</th>
+                         <th class="text-center">Сумма</th>
+                         <th class="text-center">Заказчик</th> -->
+                    </tr>
+                    </thead>
+                    <tbody id="prodReportTable">
+                    <c:forEach var="listValue" items="${projects}">
+                        <tr>
+                            <td class="text-center"><a href="/PMainWindowProject">${listValue.prId}</a></td>
+                            <td class="text-center"><a href="/PMainWindowProject">${listValue.title}</a></td>
+                            <td class="text-center"><a href="/PMainWindowProject">${listValue.description}</a></td>
+                            <!-- <td class="text-center">${listValue.dateOfCreation}</td>
+                        <td class="text-center">${listValue.status}</td>
+                        <td class="text-center">${listValue.dateOfReady}</td>
+                        <td class="text-center">${listValue.sum}</td> -->
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 5 - 0
AuthModule/target/AuthModule/META-INF/MANIFEST.MF

@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Built-By: ilysk
+Created-By: IntelliJ IDEA
+Build-Jdk: 1.8.0_121
+

+ 6 - 0
AuthModule/target/AuthModule/WEB-INF/applicationContext.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+</beans>

File diff suppressed because it is too large
+ 1339 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map


+ 459 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css

@@ -0,0 +1,459 @@
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+html {
+  font-family: sans-serif;
+  line-height: 1.15;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+
+body {
+  margin: 0;
+}
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+figcaption,
+figure,
+main {
+  display: block;
+}
+
+figure {
+  margin: 1em 40px;
+}
+
+hr {
+  -webkit-box-sizing: content-box;
+          box-sizing: content-box;
+  height: 0;
+  overflow: visible;
+}
+
+pre {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+a {
+  background-color: transparent;
+  -webkit-text-decoration-skip: objects;
+}
+
+a:active,
+a:hover {
+  outline-width: 0;
+}
+
+abbr[title] {
+  border-bottom: none;
+  text-decoration: underline;
+  text-decoration: underline dotted;
+}
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+dfn {
+  font-style: italic;
+}
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+small {
+  font-size: 80%;
+}
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+audio,
+video {
+  display: inline-block;
+}
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+img {
+  border-style: none;
+}
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif;
+  font-size: 100%;
+  line-height: 1.15;
+  margin: 0;
+}
+
+button,
+input {
+  overflow: visible;
+}
+
+button,
+select {
+  text-transform: none;
+}
+
+button,
+html [type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+legend {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  color: inherit;
+  display: table;
+  max-width: 100%;
+  padding: 0;
+  white-space: normal;
+}
+
+progress {
+  display: inline-block;
+  vertical-align: baseline;
+}
+
+textarea {
+  overflow: auto;
+}
+
+[type="checkbox"],
+[type="radio"] {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  padding: 0;
+}
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px;
+}
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button;
+  font: inherit;
+}
+
+details,
+menu {
+  display: block;
+}
+
+summary {
+  display: list-item;
+}
+
+canvas {
+  display: inline-block;
+}
+
+template {
+  display: none;
+}
+
+[hidden] {
+  display: none;
+}
+
+html {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+*,
+*::before,
+*::after {
+  -webkit-box-sizing: inherit;
+          box-sizing: inherit;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+html {
+  -ms-overflow-style: scrollbar;
+  -webkit-tap-highlight-color: transparent;
+}
+
+body {
+  font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-size: 1rem;
+  font-weight: normal;
+  line-height: 1.5;
+  color: #292b2c;
+  background-color: #fff;
+}
+
+[tabindex="-1"]:focus {
+  outline: none !important;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  margin-top: 0;
+  margin-bottom: .5rem;
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+}
+
+address {
+  margin-bottom: 1rem;
+  font-style: normal;
+  line-height: inherit;
+}
+
+ol,
+ul,
+dl {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+  margin-bottom: 0;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-bottom: .5rem;
+  margin-left: 0;
+}
+
+blockquote {
+  margin: 0 0 1rem;
+}
+
+a {
+  color: #0275d8;
+  text-decoration: none;
+}
+
+a:focus, a:hover {
+  color: #014c8c;
+  text-decoration: underline;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:not([href]):not([tabindex]):focus {
+  outline: 0;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+  overflow: auto;
+}
+
+figure {
+  margin: 0 0 1rem;
+}
+
+img {
+  vertical-align: middle;
+}
+
+[role="button"] {
+  cursor: pointer;
+}
+
+a,
+area,
+button,
+[role="button"],
+input,
+label,
+select,
+summary,
+textarea {
+  -ms-touch-action: manipulation;
+      touch-action: manipulation;
+}
+
+table {
+  border-collapse: collapse;
+  background-color: transparent;
+}
+
+caption {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+  color: #636c72;
+  text-align: left;
+  caption-side: bottom;
+}
+
+th {
+  text-align: left;
+}
+
+label {
+  display: inline-block;
+  margin-bottom: .5rem;
+}
+
+button:focus {
+  outline: 1px dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+}
+
+input,
+button,
+select,
+textarea {
+  line-height: inherit;
+}
+
+input[type="radio"]:disabled,
+input[type="checkbox"]:disabled {
+  cursor: not-allowed;
+}
+
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"] {
+  -webkit-appearance: listbox;
+}
+
+textarea {
+  resize: vertical;
+}
+
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: .5rem;
+  font-size: 1.5rem;
+  line-height: inherit;
+}
+
+input[type="search"] {
+  -webkit-appearance: none;
+}
+
+output {
+  display: inline-block;
+}
+
+[hidden] {
+  display: none !important;
+}
+/*# sourceMappingURL=bootstrap-reboot.css.map */

File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map


File diff suppressed because it is too large
+ 9320 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map


File diff suppressed because it is too large
+ 6 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css


File diff suppressed because it is too large
+ 1 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map


+ 343 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css

@@ -0,0 +1,343 @@
+html {
+    position: relative;
+    min-height: 100%;
+    font-family: 'Roboto', sans-serif;
+    max-width: 100%;
+    overflow-x: hidden;
+}
+body {
+    margin-bottom: 60px;
+    max-width: 100%;
+    overflow-x: hidden;
+}
+
+.cf {
+    width: 50%;
+    margin: 0 auto;
+    text-align: center;
+    font-size: 14px;
+    margin-top: 100px;
+}
+
+.cf h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    margin-bottom: 15px;
+}
+
+.navbar {
+    border-bottom: 1px solid #063971;
+    background-color: #eceeef;
+}
+
+.navbar-brand{
+    color: #063971;
+}
+
+.nav-masthead{
+    float: right;
+}
+
+.nav-masthead a{
+    color: #063971;
+}
+
+.footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 25px;
+    background-color: #f5f5f5;
+    text-align: center;
+}
+
+body > .container {
+    padding: 0px 15px 0;
+}
+
+.container .text-muted {
+    margin: 0px 0;
+}
+
+.footer > .container {
+    padding-right: 15px;
+    padding-left: 15px;
+}
+
+.login-block input {
+    width: 100%;
+    height: 42px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 20px;
+    font-size: 14px;
+    padding: 0 20px 0 50px;
+    outline: none;
+    background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+
+.personal-page-block {
+    width: 400px;
+    padding: 20px;
+    background: #ffffff;
+    border: 1px solid #063971;
+    border-radius: 5px;
+    border-top: 5px solid #063971;
+    margin: 0 auto;
+    margin-top: 100px;
+    margin-bottom: 40px;
+}
+
+.personal-page-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+
+.info-block {
+    width: 500px;
+    padding: 20px;
+    background: #ffffff;
+    border: 1px solid #063971;
+    border-radius: 5px;
+    border-top: 5px solid #063971;
+    margin: 0 auto;
+    margin-top: 100px;
+    margin-bottom: 40px;
+}
+
+.info-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 26px;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+
+.info-block h2 {
+    text-align: center;
+    color: #000;
+    font-size: 22px;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+
+.login-block input#password {
+    background: #fff url('http://i.imgur.com/Qf83FTt.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+
+.login-block input:active, .login-block input:focus {
+    border: 1px solid #063971;
+}
+
+.login-block form select {
+    width: 100%;
+    height: 42px;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #ccc;
+    margin-bottom: 20px;
+    font-size: 14px;
+    padding: 0 20px 0 50px;
+    outline: none;
+    background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
+    background-size: 16px 80px;
+}
+
+.login-block form select option {
+    align-items: center;
+    color: #111;
+    display: flex;
+    justify-content: space-between;
+    font-size: 1.5em;
+    width: auto;
+}
+
+.login-block button {
+    width: 100%;
+    height: 40px;
+    background: #063971;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #063971;
+    color: #fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 14px;
+    outline: none;
+    cursor: pointer;
+}
+
+.login-block button:hover {
+    background: #063971;
+}
+
+.login-block {
+    width: 400px;
+    padding: 20px;
+    background: #ffffff;
+    border: 1px solid #063971;
+    border-radius: 5px;
+    border-top: 5px solid #063971;
+    margin: 0 auto;
+    margin-top: 100px;
+    margin-bottom: 40px;
+}
+
+.login-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+
+.projects-block {
+    /*width: 300px; */
+    padding: 20px;
+    background: #ffffff;
+    /*border: 1px solid #063971;
+    border-radius: 5px;
+    border-top: 5px solid #063971; */
+    margin: 0 auto;
+    margin-top: 100px;
+    margin-bottom: 40px;
+}
+
+.projects-block h1 {
+    text-align: center;
+    color: #000;
+    font-size: 18px;
+    text-transform: uppercase;
+    margin-top: 0;
+    margin-bottom: 20px;
+}
+
+.projects-block table {
+    border-collapse: separate;
+    border-spacing: 50px 0;
+}
+
+.projects-block table td {
+    padding: 10px 0;
+}
+
+.btn-secondary,
+.btn-secondary:hover,
+.btn-secondary:focus {
+    color: #333;
+    text-shadow: none; /* Prevent inheritance from `body` */
+    background-color: #fff;
+    border: .05rem solid #fff;
+}
+
+@media (max-width: 767px) {
+
+    .nav-masthead {
+        float: none;
+    }
+
+    .login-block {
+        width: 100%;
+        padding: 20px;
+        background: #ffffff;
+        border: 1px solid #063971;
+        border-radius: 5px;
+        border-top: 5px solid #063971;
+        margin: 0 auto;
+        margin-top: 100px;
+    }
+
+    .nav-link {
+        margin-top: 10px;
+    }
+
+    .login-block form select {
+        width: 100%;
+        height: 42px;
+        box-sizing: border-box;
+        border-radius: 5px;
+        border: 1px solid #ccc;
+        margin-bottom: 20px;
+        font-size: 14px;
+        font-family: 'Roboto', sans-serif;
+        padding: 0 20px 0 50px;
+        outline: none;
+        background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
+        background-size: 16px 80px;
+    }
+}
+
+    .header h1 {
+        color: darkblue !important;
+        font-size: 120%;
+        letter-spacing: 1px;
+    }
+
+    .shadow {
+        box-shadow: 3px 3px 8px #636c72;
+        border-radius: 10px;
+        margin: 0px 10px;
+        font-size: 150%;
+    }
+
+    .table {
+        font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif;
+        font-size: 14px;
+        border-collapse: collapse;
+        text-align: center;
+    }
+
+    th, td {
+        border-style: solid;
+        border-width: 0 1px 1px 0;
+        border-color: white;
+    }
+
+    th {
+        color: midnightblue;
+        background: lightblue;
+    }
+
+    td {
+        background: #D8E6F3;
+    }
+    #wrap{
+        display: none;
+        opacity: 0.8;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        padding: 16px;
+        background-color: rgba(1, 1, 1, 0.725);
+        z-index: 100;
+        overflow: auto;
+    }
+    #window{
+        width: 400px;
+        height: 400px;
+        margin: 50px auto;
+        display: none;
+        background: #fff;
+        z-index: 200;
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        padding: 16px;
+    }
+    .close{
+        margin-left: 364px;
+        cursor: pointer;
+    }

File diff suppressed because it is too large
+ 3535 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js


File diff suppressed because it is too large
+ 7 - 0
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js


+ 32 - 0
AuthModule/target/AuthModule/WEB-INF/dispatcher-servlet.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+    <!-- DispatcherServlet Context: defines this servlet's request-processing
+        infrastructure -->
+    <context:component-scan base-package="Controller" />
+    <mvc:annotation-driven/>
+    <!-- Resolves views selected for rendering by @Controllers to .jsp resources
+        in the /WEB-INF/views directory -->
+    <bean
+            class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value="/WEB-INF/views/" />
+        <property name="suffix" value=".jsp" />
+    </bean>
+    <bean class = "org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
+        <property name="messageConverters">
+            <array>
+                <bean class = "org.springframework.http.converter.StringHttpMessageConverter">
+                    <property name="supportedMediaTypes" value = "text/plain;charset=UTF-8" />
+                </bean>
+            </array>
+        </property>
+    </bean>
+
+
+</beans>

+ 57 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp

@@ -0,0 +1,57 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 05.03.17
+  Time: 22:13
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Administrator Info Change Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="login-block">
+        <h1> Изменение персональных данных </h1>
+        ${Admin.modFamily} ${Admin.modFirstName} ${Admin.modSecName} </br>
+        </br>
+        <form:form method="post" modelAttribute="addInf" action="addInformAdmin">
+            <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
+            <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
+            <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
+            <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
+            <form:button>Изменить данные</form:button>
+            ${errorMessage}
+        </form:form>
+        <a href="/PCabinAdmin">Заполнить позже</a>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 58 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp

@@ -0,0 +1,58 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 05.03.17
+  Time: 21:35
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Administrator Info Change Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="login-block">
+        <h1> Изменение персональных данных </h1>
+        ${Client.clFamily} ${Client.clFirstName} ${Client.clSecName} </br>
+        </br>
+        <form:form method="post" modelAttribute="addInf" action="/addInformClient">
+            <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
+            <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
+            <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
+            <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
+            <form:input path="company" type="text" placeholder="Компания"/>${companyMessage}<br/>
+            <form:input path="position" type="text" placeholder="Должность"/>${posMessage}<br/>
+            <form:button>Изменить данные</form:button>
+            ${errorMessage}
+        </form:form>
+        <a href="/PCabinClient">Заполнить позже</a>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 34 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp

@@ -0,0 +1,34 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 08.03.17
+  Time: 23:00
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+    <link rel="stylesheet"
+          href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+    <script
+            src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script
+            src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    <script
+            src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.17/angular.min.js"></script>
+    <script src="assets/js/controllers.js"></script>
+</head>
+<body>
+<form:form method="post" modelAttribute="addInf" action="addInformAdmin">
+    <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
+    <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
+    <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
+    <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
+    <form:button>Изменить данные</form:button>
+    ${errorMessage}
+</form:form>
+<a href="/PCabinAdmin">Заполнить позже</a>
+</body>
+</html>

+ 78 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp

@@ -0,0 +1,78 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Admin Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <div class="container">
+                    <div class="login-block">
+                        <h1> Изменение персональных данных </h1>
+                        ${Admin.modFamily} ${Admin.modFirstName} ${Admin.modSecName} </br>
+                        </br>
+                        <form:form method="post" modelAttribute="addInf" action="addInformAdmin">
+                            <form:input path="birthdate" type="date" value="" placeholder="${Admin.modBirthdate}" id="birthdate"/>${birthMessage}<br/>
+                            <form:input path="e_mail" type="email" value="" placeholder="${Admin.modEmail}" id="email"/>${emailMessage}<br/>
+                            <form:input path="phone_number" type="text" placeholder="${Admin.modPhone}"/>${phoneMessage}<br/>
+                            <form:input path="hometown" type="text" placeholder="${Admin.modHometown}"/>${hometownMessage}<br/>
+                            <form:button> Изменить данные </form:button>
+                            ${errorMessage}
+                        </form:form>
+                        <a href="/PCabinAdmin">Отмена</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 84 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp

@@ -0,0 +1,84 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Admin Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <div class="container">
+                    <div class="personal-page-block">
+                        <h1> Персональная информация </h1>
+                        <b>Фамилия:</b> ${Admin.modFamily} <br>
+                        <b>Имя:</b> ${Admin.modFirstName} <br>
+                        <b>Отчество:</b> ${Admin.modSecName} <br>
+                        <c:if test="${not empty Admin.modBirthdate}">
+                            <b>Дата рождения:</b> ${Admin.modBirthdate} <br>
+                        </c:if>
+                        <c:if test="${not empty Admin.modPhone}">
+                            <b>Номер телефона:</b> ${Admin.modPhone} <br>
+                        </c:if>
+                        <c:if test="${not empty Admin.modEmail}">
+                            <b>E-mail адрес:</b> ${Admin.modEmail} <br>
+                        </c:if>
+                        <c:if test="${not empty Admin.modHometown}">
+                            <b>Город:</b> ${Admin.modHometown} <br>
+                        </c:if>
+                        <br>
+                        <a href="/PAdminChangeInfo">Изменить</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 60 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp

@@ -0,0 +1,60 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 06.03.17
+  Time: 19:12
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Client Info Change Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+
+<div class="container">
+    <div class="login-block">
+        <h1> Изменение персональных данных </h1>
+        ${Client.clFamily} ${Client.clFirstName} ${Client.clSecName} </br>
+        </br>
+        <form:form method="post" modelAttribute="addInf" action="/addInformClient">
+            <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
+            <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
+            <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
+            <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
+            <form:input path="company" type="text" placeholder="Компания"/>${companyMessage}<br/>
+            <form:input path="position" type="text" placeholder="Должность"/>${posMessage}<br/>
+            <form:button>Изменить данные</form:button>
+            ${errorMessage}
+        </form:form>
+        <a href="/PCabinClient">Отменить</a>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 106 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp

@@ -0,0 +1,106 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 05.03.17
+  Time: 22:08
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+
+<head>
+    <title> Personal Client Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link active" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="row">
+    <div class="col-sm-1">
+    </div>
+    <div class="col-sm-3">
+        <div class="container">
+            <div class="personal-page-block">
+                <h1> Персональная информация </h1>
+                <b>Фамилия:</b> ${Client.clFamily} <br>
+                <b>Имя:</b> ${Client.clFirstName} <br>
+                <b>Отчество:</b> ${Client.clSecName} <br>
+                <c:if test="${not empty Client.clBirthdate}">
+                    <b>Дата рождения:</b> ${Client.clBirthdate} <br>
+                </c:if>
+                <c:if test="${not empty Client.clCompany}">
+                    <b>Компания:</b> ${Client.clCompany}<br>
+                </c:if>
+                <c:if test="${not empty Client.clPos}">
+                    <b>Должность:</b> ${Client.clPos} <br>
+                </c:if>
+                <c:if test="${not empty Client.clPhone}">
+                    <b>Номер телефона:</b> ${Client.clPhone} <br>
+                </c:if>
+                <c:if test="${not empty Client.clEmail}">
+                    <b>E-mail адрес:</b> ${Client.clEmail} <br>
+                </c:if>
+                <c:if test="${not empty Client.clHometown}">
+                    <b>Город:</b> ${Client.clHometown} <br>
+                </c:if>
+                <br>
+                <a href="/PClientChangeInfo">Изменить</a>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-2">
+    </div>
+    <div class="col-sm-4">
+        <div class="container">
+            <div class="projects-block">
+                <h1>Проекты</h1>
+                <c:if test="${not empty projectList}">
+                    <table>
+                        <thead>
+                        <tr>
+                            <th>Имя проекта</th>
+                            <th>Статус</th>
+                        </tr>
+                        </thead>
+                        <tbody id="prodReportTable">
+                        <c:forEach var="listValue" items="${projectList}">
+                            <tr>
+                                <td><a href="#">${listValue.title}</a></td>
+                                <td>${listValue.status}</td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </c:if>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-2">
+    </div>
+</div>
+
+<br><br>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 96 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/mainWindowProject.jsp

@@ -0,0 +1,96 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 03.04.2017
+  Time: 11:05
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>My project</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+    <script
+            src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script
+            src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Student.stFamily}
+                ${Student.stFirstName}
+                ${Student.stSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+                <hr>
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Проектное меню</div>
+                        <li class=""> <a href="/PMainWindowProject">Информация</a></li>
+                        <div class="dropdown">   <li class="dropdown">
+                            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+                                Декомпозиция
+                                <b class="caret"></b>
+                            </a>                               <!--ИЗМЕНИ ВЫПАДАЮЩИЙ СПИСОООК-->
+                            <ul class="dropdown-menu">
+                                <li><a href="#">Задачи</a></li>
+                                <li><a href="#">Рассылка</a></li>
+                            </ul>
+                        </li>
+                            <li class=""><a href="#">Исполнение</a> </li>
+                            <li class=""><a href="#">Сборка</a> </li>
+                            <li class=""><a href="#">Сдача</a> </li>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 19 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/studentChangeInfo.jsp

@@ -0,0 +1,19 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 26.03.2017
+  Time: 19:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Student Info Change Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+</body>
+</html>

+ 75 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp

@@ -0,0 +1,75 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 23.03.2017
+  Time: 23:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Student Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-right">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                Персональная информация
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""><a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с заказчиком</a></li>
+                        <li class=""><a href="#">Мои приглашения в проекты</a></li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a></li>
+                        <li class=""><a href="#">Сообщество</a></li>
+                        <li class=""><a href="#">Выход</a></li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <div class="personal-page-block">
+                    <b>Фамилия:</b> ${Student.stFamily} <br>
+                    <b>Имя:</b> ${Student.stFirstName} <br>
+                    <b>Отчество:</b> ${Student.stSecName} <br>
+                    <c:if test="${not empty Student.stBirthdate}">
+                    <b>Дата рождения:</b> ${Student.stBirthdate} <br>
+                    <br>
+                    <a href="/PStudentChangeInfo">Изменить</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 104 - 0
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/studentProjects.jsp

@@ -0,0 +1,104 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 26.03.2017
+  Time: 19:37
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<head>
+    <title> Personal Student Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Student.stFamily}
+                ${Student.stFirstName}
+                ${Student.stSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <form class="form-inline">
+                    <h4>Проектов</h4>
+                    <div class="shadow">
+                        <span class="badge badge-info">${fn:length(projects)}</span>
+                    </div>
+                </form>
+                <h5>Мои проекты</h5>
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th class="text-center">#</th>
+                        <th class="text-center">Название</th>
+                        <th class="text-center">Описание</th>
+                        <!-- <th class="text-center">Дата создания</th>
+                         <th class="text-center">Статус</th>
+                         <th class="text-center">Дата готовности</th>
+                         <th class="text-center">Сумма</th>
+                         <th class="text-center">Заказчик</th> -->
+                    </tr>
+                    </thead>
+                    <tbody id="prodReportTable">
+                    <c:forEach var="listValue" items="${projects}">
+                        <tr>
+                            <td class="text-center"><a href="/PMainWindowProject">${listValue.prId}</a></td>
+                            <td class="text-center"><a href="/PMainWindowProject">${listValue.title}</a></td>
+                            <td class="text-center"><a href="/PMainWindowProject">${listValue.description}</a></td>
+                            <!-- <td class="text-center">${listValue.dateOfCreation}</td>
+                        <td class="text-center">${listValue.status}</td>
+                        <td class="text-center">${listValue.dateOfReady}</td>
+                        <td class="text-center">${listValue.sum}</td> -->
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 55 - 0
AuthModule/target/AuthModule/WEB-INF/views/loginViews/adminBar.jsp

@@ -0,0 +1,55 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 28.12.2016
+  Time: 20:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Страница администратора</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<%--
+    Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется
+--%>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="login-block">
+        <h1>Вход как Администратор</h1>
+        <form:form method="post" modelAttribute="adminLogin" action="checkAdmin">
+            <form:select path="name" type="text" value="" placeholder="Логин" id="adminName">
+                <form:options items="${adminList}"/>
+            </form:select><br/>
+            <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
+            <form:button>Войти</form:button>
+        </form:form>
+    </div>
+</div>
+<!-- test comment -->
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 58 - 0
AuthModule/target/AuthModule/WEB-INF/views/loginViews/index.jsp

@@ -0,0 +1,58 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 28.12.2016
+  Time: 18:51
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<html>
+
+<head>
+  <title>Login Page</title>
+  <style type="text/css">
+    <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+    <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+  </style>
+</head>
+
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link active" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="login-block">
+        <h1>Вход в систему</h1>
+        <spring:form method="post"  modelAttribute="userJSP" action="check-user">
+            <spring:select path="name" type="text" value="" id="username">
+                <form:options items="${userList}" />
+            </spring:select> <br/>
+            <spring:input path="password" type="password" value="" placeholder="Пароль" id="password"/>   <br/>
+            ${message}<br/>
+            <spring:button>Вход</spring:button>
+        </spring:form>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+
+</html>

+ 55 - 0
AuthModule/target/AuthModule/WEB-INF/views/loginViews/ownerBar.jsp

@@ -0,0 +1,55 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 28.12.2016
+  Time: 20:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Страница заказчика</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<%--
+    Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется
+--%>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="login-block">
+        <h1>Вход как заказчик</h1>
+        <form:form method="post" modelAttribute="clientLogin" action="checkClient">
+            <form:select path="name" type="text" value="" placeholder="Логин" id="clientName">
+                <form:options items="${clientList}"/>
+            </form:select><br/>
+            <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
+            <form:button>Войти</form:button>
+        </form:form>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 119 - 0
AuthModule/target/AuthModule/WEB-INF/views/loginViews/studentBar.jsp

@@ -0,0 +1,119 @@
+<%--suppress JSUnresolvedFunction --%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--suppress ALL --%>
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 28.12.2016
+  Time: 20:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Страница студента</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+    <script type="text/javascript"
+            src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+
+    <c:url var="getGroups" value="/loadGroups" />
+    <script type="text/javascript">
+        $(document).ready(
+            function() {
+                $.getJSON('${getGroups}', {
+                    ajax : 'true'
+                }, function(data) {
+                    var html = '<option value="">Выберите группу</option>';
+                    var len = data.length;
+                    for ( var i = 0; i < len; i++) {
+                        html += '<option value="' + data[i].groupId + '">'
+                            + data[i].groupName + '</option>';
+                    }
+                    html += '</option>';
+                    $('select#IdGroupPart').html(html);
+                });
+            });
+    </script>
+
+    <c:url var="getStudents" value="/loadStudents" />
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#IdGroupPart').change(
+                function() {
+                    $.getJSON('${getStudents}', {
+                        groupId : $(this).val(),
+                        ajax : 'true'
+                    }, function(data) {
+                        var html = '<option value="">Выберите студента</option>';
+                        var len = data.length;
+                        for ( var i = 0; i < len; i++) {
+                            html += '<option value="' + data[i].studentsId + '">'
+                                + data[i].stFamily  + ' ' + data[i].stFirstName + '</option>';
+                        }
+                        html += '</option>';
+                        $('#IdStudentPart').html(html);
+                    });
+                });
+        });
+</script>
+    <script type="text/javascript">
+        $(document).ready(function(){
+            $("#IdStudentPart").change(onSelectChange);
+        });
+        function onSelectChange() {
+            var selected = $("#IdStudentPart option:selected");
+            var output = "";
+            if(selected.val() != 0){
+                output = "Вы выбрали студента " + selected.text();
+            }
+            $("#output").html(output);
+        }
+    </script>
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="logo"></div>
+<div class="login-block">
+
+    <h1>Вход как Исполнитель</h1>
+    <div id="output"></div>
+    <form:form id="signUp" method="post" modelAttribute="studentLogin" action="checkStudent">
+    <fieldset>
+        <form:select id="IdGroupPart" path="">
+        </form:select>
+        <form:select id="IdStudentPart" path="name">
+            <form:option value="">Выберите студента</form:option>
+        </form:select>
+    </fieldset>
+        <form:input path="password" type="password" value="" placeholder="Пароль" id="password"/>${passMessage}<br/>
+        <form:button>Войти</form:button>
+    </form:form>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>
+

+ 82 - 0
AuthModule/target/AuthModule/WEB-INF/views/moderatorViews/mainWindowProject.jsp

@@ -0,0 +1,82 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Александр
+  Date: 26.03.2017
+  Time: 15:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Admin Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+                <hr>
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Проектное меню</div>
+                        <li class=""> <a href="PmainWindowProjectAdmin">Общая информация по проекту</a></li>
+                        <li class=""><a href="#">Декомпозиция проекта</a> </li>
+                        <li class=""><a href="#">Исполнение проекта</a> </li>
+                        <li class=""><a href="#">Сборка проекта</a> </li>
+                        <li class=""><a href="#">Сдача проекта</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 96 - 0
AuthModule/target/AuthModule/WEB-INF/views/moderatorViews/startPageModerator.jsp

@@ -0,0 +1,96 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Александр
+  Date: 26.03.2017
+  Time: 15:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Admin Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <form class="form-inline">
+                    <h4>Новых проектов</h4>
+                    <div class="shadow">
+                        <span class="badge badge-info">${fn:length(projectList)}</span>
+                    </div>
+                </form>
+                <h5>Мои проекты</h5>
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th class="text-center">#</th>
+                        <th class="text-center">Название</th>
+                        <th class="text-center">Описание</th>
+                    </thead>
+                    <tbody id="prodReportTable">
+                    <c:forEach var="listValue" items="${projectList}">
+                        <tr>
+                            <td class="text-center"><a href="PmainWindowProjectAdmin">${listValue.prId}</a></td>
+                            <td class="text-center"><a href="PmainWindowProjectAdmin">${listValue.title}</a></td>
+                            <td class="text-center"><a href="PmainWindowProjectAdmin">${listValue.description}</a></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>
+

+ 38 - 0
AuthModule/target/AuthModule/WEB-INF/views/otherViews/aboutPage.jsp

@@ -0,0 +1,38 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 03.01.2017
+  Time: 9:39
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>About Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 45 - 0
AuthModule/target/AuthModule/WEB-INF/views/otherViews/accessDeniedView.jsp

@@ -0,0 +1,45 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 05.03.17
+  Time: 21:38
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Access Denied</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="container">
+    <div class="info-block">
+        <h1>В доступе отказано.</h1>
+        <h2>Пожалуйста, <a class="nav-link" href="/">авторизируйтесь</a> </h2>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 38 - 0
AuthModule/target/AuthModule/WEB-INF/views/otherViews/contactPage.jsp

@@ -0,0 +1,38 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 03.01.2017
+  Time: 9:40
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Contacts</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 45 - 0
AuthModule/target/AuthModule/WEB-INF/views/otherViews/errorView.jsp

@@ -0,0 +1,45 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 26.02.17
+  Time: 20:52
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Error Occured</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+
+<div class="container">
+    <div class="info-block">
+        <h1>Все сломалось, дайте пиздюлей разработчикам</h1>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 57 - 0
AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regAdminPage.jsp

@@ -0,0 +1,57 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Кинетик
+  Date: 02.01.2017
+  Time: 23:30
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Регистрация Администратора</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<%--
+    Все сообщения ${<название сообщения} буду ошибками в случае неправильного заполнения/ не заполнения поля, около которого появляется