#34 #35

src/app/page.tsx

@@ -1,18 +1,18 @@
 "use client"
 import * as THREE from 'three';
 import { useEffect, useState } from 'react';
-import { ThreeScene, AnimeExample, ReactFiber  } from "../../components/test"
+import { ThreeScene, AnimeExample, ReactFiber  } from "../components/test"
 import WebGL from 'three/addons/capabilities/WebGL.js';
-import { testSupabase } from '../../server/db/example';
-import { BasicScene }  from "../../components/basicScene";
-import {CameraSwitch} from "../../components/ui/buttons/cameraSwitch"
+// import { testSupabase } from '../utils/types/example';
+import { BasicScene }  from "../components/basicScene";
+import {CameraSwitch} from "../components/ui/buttons/cameraSwitch"
 
 export default function Home() {
     const [isWebGLAvailable, setIsWebGLAvailable] = useState(false);  
 
     useEffect(() => {
      setIsWebGLAvailable(WebGL.isWebGLAvailable());
-     testSupabase()
+    //  testSupabase()
     }, []);
 
   return (

src/components/forms/login.tsx

@@ -35,6 +35,7 @@ export const LoginForm: React.FC = () => {
 
     const [ state, dispatch ] = useReducer(reducer, initialState );
 
+<<<<<<< HEAD
     const handleSubmit = ( e:Event ) => {
         e.preventDefault();
 
@@ -45,6 +46,9 @@ export const LoginForm: React.FC = () => {
             console.log(state);
         }
     }
+=======
+    const handleSubmit = (e:Event) => 
+>>>>>>> main
 
     const { register, handleSubmit, errors, watch } = useForm<State>();
     const password = useRef({});

src/utils/types/user.ts

@@ -1,6 +1,65 @@
+<<<<<<< HEAD
 export type User = {
   id:         string;
   email:      string;
   name?:      string;
   created_at: Date;
 };
+=======
+export type Json =
+  | string
+  | number
+  | boolean
+  | null
+  | { [key: string]: Json | undefined }
+  | Json[]
+
+export interface Database {
+  public: {
+    Tables: {
+      "testing-work-flow-action": {
+        Row: {
+          created_at: string | null
+          id: number
+        }
+        Insert: {
+          created_at?: string | null
+          id?: number
+        }
+        Update: {
+          created_at?: string | null
+          id?: number
+        }
+        Relationships: []
+      }
+      TestTable: {
+        Row: {
+          id: number
+          testing: string | null
+        }
+        Insert: {
+          id?: number
+          testing?: string | null
+        }
+        Update: {
+          id?: number
+          testing?: string | null
+        }
+        Relationships: []
+      }
+    }
+    Views: {
+      [_ in never]: never
+    }
+    Functions: {
+      [_ in never]: never
+    }
+    Enums: {
+      [_ in never]: never
+    }
+    CompositeTypes: {
+      [_ in never]: never
+    }
+  }
+}
+>>>>>>> main