Merge remote-tracking branch 'refs/remotes/origin/master' into daniel

.gitignore

@@ -7,3 +7,9 @@ target/*
 /target
 _site/
 .DS_Store
+.log
+.editorconfig
+.springBeans
+Servers
+.metadata
+bin

pom.xml

@@ -4,15 +4,15 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.samples</groupId>
-  <artifactId>spring-petclinic</artifactId>
+  <artifactId>kidclinic</artifactId>
-  <version>1.5.1</version>
+  <version>mvp</version>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>1.5.1.RELEASE</version>
   </parent>
-  <name>petclinic</name>
+  <name>kidclinic</name>
 
   <properties>
 

readme.md

@@ -17,6 +17,9 @@ The purpose of KidClinic is to simulate the building of an enterprise applicatio
 - [x] View current list of doctors and their specialities
 - [x] Search through database of parents
 
+### Adding parents and children
+When viewing the parents page, users have an option of searching the parents database or adding a parent. Once a parent is chosen or added, a child can be added to that parent.
+
 ## Upcoming Additions
 | Addition | Stage of Development | Expected Development Time | Lead |
 | :-------- | :-------------------- | :------------------------- | :--- |
@@ -26,6 +29,18 @@ The purpose of KidClinic is to simulate the building of an enterprise applicatio
 | Add reviews section for doctors | Development | Short Term | Sasank |
 | Calendar Scheduling | Research | Long Term | Sasank |
 
+### Login System
+THe login system is meant to create three different views for users. There will be three categories of users: parents, nurses, and doctors. Each must login to view certain aspects of the website. Without the login system, the all the information of the parents is viewable without any security.
+
+#### How to incorporate the login system
+In order to create a login system, we need to create a subfolder for the login controller. This follows [DoctorController.java](/src/main/java/org/springframework/samples/kidclinic/doctor/DoctorController.java) for the methods.
+
+### Reviews section for Doctors
+The reviews section is meant to show the location of the doctors and include a view reviews for each doctor.
+
+#### How to incorporate the reviews
+In order the create the reviews section, we must create a controller similar to [DoctorController.java](/src/main/java/org/springframework/samples/kidclinic/doctor/DoctorController.java). Then we need to add some reviews to the database as well as locations of each doctor. Then, using [Thymeleaf](http://www.thymeleaf.org/), we can display this information in [reviews.html](/src/main/resources/templates/reviews.html).
+
 ## Contact
 If you are interested in the development of this app, you can contact any of the developers. You can reach us at
 

src/main/java/org/springframework/samples/kidclinic/reviews/ReviewsController.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.samples.kidclinic.reviews;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author Juergen Hoeller
+ * @author Mark Fisher
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ */
+@Controller
+class ReviewsController {
+
+    @Autowired
+    public ReviewsController() {
+    }
+
+    @RequestMapping(value = { "/reviews.html" })
+    public String showReviews(Map<String, Object> model) {
+        // Here we are returning an object of type 'Doctors' rather than a collection of Doctor
+        // objects so it is simpler for Object-Xml mapping
+        return "reviews";
+    }
+
+}

src/main/resources/application.properties

@@ -24,3 +24,5 @@ logging.level.org.springframework=INFO
 
 # Active Spring profiles
 spring.profiles.active=production
+
+# Port

src/main/resources/banner.txt

@@ -12,6 +12,7 @@ Presenting...
 
 
 :: Built with Spring Boot :: ${spring-boot.version}
+:: Made with ♥ by the 2017 GlowTouch Technologies Interns ::
 
 Enjoy...
 

src/main/resources/templates/welcome.html

@@ -6,16 +6,7 @@
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-
-
-
-
-
-
 <body>
-
-     
-            
   <div id ="navbar-2" class="container-custom">
     
     <ul class="nav navbar-nav nav-collapse navbar-right">
@@ -74,9 +65,6 @@
   <div  class="info">
     <h3>Creation</h3>
     <p>KidClinic is a platform to simplify healthcare, not for insurance companies but for you: the cutomers and the doctors. We want to streamline how records are managed and simplify the process of managing pediatric health. KidClinic expediates the oft tedious process of permissions for managing a minor's health, organizing the records in an intuitive but archivable mainframe.</p>
-  <div class="button">
-    <a href="#">Example Button</a>
-  </div>
   </div>
 
   <div class="portion five" id ="portion3">
@@ -97,9 +85,6 @@
     <p>Here at KidClinic, we want to ensure quality care and incorporate facets from disparate sources. This includes an interactive review function, where you can directly review doctors and influence their appearance on the search feature. Your insight makes a difference for future care, directly, immediately.You can also see other's reviews and comments to facilitate your decisions on care.
 
     </p> 
-  <div class="button">
-    <a href="#">Example Button</a>
-  </div>
   </div>
 
   <div class="portion four" id="portion4">
@@ -109,34 +94,13 @@
   <div  class="info">
     <h3>Our Vision</h3>
     <p>In the ever expanding and fickle internet era it is not enough to have a product. So we have crafted a vision forward, together, to revolutionize healthcare at your finger tips. This means integrating calendars, live notifications of appointment availability, and even mapping your needs. Integration can be scary and rightfully so. But we provide data for you and your family because frankly the current state of healthcare is unacceptable. This is a step in a multitude of miles to perfecting it.
-
     </p>
+    <br />
+    <br />
     <div class="button">
       <a href="#">To Top</a>
     </div>
   </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </body>
 
 </html>

update.sh

@@ -1 +1 @@
-./kill.sh && git pull origin master && ./run.sh &
+./kill.sh && git pull origin sasank && ./run.sh &