Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ProblemPage from "./views/problemPage/ProblemPage";
import Dashboard from "./views/dashboard/DashBoard";
import UserDashboard from "./views/dashboard/UserDashboard";
import Problems from "./views/problems/problems";
import NewProblem from "./views/newProblem/NewProblem";
import CreateProblem from "./views/newProblem/NewProblem";
import ContestListPage from "./views/contest/ContestListPage";
import ContestCreatePage from "./views/contest/ContestCreatePage";
import ContestLobbyAndRun from "./views/contest/ContestLobbyAndRun";
Expand Down Expand Up @@ -50,11 +50,11 @@ export default function App() {
<Route path="/problems" element={<Problems />} />
<Route path="/problems/:id" element={<ProblemPage />} />
<Route
path="/newproblem"
path="/createproblem"
element={
<ProtectedRoute>
<RequireRole allowed={["ADMIN", "AUTHOR"]}>
<NewProblem />
<CreateProblem />
</RequireRole>
</ProtectedRoute>
}
Expand Down
28 changes: 13 additions & 15 deletions Frontend/src/components/NavBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ export default function NewNav() {
{ to: "/problems", label: "Problems" },
...(userRole === "AUTHOR" || userRole === "ADMIN"
? [
{ to: "/newproblem", label: "Create Problem" },
{ to: "/contests/create", label: "Create Contest" },
]
{ to: "/createProblem", label: "Create Problem" },
{ to: "/contests/create", label: "Create Contest" },
]
: []),
{ to: "/contests", label: "Contests" },
{ to: "/interview", label: "Interview" },
Expand All @@ -72,10 +72,10 @@ export default function NewNav() {
return (
<div className="sticky top-0 z-50">
<div className="h-0.5 w-full bg-gradient-to-r from-blue-500 via-purple-500 to-pink-500" />

<nav className="border-b border-white/10 bg-slate-900/80 backdrop-blur-md shadow-lg transition-all duration-300">
<div className="mx-auto flex max-w-7xl items-center justify-between px-4 py-3 sm:px-6 lg:px-8">

{/* Logo */}
<div className="flex items-center gap-8">
<Link to="/" className="flex items-center gap-2 group">
Expand All @@ -97,10 +97,9 @@ export default function NewNav() {
key={item.to}
to={item.to}
className={({ isActive }) =>
`px-4 py-2 text-sm font-medium transition-all duration-200 rounded-lg ${
isActive
? "bg-white/10 text-white shadow-inner"
: "text-slate-400 hover:text-white hover:bg-white/5"
`px-4 py-2 text-sm font-medium transition-all duration-200 rounded-lg ${isActive
? "bg-white/10 text-white shadow-inner"
: "text-slate-400 hover:text-white hover:bg-white/5"
}`
}
>
Expand Down Expand Up @@ -148,7 +147,7 @@ export default function NewNav() {
{userRole || 'Learner'}
</span>
</div>

<div className="mt-2 space-y-1">
<Link
to="/dashboard"
Expand Down Expand Up @@ -207,17 +206,16 @@ export default function NewNav() {
key={item.to}
to={item.to}
className={({ isActive }) =>
`flex items-center px-4 py-3 text-base font-medium rounded-xl transition-colors ${
isActive
? "bg-blue-600/10 text-blue-400"
: "text-slate-300 hover:bg-white/5 hover:text-white"
`flex items-center px-4 py-3 text-base font-medium rounded-xl transition-colors ${isActive
? "bg-blue-600/10 text-blue-400"
: "text-slate-300 hover:bg-white/5 hover:text-white"
}`
}
>
{item.label}
</NavLink>
))}

{!user && (
<div className="mt-6 space-y-3 pt-6 border-t border-white/5">
<Link to="/login" className="block w-full text-center py-3 text-base font-semibold text-white bg-white/5 rounded-xl border border-white/10">
Expand Down
Loading
Loading