Map Part 1 (Created a html page and created a map using the Google Map API) + Map Part 2 + Map Part 3

.gitignore

@@ -0,0 +1 @@
+/target/

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

src/main/java/com/google/codeu/data/Datastore.java

@@ -42,7 +42,8 @@ public void storeMessage(Message message) {
     messageEntity.setProperty("user", message.getUser());
     messageEntity.setProperty("text", message.getText());
     messageEntity.setProperty("timestamp", message.getTimestamp());
-
+    messageEntity.setProperty("recipient", message.getRecipient());
+
     datastore.put(messageEntity);
   }
 
@@ -52,31 +53,33 @@ public void storeMessage(Message message) {
    * @return a list of messages posted by the user, or empty list if user has never posted a
    *     message. List is sorted by time descending.
    */
-  public List<Message> getMessages(String user) {
-    List<Message> messages = new ArrayList<>();
+  public List<Message> getMessages(String recipient) {
+      List<Message> messages = new ArrayList<>();
+
+      Query query =
+          new Query("Message")
+              .setFilter(new Query.FilterPredicate("recipient", FilterOperator.EQUAL, recipient))
+              .addSort("timestamp", SortDirection.DESCENDING);
+      PreparedQuery results = datastore.prepare(query);
 
-    Query query =
-        new Query("Message")
-            .setFilter(new Query.FilterPredicate("user", FilterOperator.EQUAL, user))
-            .addSort("timestamp", SortDirection.DESCENDING);
-    PreparedQuery results = datastore.prepare(query);
+      for (Entity entity : results.asIterable()) {
+        try {
+          String idString = entity.getKey().getName();
+          UUID id = UUID.fromString(idString);
+          String user = (String) entity.getProperty("user");
 
-    for (Entity entity : results.asIterable()) {
-      try {
-        String idString = entity.getKey().getName();
-        UUID id = UUID.fromString(idString);
-        String text = (String) entity.getProperty("text");
-        long timestamp = (long) entity.getProperty("timestamp");
+          String text = (String) entity.getProperty("text");
+          long timestamp = (long) entity.getProperty("timestamp");
 
-        Message message = new Message(id, user, text, timestamp);
-        messages.add(message);
-      } catch (Exception e) {
-        System.err.println("Error reading message.");
-        System.err.println(entity.toString());
-        e.printStackTrace();
+          Message message = new Message(id, user, text, timestamp, recipient);
+          messages.add(message);
+        } catch (Exception e) {
+          System.err.println("Error reading message.");
+          System.err.println(entity.toString());
+          e.printStackTrace();
+        }
       }
-    }
 
-    return messages;
-  }
+      return messages;
+    }
 }

src/main/java/com/google/codeu/data/Message.java

@@ -25,20 +25,22 @@ public class Message {
   private String user;
   private String text;
   private long timestamp;
+  private String recipient;
 
   /**
-   * Constructs a new {@link Message} posted by {@code user} with {@code text} content. Generates a
-   * random ID and uses the current system time for the creation time.
+   * Constructs a new {@link Message} posted by {@code user} with {@code text} content to
+   * a {@code recipient}. Generates a random ID and uses the current system time for the creation time.
    */
-  public Message(String user, String text) {
-    this(UUID.randomUUID(), user, text, System.currentTimeMillis());
+  public Message(String user, String text, String recipient) {
+    this(UUID.randomUUID(), user, text, System.currentTimeMillis(), recipient);
   }
 
-  public Message(UUID id, String user, String text, long timestamp) {
+  public Message(UUID id, String user, String text, long timestamp, String recipient) {
     this.id = id;
     this.user = user;
     this.text = text;
     this.timestamp = timestamp;
+    this.recipient = recipient;
   }
 
   public UUID getId() {
@@ -56,4 +58,9 @@ public String getText() {
   public long getTimestamp() {
     return timestamp;
   }
+
+  public String getRecipient()
+  {
+      return recipient;
+  }
 }

src/main/java/com/google/codeu/servlets/MessageServlet.java

@@ -77,10 +77,13 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
     String user = userService.getCurrentUser().getEmail();
     String text = Jsoup.clean(request.getParameter("text"), Whitelist.none());
-
-    Message message = new Message(user, text);
+    String recipient = request.getParameter("recipient");
+    System.out.println("print recipient:");
+    System.out.println(recipient);
+
+    Message message = new Message(user, text, recipient);
     datastore.storeMessage(message);
 
-    response.sendRedirect("/user-page.html?user=" + user);
+    response.sendRedirect("/user-page.html?user=" + recipient);
   }
 }

src/main/webapp/index.html

@@ -34,5 +34,6 @@ <h1>CodeU Starter Project</h1>
     their URL.</p>
     <p>This is your code now! Feel free to make changes, and don't be afraid to get creative!
     You could start by modifying this page to tell the world more about your team.</p>
+  <p>Hello World!</p>
   </body>
-</html>
+</html>

src/main/webapp/js/user-page-loader.js

@@ -30,21 +30,23 @@ function setPageTitle() {
 }
 
 /**
- * Shows the message form if the user is logged in and viewing their own page.
+ * Shows the message form if the user is logged in, even if they
+ * aren't viewing their own page.
  */
-function showMessageFormIfViewingSelf() {
-  fetch('/login-status')
-      .then((response) => {
-        return response.json();
-      })
-      .then((loginStatus) => {
-        if (loginStatus.isLoggedIn &&
-            loginStatus.username == parameterUsername) {
-          const messageForm = document.getElementById('message-form');
-          messageForm.classList.remove('hidden');
-        }
-      });
-}
+function showMessageFormIfLoggedIn() {
+	  fetch('/login-status')
+	      .then((response) => {
+	        return response.json();
+	      })
+	      .then((loginStatus) => {
+	        if (loginStatus.isLoggedIn) {
+	          const messageForm = document.getElementById('message-form');
+	          messageForm.action = '/messages?recipient=' + parameterUsername;
+	          messageForm.classList.remove('hidden');
+	        }
+	      });
+	}
+
 
 /** Fetches messages and add them to the page. */
 function fetchMessages() {
@@ -93,6 +95,6 @@ function buildMessageDiv(message) {
 /** Fetches data and populates the UI of the page. */
 function buildUI() {
   setPageTitle();
-  showMessageFormIfViewingSelf();
+  showMessageFormIfLoggedIn();
   fetchMessages();
 }

src/main/webapp/map.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Map Project</title>
+  <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAWJW6lENPXp_hwUrYirFP4kdUQixTCtwo"></script>
+  <script>
+  let map;
+  function createMap(){
+
+	//creates a map
+    map = new google.maps.Map(document.getElementById('map'), {
+      center: {lat: 37.422, lng: -122.084},
+      zoom: 16
+    });
+
+	//add marker
+    const trexMarker = new google.maps.Marker({
+    	  position: {lat: 37.421903, lng: -122.084674},
+    	  map: map,
+    	  title: 'Stan the T-Rex'
+    	});
+
+	//add popup description
+    var trexInfoWindow = new google.maps.InfoWindow({
+    	  content: 'This is Stan, the T-Rex statue.'
+    	});
+
+    trexMarker.addListener('click', function() {
+    	  trexInfoWindow.open(map, trexMarker);
+    	});	
+  }
+</script>
+<style>
+    #map{
+      width: 500px;
+      height: 500px;
+      border: thin solid black;
+    }
+  </style>
+</head>
+<body onload="createMap();">
+  <h1>Map Project</h1>
+  <div id="map"></div>
+</body>
+</html>