From 0fd66e4d8227c8f468576d9bd9fddf79a0f1adfc Mon Sep 17 00:00:00 2001
From: Yucheng Hang <yucheng.hang@uconn.edu>
Date: Wed, 6 May 2020 01:41:51 -0400
Subject: [PATCH] before submit

---
 final/css/main.css  |  3 +--
 final/js/main.js    | 28 +++++++++++++++++++++++-----
 final/js/profile.js |  6 +++---
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/final/css/main.css b/final/css/main.css
index b164ede..12fc57d 100755
--- a/final/css/main.css
+++ b/final/css/main.css
@@ -125,9 +125,8 @@ div > span > h2{
 div:not(.Me) > span > p{
    
   margin-top: 5px;
+  margin-right: 0;
   background-color: #f9d861;
-  -webkit-border-radius: 8px;
-  -webkit-border-top-left-radius: 0;
   -moz-border-radius: 8px;
   -moz-border-radius-topleft: 0;
   border-radius: 8px;
diff --git a/final/js/main.js b/final/js/main.js
index 173f7dc..63b4689 100755
--- a/final/js/main.js
+++ b/final/js/main.js
@@ -27,10 +27,27 @@ let inputBox = document.querySelector("#newmsg");
 let curr_date = new Date();
 let month = curr_date.getMonth() + 1;
 let dateStr = month.toString() + "/" + curr_date.getDate().toString() + "/" + curr_date.getFullYear().toString();
+
+
+  let realTime = new Date();
+  let hours = realTime.getHours();
+  let minutes = realTime.getMinutes();
+
+  //Add AM and PM system
+  let amPm = (hours < 12 ) ? "AM" : "PM";
+  //convert the hours component to 12-hour format
+  hours = (hours > 12) ? hours - 12 : hours;
+  //pad the hours, minutes and seconds with leading zeros
+  hours = ("0" + hours).slice(-2);
+  minutes = ("0" + minutes).slice(-2);
+  let timeStr = hours + ":" + minutes + " " + amPm;
   
-let curr_time = new Date();
-let timeStr = curr_time.getHours().toString() + ":" + curr_time.getMinutes().toString();
-// document.getElementById("time").innerHTML = timeStr;
+  // //Display the time
+  // document.getElementById('clock').innerHTML = 
+  //   hours + " : " + minutes + " " + amPm;
+  // var t = setTimeout(displayTime, 500);
+
+// }
 
 function makeMessage(msg) {
  
@@ -49,7 +66,7 @@ function makeMessage(msg) {
    
 
   name.innerHTML=msg.sentBy;
-  timeStamp.innerHTML=msg.timeStr + " " + msg.dateStr;
+  timeStamp.innerHTML=timeStr + " " + dateStr;
   message.innerHTML=msg.message;
 
 
@@ -85,8 +102,9 @@ document.querySelector("#sendBtn").addEventListener('click', () => {
 
   let userMsg = {
     sentBy: localStorage.userName,
-    //dateStamp: date_str,
     dateStr: month.toString() + "/" + curr_date.getDate().toString() + "/" + curr_date.getFullYear().toString(),
+    // timeStr: curr_time.getHours().toString() + ":" + curr_time.getMinutes().toString(),
+    timeStamp: msg.timeStr + " " + msg.dateStr,
     message: msg
 
     }
diff --git a/final/js/profile.js b/final/js/profile.js
index 4ec22f3..1d51e02 100755
--- a/final/js/profile.js
+++ b/final/js/profile.js
@@ -1,7 +1,7 @@
   
-let userName = localStorage.getItem('userName') || "Yucheng";
-let userStatus = localStorage.getItem('userStatus') || "update your profile to display a status";
-let userProfilePic = localStorage.getItem('userProfilePic') || "profile.png" ;
+let userName = localStorage.getItem('userName') || "Username";
+let userStatus = localStorage.getItem('userStatus') || "Status";
+let userProfilePic = localStorage.getItem('userProfilePic') || "imgs/change-profile.png" ;
 let usernameInput = document.querySelector("#usernameInput");
 let statusInput = document.querySelector("#statusInput");
 // let emailInput = document.querySelector("#emailInput");