Skip to content

Commit 42f10bb

Browse files
FrankFurter123FrankFurter123
authored
Merge pull request #169 from UNLV-CS472-672/Student-Tutor-selection
8th PR: Implement Role Selection Flow + Signup & Homepage UI Enhancements
2 parents 503470b + abe4caf commit 42f10bb

File tree

18 files changed

+386
-188
lines changed

18 files changed

+386
-188
lines changed

‎frontend/public/assets/images/Calendar.png‎

1.12 MB
Loading

‎frontend/public/assets/images/Pic1.webp‎

-24.8 KB
Binary file not shown.

‎frontend/public/assets/images/Pic3.webp‎

-383 KB
Binary file not shown.

‎frontend/public/assets/images/Pic5.jpg‎

-64.1 KB
Binary file not shown.

‎frontend/public/assets/images/dashboard.png‎

312 KB
Loading

‎frontend/src/App.jsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import About from "./components/About.jsx";
1111
import Learn_more from "./components/Learn_more.jsx";
1212
import Login from "./Components/Login.jsx";
1313
import SignUp from "./Components/SignUp.jsx";
14-
import DateOfBirth from "./Components/DateOfBirth.jsx";
1514
import Contact from "./Components/Contact.jsx";
1615
import FAQS from "./Components/FAQS.jsx";
1716
import Services from "./Components/Services.jsx";
@@ -31,6 +30,7 @@ import LandingPage from "./Components/LandingPage.jsx";
3130
import Settings from "./Components/Settings.jsx";
3231
import Questionnaire from "./Components/Questionnaire.jsx";
3332
import AssignmentCreate from "./Components/AssignmentCreate.jsx";
33+
import RoleSelect from "./Components/RoleSelect.jsx";
3434

3535

