Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic #126

Rishit30G · 2023-07-11T17:10:47Z

Removed redundant window.androidIntract
Made two new components ( GetBotList and SocketComponenets ) for separation of concerns and reducing LOC in main ContextProvider.tsx
Implemented logic to grey out bots that have expired
Fixes Refactored ContextProvider, Filter Bots, Removed redundant code #127

vercel · 2023-07-11T17:10:51Z

@Rishit30G is attempting to deploy a commit to the Samagra Team on Vercel.

A member of the Team first needs to authorize it.

gitguardian · 2023-07-11T17:11:22Z

⚠️ GitGuardian has uncovered 24 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request

GitGuardian id	Secret	Commit	Filename
-	Generic High Entropy Secret	`5128e13`	apps/uci/web/.env.sample	View secret
-	Generic High Entropy Secret	`5128e13`	apps/uci/web/.env.sample	View secret
-	Generic High Entropy Secret	`5128e13`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`5128e13`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`5128e13`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`5128e13`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`78b3e37`	apps/uci/web/.env.sample	View secret
-	Generic High Entropy Secret	`78b3e37`	apps/uci/web/.env.sample	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`9342ad7`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/.env.sample	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/.env.sample	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret
-	Generic High Entropy Secret	`826409e`	apps/uci/web/src/utils/set-local-storage.ts	View secret

🛠 Guidelines to remediate hardcoded secrets

Understand the implications of revoking this secret by investigating where it is used in your code.
Replace and store your secrets safely. Learn here the best practices.
Revoke and rotate these secrets.
If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider

following these best practices for managing and storing secrets including API keys and other credentials
install secret detection on pre-commit to catch secret before it leaves your machine and ease remediation.

^{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!}

geeky-abhishek · 2023-07-12T18:15:28Z

apps/uci/web/src/components/GetBotList.ts

change the file name to this format -> get-bot-list.tsx

geeky-abhishek · 2023-07-12T18:16:08Z

apps/uci/web/src/components/GetBotList.ts

+import moment from "moment";
+import { useEffect } from "react";
+import { toast } from "react-hot-toast";
+


move the types to type folder and use the following naming convention for the types file -> [component-name].d.ts

geeky-abhishek · 2023-07-12T18:18:14Z

apps/uci/web/src/components/GetBotList.ts

