{project.title}
+{project.title}
{/* Project showcase */} -
- Slider
-
- Image snapshots are below
-
From
{project.group}
{project.description}
Overview
+Overview
+
Background & More Details About the Project
-
+
- This space will be filled in by the owner -
-{project.description}
- -Edit Project
-Title
- -Description
- -{project.full_description}
- Updates content will go here -
++ Updates{" "} + (W.I.P) +
+Title
+ + {showCommentForm ? ( ++ Add your comments here +
+- Members content will go here -
++ Students Working on This Project{" "} + (W.I.P) +
+ +- Wanted content will go here -
++ Wanted{" "} + (W.I.P) +
+ {/* Positions Section */} ++ Positions Needed for This Project +
+ +- Discussions content will go here -
++ Add your comments here +
++ No discussions yet. Start the conversation! +
+ )} +- Contact content will go here -
++ Contact The Owner of This Project{" "} + (W.I.P) +
+Full Name
+ +Email Address
+ +Subject
+ +Description
+ + +Public Projects List
- + + +- {/* "More" Button */} -
K_h#Gwr6yI{DSa z0eM&8cWGt(Us*}r^Hxo%2+I@VfSj5Ow6@cq@d7GkA!GHhSHnHN2VHRC{BbLF($RKd zKvqT+t~bA;pU^%SWU~Y#VD^pJqZvpr{rr{v_N-lhn|)?FZ~8SdKNx2W+2kEw;7!;v z>fY4S>)1B@5A+xLL;hnH-M7sLGcw&yiYjD#-_6sOQsU>3SAK5M&Nj=M42l@g|3jaW z(ba@VR}4yeUgXQdV#>y+bk}EHs%#{eNxnT3V`~pC(+}+S-CHUhLTS6yzQdwAq&y}LSf27(ZgmcH0Jn; zY>4^Q)}hF&XA#Pi10t9i?=}!fPYN-Ic995$Jw(oT9`LJbYgcz{hKX3U&y*I-w>XAZ z=>uLQ`A-podXwjGGCDSTVgJIkZf&S 1YmepV4$5xkrq z_)SqDQ*3|n thP7QS~mEZk5s@_zVOlV?r=+*a0qEmk`wb_DyDA^#JD* zx|kXCUsM0wAa0<*&O|t)gHH8Bc14#>JUI@9SC9lZtv>B}Hj6@?nM*@Yo>SzPN0$NQ zbO*;O((zkX(H~}N>m18xw(aw0E1payj`#PjJ|?jaC#D0k2@&|$#T+qQHnVV*-byN0 zJmbSE4(0V`+@Lx^Wigt~TA!(lijR^QO>Vo_D$l=kD!mw0m8^Iljhwo+ss2)FMETZb z-u=_sJDw H+q9@(Y?PV8e59>-~fyw(lFp~2Y*hl)_VA2OFh4Nn|;WS zXdhQL1CdJCvs>uDBwi5AmPpZpP=2lKw!s8=aDl>C#=p}F<}CSnIpNz1_3JY@5dP@( ntzsX^o5H|9Sxw-r!DE3{ooB%>H}21^e|o^rJIG7y5zG7?=;sO; literal 0 HcmV?d00001 diff --git a/frontend/bitmatch/src/App.jsx b/frontend/bitmatch/src/App.jsx index b38fe75..1dbb200 100644 --- a/frontend/bitmatch/src/App.jsx +++ b/frontend/bitmatch/src/App.jsx @@ -1,109 +1,101 @@ -import { useEffect, useState } from "react"; -import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import { - SignedIn, - SignedOut, - SignInButton, - UserButton, - useUser, -} from "@clerk/clerk-react"; -import { Button } from "./components/ui/button"; + BrowserRouter as Router, + Routes, + Route, + useLocation, +} from "react-router-dom"; +import { SignedIn, SignedOut, useUser } from "@clerk/clerk-react"; + +import MainNavbar from "./components/navbar"; +import MainFooter from "./components/footer"; + +import LandingPage from "./views/LandingPage"; import HomePage from "./views/HomePage"; import ProjectListPage from "./views/ProjectListPage"; import ProjectDetailPage from "./views/IndividualProjectPage"; import AddProjectPage from "./views/AddProjectPage"; -import "./styles/global.css"; +import SignUpPage from "./views/SignUpPage"; +import SignInPage from "./views/SignInPage"; +import OnboardPage from "./views/OnboardPage"; +// import BrowsePage from "./views/BrowsePage"; +// import AboutPage from "./views/AboutPage"; -export default function App() { - const { user } = useUser(); - const [showModal, setShowModal] = useState(false); - // eslint-disable-next-line no-unused-vars - const [showMaintenanceNote, setShowMaintenanceNote] = useState(true); // Toggle for maintenance note +import "./styles/global.css"; - useEffect(() => { - if (user && !sessionStorage.getItem("seenDevelopmentModal")) { - setShowModal(true); - sessionStorage.setItem("seenDevelopmentModal", "true"); // Store it for the session - } - }, [user]); +function AppRoutes() { + const location = useLocation(); + const { isSignedIn } = useUser(); + const isLanding = location.pathname === "/"; + const layoutClass = + isLanding && !isSignedIn + ? "py-8" + : "container mx-auto px-4 py-16 flex pb-6 flex-col items-center justify-center min-h-screen"; return ( - - -+ ); +} + +export default function App() { + return ( +- +--- Sign in to continue -
- {/* Maintenance Note */} - {showMaintenanceNote && ( -- - Maintenance Notice: We are currently performing maintenance to - improve the performance and reliability of our service. Some - features may be temporarily unavailable. We appreciate your - patience and understanding as we work to enhance your - experience. - -- )} -- - -++ {/* Uncomment when ready */} + {/* ++ {/* Landing or Home */} + + + ++ + + > + } + /> -+ - {/* First Login Modal (Per Session) */} - {showModal && ( - + } + /> +-- )} + {/* Signed-in only routes */} +--- Disclaimer -
-- Bitmatch is in early development, so some features may not - work as expected. Thanks for your patience and support as we - continue to improve! -
-- If you experience any issues, please email us at{" "} - - lqla@cpp.edu - - . -
- -+ + + + + } + /> + + + + } + /> - - + {/* Public pages */} +- --- BITMATCH -
- -- } /> + } /> + } /> - - - -} /> - } /> - } /> - } /> - } /> + } /> + */} + + + ); } diff --git a/frontend/bitmatch/src/assets/group_students.png b/frontend/bitmatch/src/assets/group_students.png new file mode 100644 index 0000000000000000000000000000000000000000..65d6cddf0ff1862e4e9206a44c84c27961336767 GIT binary patch literal 940122 zcmeFYby%BS&?g)M6bMpWO9{c+ +