From a61510ed8c2a52aaa248d587ea0b1a32d76ad736 Mon Sep 17 00:00:00 2001 From: Ani Simhadri Date: Thu, 18 Aug 2022 17:23:27 -0400 Subject: [PATCH 1/5] config --- client/src/components/Badges.jsx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/client/src/components/Badges.jsx b/client/src/components/Badges.jsx index c63f077..91aae1b 100644 --- a/client/src/components/Badges.jsx +++ b/client/src/components/Badges.jsx @@ -1,5 +1,6 @@ import WorkspacePremiumIcon from '@mui/icons-material/WorkspacePremium'; import { Grid, Tooltip, Typography } from '@mui/material'; +import { Stack } from '@material-ui/core'; function Badge({ title = 'Good Question', @@ -31,16 +32,20 @@ export default function Badges({ badges: { obtained, unobtained } }) { return ( <> - - Obtained Badges - - {badgesGrid(obtained)} + + + Obtained Badges + + {badgesGrid(obtained)} + - - Unobtained Badges - - {badgesGrid(unobtained)} + + + Unobtained Badges + + {badgesGrid(unobtained)} + ); From bb6452b15d57323ae8dd4647f730db8335860724 Mon Sep 17 00:00:00 2001 From: tejusk2 <92613406+tejusk2@users.noreply.github.com> Date: Thu, 18 Aug 2022 16:27:50 -0500 Subject: [PATCH 2/5] level tooltips changed --- client/src/components/QAComponents/CommentControl.jsx | 2 +- client/src/components/QAComponents/CreateAnswer.jsx | 2 +- client/src/components/QAComponents/Question.jsx | 4 ++-- client/src/components/QAComponents/VoteControl.jsx | 2 +- .../controllers/QAControllers/VoteControlController.js | 2 +- client/src/services/getPermissions.js | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/components/QAComponents/CommentControl.jsx b/client/src/components/QAComponents/CommentControl.jsx index d8eaa8f..76f1491 100644 --- a/client/src/components/QAComponents/CommentControl.jsx +++ b/client/src/components/QAComponents/CommentControl.jsx @@ -18,7 +18,7 @@ export default function CommentControl({ title={ canComment ? '' - : 'You must be level 3 to comment or level 5 if this question is protected' + : 'You must be level 3 to comment or level 6 if this question is protected' } > diff --git a/client/src/components/QAComponents/CreateAnswer.jsx b/client/src/components/QAComponents/CreateAnswer.jsx index 8479ff6..5354679 100644 --- a/client/src/components/QAComponents/CreateAnswer.jsx +++ b/client/src/components/QAComponents/CreateAnswer.jsx @@ -10,7 +10,7 @@ export default function CreateAnswer({ canAnswer, show, toggleShow }) { title={ canAnswer ? '' - : 'You need to be authenticated to answer or level 5 if the question is protected' + : 'You need to be authenticated to answer or level 6 if the question is protected' } > diff --git a/client/src/components/QAComponents/Question.jsx b/client/src/components/QAComponents/Question.jsx index 259b782..217ab15 100644 --- a/client/src/components/QAComponents/Question.jsx +++ b/client/src/components/QAComponents/Question.jsx @@ -103,7 +103,7 @@ export default function Question({ Ask question - +