File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- import { BrowserRouter , Routes , Route } from "react-router-dom" ;
1+ import { BrowserRouter , Routes , Route , Outlet } from "react-router-dom" ;
22import SignIn from "./routes/auth/log/signin" ;
33import SignUp from "./routes/auth/log/signup" ;
44import Navbar from "./routes/constants/navbar" ;
55import Dashboard from "./routes/home/dashboard" ;
66import { Toaster } from "sonner" ;
7+ import Intelligence from "./routes/data/intelligence" ;
78
9+ const NavbarLayout = ( ) => {
10+ return (
11+ < >
12+ < Navbar />
13+ < Outlet />
14+ </ >
15+ ) ;
16+ } ;
817const App = ( ) => {
918 return (
1019 < BrowserRouter >
11- < Navbar />
12- < Toaster />
20+ < Toaster />
21+ { /* With Navbar */ }
1322 < Routes >
23+ < Route element = { < NavbarLayout /> } >
1424 < Route path = "/" element = { < Dashboard /> } />
1525 < Route path = "/login" element = { < SignIn /> } />
1626 < Route path = "/register" element = { < SignUp /> } />
27+ </ Route >
28+
29+ { /* No Navbar */ }
30+ < Route path = "/predictions" element = { < Intelligence /> } />
1731 </ Routes >
1832 </ BrowserRouter >
1933 ) ;
Original file line number Diff line number Diff line change @@ -81,6 +81,7 @@ const SignIn = () => {
8181 < GoogleLogin
8282 onSuccess = { ( res ) => handleGoogleResponse ( res ) }
8383 onError = { ( ) => console . log ( "Google pop-up failed" ) }
84+ width = "400"
8485 />
8586 < div className = "flex h-px grow shrink-0 basis-0 flex-col items-center gap-2 bg-neutral-border" />
8687 < span className = "text-caption font-caption text-subtext-color text-md" >
Original file line number Diff line number Diff line change @@ -78,8 +78,8 @@ const SignUp = () => {
7878 < div className = "flex flex-col pb-[50%] gap-y-1" >
7979 < GoogleLogin
8080 onSuccess = { ( res ) => handleGoogleResponse ( res ) }
81-
8281 onError = { ( ) => console . log ( "Google pop-up failed" ) }
82+ width = "400"
8383 />
8484 < div className = "flex h-px grow shrink-0 basis-0 flex-col items-center gap-2 bg-neutral-border" />
8585 < span className = "text-caption font-caption text-subtext-color text-md" >
Original file line number Diff line number Diff line change 1+
2+ import { FeatherCloudSun } from "@subframe/core" ;
3+ import { FeatherFlame } from "@subframe/core" ;
4+ import { FeatherMap } from "@subframe/core" ;
5+ import { FeatherMapPin } from "@subframe/core" ;
6+ import { FeatherMoreHorizontal } from "@subframe/core" ;
7+ import { FeatherSatellite } from "@subframe/core" ;
8+ import { FeatherScan } from "@subframe/core" ;
9+ import { FeatherShieldCheck } from "@subframe/core" ;
10+ import { FeatherTriangleAlert } from "@subframe/core" ;
11+ import { FeatherZap } from "@subframe/core" ;
12+ import { IconWithBackground } from "../../ui" ;
13+
14+ const SideBar = ( ) => {
15+ return (
16+ < div className = "flex flex-initial flex-col justify-between pl-10 border-r-2 w-[15%] border-b-2 h-screen [&>div[class*='items-start']]:" >
17+ { /* Header */ }
18+ < div className = "flex flex-col items-start" >
19+ < span className = "text-md" > Pyro Intelligence</ span >
20+ < span className = "text-md" > Wildfire Engine</ span >
21+ </ div >
22+
23+ { /* Access Menu */ }
24+ < div className = "flex flex-col justify-center" >
25+ < span className = "text-sm text-[#868686]" > < FeatherMap /> Dashboard / Map</ span >
26+ < span className = "text-sm text-[#868686]" > < FeatherCloudSun /> Micro Climate</ span >
27+ < span className = "text-sm text-[#868686]" > < FeatherFlame /> Incident Logger</ span >
28+ </ div >
29+
30+
31+ { /* Bottom Header */ }
32+ < div className = "flex flex-col justify-end" >
33+ < span className = "text-sm text-[#000000] font-bold" > Example Name</ span >
34+ < span className = "text-sm text-[#808080]" > Example Role</ span >
35+ </ div >
36+
37+ </ div >
38+ )
39+ }
40+
41+ export default SideBar
Original file line number Diff line number Diff line change 11
2+ import { FeatherShieldCheck } from "@subframe/core"
3+ import { Button } from "../../ui/components/ui/button"
4+ import SideBar from "../constants/sidebar"
25
36const Intelligence = ( ) => {
47 return (
5- < div >
6-
8+ < div className = "bg-white h-full" > { /* Main Box */ }
9+ { /* Top Bar */ }
10+ < div className = "flex flex-row justify-between border-2 border-black w-[86%] relative left-[14.9%] place-items-center" >
11+ < div className = "flex flex-col justify-center pl-4" >
12+ < h1 className = " text-shadow-black font-bold text-xl" > Wildfire Risk Intelligence</ h1 >
13+ < span className = "text-sm" > NASA FIRMS Ingestion • XGBoost Inference</ span >
14+ </ div >
15+ < div className = "grow shrink-0 relative left-[65%]" >
16+ < Button className = "p-1 bg-[#DAFBE6] text-[#639273] w-[9%] h-[15%]" > < FeatherShieldCheck /> user</ Button >
17+ </ div >
18+ </ div >
19+ < SideBar />
20+
21+ { /* Coordinate Box */ }
22+ < div >
23+
24+ </ div >
25+
26+ { /* Hotspot Box */ }
27+ < div >
28+
29+ </ div >
30+
31+ { /* Result Box */ }
32+ < div >
33+
34+ </ div >
35+
736 </ div >
837 )
938}
Original file line number Diff line number Diff line change @@ -54,11 +54,10 @@ const AvatarRoot = React.forwardRef<HTMLDivElement, AvatarRootProps>(
5454 className = { SubframeUtils . twClassNames (
5555 "line-clamp-1 w-full font-['Inter'] text-[14px] font-[500] leading-[14px] text-brand-800 text-center absolute" ,
5656 {
57- "font-['Inter'] text-[10px] font-[500 ] leading-[10px] tracking-normal" :
57+ "text-[10px] leading-[10px] tracking-normal" :
5858 size === "x-small" || size === "small" ,
59- "font-['Inter'] text-[18px] font-[500] leading-[18px] tracking-normal" :
60- size === "large" ,
61- "font-['Inter'] text-[24px] font-[500] leading-[24px] tracking-normal" :
59+ "text-[18px] leading-[18px] tracking-normal" : size === "large" ,
60+ "text-[24px] leading-[24px] tracking-normal" :
6261 size === "x-large" ,
6362 "text-warning-800" : variant === "warning" ,
6463 "text-success-800" : variant === "success" ,
You can’t perform that action at this time.
0 commit comments