diff --git a/.env b/.env
index b2d2d91..ba3f72e 100644
--- a/.env
+++ b/.env
@@ -1,10 +1,13 @@
 # Firebase Configuration
-VITE_FIREBASE_API_KEY = AIzaSyCH7XHFOpz9767boAB_OJeeVuqi7wqv6IM
-VITE_FIREBASE_AUTH_DOMAIN = niveshweb-b6b85.firebaseapp.com
-VITE_FIREBASE_PROJECT_ID = niveshweb-b6b85
-VITE_FIREBASE_STORAGE_BUCKET = niveshweb-b6b85.firebasestorage.app
-VITE_FIREBASE_MESSAGING_SENDER_ID = 731306267322
-VITE_FIREBASE_APP_ID = 1:731306267322:web:a3181d9bcd27d91974a883
+NEXT_PUBLIC_FIREBASE_KEY=AIzaSyCH7XHFOpz9767boAB_OJeeVuqi7wqv6IM
+NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN=niveshweb-b6b85.firebaseapp.com
+NEXT_PUBLIC_FIREBASE_URL=https://niveshweb-b6b85-default-rtdb.firebaseio.com
+NEXT_PUBLIC_FIREBASE_PROJECT_ID=niveshweb-b6b85
+NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET=niveshweb-b6b85.appspot.com
+NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=731306267322
+NEXT_PUBLIC_FIREBASE_APPID=1:731306267322:web:a3181d9bcd27d91974a883
+NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID=G-VW0ZTRXPZ9
+
 # Database Configuration
 DB_HOST = 10.0.50.4
 DB_USER = pgadmin
diff --git a/src/components/auth/LoginForm.tsx b/src/components/auth/LoginForm.tsx
index 9e22015..77e3435 100644
--- a/src/components/auth/LoginForm.tsx
+++ b/src/components/auth/LoginForm.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { LogIn } from 'lucide-react';
 import { useAuth } from '../../context/AuthContext';
 import Button from '../ui/Button';
 import Card, { CardContent, CardHeader, CardTitle } from '../ui/Card';
