Skip to content

added 2 lessons #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kcruz28 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

added 2 lessons #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ function App() {
const toSecondLesson = () => {
setPage("lesson/tcp_lesson");
};

const toThirdLesson = () => {
setPage("lesson/dns_lesson");
};

const toFourthLesson = () => {
setPage("lesson/ip_lesson");
};

return (
<div className={darkMode ? "dark-theme" : ""}>
<Routes>
Expand Down Expand Up @@ -183,6 +192,8 @@ function App() {
backToHomeHandler={backToHome}
goToFirstLesson={toFirstLesson}
goToSecondLesson={toSecondLesson}
goToThirdLesson={toThirdLesson}
goToFourthLesson={toFourthLesson}
SettingsHandler={toSettingsPage}
/>
}
Expand Down
28 changes: 21 additions & 7 deletions src/Components/Progress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ interface Props {
backToHomeHandler: () => void;
goToFirstLesson: () => void;
goToSecondLesson: () => void;
goToThirdLesson: () => void;
goToFourthLesson: () => void;
}

function Progress({ ProfileHandler,
Expand All @@ -26,11 +28,13 @@ function Progress({ ProfileHandler,
backToHomeHandler,
SettingsHandler,
goToFirstLesson,
goToSecondLesson }: Props) {
goToSecondLesson,
goToThirdLesson,
goToFourthLesson }: Props) {

return (
<div style={{ margin: 0, padding: 0, height: '100vh', position: 'relative' }}>
<NavigationBar
<NavigationBar
ProfileHandler={ProfileHandler}
getStartedHandler={getStartedHandler}
InventoryHandler={InventoryHandler}
Expand All @@ -41,13 +45,13 @@ function Progress({ ProfileHandler,

<div className="white-half" style={{ width: '80%', height: '100%', backgroundColor: 'white', position: 'absolute', left: '20%' }}>

<Navigation
<Navigation
username="Kelvin"
redirects={
[
{ page_name: 'Home', page_handler: backToHomeHandler },
{ page_name: 'Profile', page_handler: ProgressHandler }
]}
]}
/>

<div id="progress-group">
Expand Down Expand Up @@ -93,11 +97,21 @@ function Progress({ ProfileHandler,
<div id="down-arrow"></div>
</div>

<div id="lesson3-box">
<div id="lesson3-box" onClick={goToThirdLesson}>
<div id="unlocked-border"></div>
<div id="locked-border">
<div id="unlocked-inner-border">
<div id="lesson-text">LESSON 3</div>
<div id="lesson-name">"Topic"</div>
<div id="lesson-name">DNS</div>
</div>
<div id="down-arrow"></div>
</div>


<div id="lesson4-box" onClick={goToFourthLesson}>
<div id="unlocked-border"></div>
<div id="unlocked-inner-border">
<div id="lesson-text">LESSON 4</div>
<div id="lesson-name">SHESH</div>
</div>
<div id="down-arrow"></div>
</div>
Expand Down
8 changes: 8 additions & 0 deletions src/Styles/Progress.modules.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,14 @@
top: 105%;
}

#lesson4-box {
position: absolute;
width: 20%;
height: 18%;
left: 10%;
top: 140%;
}

#unlocked-border {
box-sizing: border-box;

Expand Down