Skip to content

Merge Frontend modifications new into branch main-1 #5

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

Open
MalshaPG wants to merge 6 commits into
base: main-1
Choose a base branch
from
Open

Merge Frontend modifications new into branch main-1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28b9fe5
Make Users page responsive and mobile-friendly
MalshaPG Feb 16, 2026
b15bb05
Improve responsiveness of users & activity pages
MalshaPG Feb 16, 2026
7e33386
Refactor hospital page layout and dialog markup
MalshaPG Feb 16, 2026
8219020
Make Doctors page header responsive
MalshaPG Feb 16, 2026
01f09b4
Make doctor-hospitals header responsive
MalshaPG Feb 16, 2026
dd1533b
Improve dashboard responsive headers
MalshaPG Feb 16, 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
66 changes: 34 additions & 32 deletions frontend/app/dashboard/agents/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,38 +175,40 @@ export default function AgentsPage() {
return (
<ProtectedLayout>
<div className="space-y-6">
<div className="flex justify-between items-center">
<div>
<h1 className="text-3xl font-bold text-gray-900">Agent Management</h1>
<div className="flex flex-col md:flex-row justify-between items-start md:items-center">
<div className="text-left">
<h1 className="text-2xl md:text-3xl font-bold text-gray-900">Agent Management</h1>
<p className="text-gray-600 mt-1">Manage all agents and partnerships</p>
</div>
<Dialog
open={isAddDialogOpen}
onOpenChange={(open) => {
setIsAddDialogOpen(open)
if (open) resetForm()
}}
>
<DialogTrigger asChild>
<Button className="bg-blue-600 hover:bg-blue-700">
<UserPlus className="w-4 h-4 mr-2" />
Add New Agent
</Button>
</DialogTrigger>
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Add New Agent</DialogTitle>
<DialogDescription>Enter agent details</DialogDescription>
</DialogHeader>
<AgentForm formData={formData} setFormData={setFormData} />
<DialogFooter>
<Button variant="outline" onClick={() => setIsAddDialogOpen(false)}>Cancel</Button>
<Button onClick={handleAddAgent} className="bg-blue-600">
Add Agent
<div className="mt-4 md:mt-0 text-left">
<Dialog
open={isAddDialogOpen}
onOpenChange={(open) => {
setIsAddDialogOpen(open)
if (open) resetForm()
}}
>
<DialogTrigger asChild>
<Button className="bg-blue-600 hover:bg-blue-700">
<UserPlus className="w-4 h-4 mr-2" />
Add New Agent
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</DialogTrigger>
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Add New Agent</DialogTitle>
<DialogDescription>Enter agent details</DialogDescription>
</DialogHeader>
<AgentForm formData={formData} setFormData={setFormData} />
<DialogFooter>
<Button variant="outline" onClick={() => setIsAddDialogOpen(false)}>Cancel</Button>
<Button onClick={handleAddAgent} className="bg-blue-600">
Add Agent
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</div>

<div className="grid grid-cols-1 md:grid-cols-5 gap-4">
Expand Down Expand Up @@ -254,12 +256,12 @@ export default function AgentsPage() {

<Card>
<CardHeader>
<div className="flex justify-between items-center">
<div>
<div className="flex flex-col md:flex-row justify-between items-start md:items-center">
<div className="text-left">
<CardTitle>All Agents</CardTitle>
<CardDescription>Active agents and booking statistics</CardDescription>
</div>
<div className="relative w-64">
<div className="relative w-full md:w-64 mt-4 md:mt-0 text-left">
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4" />
<Input
placeholder="Search agents..."
Expand Down
6 changes: 3 additions & 3 deletions frontend/app/dashboard/commissions/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ export default function CommissionsPage() {
return (
<ProtectedLayout>
<div className="space-y-6">
<div className="flex justify-between items-center">
<div className="flex flex-col sm:flex-row sm:justify-between sm:items-center gap-4">
<div>
<h1 className="text-3xl font-bold text-gray-900">Commission Settings</h1>
<p className="text-gray-600 mt-1">Manage agent commission rates and payouts</p>
</div>
<Button className="bg-blue-600 hover:bg-blue-700">
<Button className="bg-blue-600 hover:bg-blue-700 w-fit">
<DollarSign className="w-4 h-4 mr-2" />
Adjust Rates
</Button>
</Button>
</div>

<div className="grid grid-cols-1 md:grid-cols-4 gap-4">
Expand Down
6 changes: 3 additions & 3 deletions frontend/app/dashboard/doctor-hospitals/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ export default function DoctorHospitalsPage() {
return (
<ProtectedLayout>
<div className="space-y-6">
<div className="flex justify-between items-center">
<div className="flex flex-col gap-4 md:flex-row md:justify-between md:items-center">
<div>
<h1 className="text-3xl font-bold text-gray-900">Hospital Assignments</h1>
<p className="text-gray-600 mt-1">Manage doctor-hospital relationships and sessions</p>
</div>
<Button className="bg-blue-600 hover:bg-blue-700">
<Button className="bg-blue-600 hover:bg-blue-700 w-fit">
<Link2 className="w-4 h-4 mr-2" />
Assign Doctor
</Button>
</Button>
</div>

{error && (
Expand Down
70 changes: 36 additions & 34 deletions frontend/app/dashboard/doctors/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,40 +204,42 @@ export default function DoctorsPage() {
return (
<ProtectedLayout>
<div className="space-y-6">
<div className="flex justify-between items-center">
<div>
<h1 className="text-3xl font-bold text-gray-900">Doctor Management</h1>
<div className="flex flex-col md:flex-row justify-between items-start md:items-center">
<div className="text-left">
<h1 className="text-2xl md:text-3xl font-bold text-gray-900">Doctor Management</h1>
<p className="text-gray-600 mt-1">Manage doctor profiles and schedules</p>
</div>
<Dialog
open={isAddDialogOpen}
onOpenChange={(open) => {
setIsAddDialogOpen(open)
if (open) {
resetForm()
}
}}
>
<DialogTrigger asChild>
<Button className="bg-blue-600 hover:bg-blue-700">
<UserPlus className="w-4 h-4 mr-2" />
Add New Doctor
</Button>
</DialogTrigger>
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Add New Doctor</DialogTitle>
<DialogDescription>Enter doctor details to add to the system</DialogDescription>
</DialogHeader>
<DoctorForm formData={formData} setFormData={setFormData} />
<DialogFooter>
<Button variant="outline" onClick={() => setIsAddDialogOpen(false)}>Cancel</Button>
<Button onClick={handleAddDoctor} className="bg-blue-600">
Add Doctor
<div className="mt-4 md:mt-0 text-left">
<Dialog
open={isAddDialogOpen}
onOpenChange={(open) => {
setIsAddDialogOpen(open)
if (open) {
resetForm()
}
}}
>
<DialogTrigger asChild>
<Button className="bg-blue-600 hover:bg-blue-700">
<UserPlus className="w-4 h-4 mr-2" />
Add New Doctor
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</DialogTrigger>
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Add New Doctor</DialogTitle>
<DialogDescription>Enter doctor details to add to the system</DialogDescription>
</DialogHeader>
<DoctorForm formData={formData} setFormData={setFormData} />
<DialogFooter>
<Button variant="outline" onClick={() => setIsAddDialogOpen(false)}>Cancel</Button>
<Button onClick={handleAddDoctor} className="bg-blue-600">
Add Doctor
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</div>

<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
Expand All @@ -263,12 +265,12 @@ export default function DoctorsPage() {

<Card>
<CardHeader>
<div className="flex justify-between items-center">
<div>
<div className="flex flex-col md:flex-row justify-between items-start md:items-center">
<div className="text-left">
<CardTitle>All Doctors</CardTitle>
<CardDescription>Registered medical practitioners on the platform</CardDescription>
</div>
<div className="relative w-64">
<div className="relative w-full md:w-64 mt-4 md:mt-0 text-left">
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4" />
<Input
placeholder="Search doctors..."
Expand Down
66 changes: 34 additions & 32 deletions frontend/app/dashboard/hospitals/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,38 +176,40 @@ export default function HospitalsPage() {
return (
<ProtectedLayout>
<div className="space-y-6">
<div className="flex justify-between items-center">
<div>
<h1 className="text-3xl font-bold text-gray-900">Hospital Management</h1>
<div className="flex flex-col md:flex-row justify-between items-start md:items-center">
<div className="text-left">
<h1 className="text-2xl md:text-3xl font-bold text-gray-900">Hospital Management</h1>
<p className="text-gray-600 mt-1">Manage hospitals, facilities, and assignments</p>
</div>
<Dialog open={isAddDialogOpen} onOpenChange={setIsAddDialogOpen}>
<DialogTrigger asChild>
<Button className="bg-blue-600 hover:bg-blue-700">
<Plus className="w-4 h-4 mr-2" />
Add New Hospital
</Button>
</DialogTrigger>
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Add New Hospital</DialogTitle>
<DialogDescription>Enter hospital details to add to the system</DialogDescription>
</DialogHeader>
<HospitalForm
formData={formData}
setFormData={setFormData}
facilitiesText={facilitiesText}
onFacilitiesChange={handleFacilitiesChange}
/>
<DialogFooter>
<Button variant="outline" onClick={() => setIsAddDialogOpen(false)}>Cancel</Button>
<Button onClick={handleAddHospital} className="bg-blue-600">
Add Hospital
<div className="mt-4 md:mt-0 text-left">
<Dialog open={isAddDialogOpen} onOpenChange={setIsAddDialogOpen}>
<DialogTrigger asChild>
<Button className="bg-blue-600 hover:bg-blue-700">
<Plus className="w-4 h-4 mr-2" />
Add New Hospital
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</DialogTrigger>
<DialogContent className="max-w-2xl max-h-[80vh] overflow-y-auto">
<DialogHeader>
<DialogTitle>Add New Hospital</DialogTitle>
<DialogDescription>Enter hospital details to add to the system</DialogDescription>
</DialogHeader>
<HospitalForm
formData={formData}
setFormData={setFormData}
facilitiesText={facilitiesText}
onFacilitiesChange={handleFacilitiesChange}
/>
<DialogFooter>
<Button variant="outline" onClick={() => setIsAddDialogOpen(false)}>Cancel</Button>
<Button onClick={handleAddHospital} className="bg-blue-600">
Add Hospital
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</div>
</div>

<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
<Card>
Expand All @@ -233,12 +235,12 @@ export default function HospitalsPage() {

<Card>
<CardHeader>
<div className="flex justify-between items-center">
<div>
<div className="flex flex-col md:flex-row justify-between items-start md:items-center">
<div className="text-left">
<CardTitle>All Hospitals</CardTitle>
<CardDescription>Registered medical facilities on the platform</CardDescription>
</div>
<div className="relative w-64">
<div className="relative w-full md:w-64 mt-4 md:mt-0 text-left">
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4" />
<Input
placeholder="Search hospitals..."
Expand Down
22 changes: 11 additions & 11 deletions frontend/app/dashboard/user-activity/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ export default function UserActivityPage() {
return (
<ProtectedLayout>
<div className="space-y-6">
<div className="flex justify-between items-center">
<div>
<h1 className="text-3xl font-bold text-gray-900">User Activity Logs</h1>
<div className="flex flex-col md:flex-row justify-between items-center">
<div className="text-left">
<h1 className="text-2xl md:text-3xl font-bold text-gray-900">User Activity Logs</h1>
<p className="text-gray-600 mt-1">Monitor user actions and system activities (live from users table)</p>
</div>
<div className="flex gap-2">
<div className="flex flex-row gap-2 mt-4 md:mt-0">
<Button variant="outline" onClick={() => setLive(!live)}>
{live ? 'Live: ON' : 'Live: OFF'}
</Button>
Expand All @@ -139,7 +139,7 @@ export default function UserActivityPage() {
<Download className="w-4 h-4 mr-2" />
Export Logs
</Button>
</div>
</div>
</div>

<div className="grid grid-cols-1 md:grid-cols-4 gap-4">
Expand Down Expand Up @@ -183,14 +183,14 @@ export default function UserActivityPage() {

<Card>
<CardHeader>
<div className="flex justify-between items-center">
<div className="flex flex-col md:flex-row md:justify-between md:items-center gap-4">
<div>
<CardTitle>Recent Activities</CardTitle>
<CardDescription>Real-time user activity monitoring</CardDescription>
<CardTitle>Recent Activities</CardTitle>
<CardDescription>Real-time user activity monitoring</CardDescription>
</div>
<div className="relative w-64">
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4" />
<Input placeholder="Search logs..." className="pl-10" />
<div className="relative w-full md:w-64">
<Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4" />
<Input placeholder="Search logs..." className="pl-10" />
</div>
</div>
</CardHeader>
Expand Down
Loading