Skip to content

Commit f7bc0e7

Browse files
authored
Updated the admin dashboard and other changes done. (#86)
* Updated langind page and pagination for challenges page * Updated the admin dashboard
1 parent 1ca8323 commit f7bc0e7

File tree

3 files changed

+13
-33
lines changed

3 files changed

+13
-33
lines changed

client-test/src/App.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import AdminLogin from './components/Admin/index';
2121
import Dashboard from './components/Admin/Dashboard.tsx';
2222
import { useAdminStore } from './context/AdminContext.tsx';
2323
import AdminChallenges from './components/Admin/AdminChallenges.tsx';
24-
import AdminHome from './components/Admin/home.tsx';
2524

2625
function UserApp() {
2726
return (
@@ -66,15 +65,11 @@ function AdminApp() {
6665
<div className="w-64 min-h-screen fixed left-0 top-0 bg-gray-800 text-white hidden md:block">
6766
<Sidebar />
6867
</div>
69-
<div className="md:hidden fixed top-0 left-0 w-full bg-gray-800 text-white z-50">
70-
<Sidebar />
71-
</div>
7268
<div className="flex-grow md:ml-64 pl-0 md:pl-4 mt-16 md:mt-0">
7369
<Toaster position="bottom-right" toastOptions={{ duration: 2000 }} />
7470
<Routes>
7571
{/* <Route path="/codingclubadmin" element={<AdminLogin />} /> */}
76-
<Route path="/codingclubadmin" element={<AdminHome />} />
77-
<Route path="/codingclubadmin/dashboard" element={<Dashboard />} />
72+
<Route path="/codingclubadmin" element={<Dashboard />} />
7873
<Route path="/codingclubadmin/users" element={<UserDashboard />} />
7974
<Route path="/codingclubadmin/challenges" element={<AdminChallenges />} />
8075
<Route path="/codingclubadmin/users/profile/:username" element={<ProfilePage />} />

client-test/src/components/Admin/Users.tsx

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export default function UserDashboard() {
179179
}
180180

181181
return (
182-
<div className="container ml-0 md:mx-3 px-4 py-4 max-w-7xl">
182+
<div className="container ml-0 md:mx-3 px-16 py-16">
183183
<motion.div
184184
initial={{ y: -20, opacity: 0 }}
185185
animate={{ y: 0, opacity: 1 }}
@@ -393,12 +393,11 @@ export default function UserDashboard() {
393393

394394
{/* Users Table Header */}
395395
<div className="dark:bg-slate-50 bg-slate-800 rounded-lg p-4 mb-2 shadow-sm border dark:border-slate-200 border-slate-700">
396-
<div className="grid grid-cols-12 gap-4 text-sm font-medium dark:text-slate-700 text-slate-300">
397-
<div className="col-span-4 flex items-center">User Info</div>
398-
<div className="col-span-3 hidden md:block">College</div>
399-
<div className="col-span-2 hidden md:block">Branch</div>
400-
<div className="col-span-2 hidden lg:block">Joined</div>
401-
<div className="col-span-1"></div>
396+
<div className="grid grid-cols-4 gap-4 text-sm font-medium dark:text-slate-700 text-slate-300">
397+
<div className="flex items-center">User Info</div>
398+
<div className="hidden md:block">College</div>
399+
<div className="hidden md:block">Branch</div>
400+
<div className="hidden lg:block">Joined</div>
402401
</div>
403402
</div>
404403

@@ -436,8 +435,8 @@ export default function UserDashboard() {
436435
onClick={() => navigate(`/codingclubadmin/users/profile/${user.username}`)}
437436
>
438437
<CardContent>
439-
<div className="grid grid-cols-12 gap-4 items-center">
440-
<div className="col-span-4 flex items-center space-x-3">
438+
<div className="grid grid-cols-4 gap-4 items-center">
439+
<div className="flex items-center space-x-3">
441440
<Avatar className="h-10 w-10">
442441
<AvatarImage src={user.avatar || "/placeholder.svg"} alt={user.username} />
443442
<AvatarFallback className="bg-gradient-to-r from-violet-500 to-indigo-500 text-white text-sm font-medium">
@@ -451,7 +450,7 @@ export default function UserDashboard() {
451450
<p className="text-xs dark:text-slate-500 text-slate-400 truncate">@{user.username}</p>
452451
</div>
453452
</div>
454-
<div className="col-span-3 hidden md:block">
453+
<div className="hidden md:block">
455454
<Badge
456455
variant="outline"
457456
className="dark:bg-indigo-50 bg-indigo-900/20 dark:text-indigo-700 text-indigo-400 dark:border-indigo-200 border-indigo-700 text-xs font-medium truncate max-w-full"
@@ -460,7 +459,7 @@ export default function UserDashboard() {
460459
{user.collegeName || "N/A"}
461460
</Badge>
462461
</div>
463-
<div className="col-span-2 hidden md:block">
462+
<div className="hidden md:block">
464463
<Badge
465464
variant="outline"
466465
className="dark:bg-sky-50 bg-sky-900/20 dark:text-sky-700 text-sky-400 dark:border-sky-200 border-sky-700 text-xs font-medium truncate max-w-full"
@@ -469,24 +468,11 @@ export default function UserDashboard() {
469468
{user.branch || "N/A"}
470469
</Badge>
471470
</div>
472-
<div className="col-span-2 hidden lg:block">
471+
<div className="hidden lg:block">
473472
<p className="text-xs dark:text-slate-500 text-slate-400">
474473
{formatDate(user.createdAt)}
475474
</p>
476475
</div>
477-
<div className="col-span-1 flex justify-end">
478-
<Button
479-
variant="ghost"
480-
size="sm"
481-
className="opacity-0 group-hover:opacity-100 transition-opacity dark:hover:bg-slate-100 hover:bg-slate-700"
482-
onClick={(e) => {
483-
e.stopPropagation()
484-
navigate(`/codingclubadmin/users/profile/${user.username}`)
485-
}}
486-
>
487-
<MoreHorizontal size={16} />
488-
</Button>
489-
</div>
490476
</div>
491477

492478
{/* Mobile view - show college and branch below */}

client-test/src/components/Admin/sidebar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ export function Sidebar() {
2424
}, [isScrolled]);
2525

2626
const navItems = [
27-
{ href: "/codingclubadmin/", label: "Home" },
28-
{ href: "/codingclubadmin/dashboard", label: "Dashboard" },
27+
{ href: "/codingclubadmin", label: "Dashboard" },
2928
{ href: "/codingclubadmin/leaderboard", label: "Leaderboard" },
3029
{ href: "/codingclubadmin/users", label: "Users" },
3130
{ href: "/codingclubadmin/challenges", label: "Challenges" },

0 commit comments

Comments
 (0)