Просмотр исходного кода

Сделал фронт. Изменил цвет шапки. Все имена измененных файлов писать лень -- их много. Т.ч., смотрите сам коммит.

Ilya Lysko лет назад: 7
Родитель
Сommit
ff62908d35

+ 12 - 0
.idea/dataSources.xml

@@ -43,6 +43,18 @@
         <library>
           <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
         </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
+        </library>
       </libraries>
     </data-source>
   </component>

+ 50 - 350
.idea/workspace.xml

@@ -2,149 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="070a1094-550b-4f3a-bbc4-4306583dd144" name="Default" comment="First commit project">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/AuthModule_war.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/AuthModule_war_exploded.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/DBModule_war.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/DBModule_war_exploded.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/PCabinModule_war.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/PCabinModule_war_exploded.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/PCabinModule_war_exploded2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/RegModule_war.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/RegModule_war_exploded.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded/storage.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781/storage.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_efsavage_jquery_jquery_maven_1_8_2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_7.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_7.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_el_javax_el_api_3_0_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_enterprise_cdi_api_1_2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_interceptor_javax_interceptor_api_1_2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jstl_jstl_1_2.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_3_8_1.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__li_rudin_mavenjs_ajax_utils_1_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_14.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_40.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_6_6.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_biins_spring_commons_1_0_0.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_13.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_13.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_antlr_2_7_5H3.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_8_Final.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_5_2_8_Final.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Draft_16.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_1_Final.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_6.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_6.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_session_spring_session_1_3_0_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_portlet_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_6_RELEASE.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_webjars_jquery_3_1_1.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/AuthModule.iml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/pom.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/ClientMovController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/RegistrationController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/AddInfEnt.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/LoginUser.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/RegStudent.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/RegUser.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/SelectProject.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/applicationContext.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/dispatcher-servlet.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/adminBar.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/index.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/ownerBar.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/aboutPage.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/accessDeniedView.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/contactPage.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/regAdminPage.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/regClientPage.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/regStudentPage.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/registration.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/registrationSuccess.jsp" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/web.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/DBModule.iml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/pom.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/ClientsDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/GroupDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/StudentDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/UsersDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ClientsEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/GroupsEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorsEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectsEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StPrEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentsEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/UsersEntity.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateUtil/HibernateUtil.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/ClientsEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/GroupsEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/ModeratorsEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/ProjectsEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/StPrEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/StudentsEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/UsersEntity.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/mephorce.iml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/aboutPage.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/aboutPage.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/accessDeniedView.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/accessDeniedView.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/contactPage.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/contactPage.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/registrationSuccess.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/registrationSuccess.jsp" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -172,97 +44,7 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="StudentMovController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="StudentsEntity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentsEntity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="20" column="33" lean-forward="false" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
-              <folding>
-                <element signature="e#684#685#0" expanded="false" />
-                <element signature="e#716#717#0" expanded="false" />
-                <element signature="e#767#768#0" expanded="false" />
-                <element signature="e#809#810#0" expanded="false" />
-                <element signature="e#906#907#0" expanded="false" />
-                <element signature="e#940#941#0" expanded="false" />
-                <element signature="e#994#995#0" expanded="false" />
-                <element signature="e#1040#1041#0" expanded="false" />
-                <element signature="e#1137#1138#0" expanded="false" />
-                <element signature="e#1167#1168#0" expanded="false" />
-                <element signature="e#1213#1214#0" expanded="false" />
-                <element signature="e#1251#1252#0" expanded="false" />
-                <element signature="e#1347#1348#0" expanded="false" />
-                <element signature="e#1380#1381#0" expanded="false" />
-                <element signature="e#1432#1433#0" expanded="false" />
-                <element signature="e#1476#1477#0" expanded="false" />
-                <element signature="e#1567#1568#0" expanded="false" />
-                <element signature="e#1597#1598#0" expanded="false" />
-                <element signature="e#1643#1644#0" expanded="false" />
-                <element signature="e#1681#1682#0" expanded="false" />
-                <element signature="e#1758#1759#0" expanded="false" />
-                <element signature="e#1788#1789#0" expanded="false" />
-                <element signature="e#1835#1836#0" expanded="false" />
-                <element signature="e#1873#1874#0" expanded="false" />
-                <element signature="e#1966#1967#0" expanded="false" />
-                <element signature="e#1999#2000#0" expanded="false" />
-                <element signature="e#2048#2049#0" expanded="false" />
-                <element signature="e#2092#2093#0" expanded="false" />
-                <element signature="e#2200#2201#0" expanded="false" />
-                <element signature="e#2231#2232#0" expanded="false" />
-                <element signature="e#2279#2280#0" expanded="false" />
-                <element signature="e#2319#2320#0" expanded="false" />
-                <element signature="e#2434#2435#0" expanded="false" />
-                <element signature="e#2468#2469#0" expanded="false" />
-                <element signature="e#2522#2523#0" expanded="false" />
-                <element signature="e#2568#2569#0" expanded="false" />
-                <element signature="e#2679#2680#0" expanded="false" />
-                <element signature="e#2711#2712#0" expanded="false" />
-                <element signature="e#2761#2762#0" expanded="false" />
-                <element signature="e#2803#2804#0" expanded="false" />
-                <element signature="e#2916#2917#0" expanded="false" />
-                <element signature="e#2949#2950#0" expanded="false" />
-                <element signature="e#3001#3002#0" expanded="false" />
-                <element signature="e#3045#3046#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="StudentDao.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/StudentDao.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="738">
-              <caret line="49" column="24" lean-forward="false" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
-              <folding>
-                <element signature="imports" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AdminMovController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="522">
-              <caret line="37" column="5" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -357,11 +139,6 @@
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="/usr/share/maven" />
-      </MavenGeneralSettings>
-    </option>
     <option name="importingSettings">
       <MavenImportingSettings>
         <option name="importAutomatically" value="true" />
