From 51532cfe978de33f311f6b93ed8d1bc0d03158b9 Mon Sep 17 00:00:00 2001 From: MaryChes Date: Thu, 6 Oct 2016 13:51:28 -0400 Subject: [PATCH 1/2] created basic html file to allow user to input city and state to find resources using HUD API. Created web controller and kept methods from banrhome stubbed. Awaiting integration --- .../groupfive/controller/WebController.java | 22 +- src/main/webapp/WEB-INF/view/demo.html | 227 ------------------ src/main/webapp/WEB-INF/view/hudlink.html | 173 +++++++++++++ .../com.groupfive/finalProject/pom.properties | 2 +- .../groupfive/controller/WebController.class | Bin 1377 -> 1203 bytes 5 files changed, 181 insertions(+), 243 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/view/demo.html create mode 100644 src/main/webapp/WEB-INF/view/hudlink.html diff --git a/src/main/java/com/groupfive/controller/WebController.java b/src/main/java/com/groupfive/controller/WebController.java index d0ab07d..5efcf87 100644 --- a/src/main/java/com/groupfive/controller/WebController.java +++ b/src/main/java/com/groupfive/controller/WebController.java @@ -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..f27fc85 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 +#Thu Oct 06 10:27:54 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 4d0d0c9b94a3f2668be64dd3dad3f582c7c0efdc..df42341cd62311b952ce1fae5db0e5de56f505f3 100644 GIT binary patch delta 85 zcmaFJwV9La)W2Q(7#J8#7&JF>EnpI3&nQjF$;``UWZ=+;GC3HOCo?feGqP-sV-90v gRbpTR3Or<17iD5l1L|aAP-hST(rgTj3>pj!0Q@Hs00000 delta 205 zcmdnY`H+k2)W2Q(7#J8#7<4vrEntceNJ%YA&B-rFElSSMD@jZ)VPp{0M;GH@P-bKh zPRmTqNy$%3%S;ApNKP!t%+F(F5YfjX%)y{G`2bTiBkN`v<}gN96$Um2)yeajH5t_= z$1;m+t23|zUEsyQ#J~)sIdp_HwlRq5Yyh&E7`T8W7m#LP&;{z!1L{&2Wn$0-%V{wP N0BJS`Mh0yL1^~qIFaiJo From bc3985d42f31b42361d1d8223c91e70c9eddb787 Mon Sep 17 00:00:00 2001 From: MaryChes Date: Tue, 11 Oct 2016 11:24:50 -0400 Subject: [PATCH 2/2] Made a few changes to web controllers --- .../groupfive/controller/WebController.java | 2 +- .../com.groupfive/finalProject/pom.properties | 2 +- .../groupfive/controller/WebController.class | Bin 1203 -> 1208 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/groupfive/controller/WebController.java b/src/main/java/com/groupfive/controller/WebController.java index 5efcf87..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")); 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 f27fc85..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 -#Thu Oct 06 10:27:54 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 df42341cd62311b952ce1fae5db0e5de56f505f3..679b320b6e982ef012008c2e8095598c8c975a72 100644 GIT binary patch delta 20 ccmdnYxr1}VRz`L<{mi_S)QZj98UHW=08N+&p#T5? delta 15 XcmdnNxtVjrRz@a9{mpwA|1bdnEg%Ji