Skip to content

fix : unlinked ticket panel and add priority + filtering to ticketing s… #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ashishpatra0-0 wants to merge 4 commits into from
Closed

fix : unlinked ticket panel and add priority + filtering to ticketing s… #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
271c167
Fix unlinked ticket panel and add priority + filtering to ticketing s…
Ashishpatra0-0 Aug 1, 2026
197adee
Merge branch 'main' into feat/ticketing-system-priority-and-filters
Ashishpatra0-0 Aug 1, 2026
f6161ce
Remove committed file containing database credentials
Ashishpatra0-0 Aug 2, 2026
b17d6d1
Merge branch 'main' into feat/ticketing-system-priority-and-filters
Ashishpatra0-0 Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/src/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ export interface Ticket {
userName: string;
userRole: UserRole;
type: 'general' | 'curriculum';
priority: 'Low' | 'Medium' | 'High' | 'Urgent';
subject: string;
description: string;
status: 'Open' | 'Reviewed' | 'Resolved';
Expand Down
3 changes: 2 additions & 1 deletion backend/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ registerStatsRoutes(app);
const user = getAuthUser(req);
if (!user) return res.status(401).json({ error: 'Unauthorized' });

const { type, subject, description } = req.body;
const { type, subject, description, priority } = req.body;
if (type === 'curriculum' && user.role !== UserRole.TEACHER && user.role !== UserRole.VOLUNTEER) {
return res.status(400).json({ error: 'Curriculum feedback can only be submitted by Teachers or Volunteers.' });
}
Expand All @@ -158,6 +158,7 @@ registerStatsRoutes(app);
userName: user.name,
userRole: user.role,
type: type || 'general',
priority: priority || 'Medium',
subject,
description,
status: 'Open',
Expand Down
9 changes: 4 additions & 5 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,10 @@ return <SuperadminDashboard user={currentUser} token={token!} />;
announcements.map(notif => (
<div
key={notif.id}
className={`space-y-2 rounded-xl border p-4 ${
notif.isUrgent
? 'border-amber-200 bg-amber-50/30 dark:border-amber-800 dark:bg-amber-950/30'
: 'border-slate-150 bg-slate-50/50 dark:border-slate-700 dark:bg-slate-800/50'
}`}
className={`space-y-2 rounded-xl border p-4 ${notif.isUrgent
? 'border-amber-200 bg-amber-50/30 dark:border-amber-800 dark:bg-amber-950/30'
: 'border-slate-150 bg-slate-50/50 dark:border-slate-700 dark:bg-slate-800/50'
}`}
>
<div className="flex items-center justify-between">
<h4 className="text-sm font-bold text-slate-900 dark:text-white">{notif.title}</h4>
Expand Down
162 changes: 79 additions & 83 deletions frontend/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ export const Layout: React.FC<LayoutProps> = ({
break;
}

list.push({ name: 'Feedback', view: 'tickets', icon: HelpCircle });
list.push({ name: 'Notifications', view: 'notifications', icon: Bell, badge: notifications.length > 0 ? String(notifications.length) : undefined });
list.push({ name: 'Settings', view: 'settings', icon: Settings });

Expand Down Expand Up @@ -451,11 +452,10 @@ export const Layout: React.FC<LayoutProps> = ({

{/* Sidebar Left panel */}
<aside
className={`hidden md:flex flex-col bg-white transition-all duration-300 ease-in-out shrink-0 dark:bg-slate-900 ${
sidebarCollapsed
className={`hidden md:flex flex-col bg-white transition-all duration-300 ease-in-out shrink-0 dark:bg-slate-900 ${sidebarCollapsed
? 'w-0 opacity-0 overflow-hidden border-r-0 pointer-events-none'
: 'w-[280px] opacity-100 border-r border-slate-200 dark:border-r dark:border-slate-700'
}`}
}`}
aria-hidden={sidebarCollapsed}
>
<div className="w-[280px] flex flex-col h-full flex-1">
Expand All @@ -481,89 +481,87 @@ export const Layout: React.FC<LayoutProps> = ({
</button>
</div>

{/* Navigation Items menu */}
<nav className="flex-1 p-3 space-y-1.5 overflow-y-auto">
{/* Pinned shortcuts header */}
{!collapsed && pinnedItems.length > 0 && (
<div className="px-3 py-1 text-[10px] font-mono font-bold text-slate-400 uppercase tracking-widest block mb-1 dark:text-slate-500">
📌 Pinned Views
</div>
)}
{/* Navigation Items menu */}
<nav className="flex-1 p-3 space-y-1.5 overflow-y-auto">
{/* Pinned shortcuts header */}
{!collapsed && pinnedItems.length > 0 && (
<div className="px-3 py-1 text-[10px] font-mono font-bold text-slate-400 uppercase tracking-widest block mb-1 dark:text-slate-500">
📌 Pinned Views
</div>
)}

{filteredNavItems.map(item => {
const hasSub = !!item.subItems;
const isExpanded = !!expandedMenus[item.name];
const isSelected = activeView === item.view || item.subItems?.some(s => s.view === activeView);

return (
<div key={item.name} className="space-y-1">
<div className="flex items-center justify-between group">
<button
onClick={() => hasSub ? toggleSubMenu(item.name) : onSelectView(item.view)}
className={`flex flex-1 items-center gap-3 rounded-lg px-3 py-2.5 text-xs font-bold transition duration-150 border ${
isSelected
? 'bg-indigo-700 text-white border-indigo-300 shadow-sm dark:bg-indigo-900 dark:text-indigo-200 dark:border-indigo-800'
: 'text-slate-650 hover:bg-slate-100 border-transparent hover:text-slate-900 dark:text-slate-400 dark:hover:bg-slate-800 dark:hover:text-slate-100 dark:border-transparent'
}`}
>
<item.icon className={`h-4 w-4 ${isSelected ? 'text-indigo-200 dark:text-indigo-400' : 'text-slate-400 dark:text-slate-500'}`} />
{!collapsed && <span>{item.name}</span>}
{!collapsed && item.badge && (
<span className="ml-auto bg-rose-500 text-white font-mono text-[9px] px-1.5 py-0.5 rounded-full">
{item.badge}
</span>
)}
{!collapsed && hasSub && (
<ChevronDown className={`ml-auto h-3 w-3 transition ${isExpanded ? 'rotate-180' : ''}`} />
)}
</button>
{filteredNavItems.map(item => {
const hasSub = !!item.subItems;
const isExpanded = !!expandedMenus[item.name];
const isSelected = activeView === item.view || item.subItems?.some(s => s.view === activeView);

{/* Pin button */}
{!collapsed && (
return (
<div key={item.name} className="space-y-1">
<div className="flex items-center justify-between group">
<button
onClick={() => handlePinToggle(item.name)}
className={`opacity-0 group-hover:opacity-100 p-1 mr-1 text-slate-400 hover:text-indigo-600 transition dark:text-slate-500 dark:hover:text-indigo-400`}
onClick={() => hasSub ? toggleSubMenu(item.name) : onSelectView(item.view)}
className={`flex flex-1 items-center gap-3 rounded-lg px-3 py-2.5 text-xs font-bold transition duration-150 border ${isSelected
? 'bg-indigo-700 text-white border-indigo-300 shadow-sm dark:bg-indigo-900 dark:text-indigo-200 dark:border-indigo-800'
: 'text-slate-650 hover:bg-slate-100 border-transparent hover:text-slate-900 dark:text-slate-400 dark:hover:bg-slate-800 dark:hover:text-slate-100 dark:border-transparent'
}`}
>
★
<item.icon className={`h-4 w-4 ${isSelected ? 'text-indigo-200 dark:text-indigo-400' : 'text-slate-400 dark:text-slate-500'}`} />
{!collapsed && <span>{item.name}</span>}
{!collapsed && item.badge && (
<span className="ml-auto bg-rose-500 text-white font-mono text-[9px] px-1.5 py-0.5 rounded-full">
{item.badge}
</span>
)}
{!collapsed && hasSub && (
<ChevronDown className={`ml-auto h-3 w-3 transition ${isExpanded ? 'rotate-180' : ''}`} />
)}
</button>
)}
</div>

{/* Nested Sub Menu */}
{!collapsed && hasSub && isExpanded && (
<div className="pl-6 space-y-1 border-l border-slate-150 ml-5 py-1 dark:border-slate-700">
{item.subItems?.map(sub => {
const isSubSelected = activeView === sub.view;
return (
<button
key={sub.name}
onClick={() => onSelectView(sub.view)}
className={`flex w-full items-center gap-2 px-3 py-2 text-[11px] font-semibold rounded-md transition ${
isSubSelected
? 'text-indigo-700 bg-indigo-50/50 dark:text-indigo-400 dark:bg-indigo-950/40'
: 'text-slate-500 hover:text-slate-900 hover:bg-slate-50 dark:text-slate-400 dark:hover:text-slate-100 dark:hover:bg-slate-800'
}`}
>
<span className="w-1.5 h-1.5 rounded-full bg-slate-300 dark:bg-slate-600" />
<span>{sub.name}</span>
</button>
);
})}
{/* Pin button */}
{!collapsed && (
<button
onClick={() => handlePinToggle(item.name)}
className={`opacity-0 group-hover:opacity-100 p-1 mr-1 text-slate-400 hover:text-indigo-600 transition dark:text-slate-500 dark:hover:text-indigo-400`}
>
★
</button>
)}
</div>
)}
</div>
);
})}
</nav>

{/* Support Branding Footer */}
<div className="border-t border-slate-200 p-4 dark:border-slate-700">
<div className={`flex items-center gap-2 px-2 text-[10px] font-semibold text-slate-450 ${collapsed ? 'justify-center' : ''} dark:text-slate-500`}>
<HelpCircle className="h-4 w-4 text-slate-400 shrink-0 dark:text-slate-500" />
{!collapsed && <span>IIT Ropar VLED Labs</span>}

{/* Nested Sub Menu */}
{!collapsed && hasSub && isExpanded && (
<div className="pl-6 space-y-1 border-l border-slate-150 ml-5 py-1 dark:border-slate-700">
{item.subItems?.map(sub => {
const isSubSelected = activeView === sub.view;
return (
<button
key={sub.name}
onClick={() => onSelectView(sub.view)}
className={`flex w-full items-center gap-2 px-3 py-2 text-[11px] font-semibold rounded-md transition ${isSubSelected
? 'text-indigo-700 bg-indigo-50/50 dark:text-indigo-400 dark:bg-indigo-950/40'
: 'text-slate-500 hover:text-slate-900 hover:bg-slate-50 dark:text-slate-400 dark:hover:text-slate-100 dark:hover:bg-slate-800'
}`}
>
<span className="w-1.5 h-1.5 rounded-full bg-slate-300 dark:bg-slate-600" />
<span>{sub.name}</span>
</button>
);
})}
</div>
)}
</div>
);
})}
</nav>

{/* Support Branding Footer */}
<div className="border-t border-slate-200 p-4 dark:border-slate-700">
<div className={`flex items-center gap-2 px-2 text-[10px] font-semibold text-slate-450 ${collapsed ? 'justify-center' : ''} dark:text-slate-500`}>
<HelpCircle className="h-4 w-4 text-slate-400 shrink-0 dark:text-slate-500" />
{!collapsed && <span>IIT Ropar VLED Labs</span>}
</div>
</div>
</div>
</div>
</aside>

{/* Mobile Navigation Drawer */}
Expand Down Expand Up @@ -593,11 +591,10 @@ export const Layout: React.FC<LayoutProps> = ({
setMobileOpen(false);
}
}}
className={`flex w-full items-center gap-3 rounded-lg px-3 py-2.5 text-xs font-bold border transition ${
isSelected
className={`flex w-full items-center gap-3 rounded-lg px-3 py-2.5 text-xs font-bold border transition ${isSelected
? 'bg-primary-navy text-white border-accent-gold/30 shadow-sm dark:bg-indigo-900 dark:text-indigo-200 dark:border-indigo-800'
: 'text-slate-650 hover:bg-slate-100 border-transparent dark:text-slate-400 dark:hover:bg-slate-800 dark:border-transparent'
}`}
}`}
>
<item.icon className="h-4 w-4 dark:text-slate-500" />
<span>{item.name}</span>
Expand All @@ -613,9 +610,8 @@ export const Layout: React.FC<LayoutProps> = ({
onSelectView(sub.view);
setMobileOpen(false);
}}
className={`flex w-full items-center gap-2 px-3 py-1.5 text-xs font-medium rounded-md transition ${
activeView === sub.view ? 'text-indigo-600 bg-indigo-50 dark:text-indigo-400 dark:bg-indigo-950/40' : 'text-slate-500 dark:text-slate-400'
}`}
className={`flex w-full items-center gap-2 px-3 py-1.5 text-xs font-medium rounded-md transition ${activeView === sub.view ? 'text-indigo-600 bg-indigo-50 dark:text-indigo-400 dark:bg-indigo-950/40' : 'text-slate-500 dark:text-slate-400'
}`}
>
<span>{sub.name}</span>
</button>
Expand Down
Loading