diff --git a/app/.env.example b/app/.env.example deleted file mode 100644 index c53f8e6..0000000 --- a/app/.env.example +++ /dev/null @@ -1,6 +0,0 @@ -REACT_APP_API_URL = http://127.0.0.1:8000 - -# auth -REACT_APP_AUTH0_DOMAIN=##check notion## -REACT_APP_AUTH0_CLIENT_ID=##check notion## -REACT_APP_AUTH0_CALLBACK_URL=http://localhost:3000/callback diff --git a/app/src/components/Navbar.tsx b/app/src/components/Navbar.tsx index 5392d4e..c8e5af0 100644 --- a/app/src/components/Navbar.tsx +++ b/app/src/components/Navbar.tsx @@ -21,7 +21,6 @@ const Navbar = (): ReactElement => { >
{ navigate("/home"); }} diff --git a/app/src/pages/MentorDashboard.tsx b/app/src/pages/MentorDashboard.tsx index 6f2b98c..4c7c25e 100644 --- a/app/src/pages/MentorDashboard.tsx +++ b/app/src/pages/MentorDashboard.tsx @@ -1,13 +1,48 @@ import React, { useState } from "react"; import Navbar from "../components/Navbar"; + const MentorDashboard = () => { + return ( <> -

Mentor Dashboard

-
-
Example Button
+
+
+ +
+
My Mentees
+
Courses
+
+ +
+
+
+
+

JaneDoe

+
+
+ +
+
+
+

Jane Doe

+
+
+ +
+
+
+

Jane Doe

+
+
+
+ +
+
+
Upcoming Events!
+
+
); diff --git a/app/src/styles/_components.scss b/app/src/styles/_components.scss index 40b6e92..f66a4ee 100644 --- a/app/src/styles/_components.scss +++ b/app/src/styles/_components.scss @@ -38,17 +38,26 @@ margin-right: 20px; } - &-link { - color: var(--pww-color-dark-1000); - cursor: pointer; - font-size: var(--pww-font-size-16); - display: flex; // Add this - align-items: center; // Add this - height: 50px; // Match the height of the home icon - &:hover { - color: var(--pww-color-teal-1000); - } - } + &-home { + font-size: var(--pww-font-size-30); + font-weight: 900; + background-image: url('../assets/home.png'); + background-size: contain; /* Ensure the entire logo fits within the defined area */ + background-repeat: no-repeat; /* Prevent repeating */ + background-position: center; /* Center the logo within its container */ + width: 50px; // Reduced from 125px to be more proportional + height: 50px; // Reduced from 70px to match navbar height + margin-right: 20px; + } + + &-link { + color: var(--pww-color-dark-1000); + cursor: pointer; + font-size: var(--pww-font-size-16); + + &:hover { + color: var(--pww-color-teal-1000); + } } } } @@ -140,3 +149,4 @@ } } } +} diff --git a/app/src/styles/_utilities.scss b/app/src/styles/_utilities.scss index 35550c8..e7f3a17 100644 --- a/app/src/styles/_utilities.scss +++ b/app/src/styles/_utilities.scss @@ -117,6 +117,10 @@ justify-content: space-between; } +.Justify-content--center { + justify-content: center; +} + .Align-items--center { align-items: center; } @@ -332,6 +336,11 @@ padding: 2px 5px; } + &--large { + font-size: 20px; + padding: 8px 16px; + } + &:hover { background-color: transparent; cursor: pointer; @@ -404,13 +413,17 @@ padding: 0; } + &--noPadding { + padding: 0; + } + &-dark { background-color: var(--pww-color-dark-1000); } } .Block { - padding: 56px 48px; + padding: 30px 30px; box-shadow: var(--pww-shadow-dark); background-color: var(--pww-color-light-1000); border-radius: var(--pww-border-radius-8); @@ -418,7 +431,7 @@ &-header { font-size: var(--pww-font-size-24); - margin-bottom: 10px; + margin-bottom: 30px; } &-subtitle { @@ -430,13 +443,18 @@ } } +.Image { + width: 50%; + height: auto; +} + .Modal--overlay { background-color: rgba(0, 0, 0, 0.4); position: fixed; top: 0; left: 0; right: 0; - bottom: 0; + bottom: 0x; z-index: var(--pww-z-100); overflow: hidden; } @@ -463,6 +481,11 @@ // } } +.Flex-grid { + display: flex; + flex-wrap: wrap; +} + .Flex-column { display: flex; flex-direction: column; @@ -525,6 +548,7 @@ // } } + .Display--gteDesktop { display: none; @@ -563,6 +587,9 @@ .Width--40 { width: 40%; } .Width--60 { width: 60%; } +.Width--40 { width: 40%; } +.Width--60 { width: 60%; } + .Width--50 { width: 50%; } @@ -577,6 +604,10 @@ height: 100vh; } +.Height--100vh { + height: 100vh; +} + ul { list-style-type: none; padding: 0; diff --git a/app/src/styles/_variables.scss b/app/src/styles/_variables.scss index cd7df12..a608e19 100644 --- a/app/src/styles/_variables.scss +++ b/app/src/styles/_variables.scss @@ -2,31 +2,31 @@ // this is where we define our colors used in the app //add spaces so that the hex codes are lined up -$pww-color-yellow: #B1CF24; -//$pww-color-teal: #149BAF; +$pww-color-yellow: #b1cf24; +//$pww-color-teal: #149baf; $pww-color-teal: #0096C0; -//$pww-color-blue: #32559A; +//$pww-color-blue: #32559a; $pww-color-blue: #4C65A6; -$pww-color-red: #DB504A; -// $pww-color-green: #4A9A4E; +$pww-color-red: #db504a; +//$pww-color-green: #4a9a4e; $pww-color-green: #BFD71B; -$pww-color-light: #ffffff; +$pww-color-light: #ffffff; $pww-color-neutral: #f6f4ef; -// $pww-color-gray: #626262; +//$pww-color-gray: #626262; $pww-color-gray: #545454; -$pww-color-dark: #000000; +$pww-color-dark: #000000; // allow the colors to be used in inline styles $palette: ( - "yellow": $pww-color-yellow, - "teal": $pww-color-teal, - "blue": $pww-color-blue, - "red": $pww-color-red, - "green": $pww-color-green, - "light": $pww-color-light, - "neutral": $pww-color-neutral, - "gray": $pww-color-gray, - "dark": $pww-color-dark + "yellow": $pww-color-yellow, + "teal": $pww-color-teal, + "blue": $pww-color-blue, + "red": $pww-color-red, + "green": $pww-color-green, + "light": $pww-color-light, + "neutral": $pww-color-neutral, + "gray": $pww-color-gray, + "dark": $pww-color-dark, ); // opacities diff --git a/app/src/styles/main.scss b/app/src/styles/main.scss index 47d33c5..363de19 100644 --- a/app/src/styles/main.scss +++ b/app/src/styles/main.scss @@ -1,7 +1,7 @@ // Imports for all of the external libraries -@import url('https://fonts.googleapis.com/css?family=Rubik'); +@import url("https://fonts.googleapis.com/css?family=Rubik"); @import url('https://fonts.googleapis.com/css?family=Lato'); -@import url('https://pro.fontawesome.com/releases/v5.10.0/css/all.css'); +@import url("https://pro.fontawesome.com/releases/v5.10.0/css/all.css"); @import "~bootstrap/scss/bootstrap-utilities.scss"; @import "~bootstrap/scss/bootstrap-grid.scss"; @@ -16,40 +16,40 @@ :root { // define colors - @include root-palette($palette); - - --text-on-dark: var(--pww-color-light-1000); - --text-on-light: var(--pww-color-dark-1000); - - --transition-duration: 0.15s; - - --border-radius: 4rem; - --box-shadow: 0 0 3rem rgba(var(--dark), .1); - --line-height: 1.5em; - - --container-padding: 2rem; - } - - // Fonts - html, - body { - // font-family: 'Quattrocento'; - font-family: Lato; - margin: 0; - } - - // default settings for the body - body { - font-size: var(--pww-font-size-4); - background-color: var(--pww-color-neutral-1000); - color: var(--pww-color-dark-1000); - } - - // Background Colors - .app { - min-height: 100vh; - display: flex; - flex-direction: column; - color: var(--pww-color-dark-1000); - font-weight: 100; - } + @include root-palette($palette); + + --text-on-dark: var(--pww-color-light-1000); + --text-on-light: var(--pww-color-dark-1000); + + --transition-duration: 0.15s; + + --border-radius: 4rem; + --box-shadow: 0 0 3rem rgba(var(--dark), 0.1); + --line-height: 1.5em; + + --container-padding: 2rem; +} + +// Fonts +html, +body { + //font-family: "Quattrocento"; + font-family: Lato; + margin: 0; +} + +// default settings for the body +body { + font-size: var(--pww-font-size-4); + background-color: var(--pww-color-neutral-1000); + color: var(--pww-color-dark-1000); +} + +// Background Colors +.app { + min-height: 100vh; + display: flex; + flex-direction: column; + color: var(--pww-color-dark-1000); + font-weight: 100; +}