From 6e7a0a20c38dee2a6001b6324b88849af31772ee Mon Sep 17 00:00:00 2001 From: Rishit Gupta <74411873+Rishit30G@users.noreply.github.com> Date: Sun, 16 Jul 2023 13:29:57 +0530 Subject: [PATCH] Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 --- apps/uci/web/src/app/chats/[chatid]/page.tsx | 5 - apps/uci/web/src/app/page.tsx | 10 - .../src/app/starred-chat/[chatId]/page.tsx | 5 - .../src/components/common/chat-item/index.tsx | 20 +- .../common/chat-ui-component/index.tsx | 33 +-- .../components/common/message-item/index.tsx | 95 -------- apps/uci/web/src/components/get-bot-list.tsx | 84 +++++++ .../web/src/components/socket-components.tsx | 40 ++++ .../uci/web/src/providers/ContextProvider.tsx | 214 +++++------------- apps/uci/web/src/socket/index.ts | 5 - apps/uci/web/src/types/react-dispatch.d.ts | 5 + apps/uci/web/src/types/user.d.ts | 2 + apps/uci/web/src/utils/set-local-storage.ts | 24 +- apps/uci/web/tsconfig.json | 2 +- yarn.lock | 4 +- 15 files changed, 221 insertions(+), 327 deletions(-) create mode 100644 apps/uci/web/src/components/get-bot-list.tsx create mode 100644 apps/uci/web/src/components/socket-components.tsx create mode 100644 apps/uci/web/src/types/react-dispatch.d.ts diff --git a/apps/uci/web/src/app/chats/[chatid]/page.tsx b/apps/uci/web/src/app/chats/[chatid]/page.tsx index 7d69dec7..40fa8009 100644 --- a/apps/uci/web/src/app/chats/[chatid]/page.tsx +++ b/apps/uci/web/src/app/chats/[chatid]/page.tsx @@ -25,11 +25,6 @@ const Chats: NextPage<{ params: { chatid: string } }> = ({ params }) => { if (!params?.chatid) router.push('/'); }, [router, params?.chatid]); - useEffect(() => { - window && window?.androidInteract?.onBotListingScreenFocused(false); - window && - window?.androidInteract?.log(`On Home Page onBotListingScreenFocused:false triggered`); - }, []); diff --git a/apps/uci/web/src/app/page.tsx b/apps/uci/web/src/app/page.tsx index d9cb2aa2..53f84698 100644 --- a/apps/uci/web/src/app/page.tsx +++ b/apps/uci/web/src/app/page.tsx @@ -82,16 +82,6 @@ export default function Home() { borderRadius: "50%", fontSize: "14px", }} - onClick={(): void => { - try { - window && window?.androidInteract?.onDestroyScreen(); - } catch (err) { - window && - window?.androidInteract?.log( - `error in destroying screen:${JSON.stringify(err)}` - ); - } - }} size="sm" variant="ghost" > diff --git a/apps/uci/web/src/app/starred-chat/[chatId]/page.tsx b/apps/uci/web/src/app/starred-chat/[chatId]/page.tsx index 25dfbf56..547a4bd3 100644 --- a/apps/uci/web/src/app/starred-chat/[chatId]/page.tsx +++ b/apps/uci/web/src/app/starred-chat/[chatId]/page.tsx @@ -19,11 +19,6 @@ const StarredChat: NextPage<{ params: { chatId: string } }> = ({ params }) => { const history = useRouter(); const user = useMemo(() => find(context?.allUsers, { id: params?.chatId }), [context?.allUsers, params?.chatId]); - useEffect(() => { - window && window?.androidInteract?.onBotListingScreenFocused(false); - window && - window?.androidInteract?.onEvent(`On Home Page onBotListingScreenFocused:false triggered`); - }, []); return ( diff --git a/apps/uci/web/src/components/common/chat-item/index.tsx b/apps/uci/web/src/components/common/chat-item/index.tsx index ad141495..ab1f1dc1 100644 --- a/apps/uci/web/src/components/common/chat-item/index.tsx +++ b/apps/uci/web/src/components/common/chat-item/index.tsx @@ -1,4 +1,4 @@ -import React, { useCallback, useContext } from 'react'; +import React, { useCallback, useContext, useMemo } from 'react'; import { Box, useColorModeValue } from '@chakra-ui/react'; import styles from './index.module.css'; import profilePic from '../../../assets/images/bot_icon_2.png'; @@ -7,6 +7,7 @@ import { useRouter } from 'next/navigation'; import Image from 'next/image'; import { User } from '@/types'; import { AppContext } from '@/context'; +import moment from 'moment'; interface chatItemProps { active: boolean; @@ -16,22 +17,30 @@ interface chatItemProps { isBlank?: boolean; } + const ChatItem: React.FC = ({ active, name, phoneNumber, user, isBlank }) => { const history = useRouter(); const context = useContext(AppContext); const fontColorToggle = useColorModeValue(styles.darkFontColor, styles.lightFontColor); - const onChangingCurrentUserHandler = useCallback(() => { + const expiredItem = useMemo(() => { + return user?.endDate !== undefined && user.endDate < moment().format() && user?.status === 'ENABLED'; + }, [user]); + + + const onChangeUser = useCallback(() => { localStorage.setItem('currentUser', JSON.stringify(user)); context?.toChangeCurrentUser(user); + // console.log('user Date', user?.endDate); + // console.log('user Status', user?.status); history.push(`/chats/${user?.id}`); }, [context, history, user]); return ( + ); + }; export default ChatItem; diff --git a/apps/uci/web/src/components/common/chat-ui-component/index.tsx b/apps/uci/web/src/components/common/chat-ui-component/index.tsx index 80d3fb7f..97f582f1 100644 --- a/apps/uci/web/src/components/common/chat-ui-component/index.tsx +++ b/apps/uci/web/src/components/common/chat-ui-component/index.tsx @@ -85,8 +85,6 @@ export const ChatUiComponent: FC<{ if (res?.data?.result?.records?.length > 0) { const normalizedChats = normalizedChat(res.data.result.records); console.log("debug:", { normalizedChats }); - window && - window?.androidInteract?.log(JSON.stringify(normalizedChats)); localStorage.setItem("userMsgs", JSON.stringify(normalizedChats)); setMessages(normalizedChats); } else { @@ -97,14 +95,9 @@ export const ChatUiComponent: FC<{ console.log("chatUi=>:",{err}) setLoading(false); toast.error(JSON.stringify(err?.message)); - window && - window?.androidInteract?.log( - `error in fetching chat history(online):${JSON.stringify(err)}` - ); }); } else { setLoading(false); - try { if (localStorage.getItem("chatHistory")) { const offlineMsgs = filter( // @ts-ignore @@ -113,40 +106,16 @@ export const ChatUiComponent: FC<{ // @ts-ignore { botUuid: JSON.parse(localStorage.getItem("currentUser"))?.id } ); - window && - window?.androidInteract?.log(localStorage.getItem("chatHistory")); + setMessages(offlineMsgs); } - } catch (err) { - - window && - window?.androidInteract?.log( - `error in getting chat history(offline):${JSON.stringify(err)}` - ); - } } } // eslint-disable-next-line react-hooks/exhaustive-deps }, [conversationHistoryUrl, context?.socket?.connected ]); - useEffect(() => { - try { - window && - window?.androidInteract?.onChatCompleted?.( - String(currentUser?.id), - JSON.stringify(context?.state?.messages) - ); - window && - window?.androidInteract?.log(JSON.stringify(context?.state?.messages)); - } catch (err) { - window && - window?.androidInteract?.log( - `error in onChatCompleted func:${JSON.stringify(err)}` - ); - } - }, [context?.state?.messages, currentUser?.id]); const handleSend = useCallback( (type: string, val: any) => { diff --git a/apps/uci/web/src/components/common/message-item/index.tsx b/apps/uci/web/src/components/common/message-item/index.tsx index 9eddeb02..78417964 100644 --- a/apps/uci/web/src/components/common/message-item/index.tsx +++ b/apps/uci/web/src/components/common/message-item/index.tsx @@ -87,77 +87,9 @@ export const MessageItem: FC = ({ const t = omit(newStarredMsgs, [msgToStarred?.botUuid]); context?.setStarredMsgs(t); localStorage.setItem("starredChats", JSON.stringify(t)); - try { - window && - window?.androidInteract?.onMsgSaveUpdate(JSON.stringify(t)); - window && - window?.androidInteract?.onEvent( - "nl-chatbotscreen-starmessage", - JSON.stringify({ - starred: false, - botid: msgToStarred?.botUuid, - messageid: msgToStarred?.messageId, - timestamp: moment().valueOf(), - }) - ); - window && - window?.androidInteract?.log( - "nl-chatbotscreen-starmessage event:", - JSON.stringify({ - starred: false, - botid: msgToStarred?.botUuid, - messageid: msgToStarred?.messageId, - timestamp: moment().valueOf(), - }) - ); - window && - window?.androidInteract?.log( - `new starred : ${JSON.stringify(t)}` - ); - } catch (err) { - window && - window?.androidInteract?.log( - `error in onMsgSaveUpdate func:${JSON.stringify(err)}` - ); - } } else { context?.setStarredMsgs(newStarredMsgs); localStorage.setItem("starredChats", JSON.stringify(newStarredMsgs)); - try { - window && - window?.androidInteract?.onMsgSaveUpdate( - JSON.stringify(newStarredMsgs) - ); - window && - window?.androidInteract?.onEvent( - "nl-chatbotscreen-starmessage", - JSON.stringify({ - starred: true, - botid: msgToStarred?.botUuid, - messageid: msgToStarred?.messageId, - timestamp: moment().valueOf(), - }) - ); - window && - window?.androidInteract?.log( - "nl-chatbotscreen-starmessage event:", - JSON.stringify({ - starred: true, - botid: msgToStarred?.botUuid, - messageid: msgToStarred?.messageId, - timestamp: moment().valueOf(), - }) - ); - window && - window?.androidInteract?.log( - `new starred : ${JSON.stringify(newStarredMsgs)}` - ); - } catch (err) { - window && - window?.androidInteract?.log( - `error in onMsgSaveUpdate func:${JSON.stringify(err)}` - ); - } } setMsgToStarred({}); setIsInLocal(false); @@ -185,21 +117,6 @@ export const MessageItem: FC = ({ } localStorage.setItem("starredChats", JSON.stringify(valueToReturn)); - try { - window && - window?.androidInteract?.onMsgSaveUpdate( - JSON.stringify(valueToReturn) - ); - window && - window?.androidInteract?.log( - `new starred : ${JSON.stringify(valueToReturn)}` - ); - } catch (err) { - window && - window?.androidInteract?.log( - `error in onMsgSaveUpdate func:${JSON.stringify(err)}` - ); - } return valueToReturn; }); } @@ -248,18 +165,6 @@ export const MessageItem: FC = ({ [handleSend] ); - const download = (url: string): void => { - try { - window && window?.androidInteract?.onImageDownload(url); - console.log("onImageDownload function executed"); - } catch (err) { - console.log("onImageDownload function failed"); - window && - window?.androidInteract?.log( - `error in onImageDownload: ${JSON.stringify(err)}` - ); - } - }; const { content, type } = msg; diff --git a/apps/uci/web/src/components/get-bot-list.tsx b/apps/uci/web/src/components/get-bot-list.tsx new file mode 100644 index 00000000..98de1a44 --- /dev/null +++ b/apps/uci/web/src/components/get-bot-list.tsx @@ -0,0 +1,84 @@ +import { getBotDetailsList } from "@/utils/api-handler"; +import { normalizeUsers } from "@/utils/normalize-user"; +import { reverse, sortBy, without } from "lodash"; +import moment from "moment"; +import { useEffect } from "react"; +import { toast } from "react-hot-toast"; +import { setUsers, setCurrentUser, setLoading } from "@/types/react-dispatch"; + +interface GetBotItemProp{ + setUsers: setUsers, + setCurrentUser: setCurrentUser, + setLoading: setLoading +} + + +const GetBotList: React.FC = ({ setUsers, setCurrentUser, setLoading }) => { + + useEffect(() => { + try { + const checkOnline = async (): Promise => { + if (window.navigator.onLine) { + + const botIds = JSON.parse(localStorage.getItem("botList") || '{}'); + getBotDetailsList() + .then((response): any => { + console.log({ response }) + const botDetailsList = without( + reverse( + sortBy( + response?.data?.result?.map((bot: any, index: number) => { + if ( + // bot?.logicIDs?.[0]?.transformers?.[0]?.meta?.type !== + // "broadcast" && + // includes(botIds, bot?.id) + true + ) { + if (index === 0) localStorage.setItem('userID', bot?.id); + return normalizeUsers({ + ...bot, + active: index === 0, + botUuid: bot?.id, + createTime: moment(bot?.createdAt).valueOf(), + }); + } + return null; + }), + ["createTime"] + ) + ), + null + ); + + + // @ts-ignore + setUsers(botDetailsList); + setLoading(false); + + if (localStorage.getItem("currentUser")) { + + // @ts-ignore + setCurrentUser(JSON.parse(localStorage.getItem("currentUser"))); + + // @ts-ignore + } else setCurrentUser(botDetailsList?.[0]); + }) + .catch((err: any) => console.log("qwerty:", { err })); + } else { + setLoading(false); + if (localStorage.getItem("botDetails")) { + setUsers(JSON.parse(localStorage.getItem("botDetails") || '[]')); + setCurrentUser(JSON.parse(localStorage.getItem("botDetails") || '[]')?.[0]); + } + } + }; + checkOnline(); + } catch (err: any) { + toast.error(err?.message); + } + }, []); + + return null; +} + +export default GetBotList; diff --git a/apps/uci/web/src/components/socket-components.tsx b/apps/uci/web/src/components/socket-components.tsx new file mode 100644 index 00000000..53de1f60 --- /dev/null +++ b/apps/uci/web/src/components/socket-components.tsx @@ -0,0 +1,40 @@ +import io, { Socket } from 'socket.io-client'; +import React, { useEffect, useState } from 'react'; + +interface SocketConnectionProps { + isMobileAvailable: boolean; + setSocket: React.Dispatch>; +} + +// const [socket, setSocket] = useState(); +// const [isMobileAvailable, setIsMobileAvailable] = useState(false) + +const SocketConnection: React.FC = ({ isMobileAvailable, setSocket }) => { + useEffect(() => { + if (localStorage.getItem('auth') || isMobileAvailable) { + const URL = process.env.NEXT_PUBLIC_TRANSPORT_SOCKET_URL || ''; + setSocket( + io(URL, { + transportOptions: { + polling: { + extraHeaders: { + Authorization: `Bearer ${localStorage.getItem('auth')}`, + channel: 'nlpwa', + }, + }, + }, + query: { + deviceId: `nlpwa:${localStorage.getItem('mobile')}`, + }, + autoConnect: false, + upgrade: false, + }) + ); + } + + }, [isMobileAvailable, setSocket]); + return null; +} + + +export default SocketConnection; \ No newline at end of file diff --git a/apps/uci/web/src/providers/ContextProvider.tsx b/apps/uci/web/src/providers/ContextProvider.tsx index 9c6038fc..dc2263b2 100644 --- a/apps/uci/web/src/providers/ContextProvider.tsx +++ b/apps/uci/web/src/providers/ContextProvider.tsx @@ -13,6 +13,8 @@ import { Toaster } from "react-hot-toast"; import { AppContext } from "@/context"; import { io, Socket } from 'socket.io-client'; import { getBotDetailsList } from "@/utils/api-handler"; +import SocketConnection from "@/components/socket-components"; +import GetBotList from "@/components/get-bot-list"; export const ContextProvider: FC<{ children: React.ReactNode }> = ({ children }) => { @@ -25,8 +27,8 @@ export const ContextProvider: FC<{ children: React.ReactNode }> = ({ children }) const [isMobileAvailable, setIsMobileAvailable] = useState(false) const [currentUser, setCurrentUser] = useState(); - const [loading, setLoading] = useState(true); - const [starredMsgs, setStarredMsgs] = useState({}); + const [loading, setLoading] = useState(true); + const [starredMsgs, setStarredMsgs] = useState({}); // const authToken = useLocalStorage('auth', ''); // const currentUserLocal = useLocalStorage('currentUser', '', true); @@ -35,7 +37,8 @@ export const ContextProvider: FC<{ children: React.ReactNode }> = ({ children }) // const starredChats = useLocalStorage('starredChats', ''); // const botList = useLocalStorage('botList', '', true); - const [isSendDisabled, setIsSendDisabled] = useState(false); + const [isSendDisabled, setIsSendDisabled] = useState(false); + const botStartingMsgs = useMemo( () => @@ -43,9 +46,9 @@ export const ContextProvider: FC<{ children: React.ReactNode }> = ({ children }) [users] ); - // useEffect(() => { - // setLocalStorage(); - // }, []); + useEffect(() => { + setLocalStorage(); + }, []); const connect = (): void => { @@ -57,17 +60,7 @@ export const ContextProvider: FC<{ children: React.ReactNode }> = ({ children }) connect(); }, [isConnected, socket]); - const [state, setState] = - useState<{ - allMessages: { - user: string; - phoneNumber: string | null; - messages: any[]; - }[]; - messages: any[]; - username: string; - session: any; - }>(initialState); + const [state, setState] = useState(initialState); const updateMsgState = useCallback(({ user, msg, media }: UpdateMsgState) => { const newMsg = { @@ -87,92 +80,65 @@ export const ContextProvider: FC<{ children: React.ReactNode }> = ({ children }) const onMessageReceived = useCallback( (msg: SocketResponse): void => { -console.log("socket: BotResponse",{msg}) - // @ts-ignore + console.log("socket: BotResponse", { msg }); + + //@ts-ignore const user = JSON.parse(localStorage.getItem("currentUser")); + let media = {}; if (msg.content.msg_type === "IMAGE") { - updateMsgState({ - user, - msg, - media: { imageUrl: msg?.content?.media_url }, - }); + media = { imageUrl: msg?.content?.media_url }; } else if (msg.content.msg_type === "AUDIO") { - updateMsgState({ - user, - msg, - media: { audioUrl: msg?.content?.media_url }, - }); + media = { audioUrl: msg?.content?.media_url }; } else if (msg.content.msg_type === "VIDEO") { - updateMsgState({ - user, - msg, - media: { videoUrl: msg?.content?.media_url }, - }); + media = { videoUrl: msg?.content?.media_url }; } else if ( msg.content.msg_type === "DOCUMENT" || msg.content.msg_type === "FILE" ) { - updateMsgState({ - user, - msg, - media: { fileUrl: msg?.content?.media_url }, - }); + media = { fileUrl: msg?.content?.media_url }; } else if (msg.content.msg_type === "TEXT") { - updateMsgState({ user, msg, media: {} }); + media = {}; } + updateMsgState({ + user, + msg, + media, + }); + + const newMessage = { + username: user?.name, + text: msg.content.title, + choices: msg.content.choices, + position: "left", + }; + localStorage.setItem( "userMsgs", - JSON.stringify([ - ...messages, - { - username: user?.name, - text: msg.content.title, - choices: msg.content.choices, - position: "left", - }, - ]) + JSON.stringify([...messages, newMessage]) ); }, [messages, updateMsgState] ); - // useEffect(() => { - // setLocalStorage(); - // }, []); + // const hasLocalStorageBeenSet = localStorage.getItem('localStorageSet'); + // if(!hasLocalStorageBeenSet) { + // setLocalStorage(); + // localStorage.setItem('localStorageSet', 'true'); + // } + // }, []); - useEffect(() => { - if (localStorage.getItem('auth') || isMobileAvailable) { - const URL = process.env.NEXT_PUBLIC_TRANSPORT_SOCKET_URL || ''; - setSocket( - io(URL, { - transportOptions: { - polling: { - extraHeaders: { - Authorization: `Bearer ${localStorage.getItem('auth')}`, - channel: 'nlpwa', - }, - }, - }, - query: { - deviceId: `nlpwa:${localStorage.getItem('mobile')}`, - }, - autoConnect: false, - upgrade: false, - }) - ); - } - }, [isMobileAvailable]); + console.log(socket); useEffect(() => { function onConnect(): void { - window && window?.androidInteract?.log(`socket: onConnectCallback`); + setIsConnected(true); } @@ -181,8 +147,6 @@ console.log("socket: BotResponse",{msg}) } function onDisconnect(): void { - console.log("socket: disconnecting"); - window && window?.androidInteract?.log(`socket: onDisconnectCallback`); setIsConnected(false); } @@ -199,10 +163,6 @@ console.log("socket: BotResponse",{msg}) } return () => { - window && - window?.androidInteract?.log( - `socket: turning off everything on return` - ); // socket?.disconnect(); // socket?.off("connect", onConnect); // socket?.off("disconnect", onDisconnect); @@ -216,80 +176,8 @@ console.log("socket: BotResponse",{msg}) setStarredMsgs(JSON.parse(localStorage.getItem("starredChats") || '{}')); } }, []); - - // getting botList from android and fetching bot details - useEffect(() => { - try { - const checkOnline = async (): Promise => { - if (window.navigator.onLine) { - - const botIds = JSON.parse(localStorage.getItem("botList") || '{}'); - getBotDetailsList() - .then((response): any => { - console.log({ response }) - const botDetailsList = without( - reverse( - sortBy( - response?.data?.result?.map((bot: any, index: number) => { - if ( - // bot?.logicIDs?.[0]?.transformers?.[0]?.meta?.type !== - // "broadcast" && - // includes(botIds, bot?.id) - true - ) { - if(index===0) localStorage.setItem('userID', bot?.id); - return normalizeUsers({ - ...bot, - active: index === 0, - botUuid: bot?.id, - createTime: moment(bot?.createdAt).valueOf(), - }); - } - return null; - }), - ["createTime"] - ) - ), - null - ); - - window && - window?.androidInteract?.log(JSON.stringify(botDetailsList)); - - - // @ts-ignore - setUsers(botDetailsList); - setLoading(false); - window?.androidInteract?.onBotDetailsLoaded( - JSON.stringify(botDetailsList) - ); - if (localStorage.getItem("currentUser")) { - - // @ts-ignore - setCurrentUser(JSON.parse(localStorage.getItem("currentUser"))); - - // @ts-ignore - } else setCurrentUser(botDetailsList?.[0]); - }) - .catch((err: any) => console.log("qwerty:", { err })); - } else { - setLoading(false); - if (localStorage.getItem("botDetails")) { - setUsers(JSON.parse(localStorage.getItem("botDetails") || '[]')); - setCurrentUser(JSON.parse(localStorage.getItem("botDetails") || '[]')?.[0]); - } - } - }; - checkOnline(); - } catch (err: any) { - toast.error(err?.message); - window && - window?.androidInteract?.log( - `error in fetching botList:${JSON.stringify(err)}` - ); - } - }, []); - + + const onChangeCurrentUser = useCallback((newUser: User) => { setCurrentUser({ ...newUser, active: true }); localStorage.removeItem("userMsgs"); @@ -299,7 +187,7 @@ console.log("socket: BotResponse",{msg}) const sendMessage = useCallback( (text: string, media: any, isVisibile = true): void => { - send({ text, socketSession, socket}); + send({ text, socketSession, socket }); if (isVisibile) if (media) { if (media.mimeType.slice(0, 5) === 'image') { @@ -309,7 +197,7 @@ console.log("socket: BotResponse",{msg}) } else { } } else { - + setMessages((prev: any) => { return [ ...map(prev, (prevMsg, index) => { @@ -334,10 +222,10 @@ console.log("socket: BotResponse",{msg}) }, ] }); - + } }, - [currentUser,socketSession] + [currentUser, socketSession] ); const values = useMemo( @@ -374,12 +262,18 @@ console.log("socket: BotResponse",{msg}) ] ); - + return ( //@ts-ignore <> + + {children} + >; +export type setCurrentUser = React.Dispatch>; +export type setLoading = React.Dispatch>; \ No newline at end of file diff --git a/apps/uci/web/src/types/user.d.ts b/apps/uci/web/src/types/user.d.ts index 2286b213..3b0b26ea 100644 --- a/apps/uci/web/src/types/user.d.ts +++ b/apps/uci/web/src/types/user.d.ts @@ -5,6 +5,8 @@ export type User = { id?: string; botUuid?: string; startingMessage?: string; + status?: string; + endDate: string | undefined; }; export type toChangeCurrentUser = (arg: User) => void; diff --git a/apps/uci/web/src/utils/set-local-storage.ts b/apps/uci/web/src/utils/set-local-storage.ts index 48aecd3b..b6a96198 100644 --- a/apps/uci/web/src/utils/set-local-storage.ts +++ b/apps/uci/web/src/utils/set-local-storage.ts @@ -1,10 +1,18 @@ export const setLocalStorage = (): void => { - localStorage.setItem( - 'auth',`${process.env.NEXT_PUBLIC_ACCESS_TOKEN}` - ); - localStorage.setItem('mobile', `${process.env.NEXT_PUBLIC_USER_MOBILE}`); - localStorage.setItem( - 'botList', - `${process.env.NEXT_PUBLIC_BOT_LIST}` - ); + + + // localStorage.setItem('auth', 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjRwSFNCOUYteGw5OGZLSnJ0LVEyVDV6UjQ3cyJ9.eyJhdWQiOiIzMjBiMDIwYS0zZDg0LTRkOGEtYTE5MS1kYTRlOTcyYzI5NTEiLCJleHAiOjE3MTc1MTQ2NDcsImlhdCI6MTY4NTk3ODY0NywiaXNzIjoiYWNtZS5jb20iLCJzdWIiOiIxNjNlM2RjMy1iOTYyLTQ0MzQtODMyNy00M2EwOGU0OTJkNzYiLCJqdGkiOiJhNTc4ZTkwNC0zZTU1LTRmYTgtYTI3OC1mMTYyODM2ZmQwZWMiLCJhdXRoZW50aWNhdGlvblR5cGUiOiJSRUZSRVNIX1RPS0VOIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiODc2NzQ0NzQxNiIsImFwcGxpY2F0aW9uSWQiOiIzMjBiMDIwYS0zZDg0LTRkOGEtYTE5MS1kYTRlOTcyYzI5NTEiLCJ0aWQiOiIwMTA1NjZmZC1lMWNiLWM2NTgtYjY1OS1hMWQzZTA3MGJhYTgiLCJyb2xlcyI6W10sImF1dGhfdGltZSI6MTY4NTk3MDc3Miwic2lkIjoiYTQ2ZmJhNDgtYWExOC00YWRkLTgwY2ItZGJhM2IxYTEzMTkxIiwiaHR0cHM6Ly9oYXN1cmEuaW8vand0L2NsYWltcyI6eyJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbIk9wZW5Sb2xlIiwiRElFVCIsIm1hbmF2X3NhbXBhZGEiXSwieC1oYXN1cmEtZGVmYXVsdC1yb2xlIjoiRElFVCIsIlgtSGFzdXJhLVVzZXItSWQiOiI4NzY3NDQ3NDE2In0sImFwaVJvbGVzIjpbIkRJRVQiXX0.FL_nnEdHh97tLy5y6RnfTYxwHPkfMstgeRyF1yXp_YHz5ooVwZ6Egnb4BovLFShB7RU1HHF5RanpXxpKtwlpdO8Z43C6yJ-nVOA1rzUiaduYnnE5yq9PHs8_ZDMpdMegmm0lPw4n023rSx5sf8lE6cwLPFpx3jIDytI4gHyVyGOt3Yfm8CpqcTXawR59BLnY4HXmL0rJCtvkyTGKNR0HoKmupsk3GS1FxD6deEPoR2luQaEpGqAzOSx155sf8vvRD292q1BjGE8X3SG_-bXF9qcT5P6oUq_FitxXfRuto-APkQJvbm1iqsLNVkVC_LHYkswU0wZRBVX5LPn7UFtZeA' ); + // localStorage.setItem('mobile', '8767447416'); + // localStorage.setItem( + // 'botList', + // '["7b1cadb7-694d-478f-b7d7-3e59088871c6"]' + // ); + + // localStorage.setItem('socketUrl', 'ws://142.93.217.128:3005' ); + // localStorage.setItem('chatHistoryUrl', 'http://142.93.217.128:9080/' ); + // localStorage.setItem('botDetailsUrl', 'http://142.93.217.128:9999/' ); + // localStorage.setItem('conversation-authorization', 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjRwSFNCOUYteGw5OGZLSnJ0LVEyVDV6UjQ3cyJ9.eyJhdWQiOiIzMjBiMDIwYS0zZDg0LTRkOGEtYTE5MS1kYTRlOTcyYzI5NTEiLCJleHAiOjE3MTc1MTQ2NDcsImlhdCI6MTY4NTk3ODY0NywiaXNzIjoiYWNtZS5jb20iLCJzdWIiOiIxNjNlM2RjMy1iOTYyLTQ0MzQtODMyNy00M2EwOGU0OTJkNzYiLCJqdGkiOiJhNTc4ZTkwNC0zZTU1LTRmYTgtYTI3OC1mMTYyODM2ZmQwZWMiLCJhdXRoZW50aWNhdGlvblR5cGUiOiJSRUZSRVNIX1RPS0VOIiwicHJlZmVycmVkX3VzZXJuYW1lIjoiODc2NzQ0NzQxNiIsImFwcGxpY2F0aW9uSWQiOiIzMjBiMDIwYS0zZDg0LTRkOGEtYTE5MS1kYTRlOTcyYzI5NTEiLCJ0aWQiOiIwMTA1NjZmZC1lMWNiLWM2NTgtYjY1OS1hMWQzZTA3MGJhYTgiLCJyb2xlcyI6W10sImF1dGhfdGltZSI6MTY4NTk3MDc3Miwic2lkIjoiYTQ2ZmJhNDgtYWExOC00YWRkLTgwY2ItZGJhM2IxYTEzMTkxIiwiaHR0cHM6Ly9oYXN1cmEuaW8vand0L2NsYWltcyI6eyJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbIk9wZW5Sb2xlIiwiRElFVCIsIm1hbmF2X3NhbXBhZGEiXSwieC1oYXN1cmEtZGVmYXVsdC1yb2xlIjoiRElFVCIsIlgtSGFzdXJhLVVzZXItSWQiOiI4NzY3NDQ3NDE2In0sImFwaVJvbGVzIjpbIkRJRVQiXX0.FL_nnEdHh97tLy5y6RnfTYxwHPkfMstgeRyF1yXp_YHz5ooVwZ6Egnb4BovLFShB7RU1HHF5RanpXxpKtwlpdO8Z43C6yJ-nVOA1rzUiaduYnnE5yq9PHs8ZDMpdMegmm0lPw4n023rSx5sf8lE6cwLPFpx3jIDytI4gHyVyGOt3Yfm8CpqcTXawR59BLnY4HXmL0rJCtvkyTGKNR0HoKmupsk3GS1FxD6deEPoR2luQaEpGqAzOSx155sf8vvRD292q1BjGE8X3SG-bXF9qcT5P6oUq_FitxXfRuto-APkQJvbm1iqsLNVkVC_LHYkswU0wZRBVX5LPn7UFtZeA' ); + // localStorage.setItem('admin-token', '4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7'); + // localStorage.setItem('filterList', 'false'); + }; diff --git a/apps/uci/web/tsconfig.json b/apps/uci/web/tsconfig.json index 0c7555fa..16ed2558 100644 --- a/apps/uci/web/tsconfig.json +++ b/apps/uci/web/tsconfig.json @@ -23,6 +23,6 @@ "@/*": ["./src/*"] } }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "src/components/SocketComponent.js"], "exclude": ["node_modules"] } diff --git a/yarn.lock b/yarn.lock index f481866e..07c8e11a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3722,7 +3722,7 @@ "resolved" "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz" "version" "1.0.2" -"chatui@*", "chatui@file:/Users/abhishekkumar/GitHub_Repos/Samagra/uci-web-channel/packages/chat-ui": +"chatui@*", "chatui@file:C:\\Users\\KIIT\\Desktop\\uci-web-channel\\packages\\chat-ui": "resolved" "file:packages/chat-ui" "version" "0.0.0" dependencies: @@ -8561,7 +8561,7 @@ dependencies: "makeerror" "1.0.12" -"web@file:/Users/abhishekkumar/GitHub_Repos/Samagra/uci-web-channel/apps/uci/web": +"web@file:C:\\Users\\KIIT\\Desktop\\uci-web-channel\\apps\\uci\\web": "resolved" "file:apps/uci/web" "version" "0.1.0" dependencies: