Skip to content
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

DashboardCalendar #21

Merged
merged 2 commits into from
Dec 8, 2024
+45 −3
Merged

DashboardCalendar #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c603f81
Calendar
KBrennan39 Dec 6, 2024
5faad42
Update MenteeDashboard.tsx
lolitaroz Dec 8, 2024
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
2 changes: 2 additions & 0 deletions app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { type ReactElement } from "react";
import { Routes, Route } from "react-router-dom";
import Home from "./pages/Home";
import MentorDashboard from "./pages/MentorDashboard";
import MenteeDashboard from "./pages/MenteeDashboard";
import CreateWorkshop from "./pages/CreateWorkshop";
import CreateMeeting from "./pages/CreateMeeting";
import AuthCallback from "./pages/auth-callback";
Expand All @@ -13,6 +14,7 @@ function App(): ReactElement {
<Route path="/" element={<Home />} />
<Route path="/home" element={<Home />} />
<Route path="/mentor" element={<MentorDashboard />} />
<Route path="/mentee" element={<MenteeDashboard/>}/>
<Route path="/create-workshop" element={<CreateWorkshop />} />
<Route path="/create-meeting" element={<CreateMeeting />} />
<Route path="/callback" element={<AuthCallback />} />
Expand Down
45 changes: 42 additions & 3 deletions app/src/pages/MenteeDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const MenteeDashboard = () => {
<Navbar />
<div className="Flex-row Justify-content--spaceBetween">
<div className="Block Width--60 Margin-right--40 Margin-left--40 Margin-top--40 Height--100vh">
<div className="Block-header Text-color--gray-600 Margin-bottom--20">
<div className="Block-header Text-color--gray-600 Margin-bottom--20" style={{fontSize:"20px"}}>
My courses
</div>

Expand Down Expand Up @@ -67,9 +67,48 @@ const MenteeDashboard = () => {
</div>
</div>
</div>


<div className="Block Width--40 Margin-right--40 Margin-top--40 Height--100vh">
<div className="Block-header Text-color--gray-600 Margin-bottom--20">
Upcoming Events
<div className="Block-header Text-color--gray-1000 Margin-bottom--20" style={{ borderBottom: '1px solid #e0e0e0', paddingBottom: '10px',textAlign:"center" }}>
Upcoming Events!
</div>
<div className="Block-subtitle Margin-top--40" style={{borderBottom: '1px solid #e0e0e0', width: "50%"}}>
June
</div>

<div className="Margin-top--20">
<div className="Flex-row Margin-bottom--10">
<div className="Margin-right--40" style={{ textAlign: 'center', width: '40px' }}>
<div className="Text-color--gray-800">wed</div>
<div className="Text-fontSize--30 Text-color--gray-1000">25</div>
</div>
<div>
<div className="Text-fontSize--16 Text-color--gray-1000">
Mock Interview Session
</div>
<div className="Text-fontSize--14 Text-color--gray-800">
Practice your interview skills with an industry professional
</div>
</div>
</div>
</div>

<div className="Margin-top--20">
<div className="Flex-row Margin-bottom--10">
<div className="Margin-right--40" style={{ textAlign: 'center', width: '40px' }}>
<div className="Text-color--gray-800">wed</div>
<div className="Text-fontSize--30 Text-color--gray-1000">25</div>
</div>
<div>
<div className="Text-fontSize--16 Text-color--gray-1000">
Resume Workshop
</div>
<div className="Text-fontSize--14 Text-color--gray-800">
Develop your resume with a senior employee
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions app/src/styles/_utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@
}
}


.Image {
width: 50%;
height: auto;
Expand Down
Loading