Goutam/LynkedUpPro_CRM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: integrate subcontractor, org-settings & commission features from project-refinement

Browse Source 
# Conflicts:
#	src/App.jsx
#	src/components/Layout.jsx
#	src/data/mockStore.jsx
#	src/pages/LeadsListPage.jsx
#	src/pages/owner/OwnerProjectDetail.jsx
#	src/pages/owner/OwnerSnapshot.jsx
This commit is contained in:
Satyam Rastogi
2026-05-29 01:11:03 +05:30
parent ac1811c765 490d16b80a
commit 73387366fe
13 changed files with 5564 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Layout.jsx
+5 -2
View File
@@ -5,7 +5,8 @@ import { useTheme } from '../context/ThemeContext';
import {
LayoutDashboard, Map, Calendar, LogOut, User, Home, MessageSquare,
ChevronLeft, ChevronRight, Sun, Moon, Trophy, Users, Briefcase,
FileText, Menu, X, Calculator, PlusCircle, ClipboardList, Zap, LayoutGrid, Settings, CloudLightning
FileText, Menu, X, Calculator, PlusCircle, ClipboardList, Zap, LayoutGrid, Settings, CloudLightning,
HardHat
} from 'lucide-react';
import PageTransition from './PageTransition';
@@ -150,6 +151,7 @@ const Layout = () => {
{ to: "/owner/estimates", icon: Calculator, label: "Estimates" },
{ to: "/admin/schedule", icon: Calendar, label: "Team Schedule" },
{ to: "/admin/leaderboard", icon: Trophy, label: "Leaderboard" },
{ to: "/owner/subcontractor-tasks", icon: HardHat, label: "Subcontractor Tasks" },
{ to: "/owner/settings", icon: Settings, label: "Org Settings" },
...commonItems,
];
@@ -169,7 +171,8 @@ const Layout = () => {
label: <span><span className="text-[#fda913]">Pro</span>Canvas</span>
},
{ to: "/admin/estimates", icon: Calculator, label: "Estimates" },
{ to: "/owner/settings", icon: Settings, label: "Org Settings" },
{ to: "/admin/subcontractor-tasks", icon: HardHat, label: "Subcontractor Tasks" },
{ to: "/admin/settings", icon: Settings, label: "Org Settings" },
...commonItems,
];
case 'CONTRACTOR':