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 0000000..757b773 Binary files /dev/null and b/src/assets/tutorial.png differ diff --git a/src/components/MapDesigner/MapDesigner.tsx b/src/components/MapDesigner/MapDesigner.tsx index 4105fe0..4901e0d 100644 --- a/src/components/MapDesigner/MapDesigner.tsx +++ b/src/components/MapDesigner/MapDesigner.tsx @@ -162,7 +162,7 @@ export default function MapDesigner(props: MapDesignerProps): JSX.Element { tutorialAPI .createCodeTutorialMatch({ value: JSON.stringify(stagedMap), - codeTutorialNumber: 6, + codeTutorialNumber: 4, }) .then(() => { 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 ? ( <> ) : (