add logout, team selection

This commit is contained in:
2024-03-12 08:36:05 -05:00
parent fda4e1c3cc
commit 4f30021a99
5 changed files with 22 additions and 4 deletions

View File

@@ -5,6 +5,7 @@ utils = require("../lib/utils");
exports.getTeams = async (req, res, next) => {
const {layout} = req
const {user_id} = req.params
req.session.current_team_id = null
promise = teamsnap.loadTeams({'userId':user_id},
(err, items) =>{
teamsnapCallback(err,items);

View File

@@ -149,4 +149,11 @@ router.get('/auth/teamsnap/session_storage', (req,res)=>{
}
)
router.post('/logout', function(req, res, next){
req.logout(function(err) {
if (err) { return next(err); }
res.redirect('/');
});
});
module.exports = {router, ensureLoggedIn};

View File

@@ -15,12 +15,12 @@ const membersController = require("../controllers/member");
router.use("/", ensureLoggedIn, (req,res,next) => {req.layout="layouts/main";req.promises=[];next();})
router.get("/", (req,res,next) => {
if (!req.session.current_team){
if (!req.session.current_team_id){
res.redirect(`/user/${req.session.passport.user.id}/teams`)
next();
}
else {
res.redirect(`/${req.session.current_team}/home`)
res.redirect(`/${req.session.current_team_id}/home`)
next();
}
});

View File

@@ -17,7 +17,17 @@
<h6 class="h6 title u-textNoWrap u-fontSizeSm u-textSemiBold">{{user.first_name}} {{user.last_name}}</h6>
<div class="u-textNoWrap u-fontSizeSm">{{user.email}}</div>
<hr class="Divider u-spaceEndsNone">
<a href="/logout">Logout</a>
<div class="u-padBottomSm u-padTopSm">
<a href="/user/{{user.id}}/teams" class="u-spaceBottomSm Button Button--small">
<span>{{{embeddedSvgFromPath "/teamsnap-ui/assets/icons/team.svg"}}}</span>
Teams
</a>
<form method="post" action="/logout">
<button type="submit" name="logout" class="u-spaceBottomSm Button Button--small">
Logout
</button>
</form>
</div>
</div>
</div>
</div>

View File

@@ -10,7 +10,7 @@
</div>
<div class=" Grid-cell u-sizeFit">
<div class=" Grid-cell u-sizeFit u-padTopSm u-padBottomSm">
<div class=" u-flex u-flexAlignItemsCenter u-flexJustifyEnd">
<div class="ButtonGroup">
<a class="Button" href="schedule">