From 4f30021a99d8c7e5ac0a09c6ff7179ccd2ec085f Mon Sep 17 00:00:00 2001 From: Anthony Correa Date: Tue, 12 Mar 2024 08:36:05 -0500 Subject: [PATCH 1/2] add logout, team selection --- src/controllers/team.js | 1 + src/routes/auth.js | 7 +++++++ src/routes/index.js | 4 ++-- src/views/partials/navbar.hbs | 12 +++++++++++- src/views/team/home.hbs | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/controllers/team.js b/src/controllers/team.js index 9c927ec..af7a9da 100644 --- a/src/controllers/team.js +++ b/src/controllers/team.js @@ -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); diff --git a/src/routes/auth.js b/src/routes/auth.js index 25b1b86..ee10f0a 100644 --- a/src/routes/auth.js +++ b/src/routes/auth.js @@ -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}; diff --git a/src/routes/index.js b/src/routes/index.js index 287c683..b006e7a 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -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(); } }); diff --git a/src/views/partials/navbar.hbs b/src/views/partials/navbar.hbs index dbe17e7..7a252ed 100644 --- a/src/views/partials/navbar.hbs +++ b/src/views/partials/navbar.hbs @@ -17,7 +17,17 @@
{{user.first_name}} {{user.last_name}}
{{user.email}}
- Logout +
+ + {{{embeddedSvgFromPath "/teamsnap-ui/assets/icons/team.svg"}}} + Teams + +
+ +
+
diff --git a/src/views/team/home.hbs b/src/views/team/home.hbs index 55dd47a..5fb66a1 100644 --- a/src/views/team/home.hbs +++ b/src/views/team/home.hbs @@ -10,7 +10,7 @@ -
+
From b53c8c532e8dbb3585a5abedc7bab1e133d5ba6c Mon Sep 17 00:00:00 2001 From: Anthony Correa Date: Tue, 12 Mar 2024 08:37:13 -0500 Subject: [PATCH 2/2] remove legacy pug templates --- src/views/layouts/main.pug | 39 ----------------------------------- src/views/partials/navbar.pug | 25 ---------------------- 2 files changed, 64 deletions(-) delete mode 100644 src/views/layouts/main.pug delete mode 100644 src/views/partials/navbar.pug diff --git a/src/views/layouts/main.pug b/src/views/layouts/main.pug deleted file mode 100644 index 0d64ce0..0000000 --- a/src/views/layouts/main.pug +++ /dev/null @@ -1,39 +0,0 @@ -html -head - block meta - meta(charset='utf-8') - meta(name='viewport' content='width=device-width, initial-scale=1') - title BenchCoach - #{title} - block styles - link(rel='stylesheet' href='/css/bootstrap.min.css') - link(rel='stylesheet' href='/font/bootstrap-icons.min.css') - link(rel='stylesheet' href='/css/teamsnap-ui.css') - link(rel='stylesheet' href='/css/project.css') - block pre-scripts - script(type='text/javascript', src='/js/Sortable.js') - -body.bg-light - block navbar - include navbar.pug - - .u-spaceSm.u-md-spaceLg - block content - .Panel - .Panel-header - h2.Panel-title Panel - .Panel-body - .Panel-row Panel Row - .Panel-row Roster - .Panel-row Opponents - - block footer - .u-padMd.u-borderTop - .u-max1200.u-flexExpandSides.Grid - .Grid-cell.u-md-size1of2 - p.u-textCenter.u-md-textLeft - | Copyright © 2023 BenchCoach. BenchCoach is not affiliated with TeamSnap, inc. - .Grid-cell.u-md-size1of2 - p.u-textCenter.u-md-textRight - - block scripts - \ No newline at end of file diff --git a/src/views/partials/navbar.pug b/src/views/partials/navbar.pug deleted file mode 100644 index 4277161..0000000 --- a/src/views/partials/navbar.pug +++ /dev/null @@ -1,25 +0,0 @@ -header.Header - .Header-container.Grid.u-flexAlignItemsCenter - .Grid-cell.u-sizeFill - .Header-banner.Grid.u-flexAlignItemsCenter - a.Grid-cell.u-sizeFit.u-flexInline.u-flexAlignItemsCenter.u-textDecorationNone href=url_for(root_path) - div.Header-bannerLogo - img(class='logo' src='/media/benchcoach.svg' alt='BenchCoach Logo') - span - - if defined?(team) - h1.Header-bannerTitle #{team.name} - - else - h1.Header-bannerTitle BenchCoach - .Grid-cell.u-flexInline.u-flexJustifyEnd.u-sizeFill.u-padSidesSm - - if @user - .Popup - .Button.Button--small.Popup-toggle onclick="this.closest('.Popup').querySelector('.Popup-container').classList.toggle('is-open')" - | Account - .Popup-container.Popup-container--down.Popup-container--right.u-sizeFit - .Popup-content.u-padXs.u-sizeFit.u-fontSizeSm - h6.title.u-textNoWrap.u-fontSizeSm.u-textSemiBold="#{@user['first_name']} #{@user['last_name']}" - .u-textNoWrap.u-fontSizeSm="#{@user['email']}" - hr.Divider.u-spaceEndsNone - a href=url_for(logout_path) Logout - - .Grid-cell.u-sizeFit