Browse Source

коммит страниц

Kinetik 5 years ago
parent
commit
febdfe76d0

+ 0 - 63
MephorceAuth.userlibraries

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eclipse-userlibraries>
-  <library name="Hibernate 5.2.3-5.2.3">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/hibernate-commons-annotations-5.0.1.Final.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/hibernate-jpa-2.1-api-1.0.0.Final.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/antlr-2.7.7.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/hibernate-core-5.2.3.Final.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/dom4j-1.6.1.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/jboss-logging-3.3.0.Final.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/jandex-2.0.0.Final.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/geronimo-jta_1.1_spec-1.1.1.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/classmate-1.3.0.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/javassist-3.20.0-GA.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/el-api-2.2.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/javax.inject-1.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/cdi-api-1.1.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/jboss-interceptors-api_1.1_spec-1.0.0.Beta1.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/jsr250-api-1.0.jar" />
-  </library>
-  <library name="Spring-4.3.4.RELEASE">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-aspects-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-context-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-core-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-context-support-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-instrument-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-instrument-tomcat-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-aop-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-expression-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-beans-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-jms-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-messaging-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-oxm-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-jdbc-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/commons-logging-1.2.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-orm-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/aopalliance-1.0.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-tx-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-test-4.3.4.RELEASE.jar" />
-  </library>
-  <library name="Spring MVC-4.3.4.RELEASE">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-webmvc-portlet-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-websocket-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-webmvc-4.3.4.RELEASE.jar" />
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/spring-web-4.3.4.RELEASE.jar" />
-  </library>
-  <library name="com.fasterxml.jackson.core:jackson-core:2.8.5">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/jackson-core-2.8.5.jar" />
-  </library>
-  <library name="com.mysql.jdbc_5.1.5">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/com.mysql.jdbc_5.1.5.jar" />
-  </library>
-  <library name="gson-2.2.2">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/gson-2.2.2.jar" />
-  </library>
-  <library name="jstl">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/lib/jstl.jar" />
-  </library>
-  <library name="jstl-1.2">
-    <archive path="C:/Users/Кинетик/IdeaProjects/MephorceAuth/web/WEB-INF/lib/jstl-1.2.jar" />
-  </library>
-  <library name="net.disy.legato:legato-jquery:2.0.0" />
-</eclipse-userlibraries>
-

+ 0 - 1
src/controller/controller.java

@@ -7,7 +7,6 @@ import HibernateEntities.StudentsEntity;
 import HibernateEntities.UsersEntity;
 import LoginEntities.LoginClient;
 import LoginEntities.LoginUser;
-import com.google.gson.Gson;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;

+ 1 - 1
web/WEB-INF/views/loginViews/studentBar.jsp

@@ -20,7 +20,7 @@
         <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
     </style>
     <script type="text/javascript"
-            src="<c:url value='/WEB-INF/lib/jquery-3.1.1.js' />"></script>
+            src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 
     <c:url var="getGroups" value="/loadGroups" />
     <script type="text/javascript">

+ 3 - 9
web/WEB-INF/views/registrationViews/registration.jsp

@@ -33,15 +33,9 @@
     <div class="cf">
         <h1>Выбор типа создаваемого пользователя</h1>
         <div class="btn-group-vertical" role="group" aria-label="Vertical button group">
-            <button type="button" class="btn btn-secondary">
-                <a href="/regStudent">Исполнитель</a>
-            </button>
-            <button type="button" class="btn btn-secondary">
-                <a href="/regAdmin">Администратор</a>
-            </button>
-            <button type="button" class="btn btn-secondary">
-                <a href="/regClient">Заказчик</a>
-            </button>
+            <a class="nav-link" href="/regStudent">Исполнитель</a>
+            <a class="nav-link" href="/regAdmin">Администратор</a>
+            <a class="nav-link" href="/regClient">Заказчик</a>
         </div>
     </div>
 </div>