thead view- updated

Oshanath · Mar 20, 2021 · 18871c3 · 18871c3
1 parent 884ebb9
commit 18871c3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Controllers/threadController.js b/Controllers/threadController.js
@@ -55,10 +55,10 @@ module.exports.submitRequests_post = (req, res) => {
         let user = await db.collections.users.findOne({_id: mongoose.Types.ObjectId(id)});
         let message2;
         if(bodyData.type == 'repeat' || bodyData.type == 'submission'){
-            message2 = (user.name + ' has a request regarding the module ' + bodyData.module);
+            message2 = ('Module: ' + bodyData.module);
         }
         else{
-            message2 = (user.name + ' requested the module ' + bodyData.module + ' to be changed to ' + bodyData.requiredModule);
+            message2 = ('Current Module: ' + bodyData.module + '\nRequired Module: ' + bodyData.requiredModule);
         }
         let messageId2 = database.addMessage({'from': id, 'text': message2});
 

diff --git a/public/assets/css/styles_threadView.css b/public/assets/css/styles_threadView.css
@@ -556,6 +556,22 @@ footer{
     color: #fff;
 }
 
+.msg-group .firstMessage{
+    margin: 5px;
+    padding: 5px;
+    height: fit-content;
+    width: 97%;
+    /* background: linear-gradient(to right, #2193b0, #202020); */
+    border-radius: 10px;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
+    /* max-width: 100%; */
+    position: relative;
+    float: right;
+    text-align: right;
+    font-size: 1.2rem;
+    color: #111;
+}
+
 .msg-group a{
     display: flex;
     flex-direction: row;

diff --git a/public/assets/javascript/threadView.js b/public/assets/javascript/threadView.js
@@ -316,6 +316,10 @@ let displayMessages = async (arr, msgId) => {
             msgContainer.setAttribute('class', 'sender');
         }
 
+        if(i == 0){
+            msgContainer.setAttribute('class', 'firstMessage');
+        }
+
         msgGroup.appendChild(msgContainer);
 
         // keep the scrollbar at the bottom when messages are displayed