diff --git a/src/main/java/com/groupfive/controller/WebController.java b/src/main/java/com/groupfive/controller/WebController.java index d0ab07d..22e6548 100644 --- a/src/main/java/com/groupfive/controller/WebController.java +++ b/src/main/java/com/groupfive/controller/WebController.java @@ -8,7 +8,7 @@ @Controller public class WebController { - @RequestMapping("/") + @RequestMapping("/index") public ModelAndView home(HttpServletRequest request, ModelAndView mv){ // if(request.getParameter("name") != null){ // mv.addObject("name", request.getParameter("name")); @@ -24,27 +24,19 @@ public ModelAndView banrhome(HttpServletRequest request, ModelAndView mv){ // }//end if statement mv.setViewName("banrhome"); return mv; - }//endModelAndView Developer Contact Page + }//endModelAndView banrhome - - - @RequestMapping("/developercontact") - public ModelAndView developercontact(HttpServletRequest request, ModelAndView mv){ + @RequestMapping("/hudlink") + public ModelAndView hudlink(HttpServletRequest request, ModelAndView mv){ // if(request.getParameter("name") != null){ // mv.addObject("name", request.getParameter("name")); // }//end if statement - mv.setViewName("developercontact"); + mv.setViewName("hudlink"); return mv; - }//endModelAndView Developer Contact Page + }//endModelAndView hudlink + + - @RequestMapping("/fieldofficelocation") - public ModelAndView fieldofficelocation(HttpServletRequest request, ModelAndView mv){ -// if(request.getParameter("name") != null){ -// mv.addObject("name", request.getParameter("name")); -// }//end if statement - mv.setViewName("fieldofficelocation"); - return mv; - }//endModelAndView Developer Contact Page diff --git a/src/main/webapp/WEB-INF/view/demo.html b/src/main/webapp/WEB-INF/view/demo.html deleted file mode 100644 index f086723..0000000 --- a/src/main/webapp/WEB-INF/view/demo.html +++ /dev/null @@ -1,227 +0,0 @@ - - - -Angular Rest Demo - - - - - - -
-

- -

Employees

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
IDFirst NameLast NameEmailHome PhoneCell PhonePasswordActiveAdmin
{{ employee.employeeId }}{{ employee.firstName }}{{ employee.lastName }}{{ employee.email }}{{ employee.homePhone }}{{ employee.cellPhone }}{{ employee.password }}{{ employee.active }} - - -
-
-
- -

{{action}} Employee

-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- Password should be at - least 8 characters, 1 upppercase, 1 lowercase, 1 special - character, and one number -
-
-
-
-
- -
-
- -
-
-
-
-
- -
-
-
- -
-
-
- - - - - - - - + + + + + + + + + + diff --git a/target/classes/META-INF/maven/com.groupfive/finalProject/pom.properties b/target/classes/META-INF/maven/com.groupfive/finalProject/pom.properties index 88d7846..2e57c1b 100644 --- a/target/classes/META-INF/maven/com.groupfive/finalProject/pom.properties +++ b/target/classes/META-INF/maven/com.groupfive/finalProject/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Wed Oct 05 12:51:30 EDT 2016 +#Fri Oct 07 08:38:46 EDT 2016 version=1.0-SNAPSHOT groupId=com.groupfive m2e.projectName=finalProject diff --git a/target/classes/com/groupfive/controller/WebController.class b/target/classes/com/groupfive/controller/WebController.class index 4d0d0c9..679b320 100644 Binary files a/target/classes/com/groupfive/controller/WebController.class and b/target/classes/com/groupfive/controller/WebController.class differ