@@ -12,7 +11,6 @@ const LoginForm: React.FC = () => {
   const handleGoogleSignIn = async () => {
 
     try {
-      console.log("DKDKKDOKDODKDKODOD");
       setIsLoading(true);
       setError(null);
       await signInWithGoogle();
diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx
index 3cdeffc..7cdff79 100644
--- a/src/components/ui/Button.tsx
+++ b/src/components/ui/Button.tsx
@@ -22,7 +22,7 @@ const Button: React.FC<ButtonProps> = ({
   ...props
 }) => {
   const baseClasses = 'inline-flex items-center justify-center font-medium transition-colors duration-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2';
-  
+
   const variantClasses = {
     primary: 'bg-primary-500 text-white hover:bg-primary-600 focus:ring-primary-500',
     secondary: 'bg-secondary-500 text-white hover:bg-secondary-600 focus:ring-secondary-500',
@@ -30,16 +30,16 @@ const Button: React.FC<ButtonProps> = ({
     ghost: 'bg-transparent hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-700 dark:text-gray-200 focus:ring-primary-500',
     danger: 'bg-red-600 text-white hover:bg-red-700 focus:ring-red-500',
   };
-  
+
   const sizeClasses = {
     sm: 'px-3 py-1.5 text-sm',
     md: 'px-4 py-2 text-base',
     lg: 'px-6 py-3 text-lg',
   };
-  
+
   const widthClass = fullWidth ? 'w-full' : '';
   const disabledClass = disabled || isLoading ? 'opacity-60 cursor-not-allowed' : '';
-  
+
   return (
     <button
       className={`${baseClasses} ${variantClasses[variant]} ${sizeClasses[size]} ${widthClass} ${disabledClass} ${className}`}
@@ -48,17 +48,25 @@ const Button: React.FC<ButtonProps> = ({
     >
       {isLoading && (
         <svg className="animate-spin -ml-1 mr-2 h-4 w-4 text-current\" xmlns="http://www.w3.org/2000/svg\" fill="none\" viewBox="0 0 24 24">
-          <circle className="opacity-25\" cx="12\" cy="12\" r="10\" stroke="currentColor\" strokeWidth="4"></circle>
+          <circle
+            className="opacity-25"
+            cx="12"
+            cy="12"
+            r="10"
+            stroke="currentColor"
+            strokeWidth="4"
+          />
+
           <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
         </svg>
       )}
-      
+
       {!isLoading && icon && iconPosition === 'left' && (
         <span className="mr-2">{icon}</span>
       )}
-      
+
       {children}
-      
+
       {!isLoading && icon && iconPosition === 'right' && (
         <span className="ml-2">{icon}</span>
       )}
diff --git a/src/context/AuthContext.tsx b/src/context/AuthContext.tsx
index 77636ac..cfdf441 100644
--- a/src/context/AuthContext.tsx
+++ b/src/context/AuthContext.tsx
@@ -6,6 +6,7 @@ import {
   onAuthStateChanged
 } from 'firebase/auth';
 import { auth, googleProvider } from '../lib/firebase';
+import { useRouter } from 'next/router';
 // import { supabase } from '../lib/supabase';
 
 interface AuthContextType {
@@ -30,7 +31,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
   const [currentUser, setCurrentUser] = useState<User | null>(null);
   const [loading, setLoading] = useState(true);
   const [userProfile, setUserProfile] = useState<any | null>(null);
-
+  const router = useRouter();
   // Function to sync Firebase user with Supabase
   const syncUserWithDatabase = async (user: User) => {
     if (!user) return null;
@@ -72,8 +73,12 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
   const signInWithGoogle = async () => {
     try {
       const result = await signInWithPopup(auth, googleProvider);
-      const profile = await syncUserWithDatabase(result.user);
-      setUserProfile(profile);
+      const profile = result.user;
+      if (profile?.email?.includes("nivesh.com")) {
+        setUserProfile(profile);
+        router.push('/dashboard');
+      }
+
     } catch (error) {
       console.error('Error signing in with Google:', error);
     }
@@ -93,10 +98,8 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
   useEffect(() => {
     const unsubscribe = onAuthStateChanged(auth, async (user) => {
       setCurrentUser(user);
-
-      if (user) {
-        const profile = await syncUserWithDatabase(user);
-        setUserProfile(profile);
+      if (user?.email?.includes("nivesh")) {
+        setUserProfile(user);
       } else {
         setUserProfile(null);
       }
diff --git a/src/lib/firebase.ts b/src/lib/firebase.ts
index a45bc54..68f803c 100644
--- a/src/lib/firebase.ts
+++ b/src/lib/firebase.ts
@@ -3,12 +3,14 @@ import { getAuth, GoogleAuthProvider } from 'firebase/auth';
 
 // This would typically come from environment variables
 const firebaseConfig = {
-  apiKey:process.env.VITE_FIREBASE_API_KEY || "YOUR_API_KEY",
-  authDomain:process.env.VITE_FIREBASE_AUTH_DOMAIN || "YOUR_AUTH_DOMAIN",
-  projectId:process.env.VITE_FIREBASE_PROJECT_ID || "YOUR_PROJECT_ID",
-  storageBucket:process.env.VITE_FIREBASE_STORAGE_BUCKET || "YOUR_STORAGE_BUCKET",
-  messagingSenderId:process.env.VITE_FIREBASE_MESSAGING_SENDER_ID || "YOUR_MESSAGING_SENDER_ID",
-  appId:process.env.VITE_FIREBASE_APP_ID || "YOUR_APP_ID"
+  apiKey: process.env.NEXT_PUBLIC_FIREBASE_KEY,
+  authDomain: process.env.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN,
+  databaseURL: process.env.NEXT_PUBLIC_FIREBASE_URL,
+  projectId: process.env.NEXT_PUBLIC_FIREBASE_PROJECT_ID,
+  storageBucket: process.env.NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET,
+  messagingSenderId: process.env.NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID,
+  appId: process.env.NEXT_PUBLIC_FIREBASE_APPID,
+  measurementId: process.env.NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID
 };
 
 // Initialize Firebase
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 50f8a10..49eb730 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -1,7 +1,12 @@
 // src/pages/_app.tsx
-import '../index.css'; // correct path to your Tailwind CSS file
+import { AuthProvider } from '../context/AuthContext';
+import '../index.css'; // Tailwind ya global styles
 import type { AppProps } from 'next/app';
 
 export default function App({ Component, pageProps }: AppProps) {
-    return <Component {...pageProps} />;
+    return (
+        <AuthProvider>
+            <Component {...pageProps} />
+        </AuthProvider>
+    );
 }