Refactor dashboard structure by removing unused dashboard components (Academy, Analytics, CRM, ECommerce, Farm, Logistics) and updating the main dashboard to use FarmDashboardWrapper. Adjusted navigation links to point to the main dashboard.

src/app/(dashboard)/(private)/dashboard/page.tsx

@@ -1,9 +1,8 @@
-// Component Imports
+// Components Imports
-import AcademyDashboard from '../apps/academy/dashboard/page'
+import FarmDashboardWrapper from '@views/dashboards/farm/FarmDashboardWrapper'
 
 const Dashboard = async () => {
-  return <AcademyDashboard />
+  return <FarmDashboardWrapper />
 }
 
 export default Dashboard
-

src/app/(dashboard)/(private)/dashboards/academy/page.tsx

@@ -1,8 +0,0 @@
-// Component Imports
-import AcademyDashboard from '../../apps/academy/dashboard/page'
-
-const DashboardAcademy = async () => {
-  return <AcademyDashboard />
-}
-
-export default DashboardAcademy

src/app/(dashboard)/(private)/dashboards/analytics/page.tsx

@@ -1,58 +0,0 @@
-// MUI Imports
-import Grid from '@mui/material/Grid2'
-
-// Components Imports
-import WebsiteAnalyticsSlider from '@views/dashboards/analytics/WebsiteAnalyticsSlider'
-import LineAreaDailySalesChart from '@views/dashboards/analytics/LineAreaDailySalesChart'
-import SalesOverview from '@views/dashboards/analytics/SalesOverview'
-import EarningReports from '@views/dashboards/analytics/EarningReports'
-import SupportTracker from '@views/dashboards/analytics/SupportTracker'
-import SalesByCountries from '@views/dashboards/analytics/SalesByCountries'
-import TotalEarning from '@views/dashboards/analytics/TotalEarning'
-import MonthlyCampaignState from '@views/dashboards/analytics/MonthlyCampaignState'
-import SourceVisits from '@views/dashboards/analytics/SourceVisits'
-import ProjectsTable from '@views/dashboards/analytics/ProjectsTable'
-
-// TODO: Connect to backend API when analytics service is available
-
-const DashboardAnalytics = async () => {
-  // TODO: Fetch data from backend API when analytics service is available
-  const data = undefined
-
-  return (
-    <Grid container spacing={6}>
-      <Grid size={{ xs: 12, lg: 6 }}>
-        <WebsiteAnalyticsSlider />
-      </Grid>
-      <Grid size={{ xs: 12, sm: 6, lg: 3 }}>
-        <LineAreaDailySalesChart />
-      </Grid>
-      <Grid size={{ xs: 12, sm: 6, lg: 3 }}>
-        <SalesOverview />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6 }}>
-        <EarningReports />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6 }}>
-        <SupportTracker />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <SalesByCountries />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <TotalEarning />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <MonthlyCampaignState />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <SourceVisits />
-      </Grid>
-      <Grid size={{ xs: 12, lg: 8 }}>
-        <ProjectsTable projectTable={undefined} />
-      </Grid>
-    </Grid>
-  )
-}
-
-export default DashboardAnalytics

src/app/(dashboard)/(private)/dashboards/crm/page.tsx

