merge changes

client/entrypoints/popup/components/ImageRecognition/ImageRecognition.tsx

@@ -1,18 +1,18 @@
-// import React from 'react';
-// import Header from '../shared/Header';
-// import ModuleNames from '../../constants/Modules';
-// import Footer from '../shared/Footer';
+import React from 'react';
+import Header from '../shared/Header';
+import ModuleNames from '../../constants/Modules';
+import Footer from '../shared/Footer';
 
-// const ImageRecognition: React.FC = () => {
-//   return (
-//     <>
-//       <div>
-//         <Header heading={ModuleNames.IMAGE_RECOGNITION}/>
-//         {/* Add content for Image Recognition screen */}
-//       </div>
-//       <Footer/>
-//     </>
-//   );
-// };
+const ImageRecognition: React.FC = () => {
+  return (
+    <>
+      <div>
+        <Header heading={ModuleNames.IMAGE_RECOGNITION}/>
+        {/* Add content for Image Recognition screen */}
+      </div>
+      <Footer/>
+    </>
+  );
+};
 
-// export default ImageRecognition;
+export default ImageRecognition;

client/entrypoints/sidepanel/components/MainMenu/MainMenu.tsx

@@ -6,15 +6,13 @@ import summaryIcon from '@/assets/icons/summary-icon.png';
 import navigationIcon from '@/assets/icons/navigation-icon.svg';
 import imageRecIcon from '@/assets/icons/image-rec-icon.svg';
 import feedbackIcon from '@/assets/icons/feedback-icon.svg';
-import FeedBackPopover from '../FeedBack/FeedBackPopover';
 import { Link } from 'react-router-dom';
 import useStore from '../../context/store';
-import {Popover,PopoverHandler,PopoverContent,Button,Input,Typography,} from "@material-tailwind/react";
 
 const MainMenu: React.FC = () => {
 
   const [hover, setHover] = useState('');
-  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
   const {userSettings} = useStore();
   const handlePopoverClick = () => {
     setIsPopoverOpen(!isPopoverOpen); 
@@ -27,9 +25,14 @@ const MainMenu: React.FC = () => {
   };
 
   useEffect(() => {
-    setMode(userSettings?.theme || '');
-  }, [userSettings]);
-
+      if(userSettings && userSettings.theme == 'dark') {
+        setMode('bg-darkBg text-white');
+        setHover('hover:bg-darkTileHover')
+      }else{
+        setHover('hover:bg-slate-200');
+      }
+  }, [userSettings])
+
   return (
     <div className={`${mode} dark:bg-darkBg dark:text-white grid p-4 max-w-screen-md mx-auto text-xl font-kanit h-full overflow-y-hidden`}>
 

client/entrypoints/sidepanel/constants/Modules.ts

@@ -2,8 +2,7 @@ const ModuleNames = {
     NAVIGATION: 'Navigation',
     SUMMARIZATION: 'Summarization',
     IMAGE_RECOGNITION: 'Image Recognition',
-    MY_ACCOUNT: 'My Account',
-    FEED_BACK:"Feedback"
+    MY_ACCOUNT: 'My Account'
 }
 
 export default ModuleNames;