Bit cleanup

tameeshB · Dec 31, 2017 · f108109 · f108109
1 parent 982018e
commit f108109
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 71 deletions.
diff --git a/public/css/chat.css b/public/css/chat.css
@@ -114,9 +114,8 @@ html,body {
   font-weight: 500;
 }
 
-
 .messages {
-  padding: 40px 20px;
+  padding: 15px 20px;
 }
 .message {
   padding: 40px 20px;
@@ -284,7 +283,7 @@ height: 100%;
   font-size: 2em;
   color: #FFFFFF;
   text-transform: capitalize;
-  padding-left: 40px;
+  /* padding-left: 40px; */
 }
 
 /* scrollbar */

diff --git a/public/js/chat.js b/public/js/chat.js
@@ -169,19 +169,22 @@ socket.emit('connected', {
 /**
  * Room list
  */
-const RoomTab = (props) => {//function component
-    function roomTabClick(){
+class RoomTab extends React.Component {//function component
+    roomTabClick(){
         mobMaster();
-        
+
     }
-    return (
-        <a className="item active roomTab" data-rn={props.roomname} onClick={roomTabClick}>
+    render(){
+
+        return (
+            <a className="item active roomTab" data-rn={this.props.roomname} onClick={this.roomTabClick}>
             <span className="icon">
                 <i className="fa fa-inbox"></i>
             </span>
-            <span className="name">{props.roomname}</span>
-        </a>
-    );
+            <span className="name">{this.props.roomname}</span>
+            </a>
+        );
+    }   
 };
 
 

diff --git a/routes/index.js b/routes/index.js
@@ -14,56 +14,14 @@ module.exports = function (app, passport, db) {
 		}
 	});
 
-	// app.get('/test/:a/:b',function(req,res){
-
-	// 	db.users.findOne({ 'username': req.params.a, 'name': req.params.b }, function (err, doc) {
-	// 		if (err) {
-	// 			res.send(err);
-	// 		}
-	// 		if(doc)
-	// 			res.send('a'+doc);
-	// 		if(!doc)
-	// 			res.send('b' + doc);
-	// 	});
-	// });
-	//@async
 	app.get('/app', isLoggedIn, function (req, res) {
-		var rooms = {};
-		var messages = {};
 		var rooms_ = [];
 		roomsGL.forEach(function (room__) {
 			rooms_.push(room__.roomname);
 		});
-		console.log('rooms_', rooms_);
-		db.rooms.find({
-			roomname: {
-				$in: rooms_
-			} //@todo: Limit
-		}, function (err, docs) {
-			if (err)
-				console.log(err);
-			rooms = docs;
-			//filter message history
-			//message remodel
-			db.messages.find({
-				room: {
-					$in: rooms_
-				}
-			}, function (err, docs_) {
-				console.log("pastmsgs:", docs_);
-				messages = docs_; //later fetch with js lib
-				console.log("dbg:", messages, rooms)
-				res.render('chat', {
-					messages: messages,
-					user: req.user,
-					rooms: rooms
-				}); //want room data here with all participants etc.
-				//complete room data, user and messages
-			});
-		})
-
-
-
+		res.render('chat', {
+			user: req.user
+		});
 	});
 
 
@@ -74,13 +32,10 @@ module.exports = function (app, passport, db) {
 		console.log('check auth');
 		if (req.isAuthenticated()) {
 			console.log('isauth');
-
 			if (!req.session.user.hasOwnProperty('username') && req.url != '/addusername') {
 				res.redirect('/addusername');
 			}
-
 			return next();
-
 		}
 		console.log('isNOTauth');
 		// if they aren't redirect them to the home page

diff --git a/views/chat.ejs b/views/chat.ejs
@@ -9,8 +9,14 @@
 	<script>
 		var myuser = '<%= user.username %>';
 		var userhash = '<%= user.hash %>';
-		var rooms = JSON.parse('<%- JSON.stringify(rooms) %>');
-		var messages = JSON.parse('<%- JSON.stringify(messages) %>');
+		$(document).ready(function () {
+				setInterval(function () {
+					$(".dynamicTimeStamp").each(function () {
+						$(this).text(moment.parseZone($(this).data('ts'), "ddd MMM DD YYYY HH:mm:ss Z").fromNow());
+					});
+				}, 60000)
+
+			});
 	</script>
 	<script src="/js/mobile.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.20.1/moment.min.js"></script>
@@ -23,16 +29,6 @@
 	<!-- @todo Feed these values directly to js -->
 	<script type="text/babel" src="/js/chat.js"></script>
 	</head>
-	<script>
-		$(document).ready(function(){
-			setInterval(function(){
-				$(".dynamicTimeStamp").each(function () {
-					$(this).text(moment.parseZone($(this).data('ts'), "ddd MMM DD YYYY HH:mm:ss Z").fromNow());
-				});
-			},60000)
-			
-		});
-	</script>
 	<body>
 		<nav class="navbar has-shadow is-black" id="mainNav" style="position:fixed;z-index:100;width:100%">
 			<div class="container">