feat: Implement comprehensive course analytics, RBAC with roles and authentication, and dynamic passing thresholds.
This commit is contained in:
@@ -1,98 +1,168 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { lmsApi } from "@/lib/api";
|
||||
import { useAuth } from "@/context/AuthContext";
|
||||
import React, { useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import Link from "next/link";
|
||||
import { LogIn, Mail, Lock } from "lucide-react";
|
||||
import { lmsApi } from "@/lib/api";
|
||||
import { GraduationCap, Lock, Mail, User } from "lucide-react";
|
||||
|
||||
export default function LoginPage() {
|
||||
export default function ExperienceLoginPage() {
|
||||
const router = useRouter();
|
||||
const [isLogin, setIsLogin] = useState(true);
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState("");
|
||||
const [fullName, setFullName] = useState("");
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
const { login } = useAuth();
|
||||
const router = useRouter();
|
||||
const [error, setError] = useState("");
|
||||
|
||||
const handleSubmit = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
setLoading(true);
|
||||
setError("");
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const res = await lmsApi.login({ email, password });
|
||||
login(res.user, res.token);
|
||||
router.push("/");
|
||||
if (isLogin) {
|
||||
const response = await lmsApi.login({ email, password });
|
||||
|
||||
// Verify user is a student
|
||||
if (response.user.role !== "student") {
|
||||
setError("Access denied. This portal is for students only. Please use the Studio portal for instructors.");
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
localStorage.setItem("experience_token", response.token);
|
||||
localStorage.setItem("experience_user", JSON.stringify(response.user));
|
||||
router.push("/");
|
||||
} else {
|
||||
const response = await lmsApi.register({
|
||||
email,
|
||||
password,
|
||||
full_name: fullName
|
||||
});
|
||||
|
||||
localStorage.setItem("experience_token", response.token);
|
||||
localStorage.setItem("experience_user", JSON.stringify(response.user));
|
||||
router.push("/");
|
||||
}
|
||||
} catch (err) {
|
||||
const message = err instanceof Error ? err.message : "Login failed. Please check your credentials.";
|
||||
setError(message);
|
||||
setError(err instanceof Error ? err.message : "Authentication failed");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="min-h-[calc(100vh-64px)] flex items-center justify-center p-6 bg-[#050505]">
|
||||
<div className="w-full max-w-md space-y-8 animate-in fade-in zoom-in duration-500">
|
||||
<div className="text-center space-y-2">
|
||||
<div className="w-16 h-16 rounded-2xl bg-blue-600/10 border border-blue-500/20 flex items-center justify-center mx-auto text-blue-500 mb-6">
|
||||
<LogIn size={32} />
|
||||
<div className="min-h-screen bg-gradient-to-br from-slate-950 via-indigo-950 to-slate-950 flex items-center justify-center p-4">
|
||||
<div className="w-full max-w-md">
|
||||
{/* Header */}
|
||||
<div className="text-center mb-8">
|
||||
<div className="inline-flex items-center justify-center w-16 h-16 bg-indigo-600 rounded-2xl mb-4">
|
||||
<GraduationCap className="w-8 h-8 text-white" />
|
||||
</div>
|
||||
<h1 className="text-3xl font-black tracking-tighter text-white">Student Login</h1>
|
||||
<p className="text-gray-500 font-bold uppercase tracking-widest text-[10px]">Welcome back to your learning journey</p>
|
||||
<h1 className="text-3xl font-black text-white mb-2">OpenCCB Experience</h1>
|
||||
<p className="text-gray-400">Student Learning Portal</p>
|
||||
</div>
|
||||
|
||||
<div className="glass-card p-8 border-white/5 bg-white/[0.02]">
|
||||
<form onSubmit={handleSubmit} className="space-y-6">
|
||||
{/* Login/Register Form */}
|
||||
<div className="bg-white/5 backdrop-blur-xl border border-white/10 rounded-3xl p-8">
|
||||
<div className="flex gap-2 mb-6 bg-white/5 rounded-xl p-1">
|
||||
<button
|
||||
onClick={() => setIsLogin(true)}
|
||||
className={`flex-1 py-2 px-4 rounded-lg font-bold transition-all ${isLogin ? "bg-indigo-600 text-white" : "text-gray-400 hover:text-white"
|
||||
}`}
|
||||
>
|
||||
Login
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setIsLogin(false)}
|
||||
className={`flex-1 py-2 px-4 rounded-lg font-bold transition-all ${!isLogin ? "bg-indigo-600 text-white" : "text-gray-400 hover:text-white"
|
||||
}`}
|
||||
>
|
||||
Register
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<form onSubmit={handleSubmit} className="space-y-4">
|
||||
{!isLogin && (
|
||||
<div>
|
||||
<label className="block text-sm font-bold text-gray-300 mb-2">
|
||||
Full Name
|
||||
</label>
|
||||
<div className="relative">
|
||||
<User className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-gray-400" />
|
||||
<input
|
||||
type="text"
|
||||
value={fullName}
|
||||
onChange={(e) => setFullName(e.target.value)}
|
||||
className="w-full bg-white/5 border border-white/10 rounded-xl py-3 pl-11 pr-4 text-white placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500"
|
||||
placeholder="Jane Smith"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-bold text-gray-300 mb-2">
|
||||
Email
|
||||
</label>
|
||||
<div className="relative">
|
||||
<Mail className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-gray-400" />
|
||||
<input
|
||||
type="email"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
className="w-full bg-white/5 border border-white/10 rounded-xl py-3 pl-11 pr-4 text-white placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500"
|
||||
placeholder="student@example.com"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label className="block text-sm font-bold text-gray-300 mb-2">
|
||||
Password
|
||||
</label>
|
||||
<div className="relative">
|
||||
<Lock className="absolute left-3 top-1/2 -translate-y-1/2 w-5 h-5 text-gray-400" />
|
||||
<input
|
||||
type="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
className="w-full bg-white/5 border border-white/10 rounded-xl py-3 pl-11 pr-4 text-white placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500"
|
||||
placeholder="••••••••"
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="p-4 rounded-xl bg-red-500/10 border border-red-500/20 text-red-400 text-xs font-bold text-center">
|
||||
<div className="bg-red-500/10 border border-red-500/20 rounded-xl p-3 text-red-400 text-sm">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="space-y-2">
|
||||
<label className="text-[10px] font-black uppercase tracking-widest text-gray-500 px-1">Email Address</label>
|
||||
<div className="relative">
|
||||
<Mail className="absolute left-4 top-1/2 -translate-y-1/2 text-gray-500" size={18} />
|
||||
<input
|
||||
type="email"
|
||||
required
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
placeholder="name@company.com"
|
||||
className="w-full bg-white/5 border border-white/10 rounded-xl py-4 pl-12 pr-4 text-sm text-white focus:outline-none focus:border-blue-500 transition-all"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<label className="text-[10px] font-black uppercase tracking-widest text-gray-500 px-1">Password</label>
|
||||
<div className="relative">
|
||||
<Lock className="absolute left-4 top-1/2 -translate-y-1/2 text-gray-500" size={18} />
|
||||
<input
|
||||
type="password"
|
||||
required
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
placeholder="••••••••"
|
||||
className="w-full bg-white/5 border border-white/10 rounded-xl py-4 pl-12 pr-4 text-sm text-white focus:outline-none focus:border-blue-500 transition-all"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button
|
||||
disabled={loading}
|
||||
type="submit"
|
||||
className="btn-premium w-full !py-4 font-black text-xs uppercase tracking-[0.2em] shadow-xl shadow-blue-500/20 disabled:opacity-50"
|
||||
disabled={loading}
|
||||
className="w-full bg-indigo-600 hover:bg-indigo-700 text-white font-bold py-3 rounded-xl transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
{loading ? "Authenticating..." : "Continue to Dashboard"}
|
||||
{loading ? "Processing..." : isLogin ? "Sign In" : "Create Account"}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div className="mt-6 pt-6 border-t border-white/10 text-center">
|
||||
<p className="text-sm text-gray-400">
|
||||
Are you an instructor?{" "}
|
||||
<a href="http://localhost:3000/auth/login" className="text-indigo-400 hover:text-indigo-300 font-bold">
|
||||
Go to Instructor Portal
|
||||
</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p className="text-center text-[10px] font-bold uppercase tracking-widest text-gray-600">
|
||||
Don't have an account? <Link href="/auth/register" className="text-blue-500 hover:text-blue-400">Sign up here</Link>
|
||||
<p className="text-center text-xs text-gray-500 mt-6">
|
||||
OpenCCB Experience - Student Learning Portal
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
ArrowLeft,
|
||||
TrendingUp
|
||||
} from "lucide-react";
|
||||
import PerformanceBar from "@/components/PerformanceBar";
|
||||
import { clsx, type ClassValue } from "clsx";
|
||||
import { twMerge } from "tailwind-merge";
|
||||
|
||||
@@ -134,9 +135,12 @@ export default function StudentProgressPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-center gap-2 text-green-400 bg-green-400/10 py-2 px-4 rounded-full w-fit mx-auto border border-green-400/20">
|
||||
<Award className="w-4 h-4" />
|
||||
<span className="text-sm font-bold">Passing Standing</span>
|
||||
{/* Performance Bar */}
|
||||
<div className="mt-8">
|
||||
<PerformanceBar
|
||||
score={Math.round(totalWeightedGrade)}
|
||||
passingPercentage={course.passing_percentage || 70}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
import React from 'react';
|
||||
|
||||
interface PerformanceBarProps {
|
||||
score: number; // 0-100
|
||||
passingPercentage: number; // e.g., 70
|
||||
}
|
||||
|
||||
export default function PerformanceBar({ score, passingPercentage }: PerformanceBarProps) {
|
||||
// Calculate tier boundaries
|
||||
// Reprobado: 0 to P-1
|
||||
const reprobadoMax = Math.max(0, passingPercentage - 1);
|
||||
// Rendimiento Bajo: P to P+9
|
||||
const lowMin = passingPercentage;
|
||||
const lowMax = passingPercentage + 9;
|
||||
// Rendimiento Medio: P+10 to P+15
|
||||
const mediumMin = passingPercentage + 10;
|
||||
const mediumMax = passingPercentage + 15;
|
||||
// Buen Rendimiento: P+16 to 90
|
||||
const goodMin = passingPercentage + 16;
|
||||
const goodMax = 90;
|
||||
// Excelente: 91+
|
||||
const excellentMin = 91;
|
||||
|
||||
// Determine current tier
|
||||
let tier = '';
|
||||
let tierColor = '';
|
||||
let tierLabel = '';
|
||||
|
||||
if (score < passingPercentage) {
|
||||
tier = 'reprobado';
|
||||
tierColor = 'bg-red-500';
|
||||
tierLabel = 'Reprobado';
|
||||
} else if (score >= lowMin && score <= lowMax) {
|
||||
tier = 'low';
|
||||
tierColor = 'bg-orange-500';
|
||||
tierLabel = 'Rendimiento Bajo';
|
||||
} else if (score >= mediumMin && score <= mediumMax) {
|
||||
tier = 'medium';
|
||||
tierColor = 'bg-yellow-500';
|
||||
tierLabel = 'Rendimiento Medio';
|
||||
} else if (score >= goodMin && score <= goodMax) {
|
||||
tier = 'good';
|
||||
tierColor = 'bg-green-500';
|
||||
tierLabel = 'Buen Rendimiento';
|
||||
} else if (score >= excellentMin) {
|
||||
tier = 'excellent';
|
||||
tierColor = 'bg-blue-500';
|
||||
tierLabel = 'Excelente';
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
{/* Current Score Display */}
|
||||
<div className="flex items-center justify-between">
|
||||
<div>
|
||||
<div className="text-sm font-bold text-gray-400 uppercase tracking-wider">Tu Rendimiento</div>
|
||||
<div className={`text-3xl font-black ${tierColor.replace('bg-', 'text-')}`}>
|
||||
{score}%
|
||||
</div>
|
||||
</div>
|
||||
<div className={`px-4 py-2 rounded-xl ${tierColor} text-white font-bold text-sm`}>
|
||||
{tierLabel}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Visual Bar */}
|
||||
<div className="relative h-8 bg-white/5 rounded-full overflow-hidden border border-white/10">
|
||||
{/* Tier segments */}
|
||||
<div className="absolute inset-0 flex">
|
||||
{/* Reprobado */}
|
||||
<div
|
||||
className="bg-red-500/30 border-r border-white/20"
|
||||
style={{ width: `${reprobadoMax}%` }}
|
||||
></div>
|
||||
{/* Low */}
|
||||
<div
|
||||
className="bg-orange-500/30 border-r border-white/20"
|
||||
style={{ width: `${lowMax - lowMin + 1}%` }}
|
||||
></div>
|
||||
{/* Medium */}
|
||||
<div
|
||||
className="bg-yellow-500/30 border-r border-white/20"
|
||||
style={{ width: `${mediumMax - mediumMin + 1}%` }}
|
||||
></div>
|
||||
{/* Good */}
|
||||
<div
|
||||
className="bg-green-500/30 border-r border-white/20"
|
||||
style={{ width: `${goodMax - goodMin + 1}%` }}
|
||||
></div>
|
||||
{/* Excellent */}
|
||||
<div
|
||||
className="bg-blue-500/30"
|
||||
style={{ width: `${100 - excellentMin + 1}%` }}
|
||||
></div>
|
||||
</div>
|
||||
|
||||
{/* Current position indicator */}
|
||||
<div
|
||||
className="absolute top-0 bottom-0 w-1 bg-white shadow-lg"
|
||||
style={{ left: `${score}%` }}
|
||||
>
|
||||
<div className="absolute -top-8 left-1/2 -translate-x-1/2 bg-white text-gray-900 px-2 py-1 rounded text-xs font-black">
|
||||
{score}%
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Legend */}
|
||||
<div className="grid grid-cols-5 gap-2 text-xs">
|
||||
<div className="text-center">
|
||||
<div className="w-full h-2 bg-red-500 rounded mb-1"></div>
|
||||
<div className="text-red-400 font-bold">0-{reprobadoMax}</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="w-full h-2 bg-orange-500 rounded mb-1"></div>
|
||||
<div className="text-orange-400 font-bold">{lowMin}-{lowMax}</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="w-full h-2 bg-yellow-500 rounded mb-1"></div>
|
||||
<div className="text-yellow-400 font-bold">{mediumMin}-{mediumMax}</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="w-full h-2 bg-green-500 rounded mb-1"></div>
|
||||
<div className="text-green-400 font-bold">{goodMin}-{goodMax}</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="w-full h-2 bg-blue-500 rounded mb-1"></div>
|
||||
<div className="text-blue-400 font-bold">{excellentMin}+</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect } from "react";
|
||||
import { useRouter, usePathname } from "next/navigation";
|
||||
import { useAuth } from "@/context/AuthContext";
|
||||
|
||||
export default function ProtectedRoute({ children }: { children: React.ReactNode }) {
|
||||
const { user, loading } = useAuth();
|
||||
const router = useRouter();
|
||||
const pathname = usePathname();
|
||||
|
||||
useEffect(() => {
|
||||
if (!loading && !user && pathname !== "/auth/login") {
|
||||
router.push("/auth/login");
|
||||
}
|
||||
}, [user, loading, router, pathname]);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div className="min-h-screen bg-slate-950 flex items-center justify-center">
|
||||
<div className="w-12 h-12 border-4 border-indigo-500/20 border-t-indigo-500 rounded-full animate-spin"></div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!user && pathname !== "/auth/login") {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <>{children}</>;
|
||||
}
|
||||
@@ -5,6 +5,7 @@ export interface Course {
|
||||
title: string;
|
||||
description?: string;
|
||||
instructor_id: string;
|
||||
passing_percentage: number;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
@@ -72,6 +73,7 @@ export interface User {
|
||||
id: string;
|
||||
email: string;
|
||||
full_name: string;
|
||||
role: string;
|
||||
}
|
||||
|
||||
export interface AuthResponse {
|
||||
|
||||
Reference in New Issue
Block a user