@@ -369,10 +146,10 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="65" />
-    <option name="y" value="24" />
-    <option name="width" value="1855" />
-    <option name="height" value="1056" />
+    <option name="x" value="73" />
+    <option name="y" value="27" />
+    <option name="width" value="1847" />
+    <option name="height" value="1053" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -391,7 +168,6 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -406,6 +182,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -420,6 +197,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="last_directory_selection" value="$PROJECT_DIR$/AuthModule/src/main/java" />
     <property name="JPA.DatabaseSchemaImportDialog" value="e66f3b80-d157-473d-b64a-69cd88715781" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -774,9 +552,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
-      <method />
-    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -835,26 +610,13 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <working-directory />
-      <pass-parent-env>true</pass-parent-env>
-      <envs />
-      <ui />
-      <extra-mocha-options />
-      <test-kind>DIRECTORY</test-kind>
-      <test-directory />
-      <recursive>false</recursive>
-      <method />
-    </configuration>
     <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
       <method />
     </configuration>
     <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
       <method />
     </configuration>
-    <configuration default="false" name="Tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.0.M17" ALTERNATIVE_JRE_ENABLED="false">
+    <configuration default="false" name="Tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.27" ALTERNATIVE_JRE_ENABLED="false">
       <option name="UPDATING_POLICY" value="restart-server" />
       <deployment>
         <artifact name="AuthModule:war">
@@ -958,19 +720,21 @@
       <workItem from="1488783149740" duration="72000" />
       <workItem from="1488815571419" duration="9170000" />
       <workItem from="1488832758023" duration="310000" />
+      <workItem from="1488916407301" duration="361000" />
+      <workItem from="1488916779437" duration="157000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="74545000" />
+    <option name="totallyTimeSpent" value="75063000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
+    <frame x="73" y="27" width="1847" height="1053" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32975295" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="CDI" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -983,16 +747,17 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32975295" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959569" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959394" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -1000,7 +765,6 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -1174,15 +938,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="486">
           <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="21" column="16" lean-forward="false" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1198,7 +953,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="759">
           <caret line="63" column="19" lean-forward="false" selection-start-line="63" selection-start-column="19" selection-end-line="63" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1214,7 +968,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="18">
           <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1230,9 +983,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
           <caret line="8" column="28" lean-forward="false" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