@@ -1,88 +0,0 @@
-// MUI Imports
-import Grid from '@mui/material/Grid2'
-
-// Component Imports
-import DistributedBarChartOrder from '@views/dashboards/crm/DistributedBarChartOrder'
-import LineAreaYearlySalesChart from '@views/dashboards/crm/LineAreaYearlySalesChart'
-import CardStatVertical from '@/components/card-statistics/Vertical'
-import BarChartRevenueGrowth from '@views/dashboards/crm/BarChartRevenueGrowth'
-import EarningReportsWithTabs from '@views/dashboards/crm/EarningReportsWithTabs'
-import RadarSalesChart from '@views/dashboards/crm/RadarSalesChart'
-import SalesByCountries from '@views/dashboards/crm/SalesByCountries'
-import ProjectStatus from '@views/dashboards/crm/ProjectStatus'
-import ActiveProjects from '@views/dashboards/crm/ActiveProjects'
-import LastTransaction from '@views/dashboards/crm/LastTransaction'
-import ActivityTimeline from '@views/dashboards/crm/ActivityTimeline'
-
-// Server Action Imports
-import { getServerMode } from '@core/utils/serverHelpers'
-
-const DashboardCRM = async () => {
-  // Vars
-  const serverMode = await getServerMode()
-
-  return (
-    <Grid container spacing={6}>
-      <Grid size={{ xs: 12, sm: 6, md: 4, lg: 2 }}>
-        <DistributedBarChartOrder />
-      </Grid>
-      <Grid size={{ xs: 12, sm: 6, md: 4, lg: 2 }}>
-        <LineAreaYearlySalesChart />
-      </Grid>
-      <Grid size={{ xs: 12, sm: 6, md: 4, lg: 2 }}>
-        <CardStatVertical
-          title='Total Profit'
-          subtitle='Last Week'
-          stats='1.28k'
-          avatarColor='error'
-          avatarIcon='tabler-credit-card'
-          avatarSkin='light'
-          avatarSize={44}
-          chipText='-12.2%'
-          chipColor='error'
-          chipVariant='tonal'
-        />
-      </Grid>
-      <Grid size={{ xs: 12, sm: 6, md: 4, lg: 2 }}>
-        <CardStatVertical
-          title='Total Sales'
-          subtitle='Last Week'
-          stats='24.67k'
-          avatarColor='success'
-          avatarIcon='tabler-currency-dollar'
-          avatarSkin='light'
-          avatarSize={44}
-          chipText='+24.67%'
-          chipColor='success'
-          chipVariant='tonal'
-        />
-      </Grid>
-      <Grid size={{ xs: 12, md: 8, lg: 4 }}>
-        <BarChartRevenueGrowth />
-      </Grid>
-      <Grid size={{ xs: 12, lg: 8 }}>
-        <EarningReportsWithTabs />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <RadarSalesChart />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <SalesByCountries />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <ProjectStatus />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6, lg: 4 }}>
-        <ActiveProjects />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6 }}>
-        <LastTransaction serverMode={serverMode} />
-      </Grid>
-      <Grid size={{ xs: 12, md: 6 }}>
-        <ActivityTimeline />
-      </Grid>
-    </Grid>
-  )
-}
-
-export default DashboardCRM

src/app/(dashboard)/(private)/dashboards/ecommerce/page.tsx

@@ -1,7 +0,0 @@
-import EcommerceDashboard from '../../apps/ecommerce/dashboard/page'
-
-const DashboardECommerce = () => {
-  return <EcommerceDashboard />
-}
-
-export default DashboardECommerce

src/app/(dashboard)/(private)/dashboards/farm/page.tsx

@@ -1,8 +0,0 @@
-// Components Imports
-import FarmDashboardWrapper from '@views/dashboards/farm/FarmDashboardWrapper'
-
-const DashboardFarm = async () => {
-  return <FarmDashboardWrapper />
-}
-
-export default DashboardFarm

src/app/(dashboard)/(private)/dashboards/logistics/page.tsx

@@ -1,7 +0,0 @@
-import LogisticsDashboard from '../../apps/logistics/dashboard/page'
-
-const DashboardLogistics = () => {
-  return <LogisticsDashboard />
-}
-
-export default DashboardLogistics

src/components/layout/vertical/NavbarContent.tsx

@@ -119,10 +119,12 @@ const NavbarContent = () => {
       <div className='flex items-center gap-4'>
         <NavToggle />
         <NavSearch />
-        {slotContent}
       </div>
       <div className='flex items-center'>
+      {slotContent}
+
         <ModeDropdown/>
+
         <ThemeColorDropdown />
         {/* <NotificationsDropdown notifications={notifications} /> */}
         <UserDropdown />

src/components/layout/vertical/VerticalMenu.tsx

@@ -91,7 +91,7 @@ const VerticalMenu = ({ scrollMenu }: Props) => {
         menuSectionStyles={menuSectionStyles(verticalNavOptions, theme)}
       >
         <MenuItem
-          href={`/dashboards/academy`}
+          href={`/dashboard`}
           icon={<i className="tabler-smart-home" />}
         >
           {navigationLabels.dashboards}

src/views/dashboards/farm/FarmDashboardSettingsDropdown.tsx

@@ -60,10 +60,9 @@ const FarmDashboardSettingsDropdown = (props: FarmDashboardSettingsDropdownProps
           ref={anchorRef}
           onClick={handleToggle}
           aria-label='Dashboard settings'
-          size='small'
+          className='text-textPrimary'
-          color='default'
         >
-          <i className='tabler-settings text-xl' />
+          <i className='tabler-settings' />
         </IconButton>
       </Box>
       <Popper