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
2 changes: 1 addition & 1 deletion app/src/components/CommentBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function getRoleConfig(role: string) {
const norm = (role || '').toLowerCase();
if (norm.includes('faculty')) {
return {
label: 'Faculty',
label: 'Employee',
badgeClass: 'bg-violet-50/80 text-violet-700 border-violet-100',
};
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/layout/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function Footer() {
</button>
{!isAuth && lodgeOpen && (
<div className="mt-2 bg-[#222222] border border-[#333333] rounded-lg p-2 space-y-1 text-xs">
<Link to="/faculty/login" className="block px-3 py-1.5 hover:bg-[#333333] rounded transition-colors text-white">Faculty / Staff Login</Link>
<Link to="/faculty/login" className="block px-3 py-1.5 hover:bg-[#333333] rounded transition-colors text-white">Employee Login</Link>
<Link to="/warden/login" className="block px-3 py-1.5 hover:bg-[#333333] rounded transition-colors text-white">Warden Login</Link>
<Link to="/centre-head/login" className="block px-3 py-1.5 hover:bg-[#333333] rounded transition-colors text-white">Centre Head Login</Link>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/src/components/layout/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function Navbar() {
Lodge Complaint <ChevronDown className="w-3.5 h-3.5 opacity-60" />
</button>
<div className="absolute top-full left-0 hidden group-hover:block bg-white text-[#111111] shadow-lg border border-[#E5E5E5] rounded-b-lg min-w-[180px] z-50">
<Link to="/faculty/signup" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Faculty</Link>
<Link to="/faculty/signup" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Employee</Link>
<Link to="/warden/signup" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Warden</Link>
<Link to="/centre-head/signup" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Centre Head</Link>
</div>
Expand Down Expand Up @@ -99,7 +99,7 @@ export function Navbar() {
<ChevronDown className="w-3.5 h-3.5 opacity-60" />
</button>
<div className="absolute top-full right-0 hidden group-hover:block bg-white text-[#111111] shadow-lg border border-[#E5E5E5] rounded-b-lg min-w-[180px] z-50">
<Link to="/faculty/login" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Faculty / Staff Login</Link>
<Link to="/faculty/login" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Employee Login</Link>
<Link to="/warden/login" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Warden Login</Link>
<Link to="/centre-head/login" className="block px-4 py-2.5 text-sm hover:bg-[#F5F5F5] transition-colors">Centre Head Login</Link>
<div className="border-t border-[#E5E5E5] my-1"></div>
Expand Down Expand Up @@ -181,7 +181,7 @@ export function Navbar() {
</button>
{loginDropdownOpen && (
<div className="bg-white/5">
<Link to="/faculty/login" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Faculty / Staff Login</Link>
<Link to="/faculty/login" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Employee Login</Link>
<Link to="/warden/login" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Warden Login</Link>
<Link to="/centre-head/login" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Centre Head Login</Link>
<Link to="/staff/login" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors font-semibold text-white/90">Admin Staff Login</Link>
Expand All @@ -201,7 +201,7 @@ export function Navbar() {
</button>
{lodgeOpen && (
<div className="bg-white/5">
<Link to="/faculty/signup" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Faculty</Link>
<Link to="/faculty/signup" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Employee</Link>
<Link to="/warden/signup" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Warden</Link>
<Link to="/centre-head/signup" onClick={closeMobile} className="block px-8 py-2.5 hover:bg-white/10 transition-colors">Centre Head</Link>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/Landing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function Landing() {
}`}
>
<Link to="/faculty/login" className="block px-5 py-3 text-sm font-medium text-white hover:bg-[#333333] transition-colors border-b border-[#333333] cursor-pointer">
Login as Faculty
Login as Employee
</Link>
<Link to="/warden/login" className="block px-5 py-3 text-sm font-medium text-white hover:bg-[#333333] transition-colors border-b border-[#333333] cursor-pointer">
Login as Warden
Expand All @@ -96,7 +96,7 @@ export function Landing() {
}`}
>
<Link to="/faculty/signup" className="block px-5 py-3 text-sm font-medium text-white hover:bg-[#333333] transition-colors border-b border-[#333333] cursor-pointer">
Signup as Faculty / Staff
Signup as Employee
</Link>
<Link to="/warden/signup" className="block px-5 py-3 text-sm font-medium text-white hover:bg-[#333333] transition-colors border-b border-[#333333] cursor-pointer">
Signup as Warden
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/admin/AEPostView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ export function AEPostView() {
</h2>
</div>
<p className="text-sm text-gray-500">
Complaints assigned at the AE level — Faculty, Warden, and Centre Head.
Complaints assigned at the AE level — Employee, Warden, and Centre Head.
</p>
</div>

Expand Down Expand Up @@ -297,7 +297,7 @@ export function AEPostView() {
{/* Tiles — stacked vertically, full-width */}
<div className="flex flex-col gap-6">
<PostTile
label="Faculty Posts"
label="Employee Posts"
icon={<GraduationCap className="w-4 h-4" />}
role="faculty"
posts={facultyPosts.filter(matchesFilter)}
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/admin/AdminPostView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ export function AdminPostView() {

const comments = post.comments ?? [];

const roleLabel = isFaculty ? 'Faculty' : isWarden ? 'Warden' : 'Centre Head';
const roleLabel = isFaculty ? 'Employee' : isWarden ? 'Warden' : 'Centre Head';
const RoleIcon = isFaculty ? GraduationCap : isWarden ? BedDouble : Building2;
const statusCls = STATUS_STYLES[post.status.toLowerCase()] ?? 'bg-gray-100 text-gray-700 border-gray-200';
const statusDot = STATUS_DOT[post.status.toLowerCase()] ?? 'bg-gray-400';
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/admin/JEPostView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ export function JEPostView() {
</h2>
</div>
<p className="text-sm text-gray-500">
Complaints assigned at the JE level — Faculty, Warden, and Centre Head.
Complaints assigned at the JE level — Employee, Warden, and Centre Head.
</p>
</div>

Expand Down Expand Up @@ -295,7 +295,7 @@ export function JEPostView() {
{/* Sections — each a responsive card grid */}
<div className="flex flex-col gap-10">
<PostTile
label="Faculty Posts"
label="Employee Posts"
icon={<GraduationCap className="w-4 h-4" />}
role="faculty"
posts={byFilter(faculty)}
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/admin/XENPostView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export function XENPostView() {
</h2>
</div>
<p className="text-sm text-gray-500">
Incoming complaints routed through the XEN pipeline — Faculty, Warden, and Centre Head.
Incoming complaints routed through the XEN pipeline — Employee, Warden, and Centre Head.
</p>
</div>

Expand Down Expand Up @@ -294,7 +294,7 @@ export function XENPostView() {
{/* Tiles — stacked vertically, full-width */}
<div className="flex flex-col gap-6">
<PostTile
label="Faculty Posts"
label="Employee Posts"
icon={<GraduationCap className="w-4 h-4" />}
role="faculty"
posts={applyFilter(facultyPosts)}
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/auth/CentreHeadLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export function CentreHeadLogin() {
<h2 className="text-xs font-bold uppercase tracking-widest text-[#666666] mb-3">Other Roles</h2>
<div className="flex flex-wrap gap-2">
<Link to="/faculty/login" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors cursor-pointer">
Login as Faculty
Login as Employee
</Link>
<Link to="/warden/login" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors cursor-pointer">
Login as Warden
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/auth/CentreHeadSignup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export function CentreHeadSignup() {
<div>
<p className="font-semibold mb-2">Other Roles</p>
<div className="flex flex-wrap gap-2">
<Link to="/faculty/signup" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors">Register as Faculty</Link>
<Link to="/faculty/signup" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors">Register as Employee</Link>
<Link to="/warden/signup" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors">Register as Warden</Link>
</div>
</div>
Expand Down Expand Up @@ -275,7 +275,7 @@ export function CentreHeadSignup() {
<div>
<h3 className="text-xs font-bold uppercase tracking-widest text-[#666666] mb-3">Other Roles</h3>
<div className="space-y-2">
<Link to="/faculty/signup" className="block w-full bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg text-center transition-colors cursor-pointer">Register as Faculty</Link>
<Link to="/faculty/signup" className="block w-full bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg text-center transition-colors cursor-pointer">Register as Employee</Link>
<Link to="/warden/signup" className="block w-full bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg text-center transition-colors cursor-pointer">Register as Warden</Link>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/auth/FacultyForgotPassword.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function FacultyForgotPassword() {
value={email}
onChange={e => setEmail(e.target.value)}
className={inputCls}
placeholder="faculty@nith.ac.in"
placeholder="employee@nith.ac.in"
required
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/auth/FacultyLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export function FacultyLogin() {
{/* Header strip */}
<div className="border-b border-[#E5E5E5] py-5">
<div className="max-w-6xl mx-auto w-full px-4 sm:px-8">
<h1 className="text-xl font-bold text-[#111111]">Faculty Login</h1>
<h1 className="text-xl font-bold text-[#111111]">Employee Login</h1>
<p className="text-sm text-[#666666] mt-0.5">Access your complaint dashboard.</p>
</div>
</div>
Expand Down Expand Up @@ -93,7 +93,7 @@ export function FacultyLogin() {
value={email}
onChange={e => setEmail(e.target.value)}
className={inputCls}
placeholder="faculty@nith.ac.in"
placeholder="employee@nith.ac.in"
required
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/auth/FacultySignup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function FacultySignup() {
{/* Page header strip */}
<div className="border-b border-[#E5E5E5] py-5">
<div className="max-w-6xl mx-auto w-full px-4 sm:px-8">
<h1 className="text-xl font-bold text-[#111111]">Faculty Registration</h1>
<h1 className="text-xl font-bold text-[#111111]">Employee Registration</h1>
<p className="text-sm text-[#666666] mt-0.5">Register to lodge and track Construction Cell complaints.</p>
</div>
</div>
Expand Down Expand Up @@ -254,7 +254,7 @@ export function FacultySignup() {
className={`inline-flex items-center gap-2 bg-[#16a34a] hover:bg-[#15803d] text-white font-semibold py-2.5 px-8 rounded-lg transition-colors duration-200 text-sm active:scale-[0.98] ${loading ? 'opacity-70 cursor-not-allowed' : 'cursor-pointer'}`}
>
{loading && <Loader size="sm" color="white" />}
{loading ? 'Registering…' : 'Register as Faculty'}
{loading ? 'Registering…' : 'Register as Employee'}
</button>
<Link
to="/faculty/login"
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/auth/StaffLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export function StaffLogin() {
<h2 className="text-xs font-bold uppercase tracking-widest text-[#666666] mb-3">Other Roles</h2>
<div className="flex flex-wrap gap-2">
<Link to="/faculty/login" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors cursor-pointer">
Login as Faculty
Login as Employee
</Link>
<Link to="/warden/login" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors cursor-pointer">
Login as Warden
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/auth/WardenLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export function WardenLogin() {
<h2 className="text-xs font-bold uppercase tracking-widest text-[#666666] mb-3">Other Roles</h2>
<div className="flex flex-wrap gap-2">
<Link to="/faculty/login" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors cursor-pointer">
Login as Faculty
Login as Employee
</Link>
<Link to="/centre-head/login" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors cursor-pointer">
Login as Centre Head
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/auth/WardenSignup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export function WardenSignup() {
<div>
<p className="font-semibold mb-2">Other Roles</p>
<div className="flex flex-wrap gap-2">
<Link to="/faculty/signup" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors">Register as Faculty</Link>
<Link to="/faculty/signup" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors">Register as Employee</Link>
<Link to="/centre-head/signup" className="bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg transition-colors">Register as Centre Head</Link>
</div>
</div>
Expand Down Expand Up @@ -275,7 +275,7 @@ export function WardenSignup() {
<div>
<h3 className="text-xs font-bold uppercase tracking-widest text-[#666666] mb-3">Other Roles</h3>
<div className="space-y-2">
<Link to="/faculty/signup" className="block w-full bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg text-center transition-colors cursor-pointer">Register as Faculty</Link>
<Link to="/faculty/signup" className="block w-full bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg text-center transition-colors cursor-pointer">Register as Employee</Link>
<Link to="/centre-head/signup" className="block w-full bg-[#222222] hover:bg-[#000000] text-white text-xs font-semibold px-3 py-2 rounded-lg text-center transition-colors cursor-pointer">Register as Centre Head</Link>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/post/FacultyPost.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function FacultyPost() {
{/* Header strip */}
<div className="border-b border-[#E5E5E5] py-5">
<div className="max-w-6xl mx-auto w-full px-4 sm:px-8">
<h1 className="text-xl font-bold text-[#111111]">Submit a Faculty Complaint</h1>
<h1 className="text-xl font-bold text-[#111111]">Submit an Employee Complaint</h1>
<p className="text-sm text-[#666666] mt-0.5">Lodge a residential or departmental maintenance complaint.</p>
</div>
</div>
Expand Down Expand Up @@ -205,7 +205,7 @@ export function FacultyPost() {
<div>
<h3 className="text-xs font-bold uppercase tracking-widest text-[#666666] mb-3">Complaint Areas</h3>
<p className="text-sm text-[#111111] leading-relaxed">
Faculty may file for <span className="font-semibold">residential quarters</span> and <span className="font-semibold">departmental buildings</span> only.
Employees may file for <span className="font-semibold">residential quarters</span> and <span className="font-semibold">departmental buildings</span> only.
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/profile/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export function Profile() {
let roleLabel = 'User';
let registerRoute = '/';
let role: Role = 'centrehead';
if (isFaculty) { roleLabel = 'Faculty Member'; registerRoute = '/faculty/posts'; role = 'faculty'; }
if (isFaculty) { roleLabel = 'Employee'; registerRoute = '/faculty/posts'; role = 'faculty'; }
else if (isWarden) { roleLabel = 'Hostel Warden'; registerRoute = '/warden/posts'; role = 'warden'; }
else if (isCentreHead) { roleLabel = 'Centre Head'; registerRoute = '/centre-head/posts'; role = 'centrehead'; }

Expand Down
Loading