Merge branch 'working' of https://github.com/Oshanath/WebApp into wor…

…king
Oshanath · Mar 20, 2021 · ac8dc26 · ac8dc26
2 parents 387491a + f1a1f13
commit ac8dc26
Show file tree

Hide file tree

Showing 19 changed files with 195 additions and 207 deletions.
diff --git a/Controllers/threadController.js b/Controllers/threadController.js
@@ -19,7 +19,7 @@ module.exports.submitRequests_post = (req, res) => {
 
     const token = req.cookies.jwt;
 
-    jwt.verify(token, 'esghsierhgoisio43jh5294utjgft*/*/4t*4et490wujt4*/w4t*/t4', (err, decodedToken) => {
+    jwt.verify(token, 'esghsierhgoisio43jh5294utjgft*/*/4t*4et490wujt4*/w4t*/t4', async (err, decodedToken) => {
 
         let id = decodedToken.id;
 
@@ -50,7 +50,19 @@ module.exports.submitRequests_post = (req, res) => {
             messageObject['files'] = [];
 
         let messageId = database.addMessage(messageObject);
-        data['messageID_list'] = [messageId];
+
+        //create the main message for add/drop requests
+        let user = await db.collections.users.findOne({_id: mongoose.Types.ObjectId(id)});
+        let message2;
+        if(bodyData.type == 'repeat' || bodyData.type == 'submission'){
+            message2 = ('Module: ' + bodyData.module);
+        }
+        else{
+            message2 = ('Current Module: ' + bodyData.module + '\nRequired Module: ' + bodyData.requiredModule);
+        }
+        let messageId2 = database.addMessage({'from': id, 'text': message2});
+
+        data['messageID_list'] = [messageId2, messageId];
 
         database.addThread(data);
         res.redirect('/userProfile');
@@ -130,7 +142,6 @@ module.exports.getThreadData_post = (req, res) => {
                 searchQuery['type'] = filter.type;
 
             let filterThreads = async (thread, filter) => {
-                console.log(filter);
                 let string = filter.string.toLowerCase();
                 let searchWords = string.split(' ');
 

diff --git a/...s/0d993272-2321-45fd-ad41-5990e1918b75-10cd73c02e713fc55986852f4a80d387 (1).png b/...s/0d993272-2321-45fd-ad41-5990e1918b75-10cd73c02e713fc55986852f4a80d387 (1).png
diff --git a/public/about.ejs b/public/about.ejs
@@ -5,6 +5,7 @@
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link rel="stylesheet" href="/css/styles_aboutUs.css">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
         <!-- fa-eye and fa-eye-slash -->
         <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@300&display=swap" rel="stylesheet">
@@ -14,60 +15,65 @@
 
     <body>
 
-        <div>
-            <h1>Team GTX</h1>
+        <div class="header">
+            <div class="image-container">
+                <img src="./resources/gtx.jpg" alt="team_logo">
+            </div>
+            <h1>TEAM GTX</h1>
         </div>
 
-        <div>
-            <h2>Second semester project for Engineering Skill Development : Student Request System</h2>
+        <div class="projectHeaderContainer">
+            <div class="projectHeader">
+                <h2>Second Semester Project: Student Request System</h2>
+            </div>
+            <span>Contact Us: uom.studentrequestsystem@gmail.com</span>
         </div>
 
         <div>
             <h3>Team Members:</h3>
         </div>
 
-        <div>
-            <ul>
-                <li>
-                    Oshanath Rajawasam
+        <div class="teamMembers">
+            <div class="details">
+                <h3>Oshanath Rajawasam (LOMCCA)</h3>
+                <div>
                     <ul>
-                        <li>email</li>
-                        <li>contact No.</li>
+                        <li>email: oshanath.19@cse.mrt.ac.lk</li>
                     </ul>
-                </li>
-                <li>
-                    Akash Tharuka
+                </div>
+            </div>
+            <div class="details">
+                <h3>Lasith Rajakarunaratne</h3>
+                <div>
                     <ul>
-                        <li>email</li>
-                        <li>contact No.</li>
+                        <li>email: lasith.19@cse.mrt.ac.lk</li>
                     </ul>
-                </li>
-                <li>
-                    Kalana Rubasinghe
+                </div>
+            </div>
+            <div class="details">
+                <h3>Kalana Rubasinghe</h3>
+                <div>
                     <ul>
-                        <li>email</li>
-                        <li>contact No.</li>
+                        <li>email: kalana.19@cse.mrt.ac.lk</li>
                     </ul>
-                </li>
-                <li>
-                    Lasith Rajakaruna
+                </div>
+            </div>
+            <div class="details">
+                <h3>Akash Tharuka</h3>
+                <div>
                     <ul>
-                        <li>email</li>
-                        <li>contact No.</li>
+                        <li>email: akash.19@cse.mrt.ac.lk</li>
                     </ul>
-                </li>
-                <li>
-                    Samadhi Divyanjalee
+                </div>
+            </div>
+            <div class="details">
+                <h3>Samadhi Divyanjali</h3>
+                <div>
                     <ul>
-                        <li>email</li>
-                        <li>contact No.</li>
+                        <li>email: samadhi.19@cse.mrt.ac.lk</li>
                     </ul>
-                </li>
-            </ul>
-        </div>
-
-        <div>
-            <span>Contact Us: uom.studentrequestsystem@gmail.com</span>
+                </div>
+            </div>
         </div>
 
     </body>