@devvistatech/devvista-kit 0.0.12 → 0.0.13

package/app/admin-profile/page.tsx

@@ -0,0 +1,123 @@
+"use client";
+
+import { useState, useEffect } from "react";
+import { useUser } from "@clerk/nextjs";
+import { useStrapiAuth } from "@/lib/auth/auth-context";
+import { isAdminUser } from "@/lib/auth/auth-utils"; 
+import Spinner from "@/components/addOns/non-functional/spinner";
+import { ADMIN_PROFILE_PAGE } from "@/lib/constants/admin-profile";
+import { BannerDashboard } from "@/components/addOns/functional/banner/BannerDashboard";
+import Banner from "@/components/addOns/functional/banner/Banner";
+
+export default function AdminProfile() {
+  const { user, authLoading, checkSession } = useStrapiAuth();
+  const { isSignedIn } = useUser();
+  const [isAdmin, setIsAdmin] = useState(false);
+
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, []);
+
+  useEffect(() => {
+    const handleLogin = () => checkSession();
+    const handleLogout = () => checkSession();
+    window.addEventListener("user-login", handleLogin);
+    window.addEventListener("user-logout", handleLogout);
+    return () => {
+      window.removeEventListener("user-login", handleLogin);
+      window.removeEventListener("user-logout", handleLogout);
+    };
+  }, [checkSession]);
+
+  useEffect(() => {
+    let isMounted = true;
+    const checkAdmin = async (retries = 3, delay = 1000) => {
+      if (!isSignedIn || !user?.authId) {
+        if (isMounted) setIsAdmin(false);
+        return;
+      }
+      for (let attempt = 1; attempt <= retries; attempt++) {
+        try {
+          const adminStatus = await isAdminUser(isSignedIn, user);
+          if (isMounted) {
+            setIsAdmin(adminStatus);
+          }
+          return;
+        } catch (error) {
+          console.error("AdminProfile: Admin check failed:", {
+            error: error instanceof Error ? error.message : "Unknown error",
+            attempt,
+            timestamp: new Date().toISOString(),
+          });
+          if (attempt < retries) {
+            await new Promise(resolve => setTimeout(resolve, delay));
+          } else if (isMounted) {
+            setIsAdmin(false);
+          }
+        }
+      }
+    };
+    checkAdmin();
+    return () => {
+      isMounted = false;
+    };
+  }, [isSignedIn, user]);
+
+  if (authLoading || isSignedIn === undefined) {
+    return (
+      <div className="min-h-screen bg-gray-900 text-gray-200 py-32 px-4 sm:px-6 lg:px-8 pt-48 lg:pt-56">
+        <div className="max-w-7xl mx-auto text-center">
+          <Spinner />
+        </div>
+      </div>
+    );
+  }
+
+  if (!isSignedIn || !user) {
+    return (
+      <div className="min-h-screen bg-gray-900 text-gray-200 flex items-center justify-center">
+        <div className="text-center">
+          <h1 className="text-3xl font-bold text-gray-400">{ADMIN_PROFILE_PAGE.UI.NOT_AUTHENTICATED_HEADING}</h1>
+          <p className="mt-4 text-gray-500">{ADMIN_PROFILE_PAGE.UI.NOT_AUTHENTICATED_MESSAGE}</p>
+        </div>
+      </div>
+    );
+  }
+
+  if (!isAdmin) {
+    return (
+      <div className="min-h-screen bg-gray-900 text-gray-200 flex items-center justify-center">
+        <div className="text-center">
+          <h1 className="text-3xl font-bold text-gray-400">{ADMIN_PROFILE_PAGE.UI.UNAUTHORIZED_HEADING}</h1>
+          <p className="mt-4 text-gray-500">{ADMIN_PROFILE_PAGE.UI.UNAUTHORIZED_MESSAGE}</p>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen bg-gray-900 text-gray-200 py-32 px-4 sm:px-6 lg:px-8 pt-48 lg:pt-56">
+      <Banner />
+      <div className="max-w-7xl mx-auto">
+        <header className="mb-12 relative">
+          <div className="absolute inset-0 bg-gradient-to-r from-blue-500/10 to-gray-800/20 rounded-full blur-3xl"></div>
+          <h1 className="text-4xl sm:text-5xl font-extrabold tracking-tight bg-clip-text text-transparent bg-gradient-to-r from-blue-400 to-gray-300 p-2">
+            {ADMIN_PROFILE_PAGE.UI.DASHBOARD_HEADING}
+          </h1>
+          <p className="mt-2 text-sm sm:text-base text-gray-400">
+            {ADMIN_PROFILE_PAGE.UI.DASHBOARD_SUBHEADING}
+          </p>
+        </header>
+
+        <div className="text-center">
+          <p className="text-lg text-gray-300">{ADMIN_PROFILE_PAGE.UI.WELCOME_MESSAGE}</p>
+          <p className="mt-4 text-gray-400">{ADMIN_PROFILE_PAGE.UI.CONTENT_MESSAGE}</p>
+        </div>
+
+        <div className="mt-8">
+          <BannerDashboard />
+        </div>
+      </div>
+    </div>
+  );
+}

