diff --git a/components/dashboards/SiteCard.tsx b/components/dashboards/SiteCard.tsx index 6bc894b..ff47cca 100644 --- a/components/dashboards/SiteCard.tsx +++ b/components/dashboards/SiteCard.tsx @@ -88,17 +88,17 @@ const SiteCard: React.FC = ({ siteId, className = '', fallbackSta 'N/A'; return ( -
+

{project?.project_name || siteId}

{loading ? (
-
-
-
-
+
+
+
+
) : err ? (
Failed to load CRM: {err}
diff --git a/components/dropdown.tsx b/components/dropdown.tsx index 9f141d5..7fef922 100644 --- a/components/dropdown.tsx +++ b/components/dropdown.tsx @@ -38,7 +38,7 @@ const Dropdown = (props: DropdownProps, forwardedRef: any) => { useImperativeHandle(forwardedRef, () => ({ close: () => setVisible(false) })); const defaultButton = ( - + ); return ( @@ -59,7 +59,7 @@ const Dropdown = (props: DropdownProps, forwardedRef: any) => { className="z-50" > {visible && ( -
+
{props.children}
)} diff --git a/components/layouts/header.tsx b/components/layouts/header.tsx index 2183ff1..19402f0 100644 --- a/components/layouts/header.tsx +++ b/components/layouts/header.tsx @@ -4,6 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import Link from 'next/link'; import { IRootState } from '@/store'; import { toggleTheme, toggleSidebar, toggleRTL } from '@/store/themeConfigSlice'; +import Image from 'next/image'; import Dropdown from '@/components/dropdown'; import IconMenu from '@/components/icon/icon-menu'; import IconSun from '@/components/icon/icon-sun'; @@ -82,20 +83,26 @@ useEffect(() => {
{/* Logo */}
- - logo - - Rooftop Energy - - +
+ logo +
+ -
+
+ {/* Right-side actions */}
@@ -121,17 +128,17 @@ useEffect(() => { {loadingUser ? (
) : user ? ( - - -
- } - > -
    {/* make sure this stays transparent */} + + +
+ } + > +
    {/* make sure this stays transparent */}
  • {user.email}

    @@ -142,11 +149,6 @@ useEffect(() => { Profile
  • -
  • - - Inbox - -
  • Lock Screen diff --git a/components/layouts/sidebar.tsx b/components/layouts/sidebar.tsx index 162092d..b3f6326 100644 --- a/components/layouts/sidebar.tsx +++ b/components/layouts/sidebar.tsx @@ -67,16 +67,15 @@ const Sidebar = () => {
  • + {/*}

    Providers @@ -239,7 +239,7 @@ const Sidebar = () => {

- + */} diff --git a/public/assets/images/newfulllogo.png b/public/assets/images/newfulllogo.png index 3ed9428..708c5e7 100644 Binary files a/public/assets/images/newfulllogo.png and b/public/assets/images/newfulllogo.png differ