From e9643c20cd863384f5b830eb9acadcd2a5826033 Mon Sep 17 00:00:00 2001 From: Aadit-Krishnaa-R Date: Mon, 29 Jan 2024 01:21:35 +0530 Subject: [PATCH] fix: added tutorial icon, change tutorial number --- src/assets/book (1).png:Zone.Identifier | 4 ++ src/assets/tutorial.png | Bin 0 -> 9968 bytes src/components/MapDesigner/MapDesigner.tsx | 2 +- src/components/NavBar/NavBar.module.css | 13 +++++++ src/components/NavBar/NavBar.tsx | 18 +++------ src/pages/Dashboard/Dashboard.tsx | 43 ++++++++++++--------- src/store/Tutorials/tutorials.ts | 5 +++ src/store/User/UserApi.ts | 2 + src/store/User/UserSlice.ts | 2 + 9 files changed, 58 insertions(+), 31 deletions(-) create mode 100644 src/assets/book (1).png:Zone.Identifier create mode 100644 src/assets/tutorial.png diff --git a/src/assets/book (1).png:Zone.Identifier b/src/assets/book (1).png:Zone.Identifier new file mode 100644 index 0000000..053138f --- /dev/null +++ b/src/assets/book (1).png:Zone.Identifier @@ -0,0 +1,4 @@ +[ZoneTransfer] +ZoneId=3 +ReferrerUrl=https://www.flaticon.com/free-icon/book_13637888?term=code+tutorials&page=1&position=1&origin=search&related_id=13637888 +HostUrl=https://www.flaticon.com/download/icon/edited diff --git a/src/assets/tutorial.png b/src/assets/tutorial.png new file mode 100644 index 0000000000000000000000000000000000000000..757b773492dff327abb2c43dffcc04e21e3de41e GIT binary patch literal 9968 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 { Toast.success('Code Tutorial submitted succesfully'); diff --git a/src/components/NavBar/NavBar.module.css b/src/components/NavBar/NavBar.module.css index c41a7a0..3560abb 100644 --- a/src/components/NavBar/NavBar.module.css +++ b/src/components/NavBar/NavBar.module.css @@ -124,6 +124,19 @@ opacity: 0.8; } +.tutorialIcon { + height: 37px; + width: auto; + margin-top: 5px; + position: relative; + margin-right: 2rem; +} + +.tutorialIcon:hover{ + cursor: pointer; + opacity: 0.8; +} + .navbarTextButton { background-color: #374043; color: #fff; diff --git a/src/components/NavBar/NavBar.tsx b/src/components/NavBar/NavBar.tsx index 2a18d6b..2efbf0c 100644 --- a/src/components/NavBar/NavBar.tsx +++ b/src/components/NavBar/NavBar.tsx @@ -21,6 +21,7 @@ import signUpIcon from '../../assets/sign_up.svg'; import signInIcon from '../../assets/sign_in.svg'; import challengeDone from '../../assets/challenge_done.png'; import challengeAvailable from '../../assets/challenge_available.png'; +import tutorialIcon from '../../assets/tutorial.png'; import DcCompleted from '../DcModals/DcCompleted'; import DcAvailable from '../DcModals/DcAvailable'; import { @@ -188,21 +189,14 @@ const NavBar: React.FunctionComponent = () => {
{pageState == 'Dashboard' ? ( - - ) : pageState == 'Tutorials' ? ( - + /> ) : ( <> )} diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx index adcfee2..b722acf 100644 --- a/src/pages/Dashboard/Dashboard.tsx +++ b/src/pages/Dashboard/Dashboard.tsx @@ -190,6 +190,7 @@ export default function Dashboard(): JSX.Element { .getLatestCode() .then(response => { dispatch(initializeEditorStates(response)); + console.log(response); }) .catch(err => { if (err instanceof ApiError) Toast.error(err.message); @@ -289,7 +290,7 @@ export default function Dashboard(): JSX.Element { if (isInfoOpen === true) dispatch(isInfoOpened(false)); else dispatch(isInfoOpened(true)); } - + console.log(userCode); const handleSubmit = () => { let languageType: Language = Language.Cpp; if (userLanguage === 'c_cpp') languageType = Language.Cpp; @@ -357,8 +358,10 @@ export default function Dashboard(): JSX.Element { const currentUserApi = new CurrentUserApi(apiConfig); const User = useAppSelector(user); + const codeTutorialInitialLevel = User.codeTutorialNumber; + console.log(codeTutorialInitialLevel); const navigate = useNavigate(); - + console.log(codeTutorialNumber); const setOpened = (opened: boolean) => { if (opened === false) { currentUserApi @@ -581,19 +584,23 @@ export default function Dashboard(): JSX.Element {
- - - + {codeTutorialNumber == 4 ? ( + <> + ) : ( + + + + )} <> {codeTutorialNumber == 1 ? ( <> @@ -605,7 +612,7 @@ export default function Dashboard(): JSX.Element { Prev Tutorial )} - {codeTutorialNumber == 6 ? ( + {codeTutorialNumber == 4 ? ( <> ) : (