-          <folding>
-            <element signature="e#178#179#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1275,7 +1025,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
           <caret line="23" column="48" lean-forward="false" selection-start-line="23" selection-start-column="48" selection-end-line="23" selection-end-column="48" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1283,7 +1032,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="313">
           <caret line="27" column="8" lean-forward="false" selection-start-line="27" selection-start-column="8" selection-end-line="27" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1291,7 +1039,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="282">
           <caret line="49" column="78" lean-forward="false" selection-start-line="49" selection-start-column="78" selection-end-line="49" selection-end-column="78" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1299,7 +1046,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="358">
           <caret line="98" column="97" lean-forward="false" selection-start-line="98" selection-start-column="15" selection-end-line="98" selection-end-column="97" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1311,10 +1057,21 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" />
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="16" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="16" />
+        <state relative-caret-position="385">
+          <caret line="169" column="67" lean-forward="false" selection-start-line="169" selection-start-column="47" selection-end-line="169" selection-end-column="67" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1323,52 +1080,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
           <caret line="20" column="33" lean-forward="false" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
-          <folding>
-            <element signature="e#684#685#0" expanded="false" />
-            <element signature="e#716#717#0" expanded="false" />
-            <element signature="e#767#768#0" expanded="false" />
-            <element signature="e#809#810#0" expanded="false" />
-            <element signature="e#906#907#0" expanded="false" />
-            <element signature="e#940#941#0" expanded="false" />
-            <element signature="e#994#995#0" expanded="false" />
-            <element signature="e#1040#1041#0" expanded="false" />
-            <element signature="e#1137#1138#0" expanded="false" />
-            <element signature="e#1167#1168#0" expanded="false" />
-            <element signature="e#1213#1214#0" expanded="false" />
-            <element signature="e#1251#1252#0" expanded="false" />
-            <element signature="e#1347#1348#0" expanded="false" />
-            <element signature="e#1380#1381#0" expanded="false" />
-            <element signature="e#1432#1433#0" expanded="false" />
-            <element signature="e#1476#1477#0" expanded="false" />
-            <element signature="e#1567#1568#0" expanded="false" />
-            <element signature="e#1597#1598#0" expanded="false" />
-            <element signature="e#1643#1644#0" expanded="false" />
-            <element signature="e#1681#1682#0" expanded="false" />
-            <element signature="e#1758#1759#0" expanded="false" />
-            <element signature="e#1788#1789#0" expanded="false" />
-            <element signature="e#1835#1836#0" expanded="false" />
-            <element signature="e#1873#1874#0" expanded="false" />
-            <element signature="e#1966#1967#0" expanded="false" />
-            <element signature="e#1999#2000#0" expanded="false" />
-            <element signature="e#2048#2049#0" expanded="false" />
-            <element signature="e#2092#2093#0" expanded="false" />
-            <element signature="e#2200#2201#0" expanded="false" />
-            <element signature="e#2231#2232#0" expanded="false" />
-            <element signature="e#2279#2280#0" expanded="false" />
-            <element signature="e#2319#2320#0" expanded="false" />
-            <element signature="e#2434#2435#0" expanded="false" />
-            <element signature="e#2468#2469#0" expanded="false" />
-            <element signature="e#2522#2523#0" expanded="false" />
-            <element signature="e#2568#2569#0" expanded="false" />
-            <element signature="e#2679#2680#0" expanded="false" />
-            <element signature="e#2711#2712#0" expanded="false" />
-            <element signature="e#2761#2762#0" expanded="false" />
-            <element signature="e#2803#2804#0" expanded="false" />
-            <element signature="e#2916#2917#0" expanded="false" />
-            <element signature="e#2949#2950#0" expanded="false" />
-            <element signature="e#3001#3002#0" expanded="false" />
-            <element signature="e#3045#3046#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1382,30 +1094,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="169" column="67" lean-forward="false" selection-start-line="169" selection-start-column="47" selection-end-line="169" selection-end-column="67" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="522">
           <caret line="37" column="5" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state relative-caret-position="491">
+          <caret line="21" column="16" lean-forward="false" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
           <folding />
         </state>
       </provider>

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

