From e4c6d55a6b9799cbfbe4c730b3307707fbed7e6c Mon Sep 17 00:00:00 2001 From: Darsh Date: Fri, 24 Jul 2020 11:20:56 +0530 Subject: [PATCH 1/3] Added github logged in button --- src/containers/TheHeader.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/containers/TheHeader.js b/src/containers/TheHeader.js index 18da5bb..474841d 100644 --- a/src/containers/TheHeader.js +++ b/src/containers/TheHeader.js @@ -79,6 +79,11 @@ const TheHeader = () => { Discord Logged In )} + + + From 39b20f56d01ff4e0c2564a9015fea46e8fb83ac1 Mon Sep 17 00:00:00 2001 From: Darsh Date: Fri, 24 Jul 2020 11:21:05 +0530 Subject: [PATCH 2/3] added avatar image and fallback --- server/middlewares/authenticated.js | 3 ++- src/containers/TheHeaderDropdown.js | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/middlewares/authenticated.js b/server/middlewares/authenticated.js index 23480d6..2d2c30e 100644 --- a/server/middlewares/authenticated.js +++ b/server/middlewares/authenticated.js @@ -33,7 +33,8 @@ export const customAuthenticator = async (req, res, next) => { export const authSuccess = (req, res) => { const data = { username: req.user.username, - tokens: req.user.accounts + tokens: req.user.accounts, + avatar: req.user.githubProfile._json.avatar_url }; const token = Buffer.from(JSON.stringify(data)).toString('base64'); res.redirect(`${hosts[0]}/#/auth?token=${token}`); diff --git a/src/containers/TheHeaderDropdown.js b/src/containers/TheHeaderDropdown.js index 9f46809..11186bb 100644 --- a/src/containers/TheHeaderDropdown.js +++ b/src/containers/TheHeaderDropdown.js @@ -7,7 +7,12 @@ import { CImg } from '@coreui/react' import CIcon from '@coreui/icons-react' - +function getAvatar() { + const bundlyToken = localStorage.getItem("bundly-token"); + let avatar_url; + if (bundlyToken) avatar_url = JSON.parse(atob(bundlyToken)).avatar; + return avatar_url; +} const TheHeaderDropdown = () => { return ( {
From eeffebef2f98e93e096624a250f3bd404f52a7a0 Mon Sep 17 00:00:00 2001 From: Darsh Date: Fri, 24 Jul 2020 11:27:19 +0530 Subject: [PATCH 3/3] linting-fix --- src/containers/TheHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/TheHeader.js b/src/containers/TheHeader.js index 474841d..b893564 100644 --- a/src/containers/TheHeader.js +++ b/src/containers/TheHeader.js @@ -79,11 +79,11 @@ const TheHeader = () => { Discord Logged In )} - +