Merge branch 'master' into AccountAdmin

Conflicts:
	src/conf/persistence.xml

Author: donggyu9208

.gitignore

@@ -1,5 +1,6 @@
-lib/
-nbproject/
-src/conf/MANIFEST.MF
-build.xml
-build/
+lib/
+nbproject/
+src/conf/MANIFEST.MF
+build.xml
+build/
+/dist/

dist/CookToShare.war

@@ -5,7 +5,6 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.jdbc.user" value="root" />
-            <property name="javax.persistence.jdbc.password" value="" />
             <property name="javax.persistence.jdbc.password" value="CSD@mysql-1872" />
         </properties>
     </persistence-unit>

src/conf/persistence.xml

@@ -185,6 +185,14 @@ Style the div component whose unique id is "rightAlignPanelGroup" per reference
 #rightAlignPanelGroup {
     float: right;
 }
+
+/* Style the Google map display */
+.map {
+    margin-left: 10px;
+    margin-right: 40px;
+    height:600px;
+}
+
 /* 
 Place the logo image on the left top corner per reference
 <h:panelGrid columns="2" columnClasses="leftTopCornerAlign, rightTopCornerAlign">

web/resources/css/siteStyles.css

@@ -85,6 +85,12 @@ Copyright © 2017 Anand Guruswamy. All rights reserved.
                             </h:link>&nbsp;&nbsp;
                         </c:if>
 
+                        <c:if test="#{accountManager.isLoggedIn() == true}">
+                            <!-- Clicking "Sign In" displays the SignIn.xhtml file -->
+                            <h:link outcome="FoodMap" styleClass="arialTen">
+                                <i class="fa fa-map">&nbsp;</i>Food Map
+                            </h:link>&nbsp;&nbsp;
+                        </c:if>
                         <!-- Clicking "Dishes" displays the index.xhtml file -->
                         <h:link outcome="/dish/List" styleClass="arialTen">
                             <i class="fa fa-cutlery">&nbsp;</i>Dishes

web/template/headerTemplate.xhtml

@@ -47,6 +47,20 @@ Copyright © 2017 Osman Balci. All rights reserved.
         <script src="resources/js/js-image-slider.js" type="text/javascript"></script>
 
 
+        <!-- 
+        ===================================================================================
+        Google Maps JavaScript API requires a developer key. You can obtain your own key at
+        
+                  https://developers.google.com/maps/documentation/javascript/
+        
+        The key below is Dong Gyu's key.
+        ===================================================================================
+        -->
+        <script src="https://maps.google.com/maps/api/js?key=AIzaSyBZMh9aKrCzv50b9IvSFA4puoKs6mjHAxA" type="text/javascript"></script>
+
+        <!-- map.js is needed for map operations in JavaScript -->
+        <h:outputScript library="js" name="map.js"/>
+        
         <!--
         The icons and the font-awesome.min.css styles provided by http://fontawesome.io/
         are linked for use by the entire site.