@@ -2,9 +2,13 @@ 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 {
@@ -22,6 +26,11 @@ body {
     margin-bottom: 15px;
 }
 
+.navbar {
+    border-bottom: 1px solid #063971;
+    background-color: #eceeef;
+}
+
 .navbar-brand{
     color: #063971;
 }
@@ -70,6 +79,55 @@ body > .container {
     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;
@@ -142,6 +200,36 @@ body > .container {
     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 {

+ 42 - 12
AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp

@@ -9,19 +9,49 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Title</title>
+    <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>
-<h1>Здравствуйте, ${Admin.modFamily} ${Admin.modFirstName} ${Admin.modSecName}</h1>
-Пожалуйста заполните дополнительные персонвальные данные
-<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>
+
+<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>

+ 43 - 14
AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp

@@ -9,21 +9,50 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Title</title>
+    <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>
-<h1>Здравствуйте, ${Client.clFirstName} ${Client.clSecName} ${Client.clFamily}</h1>
-Пожалуйста заполните дополнительные персонвальные данные
-<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>
+
+<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>

+ 0 - 16
AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp

@@ -1,16 +0,0 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: kinetik
-  Date: 06.03.17
-  Time: 20:54
-  To change this template use File | Settings | File Templates.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head>
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>

+ 40 - 12
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp

@@ -9,20 +9,48 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Title</title>
+    <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>
-<h1>Здравствуйте, ${Admin.modFamily} ${Admin.modFirstName} ${Admin.modSecName}</h1>
-Пожалуйста заполните дополнительные персонвальные данные
-<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>
+
+<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="${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>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
 
 </body>
 </html>

+ 49 - 10
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp

@@ -7,18 +7,57 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
+
 <head>
-    <title>Title</title>
+    <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>
-<h1> Информационный блок</h1>
-Фамилия: ${Admin.modFamily} <br>
-Имя: ${Admin.modFirstName} <br>
-Отчество: ${Admin.modSecName} <br>
-Дата рождения: ${Admin.modBirthdate} <br>
-Номер телефона: ${Admin.modPhone} <br>
-E-mail адрес: ${Admin.modEmail} <br>
-Город: ${Admin.modHometown} <br>
-<a href="/PAdminChangeInfo">Изменить</a>
+
+<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="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>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
 </body>
 </html>

+ 45 - 12
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp

@@ -9,19 +9,52 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Title</title>
+    <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>
-<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>
+
+<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>

+ 87 - 18
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp

@@ -9,29 +9,98 @@
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
+
 <head>
-    <title>Personal cabinet</title>
+    <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>
-<body>
-<h1> Информационный блок</h1>
-    Фамилия: ${Client.clFamily} <br>
-    Имя: ${Client.clFirstName} <br>
-    Отчество: ${Client.clSecName} <br>
-    Дата рождения: ${Client.clBirthdate} <br>
-    Компания: ${Client.clCompany}<br>
-    Должность: ${Client.clPos} <br>
-    Номер телефона: ${Client.clPhone} <br>
-    E-mail адрес: ${Client.clEmail} <br>
-    Город: ${Client.clHometown} <br>
 
-<a href="/PClientChangeInfo">Изменить</a>
+<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>
-<c:if test="${not empty projectList}">
 
-        <c:forEach var="listValue" items="${projectList}">
-            <input type="button" value="${listValue.prId}">${listValue.title}<br>
-        </c:forEach>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
 
-</c:if>
 </body>
 </html>

+ 23 - 1
AuthModule/src/main/webapp/WEB-INF/views/otherViews/aboutPage.jsp

@@ -8,9 +8,31 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>About</title>
+    <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>

+ 31 - 2
AuthModule/src/main/webapp/WEB-INF/views/otherViews/accessDeniedView.jsp

@@ -8,9 +8,38 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Title</title>
+    <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>

+ 22 - 0
AuthModule/src/main/webapp/WEB-INF/views/otherViews/contactPage.jsp

@@ -9,8 +9,30 @@
 <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>

+ 31 - 2
AuthModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp

@@ -8,9 +8,38 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Error occured</title>
+    <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>
-    <h1>Все сломалось, дайте пиздюлей разработчикам</h1>
+
+<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>

+ 20 - 3
AuthModule/src/main/webapp/WEB-INF/views/registrationViews/registrationSuccess.jsp

@@ -8,9 +8,14 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>Succes</title>
+    <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>
@@ -22,7 +27,19 @@
         </nav>
     </div>
 </nav>
-    <h1>RegistrationSucces</h1>
-    <h2>Теперь вы моежете войти</h2>
+
+<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>