diff --git a/packages/frontend/src/app/auth/forgot-password/page.tsx b/packages/frontend/src/app/auth/forgot-password/page.tsx index 394f1d2..ebe4a77 100644 --- a/packages/frontend/src/app/auth/forgot-password/page.tsx +++ b/packages/frontend/src/app/auth/forgot-password/page.tsx @@ -11,14 +11,19 @@ export const metadata: Metadata = { const ForgotPasswordPage = () => { return ( -
-
+
+
Loading...
}>
- -
+
+ +
+
diff --git a/packages/frontend/src/app/auth/login/page.tsx b/packages/frontend/src/app/auth/login/page.tsx index 3bcbfbb..d6c5672 100644 --- a/packages/frontend/src/app/auth/login/page.tsx +++ b/packages/frontend/src/app/auth/login/page.tsx @@ -9,12 +9,17 @@ export const metadata: Metadata = { const LoginPage = () => { return ( -
-
+
+
- -
+
+ +
+
diff --git a/packages/frontend/src/app/auth/register/page.tsx b/packages/frontend/src/app/auth/register/page.tsx index 8bd53fb..96df53b 100644 --- a/packages/frontend/src/app/auth/register/page.tsx +++ b/packages/frontend/src/app/auth/register/page.tsx @@ -10,12 +10,17 @@ export const metadata: Metadata = { export default function RegisterPage() { return ( -
-
+
+
- -
+
+ +
+
diff --git a/packages/frontend/src/app/auth/reset-password/page.tsx b/packages/frontend/src/app/auth/reset-password/page.tsx index 636d988..80ceba0 100644 --- a/packages/frontend/src/app/auth/reset-password/page.tsx +++ b/packages/frontend/src/app/auth/reset-password/page.tsx @@ -26,14 +26,19 @@ const ResetPasswordContent = () => { }, [router, searchParams]); return ( -
-
+
+
Loading...
}>
- -
+
+ +
+
diff --git a/packages/frontend/src/app/events/[[...slug]]/page.tsx b/packages/frontend/src/app/events/[[...slug]]/page.tsx index 945463a..cfe4e56 100644 --- a/packages/frontend/src/app/events/[[...slug]]/page.tsx +++ b/packages/frontend/src/app/events/[[...slug]]/page.tsx @@ -20,7 +20,7 @@ export default async function EventPage({ params }: EventPageProps) { // Handle /events - Show all events return ( }> -
+
@@ -30,7 +30,7 @@ export default async function EventPage({ params }: EventPageProps) { // Handle /events/create return ( }> -
+
@@ -41,7 +41,7 @@ export default async function EventPage({ params }: EventPageProps) { if (!id) return notFound(); return ( }> -
+
@@ -53,7 +53,7 @@ export default async function EventPage({ params }: EventPageProps) { // Handle /events/:id/subscribers return ( }> -
+
@@ -64,7 +64,7 @@ export default async function EventPage({ params }: EventPageProps) { if (action && !id) { return ( }> -
+
diff --git a/packages/frontend/src/app/resources/[[...slug]]/page.tsx b/packages/frontend/src/app/resources/[[...slug]]/page.tsx index 4978f61..6992a0b 100644 --- a/packages/frontend/src/app/resources/[[...slug]]/page.tsx +++ b/packages/frontend/src/app/resources/[[...slug]]/page.tsx @@ -20,7 +20,7 @@ export default async function NewsPage({ params }: NewsPageProps) { // Handle /news - Show all news return ( }> -
+
@@ -30,7 +30,7 @@ export default async function NewsPage({ params }: NewsPageProps) { // Handle /news/create return ( }> -
+
@@ -41,7 +41,7 @@ export default async function NewsPage({ params }: NewsPageProps) { if (!id) return notFound(); return ( }> -
+
diff --git a/packages/frontend/src/features/admin/components/admin.tsx b/packages/frontend/src/features/admin/components/admin.tsx index 38b18bc..9f81eb1 100644 --- a/packages/frontend/src/features/admin/components/admin.tsx +++ b/packages/frontend/src/features/admin/components/admin.tsx @@ -17,7 +17,7 @@ const AdminDashboard = () => { const [activeTab, setActiveTab] = useState('analytics'); return ( -
+

Admin Dashboard

diff --git a/packages/frontend/src/features/admin/components/common/admin-table/user-table.tsx b/packages/frontend/src/features/admin/components/common/admin-table/user-table.tsx index 1d1ff1f..0f490c3 100644 --- a/packages/frontend/src/features/admin/components/common/admin-table/user-table.tsx +++ b/packages/frontend/src/features/admin/components/common/admin-table/user-table.tsx @@ -130,50 +130,52 @@ export const UsersTable = ({ return ( <> -

- - - {table.getHeaderGroups().map((headerGroup) => ( - - {headerGroup.headers.map((header) => ( - - {header.isPlaceholder - ? null - : flexRender( - header.column.columnDef.header, - header.getContext() - )} - - ))} - - ))} - - - {table.getRowModel().rows?.length ? ( - table.getRowModel().rows.map((row) => ( - - {row.getVisibleCells().map((cell) => ( - - {flexRender( - cell.column.columnDef.cell, - cell.getContext() - )} - +
+
+
+ + {table.getHeaderGroups().map((headerGroup) => ( + + {headerGroup.headers.map((header) => ( + + {header.isPlaceholder + ? null + : flexRender( + header.column.columnDef.header, + header.getContext() + )} + ))} - )) - ) : ( - - - No users found. - - - )} - -
+ ))} + + + {table.getRowModel().rows?.length ? ( + table.getRowModel().rows.map((row) => ( + + {row.getVisibleCells().map((cell) => ( + + {flexRender( + cell.column.columnDef.cell, + cell.getContext() + )} + + ))} + + )) + ) : ( + + + No users found. + + + )} + + +
{/* Single set of modals - only rendered once when selectedUser exists */} diff --git a/packages/frontend/src/features/admin/components/common/user-management.tsx b/packages/frontend/src/features/admin/components/common/user-management.tsx index e10617b..f781b88 100644 --- a/packages/frontend/src/features/admin/components/common/user-management.tsx +++ b/packages/frontend/src/features/admin/components/common/user-management.tsx @@ -178,12 +178,12 @@ export const UserManagement = () => { return (
-
+

User Management

-
+
setSearchQuery(e.target.value)} @@ -274,7 +274,7 @@ export const UserManagement = () => {
)} -
+
Showing {filteredUsers.length} of {users.length} users
@@ -284,11 +284,13 @@ export const UserManagement = () => { />
- +
+ +
{ if (analyticsError) { return ( -
+

Error loading analytics: {analyticsError} @@ -68,10 +68,10 @@ export const Analytics = () => { return ( <> -

+
{/* Header Section */} -
-
+
+

Analytics Dashboard

@@ -79,7 +79,7 @@ export const Analytics = () => { Monitor your platform's performance and user engagement

-
+
{
{/* Key Metrics Row */} -
+
{
{/* New Users Chart */} -
+

New Users Growth @@ -179,7 +179,7 @@ export const Analytics = () => {

{/* Charts Row */} -
+
{/* User Status Distribution */}
@@ -214,7 +214,7 @@ export const Analytics = () => { {/* User Activity */}
-
+

User Activity diff --git a/packages/frontend/src/features/events/components/common/base-form.tsx b/packages/frontend/src/features/events/components/common/base-form.tsx index c652526..67628cf 100644 --- a/packages/frontend/src/features/events/components/common/base-form.tsx +++ b/packages/frontend/src/features/events/components/common/base-form.tsx @@ -161,7 +161,7 @@ export const BaseForm = ({ required /> -
+
-
+
+
{/* Image Section */} -
-
+
+
{/* Content Section */} -
+
{/* Title and Icon */}
-

+

{title}

@@ -142,11 +142,11 @@ export const EventCard = ({
{/* Description */} -

+

{description}

{/* Info Row */} -
+
} text={ @@ -164,18 +164,18 @@ export const EventCard = ({
{/* Buttons Row */} -
+
{canEdit && ( )} @@ -184,7 +184,7 @@ export const EventCard = ({ label="Delete Event" rightIcon="delete" variant="outline" - className="flex-1 transition-transform duration-200 hover:scale-105 hover:border-destructive hover:bg-destructive hover:text-white" + className="w-full flex-1 transition-transform duration-200 hover:scale-105 hover:border-destructive hover:bg-destructive hover:text-white" onClick={() => setIsDeleteModalOpen(true)} /> )} diff --git a/packages/frontend/src/features/events/components/common/time-location-form.tsx b/packages/frontend/src/features/events/components/common/time-location-form.tsx index a6e3166..f026058 100644 --- a/packages/frontend/src/features/events/components/common/time-location-form.tsx +++ b/packages/frontend/src/features/events/components/common/time-location-form.tsx @@ -151,7 +151,7 @@ export const TimeLocationForm = ({ required />
-
+
-
+
{ // Show loading state while fetching event data if (isLoadingEvent) { return ( - - - + + +
{ className="absolute left-0 h-10 w-10" onClick={() => router.back()} /> -

Loading Event...

+

+ Loading Event... +

- -
+ +
@@ -336,10 +338,10 @@ const EventForm = () => { } return ( - + - - + +
{ className="absolute left-0 h-10 w-10" onClick={() => router.back()} /> -

+

{isEdit ? 'Edit Event' : 'Create New Event'}

-

+

{activeStep === 1 ? 'Event Information' : 'Event Time & Location'}

- +
{ ) : ( )} -
+
{activeStep === 2 && ( { return ( <> - {eventsList.map((event) => ( - - ))} +
+ {eventsList.map((event) => ( +
+ +
+ ))} +
{totalEvents.length > eventsPerPage && (
{ }; return ( - -
-
+ +
+
Sort Events By: - - All Events - Upcoming Events - My Events + + + All + All Events + + + Upcoming + Upcoming Events + + + My Events + My Events +
{canCreateEvent && ( - router.push('/events/create')} - /> +
+ router.push('/events/create')} + /> +
)}
diff --git a/packages/frontend/src/features/landing/components/landing-page.tsx b/packages/frontend/src/features/landing/components/landing-page.tsx index 885733a..33e5c6c 100644 --- a/packages/frontend/src/features/landing/components/landing-page.tsx +++ b/packages/frontend/src/features/landing/components/landing-page.tsx @@ -28,7 +28,7 @@ export const LandingPage = () => { }, []); return ( -
+
diff --git a/packages/frontend/src/features/landing/components/section/about-section.tsx b/packages/frontend/src/features/landing/components/section/about-section.tsx index 11570f7..8cc48b4 100644 --- a/packages/frontend/src/features/landing/components/section/about-section.tsx +++ b/packages/frontend/src/features/landing/components/section/about-section.tsx @@ -2,20 +2,19 @@ import Image from 'next/image'; export function AboutSection() { return ( -
-
-
-
+
+
+
{/* Content */} -
+

OUR STORY

-

+

About Us

-

+

In 2019, Wunmi Adekanmbi discovered Alberta’s thriving tech scene but also noticed a lack of diversity. Determined to create a more inclusive space, she founded Immigrant Techies Alberta, a @@ -27,26 +26,23 @@ export function AboutSection() {

- {/* Forum Preview */} -
- {/* Floating avatars */} -
- -
+ {/* About illustration */} +
+ About illustration
{/* Background decoration */}
-
+
); diff --git a/packages/frontend/src/features/landing/components/section/contact-section.tsx b/packages/frontend/src/features/landing/components/section/contact-section.tsx index 17a8d56..24835d3 100644 --- a/packages/frontend/src/features/landing/components/section/contact-section.tsx +++ b/packages/frontend/src/features/landing/components/section/contact-section.tsx @@ -65,30 +65,75 @@ export function ContactSection() { } return ( -
-
-
- Have Questions? We're Here to Help -
-

- Get In Touch -

-
+
+
+
+
+ Have Questions? We're Here to Help +
+

+ Get In Touch +

+
- - -
+ + +
+ ( + + + + + + + )} + /> + ( + + + + + + + )} + /> +
( ( - )} /> -
- ( - - - - - - - )} - /> - ( - - -