diff --git a/app/(Admin Dashboard)/admin/page.tsx b/app/(Admin Dashboard)/admin/page.tsx index 78e399c..0052843 100644 --- a/app/(Admin Dashboard)/admin/page.tsx +++ b/app/(Admin Dashboard)/admin/page.tsx @@ -58,11 +58,13 @@ export default function Admin() { Admin Login - - - - - + + + + + + +
diff --git a/app/(Admin Dashboard)/components/navbar.tsx b/app/(Admin Dashboard)/components/navbar.tsx index 782c52d..786aadd 100644 --- a/app/(Admin Dashboard)/components/navbar.tsx +++ b/app/(Admin Dashboard)/components/navbar.tsx @@ -19,6 +19,7 @@ import { Heading, Center, Card, + StackProps, } from "@chakra-ui/react"; import { MdBrightness4 as MdMoon, @@ -63,38 +64,39 @@ export default function Navbar() { const [open, setOpen] = useState(false) // Container props - const ContainerProps = { - h: { mobile: "10dvh", tablet: "30dvh", laptop: "50dvh", xLarge: "70dvh", "2XLarge": "90dvh" }, //"2XLarge": "10dvh", + const ContainerProps: StackProps = { + h: { base: "12dvh" }, //"2XLarge": "10dvh", zIndex: 2, //2, py: { base: 5, mdTo2xl: 8 },//isFixed ? (notMobileDevice ? 8 : 2) : notMobileDevice ? 8 : 5, boxShadow: { base: "2xl" },//isFixed ? "2xl" : "none", bg: { - base: colorMode === "light" - ? "black" - : "blackAlpha.950" - , - aboveBase: colorMode === "light" - ? "black" - : "blackAlpha.950" + base: "black", }, - w: "100dvw", + w: "100%", className: openSans.className,//openSans.className, justifyContent: "space-between", - } as const; + + }; // Nav text props - const navTextProps = { + const navTextProps: StackProps = { + fontSize: "16px", + fontWeight: 600, + _light: { color: "white" }, + }; + // Mobile nav text props + const mobileNavTextProps: StackProps = { fontSize: "16px", fontWeight: 600, _light: { color: "white" }, - } as const; + }; return ( - + - + About @@ -175,9 +177,9 @@ export default function Navbar() { {/* Mobile Menu */} - setOpen(e.open)} > - - @@ -195,24 +197,24 @@ export default function Navbar() { - About + About - Contact + Contact - Services + Services - + {/* Float the badge to the above the text */} Programs @@ -227,7 +229,7 @@ export default function Navbar() { - + {/* Float the badge to the above the text */} Resources diff --git a/app/(Public Pages)/(About)/about/page.tsx b/app/(Public Pages)/(About)/about/page.tsx index f0568d9..dedf51a 100644 --- a/app/(Public Pages)/(About)/about/page.tsx +++ b/app/(Public Pages)/(About)/about/page.tsx @@ -1,7 +1,6 @@ "use client"; import NextImage from "next/image"; import TeamMemberCard from "@/components/about/team-member-card"; -// import { GemIcon } from '@/components/ui/icons'; import { executiveBoard, teamMembers } from "@/data/team"; import { Container, @@ -9,191 +8,223 @@ import { Text, AbsoluteCenter, VStack, - HStack, + Stack, Heading, Link as ChakraLink, SimpleGrid, Image as ChakraImage, Card, Avatar, + Center, } from "@chakra-ui/react"; import { poppins } from "@/components/ui/fonts"; import NextLink from "next/link"; -import checkDeviceSize from "@/components/ui/breakpoints"; import { Icon } from "@/components/ui/icons/icon"; export default function AboutUs() { - const notMobileDevice = checkDeviceSize(); return ( - <> - {notMobileDevice ? ( - - - + + + + - - - - - About Us - - - - Our organization strives to break down barriers and stop the - stigma associated with incarceration through technical - assistance, consulting services, educational conferences, - and business support programs. - - - - - - {/* ABOUT US */} - - - - - - - - Vision - - A society where all individuals have equal opportunities to - thrive, learn, and lead. Empowered to contribute positively - to their communities without the stigma or limitations from - their past. - - - - - - - - - Mission - - To promote education, empowerment, and entrepreneurship - among incarcerated learners and individuals. Our - organization strives to break down barriers and stop the - stigma associated with incarceration through consulting - services, educational conferences, and business support - programs. - - - - -
- - Executive Board Members + + + About Us + - - {executiveBoard.map((member) => ( - - ))} - -
-
- - Our Team + Our organization strives to break down barriers and stop the + stigma associated with incarceration through technical + assistance, consulting services, educational conferences, + and business support programs. + + + + + + + + + + + + + + + Vision - - {teamMembers.map((member) => ( - - ))} - -
-
- - Our Partners + + A society where all individuals have equal opportunities to + thrive, learn, and lead. Empowered to contribute positively + to their communities without the stigma or limitations from + their past. + + + + + + + + + + + Mission - - Join us in creating meaningful change through collaborative - projects and shared resources. + + To promote education, empowerment, and entrepreneurship + among incarcerated learners and individuals. Our + organization strives to break down barriers and stop the + stigma associated with incarceration through consulting + services, educational conferences, and business support + programs. - - - - - - - - - - - - - - - - - - - - -
-
-
- ) : null} - +
+ + + + + + Executive Board Members + + + + {executiveBoard.map((member) => ( +
+ +
+ ))} + +
+
+ + + + Our Team + + + {teamMembers.map((member) => ( +
+ +
+ ))} +
+
+ + + + Our Partners + + + Join us in creating meaningful change through collaborative + projects and shared resources. + + + + + + + + + + + + + + + + + + + + + + + +
); -} +} \ No newline at end of file diff --git a/app/(Public Pages)/(Contact)/contact/page.tsx b/app/(Public Pages)/(Contact)/contact/page.tsx index aebf4cd..0c000ca 100644 --- a/app/(Public Pages)/(Contact)/contact/page.tsx +++ b/app/(Public Pages)/(Contact)/contact/page.tsx @@ -1,23 +1,22 @@ "use client"; -import Image from "next/image"; +import NextLink from "next/link"; import ContactForm from "@/components/contact/contact-form"; import { contactInfo, socialLinks, mapEmbedUrl } from "@/data/contact"; -import NextLink from "next/link"; import { Box, Text, HStack, + Stack, Heading, Card, Link as ChakraLink, - Image as ChakraImage, Avatar, VStack, + SimpleGrid, } from "@chakra-ui/react"; -import checkDeviceSize from "@/components/ui/breakpoints"; import { HeaderTemplate, PageBuilder, @@ -25,201 +24,117 @@ import { } from "@/components/page-builder/template"; import { Icon } from "@/components/ui/icons/icon"; import { poppins } from "@/components/ui/fonts"; -import { Section } from "lucide-react"; export default function Contact() { - const notMobileDevice = checkDeviceSize(); return ( - <> - {notMobileDevice ? ( - - - - - - Get in Touch - - We're here to support you. Reach out to learn more about our - services, volunteer opportunities, and ways to contribute - - - - {socialLinks.map((link) => ( - - - - {link.platform} - - - ))} - - {/* Contact Info Cards Section */} - - {contactInfo.map((info) => { - info.value ? ( - {info.value} - ) : ( - {info.value} - ); + + - return ( - - - - - - - {info.label} - - {info.value} - - - ); - })} - - + + + + + Get in Touch + + + We're here to support you. Reach out to learn more about our + services, volunteer opportunities, and ways to contribute. + + - {/* Google Maps Embed Section */} -
- - - - {/* Contact Form Section */} -
-
- -
-
- -
-
- ) : ( - <> -
- {/* Hero Section */} -
- - Contact Mokse - -
-

Contact Us

-

- Find out how you can contribute and make a positive impact in - your community -

-
-
- - {/* Get In Touch Section */} -
-
-

Get in Touch

-

- We're here to support you. Reach out to learn more about - our services, volunteer opportunities, and ways to contribute -

- -
-
- - {/* Contact Info Cards Section */} -
-
- {contactInfo.map((info) => { - const content = info.phoneNumber ? ( - {info.value} - ) : ( -

{info.value}

- ); - - return ( -
- hello -
{info.icon}
-

{info.label}

- {content} -
- ); - })} -
-
+ /> + + {link.platform} + + + + + ))} + - {/* Google Maps Embed Section */} -
-
-