+interface GetBotItemProp{
+    setUsers: React.Dispatch<React.SetStateAction<any>>;
+    setCurrentUser: React.Dispatch<React.SetStateAction<any>>;
+    setLoading: React.Dispatch<React.SetStateAction<boolean>>;


Since all the types are same so you can define a separate type for this and re use it

geeky-abhishek · 2023-07-12T18:21:19Z

apps/uci/web/src/components/common/chat-item/index.tsx

@@ -16,15 +17,21 @@ interface chatItemProps {
 	isBlank?: boolean;
 }

+
 const ChatItem: React.FC<chatItemProps> = ({ active, name, phoneNumber, user, isBlank }) => {
 	const history = useRouter();
 	const context = useContext(AppContext);

 	const fontColorToggle = useColorModeValue(styles.darkFontColor, styles.lightFontColor);



use useMemo for calculated variables

geeky-abhishek · 2023-07-12T18:21:40Z

apps/uci/web/src/components/common/chat-item/index.tsx

 const ChatItem: React.FC<chatItemProps> = ({ active, name, phoneNumber, user, isBlank }) => {
 	const history = useRouter();
 	const context = useContext(AppContext);

 	const fontColorToggle = useColorModeValue(styles.darkFontColor, styles.lightFontColor);

+	const expiredItem = user?.endDate!== undefined && user.endDate < moment().format() && user?.status === 'ENABLED';
+
+
 	const onChangingCurrentUserHandler = useCallback(() => {


try to short the function name

geeky-abhishek · 2023-07-12T18:23:05Z

apps/uci/web/src/providers/ContextProvider.tsx

-  //   setLocalStorage();
-  // }, []);
+  useEffect(() => {
+    const hasLocalStorageBeenSet = localStorage.getItem('localStorageSet');


try to use some good naming conventions like isLocalStorageAvailable

* to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126

* Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * chore: base setup * refactor: added socket class (#136) * feat: added class for socket * refactor: created socket * chore: new socket class tested * feat: using deployed socket package, added suppressHydrationWarning for extensions giving warning * feat: added logger, setup store using createAsyncThunk * change: reverted few changes --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]>

* Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * chore: base setup * refactor: added socket class (#136) * feat: added class for socket * refactor: created socket * chore: new socket class tested * feat: using deployed socket package, added suppressHydrationWarning for extensions giving warning * feat: added logger, setup store using createAsyncThunk * change: reverted few changes * feat: bot's displayed from store --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]>

* Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * UI Changes * changes * changes * changes * config for all components and pages * remove local storage * styled component for starredchatitem * styled component for chatItem and global theme * dark mode UI * dark and light theme --------- Co-authored-by: Rishit Gupta <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]>

* UI Changes * changes * changes * changes * config for all components and pages * remove local storage * styled component for starredchatitem * styled component for chatItem and global theme * dark mode UI * feat: setup createAsyncThunk, added logger (#140) * Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * chore: base setup * refactor: added socket class (#136) * feat: added class for socket * refactor: created socket * chore: new socket class tested * feat: using deployed socket package, added suppressHydrationWarning for extensions giving warning * feat: added logger, setup store using createAsyncThunk * change: reverted few changes --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]> * Bot's displayed using store (#142) * Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * chore: base setup * refactor: added socket class (#136) * feat: added class for socket * refactor: created socket * chore: new socket class tested * feat: using deployed socket package, added suppressHydrationWarning for extensions giving warning * feat: added logger, setup store using createAsyncThunk * change: reverted few changes * feat: bot's displayed from store --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]> * dark and light theme * eslint and husky setup * eslint and husky setup --------- Co-authored-by: Rishit Gupta <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]>

* Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * Eslint and husky setup (#144) * UI Changes * changes * changes * changes * config for all components and pages * remove local storage * styled component for starredchatitem * styled component for chatItem and global theme * dark mode UI * feat: setup createAsyncThunk, added logger (#140) * Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * chore: base setup * refactor: added socket class (#136) * feat: added class for socket * refactor: created socket * chore: new socket class tested * feat: using deployed socket package, added suppressHydrationWarning for extensions giving warning * feat: added logger, setup store using createAsyncThunk * change: reverted few changes --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]> * Bot's displayed using store (#142) * Updated branch (#129) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic (#126) * to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126 * style: layout modified to look similar like whatsapp (#132) * Config for components * env sample * removed unnecessary config * ui changes * chore: revert ui changes * Revert "style: layout modified to look similar like whatsapp (#132)" (#134) This reverts commit fcbb545. * chore: base setup * refactor: added socket class (#136) * feat: added class for socket * refactor: created socket * chore: new socket class tested * feat: using deployed socket package, added suppressHydrationWarning for extensions giving warning * feat: added logger, setup store using createAsyncThunk * change: reverted few changes * feat: bot's displayed from store --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]> * dark and light theme * eslint and husky setup --------- Co-authored-by: Rishit Gupta <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]> * conflicts and localstorage for dark-mode * fix: old changes merged * env sample and styled-components * Refactor Home using styled-components * dockerfile * C4gt socket package (#146) * fix: socket connection fix * Update next.config.js * fix: sorted botList, Unexpected JSON error resolved, starred message now visible, updated redux, converstation working * Major UI changes * StarredChats UI fixed * Tab view UI * Fullscreen Loader * changes in bot image * Chat-message ui fix * Added unit test cases for socket and search functionality * Refactoring Message Itema and fullscreen Loader with styled-components * Configuration changes * fix: currentUser now fetched from redux * textInput config * Voice-to-text * VoiceIcon animation,no response text and ui fixes * Added lerna for watch mode,impelmented config for urls * Added lerna for watch mode,impelmented config for urls * ThemeProvider and Styledcompoents Reafactoring * Update README.md * fix: useSelcetor optimized, hardcoded auth fixed, LogIn and OTP partially functional --------- Co-authored-by: Tushar Banik <[email protected]> Co-authored-by: Saiyan Abhishek <[email protected]> Co-authored-by: Tushar98644 <[email protected]>

to be edited

5128e13

Rishit30G added 2 commits July 12, 2023 19:37

Update .env.sample

78b3e37

Update set-local-storage.ts

9342ad7

geeky-abhishek reviewed Jul 12, 2023

View reviewed changes

Rishit30G added 2 commits July 13, 2023 16:18

fix: enhancement done for #126

1261cc8

Merge branch 'master' of https://github.com/Rishit30G/uci-web-channel

826409e

geeky-abhishek pushed a commit that referenced this pull request Jul 16, 2023

Updated branch (#129)

6e7a0a2

* to be edited * Update .env.sample * Update set-local-storage.ts * fix: enhancement done for #126

geeky-abhishek changed the base branch from master to c4gt-development July 19, 2023 07:51

geeky-abhishek merged commit eda9955 into samagra-comms:c4gt-development Jul 19, 2023

Rishit30G mentioned this pull request Aug 11, 2023

feat: setup createAsyncThunk, added logger (#140) #141

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic #126

Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic #126

Rishit30G commented Jul 11, 2023 •

edited

Loading

vercel bot commented Jul 11, 2023

gitguardian bot commented Jul 11, 2023 •

edited

Loading

geeky-abhishek Jul 12, 2023

geeky-abhishek Jul 12, 2023

geeky-abhishek Jul 12, 2023

geeky-abhishek Jul 12, 2023

geeky-abhishek Jul 12, 2023

geeky-abhishek Jul 12, 2023

Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic #126

Refactored Code: Removed redundant window.androidIntract, added GetBotList and SocketComponents, implemented expired bot logic #126

Conversation

Rishit30G commented Jul 11, 2023 • edited Loading

vercel bot commented Jul 11, 2023

gitguardian bot commented Jul 11, 2023 • edited Loading

⚠️ GitGuardian has uncovered 24 secrets following the scan of your pull request.

geeky-abhishek Jul 12, 2023

Choose a reason for hiding this comment

geeky-abhishek Jul 12, 2023

Choose a reason for hiding this comment

geeky-abhishek Jul 12, 2023

Choose a reason for hiding this comment

geeky-abhishek Jul 12, 2023

Choose a reason for hiding this comment

geeky-abhishek Jul 12, 2023

Choose a reason for hiding this comment

geeky-abhishek Jul 12, 2023

Choose a reason for hiding this comment

Rishit30G commented Jul 11, 2023 •

edited

Loading

gitguardian bot commented Jul 11, 2023 •

edited

Loading