From 39588fc86820d114edb32d934f44aa116ee9f905 Mon Sep 17 00:00:00 2001 From: Gupta-Anubhav12 Date: Mon, 13 Feb 2023 01:05:38 +0530 Subject: [PATCH] fix conflicts --- components/Input/index.tsx | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/components/Input/index.tsx b/components/Input/index.tsx index e2b4cb3..3f3518b 100644 --- a/components/Input/index.tsx +++ b/components/Input/index.tsx @@ -1,17 +1,10 @@ -<<<<<<< HEAD -import React, { useState, SetStateAction, useEffect } from 'react' -import SuggestionBox from './SuggestionBox' -import { GenerateAnswer } from '@/apiFunctions/generate'; -import { usePlausible } from 'next-plausible' import SupaAuthModal from '@/components/auth/SupaAuthModal' import { useCookies } from 'react-cookie'; -======= import React, { useState, SetStateAction, useEffect } from "react"; import SuggestionBox from "./SuggestionBox"; import { GenerateAnswer } from "@/apiFunctions/generate"; import { usePlausible } from "next-plausible"; ->>>>>>> cd4b66e5d229f253ad255b14aeef3c775ac263be interface InputProps { showSuggestions: boolean; @@ -81,14 +74,7 @@ const Input = ({ setChat(chatArray); setShowSuggestions(false); setInput(""); -<<<<<<< HEAD - - } - catch (err: any) { - -======= } catch (err: Error | any) { ->>>>>>> cd4b66e5d229f253ad255b14aeef3c775ac263be if (err?.response?.status === 429) { let history = chat; history?.push({ @@ -99,19 +85,6 @@ const Input = ({ setChat(history); setInput(""); } -<<<<<<< HEAD - else if (err?.response?.status == 401) { - setOpen(true); - } - } - finally { - setLoading(false) - plausible('AskKrishna'); - // sent event to Google Analytics 4 (gtag.js) - (window as any).gtag('event', 'ask_krishna', { - 'event_category': 'Generate', - 'event_label': input -======= } finally { setLoading(false); plausible("AskKrishna"); @@ -119,7 +92,6 @@ const Input = ({ (window as any).gtag("event", "ask_krishna", { event_category: "Generate", event_label: input, ->>>>>>> cd4b66e5d229f253ad255b14aeef3c775ac263be }); } }; @@ -187,15 +159,9 @@ const Input = ({ )} -<<<<<<< HEAD - + ) } -======= - - ); -}; ->>>>>>> cd4b66e5d229f253ad255b14aeef3c775ac263be export default Input;