@devvistatech/devvista-kit 0.0.9 → 0.0.10

package/lib/verify-user.ts

@@ -1,118 +1,118 @@
-import { getAuth } from "@clerk/nextjs/server";
-import { NextRequest } from "next/server";
-
-interface StrapiUser {
-  id: number;
-  username: string;
-  email: string;
-  businessAdminId?: string;
-  isAdmin?: boolean;
-  firstName?: string;
-  lastName?: string;
-  businessId?: string[];
-  dateJoined?: string;
-  businessOwner?: boolean;
-  userStatus?: string;
-  timezone?: string;
-  language?: string;
-  isVerified?: boolean;
-  authProvider?: string;
-  authId?: string;
-  businessTitle?: string;
-  userTitle?: string;
-  number?: string;
-  address?: {
-    zip: string;
-    city: string;
-    state: string;
-    street: string;
-    country: string;
-  };
-  websiteUrl?: string;
-  userRole?: string;
-  primaryBusinessColor?: string;
-  secondaryBusinessColor?: string;
-  logoImage?: string;
-}
-
-export async function verifyUser(request: NextRequest): Promise<StrapiUser | null> {
-  const { userId } = getAuth(request);
-  if (!userId) {
-    return null;
-  }
-
-  const maxRetries = 3;
-  let attempt = 0;
-
-  while (attempt < maxRetries) {
-    try {
-      const response = await fetch(
-        `${process.env.STRAPI_USER_LIST_API_URL}?filters[authId][$eq]=${userId}&populate=*`,
-        {
-          headers: {
-            Authorization: `Bearer ${process.env.STRAPI_API_TOKEN}`,
-            "Content-Type": "application/json",
-          },
-        }
-      );
-
-      if (!response.ok) {
-        if (response.status === 429) {
-          attempt++;
-          const delay = Math.pow(2, attempt) * 1000;
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          continue;
-        }
-        console.error("User verification failed:", response.status);
-        return null;
-      }
-
-      const users = await response.json();
-      if (!users.data || users.data.length === 0) {
-        console.error("No user found in user-list for authId:", userId);
-        return null;
-      }
-
-      const userData = users.data[0].attributes;
-      return {
-        id: users.data[0].id,
-        authId: userData.authId,
-        authProvider: userData.authProvider,
-        email: userData.email,
-        username: userData.username,
-        businessAdminId: userData.businessAdminId,
-        isAdmin: userData.userRole === "admin" && userData.businessAdminId === process.env.ADMIN_BUSINESS_ID,
-        firstName: userData.firstName,
-        lastName: userData.lastName,
-        dateJoined: userData.dateJoined,
-        businessOwner: userData.businessOwner,
-        userStatus: userData.userStatus,
-        timezone: userData.timezone,
-        language: userData.language,
-        isVerified: userData.isVerified,
-        businessTitle: userData.businessTitle,
-        userTitle: userData.userTitle,
-        number: userData.number,
-        address: userData.address,
-        websiteUrl: userData.websiteUrl,
-        userRole: userData.userRole,
-        primaryBusinessColor: userData.primaryBusinessColor,
-        secondaryBusinessColor: userData.secondaryBusinessColor,
-        logoImage: userData.logoImage?.data?.attributes?.url,
-        businessId: userData.businessId,
-      };
-    } catch (error) {
-      console.error(`Error verifying user (attempt ${attempt + 1}/${maxRetries}):`, error);
-      attempt++;
-      if (attempt < maxRetries) {
-        const delay = Math.pow(2, attempt) * 1000; 
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      } else {
-        console.error("Max retries reached for Strapi API");
-        return null;
-      }
-    }
-  }
-
-  return null;
+import { getAuth } from "@clerk/nextjs/server";
+import { NextRequest } from "next/server";
+
+interface StrapiUser {
+  id: number;
+  username: string;
+  email: string;
+  businessAdminId?: string;
+  isAdmin?: boolean;
+  firstName?: string;
+  lastName?: string;
+  businessId?: string[];
+  dateJoined?: string;
+  businessOwner?: boolean;
+  userStatus?: string;
+  timezone?: string;
+  language?: string;
+  isVerified?: boolean;
+  authProvider?: string;
+  authId?: string;
+  businessTitle?: string;
+  userTitle?: string;
+  number?: string;
+  address?: {
+    zip: string;
+    city: string;
+    state: string;
+    street: string;
+    country: string;
+  };
+  websiteUrl?: string;
+  userRole?: string;
+  primaryBusinessColor?: string;
+  secondaryBusinessColor?: string;
+  logoImage?: string;
+}
+
+export async function verifyUser(request: NextRequest): Promise<StrapiUser | null> {
+  const { userId } = getAuth(request);
+  if (!userId) {
+    return null;
+  }
+
+  const maxRetries = 3;
+  let attempt = 0;
+
+  while (attempt < maxRetries) {
+    try {
+      const response = await fetch(
+        `${process.env.STRAPI_USER_LIST_API_URL}?filters[authId][$eq]=${userId}&populate=*`,
+        {
+          headers: {
+            Authorization: `Bearer ${process.env.STRAPI_API_TOKEN}`,
+            "Content-Type": "application/json",
+          },
+        }
+      );
+
+      if (!response.ok) {
+        if (response.status === 429) {
+          attempt++;
+          const delay = Math.pow(2, attempt) * 1000;
+          await new Promise((resolve) => setTimeout(resolve, delay));
+          continue;
+        }
+        console.error("User verification failed:", response.status);
+        return null;
+      }
+
+      const users = await response.json();
+      if (!users.data || users.data.length === 0) {
+        console.error("No user found in user-list for authId:", userId);
+        return null;
+      }
+
+      const userData = users.data[0].attributes;
+      return {
+        id: users.data[0].id,
+        authId: userData.authId,
+        authProvider: userData.authProvider,
+        email: userData.email,
+        username: userData.username,
+        businessAdminId: userData.businessAdminId,
+        isAdmin: userData.userRole === "admin" && userData.businessAdminId === process.env.ADMIN_BUSINESS_ID,
+        firstName: userData.firstName,
+        lastName: userData.lastName,
+        dateJoined: userData.dateJoined,
+        businessOwner: userData.businessOwner,
+        userStatus: userData.userStatus,
+        timezone: userData.timezone,
+        language: userData.language,
+        isVerified: userData.isVerified,
+        businessTitle: userData.businessTitle,
+        userTitle: userData.userTitle,
+        number: userData.number,
+        address: userData.address,
+        websiteUrl: userData.websiteUrl,
+        userRole: userData.userRole,
+        primaryBusinessColor: userData.primaryBusinessColor,
+        secondaryBusinessColor: userData.secondaryBusinessColor,
+        logoImage: userData.logoImage?.data?.attributes?.url,
+        businessId: userData.businessId,
+      };
+    } catch (error) {
+      console.error(`Error verifying user (attempt ${attempt + 1}/${maxRetries}):`, error);
+      attempt++;
+      if (attempt < maxRetries) {
+        const delay = Math.pow(2, attempt) * 1000; 
+        await new Promise((resolve) => setTimeout(resolve, delay));
+      } else {
+        console.error("Max retries reached for Strapi API");
+        return null;
+      }
+    }
+  }
+
+  return null;
 }

package/middleware.ts

@@ -1,43 +1,43 @@
-import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
-
-const isPublicRoute = createRouteMatcher([
-  '/',
-  '/about',
-  '/contact',
-  '/gallery',
-  '/schedule',
-  '/faq',
-  '/api/about',
-  '/api/bio',
-  '/api/schedule',
-  '/api/files',
-  '/api/gallery-data',
-  '/api/trial-request',
-  '/api/contact',
-  '/api/blog',
-  '/blog/:path*',
-  '/.well-known/(.*)',
-  '/404',
-  '/500', 
-  '/_not-found',
-]);
-
-export default clerkMiddleware((auth, req) => {
-  if (isPublicRoute(req) && req.method === 'GET') {
-    return;
-  }
-  try {
-    auth.protect();
-  } catch (error) {
-    console.error('Middleware error:', error); 
-    return;
-  }
-});
-
-export const config = {
-  matcher: [
-    '/((?!.*\\..*|_next).*)',
-    '/',
-    '/(api|trpc)(.*)',
-  ],
+import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
+
+const isPublicRoute = createRouteMatcher([
+  '/',
+  '/about',
+  '/contact',
+  '/gallery',
+  '/schedule',
+  '/faq',
+  '/api/about',
+  '/api/bio',
+  '/api/schedule',
+  '/api/files',
+  '/api/gallery-data',
+  '/api/trial-request',
+  '/api/contact',
+  '/api/blog',
+  '/blog/:path*',
+  '/.well-known/(.*)',
+  '/404',
+  '/500', 
+  '/_not-found',
+]);
+
+export default clerkMiddleware((auth, req) => {
+  if (isPublicRoute(req) && req.method === 'GET') {
+    return;
+  }
+  try {
+    auth.protect();
+  } catch (error) {
+    console.error('Middleware error:', error); 
+    return;
+  }
+});
+
+export const config = {
+  matcher: [
+    '/((?!.*\\..*|_next).*)',
+    '/',
+    '/(api|trpc)(.*)',
+  ],
 };

package/netlify.toml

@@ -1,6 +1,6 @@
-[build]
-  command = "npm run build:prod"
-  publish = ".next"
-
-[[plugins]]
+[build]
+  command = "npm run build:prod"
+  publish = ".next"
+
+[[plugins]]
   package = "@netlify/plugin-nextjs"

package/next.config.js

@@ -1,10 +1,10 @@
-const nextConfig = {
-  images: { unoptimized: true },
-    experimental: {
-    serverActions: {
-      allowedOrigins: ['localhost:3000', 'https://devvista-kit.netlify.app'], 
-    },
-  },
-};
-
-module.exports = nextConfig;
+const nextConfig = {
+  images: { unoptimized: true },
+    experimental: {
+    serverActions: {
+      allowedOrigins: ['localhost:3000', 'https://devvista-kit.netlify.app'], 
+    },
+  },
+};
+
+module.exports = nextConfig;

package/package.json

@@ -1,116 +1,116 @@
-{
-  "name": "@devvistatech/devvista-kit",
-  "version": "0.0.9",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "bin": {
-    "devvista-kit": "bin/init.js"
-  },
-  "files": [
-    "bin/**/*",
-    "app/**/*",
-    "components/**/*",
-    "lib/**/*",
-    "public/**/*",
-    "src/**/*",
-    "middleware.ts",
-    "hooks/**/*",
-    "utils/**/*",
-    "dist/**/*",
-    "next.config.js",
-    "tsconfig.json",
-    "tailwind.config.ts",
-    "postcss.config.js",
-    "globals.css",
-    "layout.tsx",
-    "CHANGELOG.md",
-    "README.md",
-    "netlify.toml"
-  ],
-  "scripts": {
-    "build": "next build",
-    "dev": "next dev",
-    "build:dev": "cross-env NODE_ENV=development next build",
-    "start:dev": "cross-env NODE_ENV=development next start",
-    "build:prod": "cross-env NODE_ENV=production next build",
-    "start:prod": "cross-env NODE_ENV=production next start",
-    "lint": "next lint"
-  },
-  "dependencies": {
-    "@ai-sdk/openai": "^1.3.23",
-    "@clerk/nextjs": "^6.28.0",
-    "@google-analytics/data": "^5.1.0",
-    "@hookform/resolvers": "^3.9.0",
-    "@radix-ui/react-accordion": "^1.2.0",
-    "@radix-ui/react-alert-dialog": "^1.1.1",
-    "@radix-ui/react-aspect-ratio": "^1.1.0",
-    "@radix-ui/react-avatar": "^1.1.0",
-    "@radix-ui/react-checkbox": "^1.1.1",
-    "@radix-ui/react-collapsible": "^1.1.0",
-    "@radix-ui/react-context-menu": "^2.2.1",
-    "@radix-ui/react-dialog": "^1.1.1",
-    "@radix-ui/react-dropdown-menu": "^2.1.1",
-    "@radix-ui/react-hover-card": "^1.1.1",
-    "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-menubar": "^1.1.1",
-    "@radix-ui/react-navigation-menu": "^1.2.0",
-    "@radix-ui/react-popover": "^1.1.1",
-    "@radix-ui/react-progress": "^1.1.0",
-    "@radix-ui/react-radio-group": "^1.2.0",
-    "@radix-ui/react-scroll-area": "^1.1.0",
-    "@radix-ui/react-select": "^2.1.1",
-    "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slider": "^1.2.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-switch": "^1.1.0",
-    "@radix-ui/react-tabs": "^1.1.0",
-    "@radix-ui/react-toast": "^1.2.1",
-    "@radix-ui/react-toggle": "^1.1.0",
-    "@radix-ui/react-toggle-group": "^1.1.0",
-    "@radix-ui/react-tooltip": "^1.1.2",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
-    "ai": "^4.3.17",
-    "autoprefixer": "^10.4.20",
-    "chart.js": "^4.5.0",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
-    "cmdk": "^1.0.0",
-    "date-fns": "^3.6.0",
-    "deepmerge": "^4.3.1",
-    "embla-carousel-react": "^8.3.0",
-    "eslint": "^9.13.0",
-    "eslint-config-next": "^15.0.0",
-    "framer-motion": "^11.11.9",
-    "input-otp": "^1.2.4",
-    "lucide-react": "^0.446.0",
-    "next": "^15.0.0",
-    "next-themes": "^0.3.0",
-    "nodemailer": "^7.0.5",
-    "postcss": "^8.4.47",
-    "react": "^18.3.1",
-    "react-chartjs-2": "^5.3.0",
-    "react-day-picker": "^8.10.1",
-    "react-dom": "^18.3.1",
-    "react-hook-form": "^7.53.0",
-    "react-hot-toast": "^2.5.2",
-    "react-quill": "^2.0.0",
-    "react-resizable-panels": "^2.1.3",
-    "recharts": "^2.12.7",
-    "sonner": "^1.5.0",
-    "striptags": "^3.2.0",
-    "svix": "^1.69.0",
-    "tailwind-merge": "^2.5.2",
-    "tailwindcss": "^3.4.13",
-    "tailwindcss-animate": "^1.0.7",
-    "typescript": "^5.6.3",
-    "vaul": "^0.9.9",
-    "zod": "^3.23.8"
-  },
-  "devDependencies": {
-    "@types/lodash": "^4.17.20",
-    "@types/node": "^22.7.5",
-    "@types/nodemailer": "^6.4.17",
-    "cross-env": "^10.0.0"
-  }
+{
+  "name": "@devvistatech/devvista-kit",
+  "version": "0.0.10",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "bin": {
+    "devvista-kit": "bin/init.js"
+  },
+  "files": [
+    "bin/**/*",
+    "app/**/*",
+    "components/**/*",
+    "lib/**/*",
+    "public/**/*",
+    "src/**/*",
+    "middleware.ts",
+    "hooks/**/*",
+    "utils/**/*",
+    "dist/**/*",
+    "next.config.js",
+    "tsconfig.json",
+    "tailwind.config.ts",
+    "postcss.config.js",
+    "globals.css",
+    "layout.tsx",
+    "CHANGELOG.md",
+    "README.md",
+    "netlify.toml"
+  ],
+  "scripts": {
+    "build": "next build",
+    "dev": "next dev",
+    "build:dev": "cross-env NODE_ENV=development next build",
+    "start:dev": "cross-env NODE_ENV=development next start",
+    "build:prod": "cross-env NODE_ENV=production next build",
+    "start:prod": "cross-env NODE_ENV=production next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@ai-sdk/openai": "^1.3.23",
+    "@clerk/nextjs": "^6.28.0",
+    "@google-analytics/data": "^5.1.0",
+    "@hookform/resolvers": "^3.9.0",
+    "@radix-ui/react-accordion": "^1.2.0",
+    "@radix-ui/react-alert-dialog": "^1.1.1",
+    "@radix-ui/react-aspect-ratio": "^1.1.0",
+    "@radix-ui/react-avatar": "^1.1.0",
+    "@radix-ui/react-checkbox": "^1.1.1",
+    "@radix-ui/react-collapsible": "^1.1.0",
+    "@radix-ui/react-context-menu": "^2.2.1",
+    "@radix-ui/react-dialog": "^1.1.1",
+    "@radix-ui/react-dropdown-menu": "^2.1.1",
+    "@radix-ui/react-hover-card": "^1.1.1",
+    "@radix-ui/react-label": "^2.1.0",
+    "@radix-ui/react-menubar": "^1.1.1",
+    "@radix-ui/react-navigation-menu": "^1.2.0",
+    "@radix-ui/react-popover": "^1.1.1",
+    "@radix-ui/react-progress": "^1.1.0",
+    "@radix-ui/react-radio-group": "^1.2.0",
+    "@radix-ui/react-scroll-area": "^1.1.0",
+    "@radix-ui/react-select": "^2.1.1",
+    "@radix-ui/react-separator": "^1.1.0",
+    "@radix-ui/react-slider": "^1.2.0",
+    "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-switch": "^1.1.0",
+    "@radix-ui/react-tabs": "^1.1.0",
+    "@radix-ui/react-toast": "^1.2.1",
+    "@radix-ui/react-toggle": "^1.1.0",
+    "@radix-ui/react-toggle-group": "^1.1.0",
+    "@radix-ui/react-tooltip": "^1.1.2",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "^18.3.0",
+    "ai": "^4.3.17",
+    "autoprefixer": "^10.4.20",
+    "chart.js": "^4.5.0",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
+    "cmdk": "^1.0.0",
+    "date-fns": "^3.6.0",
+    "deepmerge": "^4.3.1",
+    "embla-carousel-react": "^8.3.0",
+    "eslint": "^9.13.0",
+    "eslint-config-next": "^15.0.0",
+    "framer-motion": "^11.11.9",
+    "input-otp": "^1.2.4",
+    "lucide-react": "^0.446.0",
+    "next": "^15.0.0",
+    "next-themes": "^0.3.0",
+    "nodemailer": "^7.0.5",
+    "postcss": "^8.4.47",
+    "react": "^18.3.1",
+    "react-chartjs-2": "^5.3.0",
+    "react-day-picker": "^8.10.1",
+    "react-dom": "^18.3.1",
+    "react-hook-form": "^7.53.0",
+    "react-hot-toast": "^2.5.2",
+    "react-quill": "^2.0.0",
+    "react-resizable-panels": "^2.1.3",
+    "recharts": "^2.12.7",
+    "sonner": "^1.5.0",
+    "striptags": "^3.2.0",
+    "svix": "^1.69.0",
+    "tailwind-merge": "^2.5.2",
+    "tailwindcss": "^3.4.13",
+    "tailwindcss-animate": "^1.0.7",
+    "typescript": "^5.6.3",
+    "vaul": "^0.9.9",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@types/lodash": "^4.17.20",
+    "@types/node": "^22.7.5",
+    "@types/nodemailer": "^6.4.17",
+    "cross-env": "^10.0.0"
+  }
 }