package/app/analytics/page.tsx

@@ -1,7 +1,7 @@
-'use client';
+"use client";
 
 import { useState, useEffect, useMemo } from 'react';
-import { useStrapiAuth } from '@/lib/auth-context';
+import { useStrapiAuth } from '@/lib/auth/auth-context';
 import { useAuth } from '@clerk/nextjs';
 import {
   AnalyticsData,
@@ -12,11 +12,12 @@ import {
   getUserActivityData,
   RealtimeData,
   UserActivityData,
-} from '@/lib/google-analytics';
+} from '@/lib/google/google-analytics';
+import { isAdminUser } from '@/lib/auth/auth-utils'; 
 import { NewUsersChart } from '@/components/addOns/functional/NewUserAnalytics';
 import ContactsDashboard from '@/components/addOns/functional/contactsDashboard/ContactsDashboard';
 import Spinner from '@/components/addOns/non-functional/spinner';
-import { ExternalLinkButton, RetryButton } from '@/components/other/button'; 
+import { ExternalLinkButton, RetryButton } from '@/components/other/button';
 
 interface StrapiUser {
   id: number;
@@ -60,10 +61,45 @@ export default function AnalyticsPage() {
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [hasSynced, setHasSynced] = useState(false);
+  const [isAdmin, setIsAdmin] = useState(false);
 
   const memoizedUser = useMemo(() => user, [user?.authId, user?.businessAdminId, user?.userRole]);
 
-  const isAdmin = isSignedIn && !!memoizedUser?.businessAdminId && memoizedUser?.userRole === 'admin';
+  useEffect(() => {
+    let isMounted = true;
+    const checkAdmin = async (retries = 3, delay = 1000) => {
+      if (!isSignedIn || !user?.authId) {
+        if (isMounted) setIsAdmin(false);
+        return;
+      }
+      for (let attempt = 1; attempt <= retries; attempt++) {
+        try {
+          const adminStatus = await isAdminUser(isSignedIn, user);
+          if (isMounted) {
+            setIsAdmin(adminStatus);
+            setError(null);
+          }
+          return;
+        } catch (error) {
+          console.error("AnalyticsPage: Admin check failed:", {
+            error: error instanceof Error ? error.message : "Unknown error",
+            attempt,
+            timestamp: new Date().toISOString(),
+          });
+          if (attempt < retries) {
+            await new Promise(resolve => setTimeout(resolve, delay));
+          } else if (isMounted) {
+            setIsAdmin(false);
+            setError("Failed to verify admin status");
+          }
+        }
+      }
+    };
+    checkAdmin();
+    return () => {
+      isMounted = false;
+    };
+  }, [isSignedIn, user]);
 
   const fetchAnalyticsData = async () => {
     if (!isAdmin) {

package/app/api/about/route.ts

@@ -1,24 +1,8 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
+import { StrapiUser, AboutContent } from "@/lib/types";
 
-export const revalidate = 0; 
-
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  businessAdminId?: string;
-}
-
-interface AboutContent {
-  id: number;
-  documentId: string;
-  title: string;
-  description: string;
-  about: boolean;
-  image?: { url: string; id: number };
-  createdAt: string;
-}
+export const revalidate = 0;
 
 const CONTENT_API_URL =
   process.env.STRAPI_CONTENT_API_URL_ABOUT || process.env.STRAPI_CONTENT_API_URL || "";

package/app/api/adRequest/route.ts

@@ -1,27 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
 import nodemailer from "nodemailer";
-
-interface StrapiUser {
-    id: number;
-    username: string;
-    email: string;
-    businessAdminId?: string;
-    businessTitle?: string;
-}
-
-interface AdRequest {
-    id: number;
-    documentId: string;
-    platform: string;
-    adType: string;
-    description: string;
-    timestamp: string;
-    userId: string;
-    credits: number;
-    lastResetDate: string;
-    nextResetDate: string;
-}
+import { StrapiUser, AdRequest } from "@/lib/types";
 
 const AD_REQUEST_API_URL = process.env.STRAPI_AD_REQUEST_API_URL || "";
 const STRAPI_USER_LIST_API_URL = process.env.STRAPI_USER_LIST_API_URL || "";
@@ -315,12 +295,12 @@ export async function POST(request: NextRequest) {
               padding: 20px;
               text-align: center;
             }
-.header .business-name {
-  color: white;
-  font-size: 28px;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
+            .header .business-name {
+              color: white;
+              font-size: 28px;
+              font-weight: bold;
+              margin-bottom: 10px;
+            }
             .header h1 {
               color: #ffffff;
               font-size: 24px;

package/app/api/analytics/[reportType]/route.ts

@@ -1,70 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { BetaAnalyticsDataClient } from "@google-analytics/data";
 import { getAuth } from "@clerk/nextjs/server";
-
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  authId: string;
-  authProvider: string;
-  businessAdminId?: string;
-  userRole?: string;
-  firstName?: string;
-  lastName?: string;
-  businessId?: string[] | null;
-  dateJoined?: string;
-  businessOwner?: boolean;
-  userStatus?: string;
-  timezone?: string | null;
-  language?: string | null;
-  isVerified?: boolean;
-  businessTitle?: string | null;
-  userTitle?: string | null;
-  number?: string | null;
-  address?: {
-    zip: string;
-    city: string;
-    state: string;
-    street: string;
-    country: string;
-  } | null;
-  websiteUrl?: string | null;
-  primaryBusinessColor?: string | null;
-  secondaryBusinessColor?: string | null;
-  logoImage?: string | null;
-}
-
-interface AnalyticsData {
-  date: string;
-  country: string;
-  deviceCategory: string;
-  activeUsers: number;
-  totalUsers: number;
-  newUsers: number;
-  pageViews: number;
-  engagedSessions: number;
-  averageSessionDuration: number;
-  averageEngagementTimePerActiveUser: number;
-  bounceRate: number;
-}
-
-interface ChannelGroupData {
-  date: string;
-  channelGroup: string;
-  newUsers: number;
-  activeUsers: number;
-}
-
-interface RealtimeData {
-  activeUsersInLast30Minutes: number;
-}
-
-interface UserActivityData {
-  date: string;
-  country: string;
-  activeUsers: number;
-}
+import { StrapiUser, AnalyticsData, ChannelGroupData, RealtimeData, UserActivityData } from "@/lib/types";
 
 const PROPERTY_ID = `properties/${process.env.GOOGLE_ANALYTICS_PROPERTY_ID}`;
 const STRAPI_USER_LIST_API_URL = process.env.STRAPI_USER_LIST_API_URL || "";

package/app/api/bio/route.ts

@@ -1,25 +1,9 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
+import { StrapiUser, BioContent } from "@/lib/types";
 
 export const revalidate = 0; // Disable Next.js ISR
 
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  businessAdminId?: string;
-}
-
-interface BioContent {
-  id: number;
-  documentId: string;
-  title: string;
-  description: string;
-  bio: boolean;
-  image?: { url: string; id: number };
-  createdAt: string;
-}
-
 const CONTENT_API_URL = process.env.STRAPI_CONTENT_API_URL || "";
 const UPLOAD_API_URL = process.env.STRAPI_API_URL + "/api/upload" || "";
 const BASE_URL = process.env.STRAPI_API_URL || "";

package/app/api/blog/route.ts

@@ -1,23 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
-
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  businessAdminId?: string;
-  firstName?: string;
-  lastName?: string;
-}
-
-interface BlogPost {
-  id: number;
-  documentId: string;
-  title: string;
-  description: string;
-  author: string;
-  publishedAt: string;
-}
+import { StrapiUser, BlogPost } from "@/lib/types";
 
 const BLOG_API_URL = process.env.STRAPI_BLOG_API_URL || "";
 const STRAPI_USER_LIST_API_URL = process.env.STRAPI_USER_LIST_API_URL || "";
@@ -188,7 +171,6 @@ export async function POST(request: NextRequest) {
   }
 }
 
-// api/blog.ts
 export async function PUT(request: NextRequest) {
   const { userId } = getAuth(request);
   if (!userId) {

package/app/api/contacts/route.ts

@@ -1,51 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
-
-interface StrapiUser {
-  id: number;
-  documentId?: string;
-  authId: string;
-  authProvider: string;
-  email: string;
-  username: string;
-  businessAdminId?: string;
-  userRole?: string;
-  firstName?: string;
-  lastName?: string;
-  businessId?: string[] | null;
-  dateJoined?: string;
-  businessOwner?: boolean;
-  userStatus?: string;
-  timezone?: string | null;
-  language?: string | null;
-  isVerified?: boolean;
-  businessTitle?: string | null;
-  userTitle?: string | null;
-  number?: string | null;
-  address?: {
-    zip: string;
-    city: string;
-    state: string;
-    street: string;
-    country: string;
-  } | null;
-  websiteUrl?: string | null;
-  primaryBusinessColor?: string | null;
-  secondaryBusinessColor?: string | null;
-  logoImage?: string | null;
-}
-
-interface StrapiContact {
-  id: number;
-  documentId: string;
-  name: string;
-  lastName: string;
-  email: string;
-  phone: string;
-  subject: string;
-  message: string;
-  submissionDate: string;
-}
+import { StrapiUser, StrapiContact } from "@/lib/types";
 
 async function verifyUser(request: NextRequest): Promise<StrapiUser | null> {
   const { userId } = getAuth(request);

package/app/api/files/route.ts

@@ -1,23 +1,9 @@
 import { NextRequest, NextResponse } from "next/server";
 import { getAuth } from "@clerk/nextjs/server";
+import { StrapiUser, UploadedFile } from "@/lib/types";
 
 export const revalidate = 0; // Disable Next.js ISR
 
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  businessAdminId?: string;
-}
-
-interface UploadedFile {
-  id: number;
-  documentId: string;
-  name: string;
-  url: string;
-  createdAt: string;
-}
-
 const DOC_API_URL = process.env.STRAPI_DOC_API_URL || "";
 const BASE_URL = process.env.STRAPI_API_URL || "";
 const UPLOAD_API_URL = `${BASE_URL}/api/upload`;