diff --git a/website/routers/user/index.js b/website/routers/user/index.js index 07c9179..b517b1a 100644 --- a/website/routers/user/index.js +++ b/website/routers/user/index.js @@ -3,21 +3,34 @@ var express = require('express'), var servers = require('../../../models/server'); var votes = require('../../../models/votes'); var bots = require('../../../models/bot'); - -router.get('/', function (req,res) { +var users = require('../../../models/user'); +const user = require('../../../models/user'); +router.get('/', function (req, res) { res.redirect('/user/me') }) router.get('/me', async function (req, res) { - if (req.user) { - var bot = await bots.find({ owners: req.user.id }); - res.render('user/me', { - user: req.user, - bots: bot - }); - return - } else { + if(!req.user){ req.session.backURL = req.originalUrl; - res.redirect('/auth'); + return res.redirect('/auth'); } + var bot = await bots.find({ owners: req.user.id }); + var user = await users.find({ id: req.user.id }); + res.render('user/me', { + user: req.user, + bots: bot, + users: user, + dcuser: global.bsl.users.fetch(req.user.id) + + }); }) +router.get('/:id', async function (req, res) { + var bot = await bots.findOne({ id: req.params.id }); + res.render('user/index', { + user: req.user, + bot: bot, + users: user, + dcuser: global.bsl.users.fetch(req.user.id) + }); +}) + module.exports = router; \ No newline at end of file diff --git a/website/views/maintenance.ejs b/website/views/maintenance.ejs index cf65f48..fd581db 100644 --- a/website/views/maintenance.ejs +++ b/website/views/maintenance.ejs @@ -1,5 +1,20 @@ -