move themeswitcher to sidebar

maheshj01 · Oct 7, 2024 · c963834 · c963834
1 parent fbff425
commit c963834
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/public/sw.js.map b/public/sw.js.map
diff --git a/src/app/(main)/_components/PSNavbar.tsx b/src/app/(main)/_components/PSNavbar.tsx
@@ -3,7 +3,7 @@ import {
     NavbarContent
 } from "@nextui-org/navbar";
 import Image from 'next/image';
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
 import { FiSidebar } from 'react-icons/fi';
 import { useSidebar } from "../_hooks/useSidebar";
 import IconButton from './IconButton';
@@ -18,7 +18,8 @@ interface PSNavbarProps {
 const PSNavbar: React.FC<PSNavbarProps> = ({ sideBarIcon }) => {
     const router = useRouter();
     const { showSideBar, setShowSideBar, setId, setSelected } = useSidebar();
-
+    const pathName = usePathname();
+    const isPublishRoute = pathName.includes('/logs/publish');
     return (
         <Navbar
             position='sticky'
@@ -60,7 +61,7 @@ const PSNavbar: React.FC<PSNavbarProps> = ({ sideBarIcon }) => {
                 </div>
             </NavbarContent>
             <NavbarContent justify="end">
-                <ThemeSwitcher />
+                {isPublishRoute && <ThemeSwitcher />}
             </NavbarContent>
         </Navbar>
     )

diff --git a/src/app/(main)/_components/Sidebar.tsx b/src/app/(main)/_components/Sidebar.tsx
@@ -11,6 +11,7 @@ import IconButton from "./IconButton";
 import LoginMenu from './LoginMenu';
 import ShortCutsGuide from './ShortcutsGuide';
 import SidebarItem from './SideBarItem';
+import { ThemeSwitcher } from './ThemeSwitcher';
 
 const Sidebar: React.FC = () => {
     const { id, setSelected, setId, showSideBar, user, setUser, setShowSideBar } = useSidebar();
@@ -143,7 +144,10 @@ const Sidebar: React.FC = () => {
                     )}
                 {/* <SettingsDialog /> */}
                 <div className='flex items-center justify-between bg-surface dark:bg-gray-700 border-t border-gray-300 dark:border-gray-600 px-2 py-2'>
-                    <ShortCutsGuide />
+                    <div className="flex items-center space-x-2">
+                        <ShortCutsGuide />
+                        <ThemeSwitcher />
+                    </div>
                     <LoginMenu onLogOut={handleLogout} onLogin={handleLogin} loading={loading} onSettings={() => {
                         router.push('/settings');
                     }} />

diff --git a/src/app/(main)/_components/ThemeSwitcher.tsx b/src/app/(main)/_components/ThemeSwitcher.tsx
@@ -33,7 +33,7 @@ export function ThemeSwitcher() {
                     setTheme(theme == Theme.DARK ? 'light' : 'dark');
                     Analytics.logThemeChange(theme === 'dark' ? 'light' : 'dark');
                 }}>
-                {theme === 'dark' ? <SunIcon className='text-black size-12 dark:text-white' /> : <MoonIcon className='size-12 text-black dark:text-white' />}
+                {theme === 'dark' ? <SunIcon className='text-black size-7 dark:text-white' /> : <MoonIcon className='size-7 text-black dark:text-white' />}
             </IconButton>
         </div>
     )