Prechádzať zdrojové kódy

Minor syntax changes

theflametrooper 8 rokov pred
rodič
commit
1e87abec2f

+ 0 - 2
backend/logic/actions/news.js

@@ -5,9 +5,7 @@ const db = require('../db');
 module.exports = {
 
 	index: (session, cb) => {
-		console.log(1234);
 		db.models.news.find({}).sort({ released: 'desc' }).exec((err, news) => {
-			console.log(123456, err);
 			if (err) throw err;
 			else cb({ status: 'success', data: news });
 		});

+ 7 - 15
backend/logic/io.js

@@ -89,29 +89,21 @@ module.exports = {
 
 			//TODO check if session is valid before returning true/false
 			if (socket.sessionId !== undefined) cache.hget('sessions', socket.sessionId, (err, session) => {
-				if (err && err !== true) {
-					socket.emit('ready', false);
-				} else if (session) {
+				if (err && err !== true) socket.emit('ready', false);
+				else if (session) {
 					if (!!session.userSessionId) {
 						cache.hget('userSessions', session.userSessionId, (err, userSession) => {
-							if (err && err !== true) {
-								socket.emit('ready', false);
-							} else if (userSession) {
+							if (err && err !== true) socket.emit('ready', false);
+							else if (userSession) {
 								db.models.user.findOne({ _id: userSession.userId }, (err, user) => {
 									let role = 'default';
 									if (user) role = user.role;
 									socket.emit('ready', true, role);
 								});
-							} else {
-								socket.emit('ready', false);
-							}
+							} else socket.emit('ready', false);
 						});
-					} else {
-						socket.emit('ready', false);
-					}
-				} else {
-					socket.emit('ready', false);
-				}
+					} else socket.emit('ready', false);
+				} else socket.emit('ready', false);
 			});
 		});
 

+ 3 - 4
frontend/components/pages/News.vue

@@ -50,7 +50,7 @@
 	export default {
 		components: { MainHeader, MainFooter },
 		methods: {
-			formatDate: (unix) => {
+			formatDate: unix => {
 				return moment(unix).format("DD-MM-YYYY");
 			},
 		},
@@ -62,9 +62,8 @@
 		ready: function () {
 			let _this = this;
 			let socket = this.socket = this.$parent.socket;
-			socket.emit("news.index", function(result) {
-				_this.news = result.data;
-				console.log(_this.news)
+			socket.emit("news.index", res => {
+				_this.news = res.data;
 			});
 		}
 	}