3636
function App() {
@@ -44,7 +44,7 @@ function App() {
4444

4545
return (
4646
<div className="App">
47-
{(location.pathname !== "/login" && location.pathname !== "/dateofbirth" && location.pathname !== "/SignUp" &&
47+
{(location.pathname !== "/login" && location.pathname !== "/roleSelect" && location.pathname !== "/SignUp" &&
4848
location.pathname !== "/StudentView" && location.pathname !== "/calendar" &&
4949
location.pathname !== "/chat" && location.pathname !== "/videocall" && location.pathname !== "/tutorview") && <Header />}
5050

@@ -58,7 +58,7 @@ function App() {
5858
<Route path="/booking" element={<Booking />} />
5959
<Route path="/login" element={<Login />} />
6060
<Route path="/SignUp" element={<SignUp />} />
61-
<Route path="/dateofbirth" element={<DateOfBirth />} />
61+
<Route path="/roleSelect" element={<RoleSelect />} />
6262
<Route path="/services" element={<Services />} />
6363
<Route path="/contact" element={<Contact />} />
6464
<Route path="/support" element={<Support />} />
@@ -118,7 +118,7 @@ function App() {
118118
</Routes>
119119

120120

121-
{(location.pathname !== "/login" && location.pathname !== "/dateofbirth" && location.pathname !== "/SignUp") && <Footer />}
121+
{(location.pathname !== "/login" && location.pathname !== "/roleSelect" && location.pathname !== "/SignUp") && <Footer />}
122122
</div>
123123
);
124124
}

‎frontend/src/Components/DateOfBirth.jsx‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎frontend/src/Components/Header.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ export default function Header() {
6969
</button>
7070
<div className={`dropdown-menu ${openDropdown === "more" ? "show" : ""}`}>
7171
<NavLink to="/learn_more" className="dropdown-item">Learn More</NavLink>
72-
<NavLink to="/resources" className="dropdown-item">Resources</NavLink>
7372
<NavLink to="/pomodoro" className="dropdown-item">Pomodoro</NavLink>
7473
</div>
7574
</div>

‎frontend/src/Components/Home.jsx‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default function Home() {
3939
<span className="text-body-secondary fs-6 staggered-subtitle">with your favorite tutor.</span>
4040
</h3>
4141
<div className="buttons-container">
42-
<Link to="/dateofbirth" className="btn btn-outline-light">Sign Up</Link>
42+
<Link to="/roleSelect" className="btn btn-outline-light">Sign Up</Link>
4343
<Link to="/learn_more" className="btn btn-outline-light">Learn More</Link>
4444
</div>
4545
</section>
@@ -52,13 +52,21 @@ export default function Home() {
5252
marginBottom: "60px",
5353
fontSize: "30px",
5454
fontWeight: 600
55-
}}>📚 Connect, Learn, and Grow with Your Favorite Tutor
55+
}}>
56+
Connect, Learn, and Grow with Your Favorite Tutor
5657
</h2>
5758
<p>
58-
LessonConnect makes learning effortless—video calls, messaging, and easy scheduling, all in one place. Connect with your tutor instantly and stay on track without the hassle.. </p>
59+
LessonConnect brings everything you need into one place—live video calls, secure messaging, file sharing, and effortless scheduling.
60+
Whether you&apos;re tackling homework, reviewing for a test, or working on a project, our Pomodoro feature keeps you productive and motivated.
61+
</p>
62+
<Link to="/roleSelect" className="btn btn-outline-dark" style={{ marginTop: "20px" }}>
63+
Join LessonConnect
64+
</Link>
5965
</div>
6066
<div className="col-md-6">
61-
<img className="middleUpper-pic" src="assets/images/Pic1.webp" alt="some image" />
67+
<div className="feature-icons">
68+
<img className="middleUpper-pic" src="/assets/images/dashboard.png" alt="some image" />
69+
</div>
6270
</div>
6371
</div>
6472
</div>
@@ -73,12 +81,16 @@ export default function Home() {
7381
marginBottom: "60px",
7482
fontSize: "30px",
7583
fontWeight: 600
76-
}}>Everything You Need for Seamless Learning</h2>
84+
}}>Master Your Schedule with the LessonConnect Calendar</h2>
7785
<p>
78-
From live sessions to file sharing and a built-in scheduler, LessonConnect brings all the tools you need to make tutoring seamless and interactive. </p>
86+
Stay on top of lessons, meetings, and practice sessions with our built-in calendar.
87+
Easily filter events, auto-schedule sessions, and track your academic progress — all in one centralized place designed to keep your learning on track.
88+
</p>
7989
</div>
8090
<div className="col-md-6 order-md-1">
81-
<img className="middleUpper-pic" src="assets/images/Pic2.avif" alt="some image" />
91+
<div className="feature-icons2">
92+
<img className="middleUpper-pic" src="/assets/images/Calendar.png" alt="some image" />
93+
</div>
8294
</div>
8395
</div>
8496
</div>
@@ -98,7 +110,7 @@ export default function Home() {
98110
<div className="row d-flex justify-content-center">
99111
<div className="col-md-6 text-center">
100112
<img
101-
src="assets/images/Pomodoro_pic.png"
113+
src="/assets/images/Pomodoro_pic.png"
102114
className="lower-section-img"
103115
alt="Pomodoro Timer Feature"
104116
/>
@@ -128,19 +140,19 @@ export default function Home() {
128140
<div className="p-2">
129141
<a href="#a">
130142
<img
131-
src="assets/images/coding.jpg"
143+
src="/assets/images/coding.jpg"
132144
className="gallery-item"
133145
alt="Image 1"
134146
/>
135147
</a>
136148
</div>
137149
<div className="p-2">
138-
<img src="assets/images/Math_pic.jpg" className="gallery-item" alt="Image 2"/>
150+
<img src="/assets/images/Math_pic.jpg" className="gallery-item" alt="Image 2"/>
139151
</div>
140152
<div className="p-2">
141153
<a href="#b">
142154
<img
143-
src="assets/images/Music.webp"
155+
src="/assets/images/Music.webp"
144156
className="gallery-item"
145157
alt="Image 3"
146158
/>
@@ -149,7 +161,7 @@ export default function Home() {
149161
<div className="p-2">
150162
<a href="#c">
151163
<img
152-
src="assets/images/philosophy_pic.webp"
164+
src="/assets/images/philosophy_pic.webp"
153165
className="gallery-item"
154166
alt="Image 4"
155167
/>
@@ -158,7 +170,7 @@ export default function Home() {
158170
<div className="p-2">
159171
<a href="#d">
160172
<img
161-
src="assets/images/Science_pic.jpg"
173+
src="/assets/images/Science_pic.jpg"
162174
className="gallery-item"
163175
alt="Image 5"
164176
/>
@@ -167,7 +179,7 @@ export default function Home() {
167179
<div className="p-2">
168180
<a href="#e">
169181
<img
170-
src="assets/images/languages.avif"
182+
src="/assets/images/languages.avif"
171183
className="gallery-item"
172184
alt="Image 6"
173185
/>
@@ -176,7 +188,7 @@ export default function Home() {
176188
<div className="p-2">
177189
<a href="#f">
178190
<img
179-
src="assets/images/writing.jpg"
191+
src="/assets/images/writing.jpg"
180192
className="gallery-item"
181193
alt="Image 7"
182194
/>
@@ -187,21 +199,21 @@ export default function Home() {
187199
<div className="p-2">
188200
<a href="#a">
189201
<img
190-
src="assets/images/coding.jpg"
202+
src="/assets/images/coding.jpg"
191203
className="gallery-item"
192204
alt="Image 1"
193205
/>
194206
</a>
195207
</div>
196208
<div className="p-2">
197209
<a href="#b">
198-
<img src="assets/images/Math_pic.jpg" className="gallery-item" alt="Image 2"/>
210+
<img src="/assets/images/Math_pic.jpg" className="gallery-item" alt="Image 2"/>
199211
</a>
200212
</div>
201213
<div className="p-2">
202214
<a href="#c">
203215
<img
204-
src="assets/images/Music.webp"
216+
src="/assets/images/Music.webp"
205217
className="gallery-item"
206218
alt="Image 3"
207219
/>
@@ -210,7 +222,7 @@ export default function Home() {
210222
<div className="p-2">
211223
<a href="#e">
212224
<img
213-
src="assets/images/philosophy_pic.webp"
225+
src="/assets/images/philosophy_pic.webp"
214226
className="gallery-item"
215227
alt="Image 4"
216228
/>
@@ -219,7 +231,7 @@ export default function Home() {
219231
<div className="p-2">
220232
<a href="#f">
221233
<img
222-
src="assets/images/Science_pic.jpg"
234+
src="/assets/images/Science_pic.jpg"
223235
className="gallery-item"
224236
alt="Image 5"
225237
/>
@@ -228,7 +240,7 @@ export default function Home() {
228240
<div className="p-2">
229241
<a href="#e">
230242
<img
231-
src="assets/images/languages.avif"
243+
src="/assets/images/languages.avif"
232244
className="gallery-item"
233245
alt="Image 6"
234246
/>
@@ -237,7 +249,7 @@ export default function Home() {
237249
<div className="p-2">
238250
<a href="#f">
239251
<img
240-
src="assets/images/writing.jpg"
252+
src="/assets/images/writing.jpg"
241253
className="gallery-item"
242254
alt="Image 7"
243255
/>

‎frontend/src/Components/Learn_more.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default function Learn_more() {
5757
looking to improve or a tutor eager to share knowledge, LessonConnect is the
5858
perfect space for growth.
5959
</p>
60-
<Link to="/dateofbirth" className="btn btn-primary btn-lg">Join Now</Link>
60+
<Link to="/roleSelect" className="btn btn-primary btn-lg">Join Now</Link>
6161
</div>
6262
</section>
6363
</div>

0 commit comments

Comments
 (0)