feax!

.gitignore

@@ -26,6 +26,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
+.env
 .env*.local
 
 # vercel

__tests__/aboutPage.test.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { describe, expect, it } from "vitest";
-import PageAbout from "./../src/app/about/page";
+import PageAbout from "../src/app/dashboard/about/page";
 import { render, screen } from "@testing-library/react";
 
 describe("About Page", () => {

next.config.js

@@ -33,11 +33,24 @@ const nextConfig = {
         port: "3000",
         // pathname: '/my-bucket/**',
       },
+      {
+        protocol: "https",
+        hostname: "avatars.githubusercontent.com",
+        // port: '',
+        // pathname: '/my-bucket/**',
+      },
+      {
+        protocol: "https",
+        hostname: "*.googleusercontent.com",
+        // port: '',
+        // pathname: '/my-bucket/**',
+      },
     ],
   },
-  // experimental: {
-  //     instrumentationHook: true
-  // },
+  experimental: {
+    taint: true,
+    //     instrumentationHook: true
+  },
   async redirects() {
     return [
       {
@@ -109,4 +122,7 @@ const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.BUNDLE_ANALYZE || false,
 });
 
-module.exports = withBundleAnalyzer(withPWA(nextConfig));
+// module.exports = withBundleAnalyzer(withPWA(nextConfig));
+
+// Without PWA, Bundle analyzer support
+module.exports = nextConfig;

package.json

@@ -19,9 +19,8 @@
     "changelog": "node scripts/create-changelog"
   },
   "dependencies": {
-    "@auth/core": "^0.28.0",
     "@fluentui/react-components": "^9.41.0",
-    "@next/bundle-analyzer": "^14.0.4",
+    "@next/bundle-analyzer": "^14.2.3",
     "@next/third-parties": "^14.0.1",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-checkbox": "^1.0.4",
@@ -46,15 +45,14 @@
     "framer-motion": "^10.16.4",
     "geist": "^1.2.0",
     "lucide-react": "^0.298.0",
-    "next": "^14.0.5-canary.5",
-    "next-auth": "^5.0.0-beta.15",
+    "next": "^14.2.3",
+    "next-auth": "^5.0.0-beta.18",
     "next-pwa": "^5.6.0",
     "prettier-plugin-tailwindcss": "^0.5.9",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-icons": "^5.2.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-redux": "^9.0.4",
-    "sass": "^1.69.5",
+    "sass": "^1.77.1",
     "scss": "^0.2.4",
     "server-only": "^0.0.1",
     "swr": "^2.2.4",
@@ -69,8 +67,8 @@
     "@ianvs/prettier-plugin-sort-imports": "^4.1.1",
     "@testing-library/react": "^14.1.2",
     "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
+    "@types/react": "^18.3.2",
+    "@types/react-dom": "^18.3.0",
     "@types/redux-logger": "3.0.9",
     "@types/semver": "^7",
     "@typescript-eslint/eslint-plugin": "^7.1.1",
@@ -79,7 +77,7 @@
     "autoprefixer": "^10.0.1",
     "commitlint": "^18.2.0",
     "eslint": "^8.57.0",
-    "eslint-config-next": "14.0.3",
+    "eslint-config-next": "^14.2.3",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-unused-imports": "^3.1.0",
     "husky": "^8.0.3",
@@ -95,7 +93,7 @@
     "tailwindcss": "^3.3.0",
     "typescript": "^5",
     "vite-tsconfig-paths": "^4.2.2",
-    "vitest": "^1.0.4"
+    "vitest": "^1.6.0"
   },
   "lint-staged": {
     "*.{js,ts,jsx,tsx}": [

src/app/analytics/PageRootComponent.tsx → src/app/(dashboard)/analytics/PageRootComponent.tsx

@@ -1,12 +1,20 @@
 "use client";
 import ChartMatrix from "@/components/charts/ChartMatrix";
 import { memo } from "react";
-import dynamic from 'next/dynamic'
-const ChartMemberActivity = dynamic(() => import('@/components/charts/ChartMemberActivity'))
-const ChartMemberAgeDemographic = dynamic(() => import('@/components/charts/ChartMemberAgeDemographic'))
-const ChartMemberStats = dynamic(() => import('@/components/charts/ChartMemberStats'))
-const ChartTeamStats = dynamic(() => import('@/components/charts/ChartTeamStats'))
-import DashboardLayout from "@/components/ui/dashboard/DashboardLayout"
+import dynamic from "next/dynamic";
+const ChartMemberActivity = dynamic(
+  () => import("@/components/charts/ChartMemberActivity"),
+);
+const ChartMemberAgeDemographic = dynamic(
+  () => import("@/components/charts/ChartMemberAgeDemographic"),
+);
+const ChartMemberStats = dynamic(
+  () => import("@/components/charts/ChartMemberStats"),
+);
+const ChartTeamStats = dynamic(
+  () => import("@/components/charts/ChartTeamStats"),
+);
+import DashboardLayout from "@/components/ui/dashboard/DashboardLayout";
 
 const PageRootComponent = () => {
   return (

src/app/blood-requests/new/page.tsx → src/app/(dashboard)/blood-requests/new/page.tsx

@@ -26,7 +26,7 @@ const PageNewBloodRequest: React.FC = () => {
       title="Add new request"
       icon={<PeopleAdd24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             {/* Alerts Area */}

src/app/clubs/new/page.tsx → src/app/(dashboard)/clubs/new/page.tsx

@@ -25,7 +25,7 @@ const PageNewMember: React.FC = () => {
       title="Add new club"
       icon={<PeopleTeam24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             <ClubForm />

src/app/contacts/new/page.tsx → src/app/(dashboard)/contacts/new/page.tsx

@@ -25,7 +25,7 @@ const PageNewContact: React.FC = () => {
       title="Add new contact"
       icon={<PeopleTeam24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             <NewContactForm />

src/app/donations/PageRootComponent.tsx → src/app/(dashboard)/donations/PageRootComponent.tsx

@@ -4,7 +4,9 @@ import ChartMatrix from "@/components/charts/ChartMatrix";
 import DashboardLayout from "@/components/ui/dashboard/DashboardLayout";
 import ChartMemberActivity from "@/components/charts/ChartMemberActivity";
 import ChartMemberAgeDemographic from "@/components/charts/ChartMemberAgeDemographic";
-import DonationTable, { TDonationItem } from "@/components/donations/DonationTable";
+import DonationTable, {
+  TDonationItem,
+} from "@/components/donations/DonationTable";
 
 export type DonationResponseType = {
   data: TDonationItem[];

src/app/donations/new/page.tsx → src/app/(dashboard)/donations/new/page.tsx

@@ -26,7 +26,7 @@ const PageNewMember: React.FC = () => {
       title="Add new donation"
       icon={<PeopleAdd24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             {/* Alerts Area */}

src/app/funds/PageRootComponent.tsx → src/app/(dashboard)/funds/PageRootComponent.tsx

@@ -4,9 +4,7 @@ import ChartMatrix from "@/components/charts/ChartMatrix";
 import DashboardLayout from "@/components/ui/dashboard/DashboardLayout";
 import ChartMemberActivity from "@/components/charts/ChartMemberActivity";
 import ChartMemberAgeDemographic from "@/components/charts/ChartMemberAgeDemographic";
-import FundTable, {
-  TFundItem,
-} from "@/components/funds/FundTable";
+import FundTable, { TFundItem } from "@/components/funds/FundTable";
 
 export type DonationResponseType = {
   data: TFundItem[];

src/app/funds/new/page.tsx → src/app/(dashboard)/funds/new/page.tsx

@@ -26,7 +26,7 @@ const PageNewMember: React.FC = () => {
       title="Add new donation"
       icon={<PeopleAdd24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             {/* Alerts Area */}

src/app/members/new/page.tsx → src/app/(dashboard)/members/new/page.tsx

@@ -26,7 +26,7 @@ const PageNewMember: React.FC = () => {
       title="Add new request"
       icon={<PeopleAdd24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             {/* Alerts Area */}

src/app/profile/PageRootComponent.tsx → src/app/(dashboard)/profile/PageRootComponent.tsx

@@ -38,7 +38,7 @@ const PageRootComponent: FC = () => {
 
               <dd className="text-5xl font-light md:text-6xl">192.1k</dd>
 
-              <dd className="flex items-center space-x-1 text-sm font-medium text-green-500">
+              <dd className="text-green-500 flex items-center space-x-1 text-sm font-medium">
                 <span>32k increase</span>
 
                 <svg
@@ -104,7 +104,7 @@ const PageRootComponent: FC = () => {
 
               <dd className="text-5xl font-light md:text-6xl">03:12</dd>
 
-              <dd className="flex items-center space-x-1 text-sm font-medium text-green-500">
+              <dd className="text-green-500 flex items-center space-x-1 text-sm font-medium">
                 <span>3% increase</span>
 
                 <svg
@@ -170,7 +170,7 @@ const PageRootComponent: FC = () => {
 
               <dd className="text-5xl font-light md:text-6xl">03:12</dd>
 
-              <dd className="flex items-center space-x-1 text-sm font-medium text-green-500">
+              <dd className="text-green-500 flex items-center space-x-1 text-sm font-medium">
                 <span>3% increase</span>
 
                 <svg
@@ -237,7 +237,7 @@ const PageRootComponent: FC = () => {
           <div className="w-full">
             <h3 className="font-bold">
               Personal Information
-              <span className="ml-2 inline-block rounded-md bg-green-100 px-2 py-px text-xs text-green-500">
+              <span className="bg-green-100 text-green-500 ml-2 inline-block rounded-md px-2 py-px text-xs">
                 +4.4%
               </span>
             </h3>

src/app/profile/page.tsx → src/app/(dashboard)/profile/page.tsx

@@ -1,5 +1,7 @@
+import { auth } from "@/lib/auth";
 import PageRootComponent from "./PageRootComponent";
 import { memo } from "react";
+import { Session } from "next-auth";
 
 /**
  * Retrieves data from the specified URL.
@@ -15,6 +17,7 @@ import { memo } from "react";
 
 const PageProfile = async () => {
   // const data = await getData();
+  const session = (await auth()) as Session;
 
   return <PageRootComponent />;
 };

src/app/teams/new/page.tsx → src/app/(dashboard)/teams/new/page.tsx

@@ -25,7 +25,7 @@ const PageNewMember: React.FC = () => {
       title="Add new team member"
       icon={<PeopleTeam24Regular />}
     >
-      <section className="flex h-full w-full flex-row max-md:flex-wrap flex-nowrap items-start justify-start p-[22px]">
+      <section className="flex h-full w-full flex-row flex-nowrap items-start justify-start p-[22px] max-md:flex-wrap">
         <div className="h-full w-full">
           <div className="h-full w-full max-w-full md:pe-[22px]">
             <TeamMemberForm />

src/app/auth/errorrr/page.tsx → src/app/auth/error/page.tsx

@@ -1,10 +1,13 @@
-"use client";
 import Image from "next/image";
 import BG from "@/assets/images/bg.svg";
 import { FC } from "react";
 import LOGO from "@/assets/images/simbio-color.svg";
 
-const PageAuthError: FC = () => {
+const PageAuthError: FC = ({
+  searchParams,
+}: {
+  searchParams?: { [key: string]: string | string[] | undefined };
+}) => {
   return (
     <section className="relative block h-screen w-full">
       {/* Background image */}
@@ -32,15 +35,14 @@ const PageAuthError: FC = () => {
             <div>
               {/* Title */}
               <h1 className="mb-4 mt-4 text-2xl font-semibold leading-7">
-                Opps!
+                {searchParams?.error}
               </h1>
               {/* Error message */}
               <p className="caption1 mb-2 font-semibold">
-                Sorry, but we are having trouble signing you in.
+                {searchParams?.error_description}
               </p>
               <p className="caption1 font-medium text-[#1b1b1b]">
-                ADSTS900561: The endpoint only accepts POST requests. Received a
-                GET request.
+                {searchParams?.error_uri}
               </p>
             </div>
 

src/app/auth/login/page.tsx

@@ -8,7 +8,6 @@ import { signIn } from "next-auth/react";
 
 const PageAuthLogin: FC = () => {
   const handleLogin = async (provider: "google" | "apple" | "github") => {
-    console.log("Provider:", provider);
     if (provider === "google") {
       signIn("google");
     }