diff --git a/Controllers/AuthController.cs b/Controllers/AuthController.cs
new file mode 100644
index 0000000..fb40f23
--- /dev/null
+++ b/Controllers/AuthController.cs
@@ -0,0 +1,211 @@
+using Microsoft.AspNetCore.Mvc;
+using EduCoreSuite.Models;
+using EduCoreSuite.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using System.Security.Claims;
+using System.Security.Cryptography;
+using System.Text;
+using EduCoreSuite.Models.ViewModels.Auth;
+using Microsoft.AspNetCore.Authorization;
+
+[Route("Auth")]
+public class AuthController : Controller
+{
+    private readonly ApplicationDbContext _db;
+
+    public AuthController(ApplicationDbContext db)
+    {
+        _db = db;
+    }
+
+    [HttpGet("Register")]
+    public IActionResult Register()
+    {
+        var viewModel = new RegisterViewModel(); 
+        ViewBag.Roles = _db.Roles.ToList();
+        return View(viewModel);
+    }
+
+    [HttpPost("Register")]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Register(RegisterViewModel viewModel)
+    {
+        if (!ModelState.IsValid)
+        {
+            ViewBag.Roles = _db.Roles.ToList();
+            return View(viewModel);
+        }
+         
+        if (await _db.Users.AnyAsync(u => u.Email == viewModel.Email || u.Username == viewModel.UserName))
+        {
+            ModelState.AddModelError("Email", "User already exists");
+            ViewBag.Roles = _db.Roles.ToList();
+            return View(viewModel);
+        }
+
+        var user = new User
+        {
+            Username = viewModel.UserName,
+            Email = viewModel.Email,
+            PasswordHash = HashPassword(viewModel.Password),
+            FirstName = viewModel.FirstName,
+            LastName = viewModel.LastName,
+            RoleID = viewModel.RoleID
+        };
+
+        _db.Users.Add(user);
+        await _db.SaveChangesAsync();
+        return RedirectToAction("Login");
+    }
+
+    [HttpGet("Login")]
+    [AllowAnonymous]
+    public IActionResult Login()
+    {
+        return View(new LoginViewModel());
+    }
+
+    [HttpPost("Login")]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> Login(LoginViewModel viewModel)
+    {
+        if (!ModelState.IsValid)
+        {
+            return View(viewModel);
+        }
+
+        var user = await _db.Users.FirstOrDefaultAsync(u => u.Email == viewModel.Email);
+        if (user == null || !VerifyPassword(viewModel.Password, user.PasswordHash))
+        {
+            ModelState.AddModelError("", "Invalid credentials");
+            return View(viewModel);
+        }
+
+        var claims = new List<Claim>
+        {
+            new Claim(ClaimTypes.NameIdentifier, user.ID.ToString()),
+            new Claim(ClaimTypes.Name, user.Username),
+            new Claim(ClaimTypes.Email, user.Email),
+            new Claim("CustomUserId", user.CustomUserId),
+            new Claim(ClaimTypes.Role, user.RoleID.ToString())
+        };
+
+        var identity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+        var principal = new ClaimsPrincipal(identity);
+
+        await HttpContext.SignInAsync(
+            CookieAuthenticationDefaults.AuthenticationScheme,
+            principal,
+            new AuthenticationProperties { IsPersistent = viewModel.RememberMe });
+
+        return RedirectToAction("Approval", "User");
+    }
+
+    [HttpGet("Logout")]
+    public async Task<IActionResult> Logout()
+    {
+        await HttpContext.SignOutAsync();
+        return RedirectToAction("Login");
+    }
+
+    [HttpGet("ForgotPassword")]
+    public IActionResult ForgotPassword()
+    {
+        return View(new ForgotPasswordViewModel());
+    }
+
+    [HttpPost("ForgotPassword")]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> ForgotPassword(ForgotPasswordViewModel viewModel)
+    {
+        if (!ModelState.IsValid)
+        {
+            return View(viewModel);
+        }
+
+        var user = await _db.Users.FirstOrDefaultAsync(u => u.Email == viewModel.Email);
+        if (user == null)
+        {
+            ModelState.AddModelError("", "Email not found");
+            return View(viewModel);
+        }
+
+        string code = new Random().Next(100000, 999999).ToString();
+        HttpContext.Session.SetString("ResetCode", code);
+        HttpContext.Session.SetString("ResetEmail", viewModel.Email);
+        // TODO: Send email using SMTP or SendGrid
+
+        return RedirectToAction("VerifyCode");
+    }
+
+    [HttpGet("VerifyCode")]
+    public IActionResult VerifyCode()
+    {
+        return View(new VerifyCodeViewModel());
+    }
+
+    [HttpPost("VerifyCode")]
+    [ValidateAntiForgeryToken]
+    public IActionResult VerifyCode(VerifyCodeViewModel viewModel)
+    {
+        if (!ModelState.IsValid)
+        {
+            return View(viewModel);
+        }
+
+        var sessionCode = HttpContext.Session.GetString("ResetCode");
+        if (viewModel.Code != sessionCode)
+        {
+            ModelState.AddModelError("", "Invalid code");
+            return View(viewModel);
+        }
+
+        return RedirectToAction("ResetPassword");
+    }
+
+    [HttpGet("ResetPassword")]
+    public IActionResult ResetPassword()
+    {
+        return View(new ResetPasswordViewModel());
+    }
+
+    [HttpPost("ResetPassword")]
+    [ValidateAntiForgeryToken]
+    public async Task<IActionResult> ResetPassword(ResetPasswordViewModel viewModel)
+    {
+        if (!ModelState.IsValid)
+        {
+            return View(viewModel);
+        }
+
+        var email = HttpContext.Session.GetString("ResetEmail");
+        var user = await _db.Users.FirstOrDefaultAsync(u => u.Email == email);
+        if (user == null)
+        {
+            return RedirectToAction("Login");
+        }
+
+        user.PasswordHash = HashPassword(viewModel.NewPassword);
+        await _db.SaveChangesAsync();
+
+        // Clear the reset session
+        HttpContext.Session.Remove("ResetCode");
+        HttpContext.Session.Remove("ResetEmail");
+
+        return RedirectToAction("Login");
+    }
+
+    private string HashPassword(string password)
+    {
+        using var sha = SHA256.Create();
+        var bytes = sha.ComputeHash(Encoding.UTF8.GetBytes(password));
+        return Convert.ToBase64String(bytes);
+    }
+
+    private bool VerifyPassword(string password, string hash)
+    {
+        return HashPassword(password) == hash;
+    }
+}
\ No newline at end of file
diff --git a/Controllers/BooksController.cs b/Controllers/BooksController.cs
deleted file mode 100644
index 6ccaa11..0000000
--- a/Controllers/BooksController.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using EduCoreSuite.Data;
-using EduCoreSuite.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-
-namespace EduCoreSuite.Controllers
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    public class BooksController : ControllerBase
-    {
-        private readonly ApplicationDbContext _context;
-
-        public BooksController(ApplicationDbContext context)
-        {
-            _context = context;
-        }
-
-        [HttpGet]
-        public async Task<ActionResult<IEnumerable<Book>>> GetBooks()
-        {
-            return await _context.Books.ToListAsync();
-        }
-
-        [HttpGet("{id}")]
-        public async Task<ActionResult<Book>> GetBook(int id)
-        {
-            var book = await _context.Books.FindAsync(id);
-
-            if (book == null)
-                return NotFound();
-
-            return book;
-        }
-
-        [HttpPost]
-        public async Task<ActionResult<Book>> CreateBook(Book book)
-        {
-            _context.Books.Add(book);
-            await _context.SaveChangesAsync();
-
-            return CreatedAtAction(nameof(GetBook), new { id = book.Id }, book);
-        }
-
-        [HttpPut("{id}")]
-        public async Task<IActionResult> UpdateBook(int id, Book book)
-        {
-            if (id != book.Id)
-                return BadRequest();
-
-            _context.Entry(book).State = EntityState.Modified;
-
-            try
-            {
-                await _context.SaveChangesAsync();
-            }
-            catch (DbUpdateConcurrencyException)
-            {
-                if (!_context.Books.Any(e => e.Id == id))
-                    return NotFound();
-
-                throw;
-            }
-
-            return NoContent();
-        }
-
-        [HttpDelete("{id}")]
-        public async Task<IActionResult> DeleteBook(int id)
-        {
-            var book = await _context.Books.FindAsync(id);
-            if (book == null)
-                return NotFound();
-
-            _context.Books.Remove(book);
-            await _context.SaveChangesAsync();
-
-            return NoContent();
-        }
-    }
-}
diff --git a/Controllers/UserController.cs b/Controllers/UserController.cs
new file mode 100644
index 0000000..6f40085
--- /dev/null
+++ b/Controllers/UserController.cs
@@ -0,0 +1,31 @@
+using EduCoreSuite.Data;
+using EduCoreSuite.Models.ViewModels.UserApproval;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Authorization;
+
+
+namespace EduCoreSuite.Controllers
+{
+    public class UserController : Controller
+    {
+        private readonly ApplicationDbContext _db;
+
+        public UserController(ApplicationDbContext db)
+        {
+            _db = db;
+        }
+        [Authorize(Roles = "3")]
+
+        [HttpGet]
+        public async Task<IActionResult> Approval()
+        {
+            var viewModel = new ApprovalViewModel
+            {
+                Users = await _db.Users.ToListAsync(),
+                //Roles = await _db.Roles.ToDictionaryAsync(r => r.ID.ToString(), r => r.Name)
+            };
+            return View(viewModel);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Data/ApplicationDbContext.cs b/Data/ApplicationDbContext.cs
index 0701fdc..c91b094 100644
--- a/Data/ApplicationDbContext.cs
+++ b/Data/ApplicationDbContext.cs
@@ -5,7 +5,6 @@ namespace EduCoreSuite.Data
 {
     public class ApplicationDbContext : DbContext
     {
-        public DbSet<Book> Books { get; set; }
 
         public DbSet<User> Users { get; set; }
 
diff --git a/EduCoreSuite.csproj b/EduCoreSuite.csproj
index 1871bb1..ed88d63 100644
--- a/EduCoreSuite.csproj
+++ b/EduCoreSuite.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>fd318432-ae1c-4044-aa3e-05aef00aa902</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,6 +19,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.14">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/Models/Book.cs b/Models/Book.cs
deleted file mode 100644
index d6f3409..0000000
--- a/Models/Book.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace EduCoreSuite.Models
-{
-    public class Book
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public string Title { get; set; } = string.Empty;
-
-        [Required]
-        public string Author { get; set; } = string.Empty;
-
-        public int YearPublished { get; set; }
-
-        public string Genre { get; set; } = string.Empty;
-    }
-}
diff --git a/Models/User.cs b/Models/User.cs
index e125110..10c3477 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+
 using System.Data;
 using System.Text.Json.Serialization;
 
@@ -7,6 +8,8 @@ namespace EduCoreSuite.Models
 {
     public class User
     {
+    
+
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int ID { get; set; }
@@ -34,6 +37,9 @@ public class User
 
         public string? ResetOTP { get; set; }
         public DateTime? OTPGeneratedAt { get; set; }
+
+        [NotMapped]
+        public string CustomUserId => ID.ToString("D3");
     }
 }
 
diff --git a/Models/ViewModels/Auth/ForgotPasswordViewModel.cs b/Models/ViewModels/Auth/ForgotPasswordViewModel.cs
new file mode 100644
index 0000000..7cc78bc
--- /dev/null
+++ b/Models/ViewModels/Auth/ForgotPasswordViewModel.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace EduCoreSuite.Models.ViewModels.Auth
+{
+    public class ForgotPasswordViewModel
+    {
+        [Required, EmailAddress]
+        public string Email { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Models/ViewModels/Auth/LoginViewModel.cs b/Models/ViewModels/Auth/LoginViewModel.cs
new file mode 100644
index 0000000..6a0ffeb
--- /dev/null
+++ b/Models/ViewModels/Auth/LoginViewModel.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace EduCoreSuite.Models.ViewModels.Auth
+{
+    public class LoginViewModel
+    {
+        [Required, EmailAddress]
+        public string Email { get; set; } = string.Empty;
+
+        [Required, DataType(DataType.Password)]
+        public string Password { get; set; } = string.Empty;
+
+        public bool RememberMe { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Models/ViewModels/Auth/RegisterViewModel.cs b/Models/ViewModels/Auth/RegisterViewModel.cs
new file mode 100644
index 0000000..27efef9
--- /dev/null
+++ b/Models/ViewModels/Auth/RegisterViewModel.cs
@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace EduCoreSuite.Models.ViewModels.Auth
+{
+    public class RegisterViewModel
+    {
+        [Required, StringLength(50)]
+        public string UserName { get; set; } = string.Empty;
+
+        [Required, EmailAddress]
+        public string Email { get; set; } = string.Empty;
+
+        [Required, DataType(DataType.Password)]
+        [StringLength(100, MinimumLength = 8)]
+        public string Password { get; set; } = string.Empty;
+
+        [DataType(DataType.Password)]
+        [Compare("Password", ErrorMessage = "Passwords don't match")]
+        public string ConfirmPassword { get; set; } = string.Empty;
+
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+
+        [Required]
+        public int RoleID { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Models/ViewModels/Auth/ResetPasswordViewModel.cs b/Models/ViewModels/Auth/ResetPasswordViewModel.cs
new file mode 100644
index 0000000..dc84b15
--- /dev/null
+++ b/Models/ViewModels/Auth/ResetPasswordViewModel.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace EduCoreSuite.Models.ViewModels.Auth
+{
+    public class ResetPasswordViewModel
+    {
+        [Required, DataType(DataType.Password)]
+        [StringLength(100, MinimumLength = 8)]
+        public string NewPassword { get; set; } = string.Empty;
+
+        [DataType(DataType.Password)]
+        [Compare("NewPassword", ErrorMessage = "Passwords don't match")]
+        public string ConfirmPassword { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Models/ViewModels/Auth/VerifyCodeViewModel.cs b/Models/ViewModels/Auth/VerifyCodeViewModel.cs
new file mode 100644
index 0000000..6195330
--- /dev/null
+++ b/Models/ViewModels/Auth/VerifyCodeViewModel.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace EduCoreSuite.Models.ViewModels.Auth
+{
+    public class VerifyCodeViewModel
+    {
+        [Required]
+        public string Code { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Models/ViewModels/User/ApprovalViewModel.cs b/Models/ViewModels/User/ApprovalViewModel.cs
new file mode 100644
index 0000000..6aefd14
--- /dev/null
+++ b/Models/ViewModels/User/ApprovalViewModel.cs
@@ -0,0 +1,11 @@
+using EduCoreSuite.Models;
+using System.Collections.Generic;
+
+namespace EduCoreSuite.Models.ViewModels.UserApproval
+{
+    public class ApprovalViewModel
+    {
+        public List<Models.User> Users { get; set; }  // Fully qualify with Models.User
+        public Dictionary<long, string> Roles { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Pages/Auth/changepassword.cshtml.cs b/Pages/Auth/changepassword.cshtml.cs
index 61962fb..5f02621 100644
--- a/Pages/Auth/changepassword.cshtml.cs
+++ b/Pages/Auth/changepassword.cshtml.cs
@@ -1,11 +1,13 @@
+using EduCoreSuite.Data;
+using EduCoreSuite.Models;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
+using System;
 using System.ComponentModel.DataAnnotations;
-using System.Threading.Tasks;
 using System.Linq;
-using System;
-using EduCoreSuite.Data;
+using System.Threading.Tasks;
 
 public class ChangePasswordModel : PageModel
 {
@@ -98,8 +100,9 @@ public async Task<IActionResult> OnPostAsync()
         }
 
         // Update password
-        user.PasswordHash = BCrypt.Net.BCrypt.HashPassword(Input.NewPassword);
-        user.ResetOTP = null;
+        var passwordHasher = new PasswordHasher<User>();
+        user.Password = passwordHasher.HashPassword(user, user.Password);
+        user.PasswordHash = passwordHasher.HashPassword(user, user.Password); user.ResetOTP = null;
         user.OTPGeneratedAt = null;
 
         await _db.SaveChangesAsync();
diff --git a/Pages/Auth/forgotpassword.cshtml.cs b/Pages/Auth/forgotpassword.cshtml.cs
index 4b1a084..c5fdbc4 100644
--- a/Pages/Auth/forgotpassword.cshtml.cs
+++ b/Pages/Auth/forgotpassword.cshtml.cs
@@ -8,71 +8,73 @@
 using EduCoreSuite.Data;
 using EduCoreSuite.Pages;
 using EducoreSuite.stmpservices;
-namespace EducoreSuite.forgotpassword;
-
-
-public class ForgotPasswordModel : PageModel
+namespace EducoreSuite.forgotpassword
 {
-    private readonly ApplicationDbContext _db;
-    private readonly ILogger<ForgotPasswordModel> _logger;
-    private readonly IEmailSender _emailSender;
-
-    public ForgotPasswordModel(ApplicationDbContext db, ILogger<ForgotPasswordModel> logger, IEmailSender emailSender)
-    {
-        _db = db;
-        _logger = logger;
-        _emailSender = emailSender;
-    }
-
-    [BindProperty]
-    [Required(ErrorMessage = "Email is required.")]
-    [EmailAddress(ErrorMessage = "Invalid email address.")]
-    public string Email { get; set; }
 
-    public string InfoMessage { get; set; }
-    public string ErrorMessage { get; set; }
 
-    public async Task<IActionResult> OnPostAsync()
+    public class ForgotPasswordModel : PageModel
     {
-        _logger.LogInformation("ForgotPassword: OnPostAsync triggered.");
+        private readonly ApplicationDbContext _db;
+        private readonly ILogger<ForgotPasswordModel> _logger;
+        private readonly IEmailSender _emailSender;
 
-        if (!ModelState.IsValid)
+        public ForgotPasswordModel(ApplicationDbContext db, ILogger<ForgotPasswordModel> logger, IEmailSender emailSender)
         {
-            _logger.LogWarning("ModelState is invalid. Errors: {@Errors}, Email: {Email}",
-                ModelState.Values.SelectMany(v => v.Errors).Select(e => e.ErrorMessage).ToList(), Email);
-            return Page();
+            _db = db;
+            _logger = logger;
+            _emailSender = emailSender;
         }
 
-        var user = _db.Users.FirstOrDefault(u => u.Email == Email);
+        [BindProperty]
+        [Required(ErrorMessage = "Email is required.")]
+        [EmailAddress(ErrorMessage = "Invalid email address.")]
+        public string Email { get; set; }
 
-        if (user == null)
+        public string InfoMessage { get; set; }
+        public string ErrorMessage { get; set; }
+
+        public async Task<IActionResult> OnPostAsync()
         {
-            InfoMessage = "If this email exists, a reset code has been sent.";
-            _logger.LogWarning("User with email {Email} not found.", Email);
-            return Page();
-        }
+            _logger.LogInformation("ForgotPassword: OnPostAsync triggered.");
 
-        // Generate and store OTP
-        var otp = new Random().Next(100000, 999999).ToString();
-        user.ResetOTP = otp;
-        user.OTPGeneratedAt = DateTime.UtcNow;
+            if (!ModelState.IsValid)
+            {
+                _logger.LogWarning("ModelState is invalid. Errors: {@Errors}, Email: {Email}",
+                    ModelState.Values.SelectMany(v => v.Errors).Select(e => e.ErrorMessage).ToList(), Email);
+                return Page();
+            }
 
-        try
-        {
-            await _db.SaveChangesAsync();
-            await _emailSender.SendEmailAsync(user.Email, "Your OTP Code", $"Your One-Time Password is: {otp}");
-            _logger.LogInformation($"OTP sent to {Email}: {otp}");
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Error sending OTP.");
-            ErrorMessage = "An error occurred while sending the OTP. Please try again.";
-            return Page();
-        }
+            var user = _db.Users.FirstOrDefault(u => u.Email == Email);
 
-        // Store email temporarily and redirect
-        TempData["ResetEmail"] = Email;
-        return RedirectToPage("ChangePassword");
+            if (user == null)
+            {
+                InfoMessage = "If this email exists, a reset code has been sent.";
+                _logger.LogWarning("User with email {Email} not found.", Email);
+                return Page();
+            }
+
+            // Generate and store OTP
+            var otp = new Random().Next(100000, 999999).ToString();
+            user.ResetOTP = otp;
+            user.OTPGeneratedAt = DateTime.UtcNow;
+
+            try
+            {
+                await _db.SaveChangesAsync();
+                await _emailSender.SendEmailAsync(user.Email, "Your OTP Code", $"Your One-Time Password is: {otp}");
+                _logger.LogInformation($"OTP sent to {Email}: {otp}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error sending OTP.");
+                ErrorMessage = "An error occurred while sending the OTP. Please try again.";
+                return Page();
+            }
+
+            // Store email temporarily and redirect
+            TempData["ResetEmail"] = Email;
+            return RedirectToPage("ChangePassword");
+        }
     }
 }
 
diff --git a/Program.cs b/Program.cs
index f313dad..dcf0f6a 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,18 +1,35 @@
+using EduCoreSuite.Data;
+using Microsoft.AspNetCore.Authentication.Cookies;
 using EducoreSuite.stmpservices;
-using EduCoreSuite.Data;
 using Microsoft.EntityFrameworkCore;
 
 
 var builder = WebApplication.CreateBuilder(args);
 
 // ✅ Register MVC controller services
-builder.Services.AddControllers(); // <-- Add this line
+builder.Services.AddControllers(); // <-- Add controllers
 builder.Services.AddRazorPages();
 
 // ✅ Register your DbContext
 builder.Services.AddDbContext<ApplicationDbContext>(options =>
     options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection")));
 
+
+
+builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+    .AddCookie(options =>
+    {
+        options.LoginPath = "/Auth/Login";
+        options.LogoutPath = "/Auth/Logout";
+        options.ExpireTimeSpan = TimeSpan.FromDays(7);
+        options.SlidingExpiration = true;
+    });
+
+builder.Services.AddSession();
+builder.Services.AddHttpContextAccessor();
+
+builder.Services.AddControllersWithViews();
+
 builder.Services.AddScoped<IEmailSender, SmtpEmailSender>();
 
 builder.Services.Configure<SmtpSettings>(
@@ -30,13 +47,40 @@
 
 app.UseHttpsRedirection();
 app.UseStaticFiles();
-
 app.UseRouting();
-
+app.UseAuthentication();
 app.UseAuthorization();
+app.UseSession();
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller=Auth}/{action=Login}/{id?}");
+
+app.MapFallbackToController("Login", "Auth");
 
 // ✅ Map Razor Pages and API Controllers
 app.MapRazorPages();
 app.MapControllers(); // <-- Add this line to expose your API endpoints
 
 app.Run();
+
+//var app = builder.Build();
+
+//// ✅ Configure HTTP request pipeline
+//if (!app.Environment.IsDevelopment())
+//{
+//    app.UseExceptionHandler("/Error");
+//    app.UseHsts();
+//}
+
+//app.UseHttpsRedirection();
+//app.UseStaticFiles();
+
+//app.UseRouting();
+
+//app.UseAuthorization();
+
+//// ✅ Map Razor Pages and API Controllers
+//app.MapRazorPages();
+//app.MapControllers(); // <-- Add this line to expose your API endpoints
+
+//app.Run();
\ No newline at end of file
diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
index 625109a..664e4ca 100644
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@@ -22,7 +22,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:7065;http://localhost:5138",
+      "applicationUrl": "https://192.168.100.61;http://localhost:5138",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/Properties/serviceDependencies.json b/Properties/serviceDependencies.json
new file mode 100644
index 0000000..1729da0
--- /dev/null
+++ b/Properties/serviceDependencies.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "secrets1": {
+      "type": "secrets"
+    },
+    "mssql1": {
+      "type": "mssql",
+      "connectionId": "ConnectionStrings:DefaultConnection1",
+      "dynamicId": null
+    }
+  }
+}
\ No newline at end of file
diff --git a/Properties/serviceDependencies.local.json b/Properties/serviceDependencies.local.json
new file mode 100644
index 0000000..3661c45
--- /dev/null
+++ b/Properties/serviceDependencies.local.json
@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "secrets1": {
+      "type": "secrets.user"
+    },
+    "mssql1": {
+      "secretStore": "LocalSecretsFile",
+      "type": "mssql.local",
+      "connectionId": "ConnectionStrings:DefaultConnection1",
+      "dynamicId": null
+    }
+  }
+}
\ No newline at end of file
diff --git a/VaultDB.sql b/VaultDB.sql
new file mode 100644
index 0000000..1051d20
Binary files /dev/null and b/VaultDB.sql differ
diff --git a/Views/Auth/ForgotPassword.cshtml b/Views/Auth/ForgotPassword.cshtml
new file mode 100644
index 0000000..bdb46da
--- /dev/null
+++ b/Views/Auth/ForgotPassword.cshtml
@@ -0,0 +1,34 @@
+@model EduCoreSuite.Models.ViewModels.Auth.ForgotPasswordViewModel
+@{
+    ViewData["Title"] = "Forgot Password";
+}
+
+<div class="max-w-md mx-auto mt-10">
+    <h2 class="text-2xl font-bold mb-6 text-center">Forgot Password</h2>
+
+    <form asp-action="ForgotPassword" method="post" class="space-y-4">
+        <div>
+            <label asp-for="Email" class="block text-sm font-medium text-gray-700"></label>
+            <input asp-for="Email" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500" />
+            <span asp-validation-for="Email" class="text-red-600 text-sm"></span>
+        </div>
+
+        <div class="pt-4">
+            <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                Send Reset Code
+            </button>
+        </div>
+    </form>
+
+    <div class="mt-4 text-center">
+        <a asp-controller="Auth" asp-action="Login" class="font-medium text-blue-600 hover:text-blue-500">
+            Back to Login
+        </a>
+    </div>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+}
\ No newline at end of file
diff --git a/Views/Auth/Login.cshtml b/Views/Auth/Login.cshtml
new file mode 100644
index 0000000..7bff321
--- /dev/null
+++ b/Views/Auth/Login.cshtml
@@ -0,0 +1,45 @@
+@model EduCoreSuite.Models.ViewModels.Auth.LoginViewModel
+@{
+    ViewData["Title"] = "Login";
+}
+
+<div class="login-container">
+    <div class="login-header">
+        <h1 class="login-title">Welcome Back</h1>
+        <p class="login-subtitle">Sign in to access your account</p>
+    </div>
+
+    <form asp-action="Login" method="post">
+        <div class="form-group">
+            <label asp-for="Email" class="form-label">Email Address</label>
+            <input asp-for="Email" class="form-input" placeholder="Enter your email">
+            <span asp-validation-for="Email" class="validation-error"></span>
+        </div>
+
+        <div class="form-group">
+            <label asp-for="Password" class="form-label">Password</label>
+            <input asp-for="Password" type="password" class="form-input" placeholder="Enter your password">
+            <span asp-validation-for="Password" class="validation-error"></span>
+        </div>
+
+        <div class="remember-forgot">
+            <div class="remember-me">
+                <input asp-for="RememberMe" id="rememberMe">
+                <label for="rememberMe">Remember me</label>
+            </div>
+            <a asp-controller="Auth" asp-action="ForgotPassword">Forgot password?</a>
+        </div>
+
+        <button type="submit" class="login-button">Sign In</button>
+    </form>
+
+    <div class="create-account">
+        Don't have an account? <a asp-controller="Auth" asp-action="Register">Create New Account</a>
+    </div>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+}
\ No newline at end of file
diff --git a/Views/Auth/Register.cshtml b/Views/Auth/Register.cshtml
new file mode 100644
index 0000000..15b1514
--- /dev/null
+++ b/Views/Auth/Register.cshtml
@@ -0,0 +1,211 @@
+@model EduCoreSuite.Models.ViewModels.Auth.RegisterViewModel
+@{
+    ViewData["Title"] = "Register";
+    var roles = ViewBag.Roles as List<EduCoreSuite.Models.Role>;
+}
+
+<div class="container-fluid vh-100 d-flex align-items-center justify-content-center" style="padding: 20px;">
+    <div class="card shadow-lg border-0" style="width: 100%; max-width: 650px; border-radius: 20px; background: rgba(255, 255, 255, 0.95); backdrop-filter: blur(10px); border: 1px solid rgba(255, 255, 255, 0.2);">
+        <div class="card-body p-4 p-md-5">
+            <!-- Header -->
+            <div class="text-center mb-4">
+                <h2 class="h3 fw-bold mb-2" style="color: #2d3748; letter-spacing: -0.5px;">Sign Up</h2>
+                <p class="text-muted" style="font-size: 16px;">Create new account</p>
+            </div>
+
+            <form asp-action="Register" method="post">
+                <!-- Username -->
+                <div class="mb-3">
+                    <label asp-for="UserName" class="form-label" style="font-size: 14px; font-weight: 600; color: #4a5568; letter-spacing: 0.02em;">Username</label>
+                    <input asp-for="UserName" class="form-control"
+                           placeholder="Create a unique username"
+                           style="border-radius: 12px; padding: 14px 16px; border: 1.5px solid #e2e8f0; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);" />
+                    <span asp-validation-for="UserName" class="text-danger small d-block mt-1" style="font-size: 12px; font-weight: 500;"></span>
+                </div>
+
+                <!-- First Name and Last Name Row -->
+                <div class="row mb-3">
+                    <div class="col-md-6 mb-3 mb-md-0">
+                        <label asp-for="FirstName" class="form-label" style="font-size: 14px; font-weight: 600; color: #4a5568; letter-spacing: 0.02em;">First Name</label>
+                        <input asp-for="FirstName" class="form-control"
+                               placeholder="First Name"
+                               style="border-radius: 12px; padding: 14px 16px; border: 1.5px solid #e2e8f0; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);" />
+                        <span asp-validation-for="FirstName" class="text-danger small d-block mt-1" style="font-size: 12px; font-weight: 500;"></span>
+                    </div>
+                    <div class="col-md-6">
+                        <label asp-for="LastName" class="form-label" style="font-size: 14px; font-weight: 600; color: #4a5568; letter-spacing: 0.02em;">Last Name</label>
+                        <input asp-for="LastName" class="form-control"
+                               placeholder="Last Name"
+                               style="border-radius: 12px; padding: 14px 16px; border: 1.5px solid #e2e8f0; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);" />
+                        <span asp-validation-for="LastName" class="text-danger small d-block mt-1" style="font-size: 12px; font-weight: 500;"></span>
+                    </div>
+                </div>
+
+                <div class="row mb-3">
+                    <!-- Email Address -->
+                    <div class="col-md-6 mb-3 mb-md-0">
+                        <label asp-for="Email" class="form-label" style="font-size: 14px; font-weight: 600; color: #4a5568; letter-spacing: 0.02em;">Email Address</label>
+                        <input asp-for="Email" class="form-control"
+                               placeholder="Enter your email"
+                               style="border-radius: 12px; padding: 14px 16px; border: 1.5px solid #e2e8f0; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);" />
+                        <span asp-validation-for="Email" class="text-danger small d-block mt-1" style="font-size: 12px; font-weight: 500;"></span>
+                    </div>
+
+                    <!-- Role Selection (Hidden for now to match design) -->
+                    <div class="col-md-6">
+                        <select asp-for="RoleID" class="form-select">
+                            @foreach (var role in roles)
+                            {
+                                <option value="@role.ID">@role.Name</option>
+                            }
+                        </select>
+                        <span asp-validation-for="RoleID" class="text-danger small"></span>
+                    </div>
+                </div>
+
+                <!-- Password and Confirm Password Row -->
+                <div class="row mb-3">
+                    <div class="col-md-6 mb-3 mb-md-0">
+                        <label asp-for="Password" class="form-label" style="font-size: 14px; font-weight: 600; color: #4a5568; letter-spacing: 0.02em;">Password</label>
+                        <div class="position-relative">
+                            <input asp-for="Password" type="password" class="form-control"
+                                   placeholder="Enter your password"
+                                   style="border-radius: 12px; padding: 14px 16px; border: 1.5px solid #e2e8f0; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);" />
+                            <i class="fas fa-eye-slash position-absolute"
+                               style="right: 16px; top: 50%; transform: translateY(-50%); color: #a0aec0; cursor: pointer; z-index: 2;"></i>
+                        </div>
+                        <span asp-validation-for="Password" class="text-danger small d-block mt-1" style="font-size: 12px; font-weight: 500;"></span>
+                    </div>
+                    <div class="col-md-6">
+                        <label asp-for="ConfirmPassword" class="form-label" style="font-size: 14px; font-weight: 600; color: #4a5568; letter-spacing: 0.02em;">Confirm Password</label>
+                        <div class="position-relative">
+                            <input asp-for="ConfirmPassword" type="password" class="form-control"
+                                   placeholder="Confirm password"
+                                   style="border-radius: 12px; padding: 14px 16px; border: 1.5px solid #e2e8f0; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);" />
+                            <i class="fas fa-eye-slash position-absolute"
+                               style="right: 16px; top: 50%; transform: translateY(-50%); color: #a0aec0; cursor: pointer; z-index: 2;"></i>
+                        </div>
+                        <span asp-validation-for="ConfirmPassword" class="text-danger small d-block mt-1" style="font-size: 12px; font-weight: 500;"></span>
+                    </div>
+                </div>
+
+                <!-- Password Requirements -->
+                @* <div class="mb-4">
+                    <p class="small mb-2" style="color: #718096;">Password Requirements:</p>
+                    <div class="d-flex flex-column gap-2">
+                        <div class="d-flex align-items-center">
+                            <i class="fas fa-check-circle text-success me-2" style="font-size: 12px;"></i>
+                            <span class="small" style="color: #718096;">At least 8 characters long</span>
+                        </div>
+                        <div class="d-flex align-items-center">
+                            <i class="fas fa-check-circle text-success me-2" style="font-size: 12px;"></i>
+                            <span class="small" style="color: #718096;">Contains uppercase letter</span>
+                        </div>
+                        <div class="d-flex align-items-center">
+                            <i class="fas fa-check-circle text-success me-2" style="font-size: 12px;"></i>
+                            <span class="small" style="color: #718096;">Contains number</span>
+                        </div>
+                    </div>
+                </div> *@
+
+                <!-- Submit Button -->
+                <div class="d-grid mb-4">
+                    <button type="submit" class="btn btn-primary fw-semibold py-3"
+                            style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+                                   border: none;
+                                   border-radius: 12px;
+                                   box-shadow: 0 4px 15px rgba(102, 126, 234, 0.3);
+                                   transition: all 0.3s ease;">
+                        Create Account
+                    </button>
+                </div>
+
+                <!-- Already have account -->
+                <div class="text-center">
+                    <p class="small mb-3" style="color: #718096;">Already have an account?</p>
+                    <a asp-controller="Auth" asp-action="Login"
+                       class="btn btn-link p-0 fw-semibold"
+                       style="color: #667eea; text-decoration: none; transition: color 0.2s ease;">
+                        Sign In
+                    </a>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+
+    <!-- Font Awesome for icons -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
+
+    <script>
+        // Toggle password visibility
+        document.addEventListener('DOMContentLoaded', function() {
+            const passwordToggles = document.querySelectorAll('.fa-eye-slash, .fa-eye');
+            passwordToggles.forEach(toggle => {
+                toggle.addEventListener('click', function() {
+                    const input = this.previousElementSibling;
+                    if (input.type === 'password') {
+                        input.type = 'text';
+                        this.classList.remove('fa-eye-slash');
+                        this.classList.add('fa-eye');
+                    } else {
+                        input.type = 'password';
+                        this.classList.remove('fa-eye');
+                        this.classList.add('fa-eye-slash');
+                    }
+                });
+            });
+
+            // Add hover and focus effects
+            const inputs = document.querySelectorAll('.form-control');
+            inputs.forEach(input => {
+                input.addEventListener('focus', function() {
+                    this.style.borderColor = '#667eea';
+                    this.style.boxShadow = '0 0 0 3px rgba(102, 126, 234, 0.1)';
+                    this.style.transform = 'translateY(-1px)';
+                });
+
+                input.addEventListener('blur', function() {
+                    this.style.borderColor = '#e2e8f0';
+                    this.style.boxShadow = 'none';
+                    this.style.transform = 'translateY(0)';
+                });
+
+                input.addEventListener('mouseenter', function() {
+                    this.style.borderColor = '#cbd5e0';
+                });
+
+                input.addEventListener('mouseleave', function() {
+                    if (document.activeElement !== this) {
+                        this.style.borderColor = '#e2e8f0';
+                    }
+                });
+            });
+
+            // Button hover effects
+            const submitButton = document.querySelector('button[type="submit"]');
+            if (submitButton) {
+                submitButton.addEventListener('mouseenter', function() {
+                    this.style.transform = 'translateY(-2px)';
+                    this.style.boxShadow = '0 8px 25px rgba(102, 126, 234, 0.4)';
+                    this.style.background = 'linear-gradient(135deg, #5a67d8 0%, #6b46c1 100%)';
+                });
+
+                submitButton.addEventListener('mouseleave', function() {
+                    this.style.transform = 'translateY(0)';
+                    this.style.boxShadow = '0 4px 15px rgba(102, 126, 234, 0.3)';
+                    this.style.background = 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)';
+                });
+
+                submitButton.addEventListener('mousedown', function() {
+                    this.style.transform = 'translateY(0)';
+                });
+            }
+        });
+    </script>
+}
\ No newline at end of file
diff --git a/Views/Auth/ResetPassword.cshtml b/Views/Auth/ResetPassword.cshtml
new file mode 100644
index 0000000..f45b299
--- /dev/null
+++ b/Views/Auth/ResetPassword.cshtml
@@ -0,0 +1,34 @@
+@model EduCoreSuite.Models.ViewModels.Auth.ResetPasswordViewModel
+@{
+    ViewData["Title"] = "Reset Password";
+}
+
+<div class="max-w-md mx-auto mt-10">
+    <h2 class="text-2xl font-bold mb-6 text-center">Reset Password</h2>
+
+    <form asp-action="ResetPassword" method="post" class="space-y-4">
+        <div>
+            <label asp-for="NewPassword" class="block text-sm font-medium text-gray-700"></label>
+            <input asp-for="NewPassword" type="password" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500" />
+            <span asp-validation-for="NewPassword" class="text-red-600 text-sm"></span>
+        </div>
+
+        <div>
+            <label asp-for="ConfirmPassword" class="block text-sm font-medium text-gray-700"></label>
+            <input asp-for="ConfirmPassword" type="password" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500" />
+            <span asp-validation-for="ConfirmPassword" class="text-red-600 text-sm"></span>
+        </div>
+
+        <div class="pt-4">
+            <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                Reset Password
+            </button>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+}
\ No newline at end of file
diff --git a/Views/Auth/VerifyCode.cshtml b/Views/Auth/VerifyCode.cshtml
new file mode 100644
index 0000000..9650847
--- /dev/null
+++ b/Views/Auth/VerifyCode.cshtml
@@ -0,0 +1,28 @@
+@model EduCoreSuite.Models.ViewModels.Auth.VerifyCodeViewModel
+@{
+    ViewData["Title"] = "Verify Code";
+}
+
+<div class="max-w-md mx-auto mt-10">
+    <h2 class="text-2xl font-bold mb-6 text-center">Verify Code</h2>
+
+    <form asp-action="VerifyCode" method="post" class="space-y-4">
+        <div>
+            <label asp-for="Code" class="block text-sm font-medium text-gray-700"></label>
+            <input asp-for="Code" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500" />
+            <span asp-validation-for="Code" class="text-red-600 text-sm"></span>
+        </div>
+
+        <div class="pt-4">
+            <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                Verify Code
+            </button>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+}
\ No newline at end of file
diff --git a/Pages/Error.cshtml b/Views/Error.cshtml
similarity index 100%
rename from Pages/Error.cshtml
rename to Views/Error.cshtml
diff --git a/Pages/Error.cshtml.cs b/Views/Error.cshtml.cs
similarity index 100%
rename from Pages/Error.cshtml.cs
rename to Views/Error.cshtml.cs
diff --git a/Pages/Index.cshtml b/Views/Index.cshtml
similarity index 100%
rename from Pages/Index.cshtml
rename to Views/Index.cshtml
diff --git a/Pages/Index.cshtml.cs b/Views/Index.cshtml.cs
similarity index 100%
rename from Pages/Index.cshtml.cs
rename to Views/Index.cshtml.cs
diff --git a/Pages/Privacy.cshtml b/Views/Privacy.cshtml
similarity index 100%
rename from Pages/Privacy.cshtml
rename to Views/Privacy.cshtml
diff --git a/Pages/Privacy.cshtml.cs b/Views/Privacy.cshtml.cs
similarity index 100%
rename from Pages/Privacy.cshtml.cs
rename to Views/Privacy.cshtml.cs
diff --git a/Pages/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
similarity index 94%
rename from Pages/Shared/_Layout.cshtml
rename to Views/Shared/_Layout.cshtml
index 714d889..484c40e 100644
--- a/Pages/Shared/_Layout.cshtml
+++ b/Views/Shared/_Layout.cshtml
@@ -24,7 +24,7 @@
                             <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
+                            <a class="nav-link text-dark" asp-area="" asp-view="/Privacy">Privacy</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-page="/Auth/Signup">Sign Up</a>
@@ -54,5 +54,11 @@
     <script src="~/js/site.js" asp-append-version="true"></script>
 
     @await RenderSectionAsync("Scripts", required: false)
+
+    @section Scripts {
+        @{
+            await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        }
+    }
 </body>
 </html>
\ No newline at end of file
diff --git a/Pages/Shared/_Layout.cshtml.css b/Views/Shared/_Layout.cshtml.css
similarity index 100%
rename from Pages/Shared/_Layout.cshtml.css
rename to Views/Shared/_Layout.cshtml.css
diff --git a/Pages/Shared/_ValidationScriptsPartial.cshtml b/Views/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from Pages/Shared/_ValidationScriptsPartial.cshtml
rename to Views/Shared/_ValidationScriptsPartial.cshtml
diff --git a/Views/User/Approval.cshtml b/Views/User/Approval.cshtml
new file mode 100644
index 0000000..9e4e83e
--- /dev/null
+++ b/Views/User/Approval.cshtml
@@ -0,0 +1,60 @@
+@model EduCoreSuite.Models.ViewModels.UserApproval.ApprovalViewModel
+@{
+    ViewData["Title"] = "User Approval";
+}
+
+<div class="container mx-auto px-4 py-8">
+    <h2 class="text-2xl font-bold mb-6">User Approval</h2>
+
+    <div class="mb-6">
+        <input type="text" id="searchInput" placeholder="Search for user..."
+               class="px-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 w-full max-w-md" />
+    </div>
+
+    <div class="bg-white shadow overflow-hidden rounded-lg">
+        <table class="min-w-full divide-y divide-gray-200">
+            <thead class="bg-gray-50">
+                <tr>
+                    <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">User ID</th>
+                    <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Name</th>
+                    <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Email</th>
+                    <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">User Type</th>
+                    <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
+                </tr>
+            </thead>
+            <tbody class="bg-white divide-y divide-gray-200">
+                @foreach (var user in Model.Users)
+                {
+                    <tr class="hover:bg-gray-50">
+                        <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900">@user.CustomUserId</td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">@user.FirstName @user.LastName</td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">@user.Email</td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
+                            @(Model.Roles.ContainsKey(user.RoleID) ? Model.Roles[user.RoleID] : "Unknown")
+                        </td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm font-medium">
+                            <div class="flex space-x-2">
+                                <button class="text-blue-600 hover:text-blue-900">Approve</button>
+                                <button class="text-red-600 hover:text-red-900">Reject</button>
+                            </div>
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>
+
+@section Scripts {
+    <script>
+        document.getElementById('searchInput').addEventListener('input', function() {
+            const searchValue = this.value.toLowerCase();
+            const rows = document.querySelectorAll('tbody tr');
+
+            rows.forEach(row => {
+                const text = row.textContent.toLowerCase();
+                row.style.display = text.includes(searchValue) ? '' : 'none';
+            });
+        });
+    </script>
+}
\ No newline at end of file
diff --git a/Pages/_ViewImports.cshtml b/Views/_ViewImports.cshtml
similarity index 100%
rename from Pages/_ViewImports.cshtml
rename to Views/_ViewImports.cshtml
diff --git a/Pages/_ViewStart.cshtml b/Views/_ViewStart.cshtml
similarity index 100%
rename from Pages/_ViewStart.cshtml
rename to Views/_ViewStart.cshtml
diff --git a/appsettings.json b/appsettings.json
index 4121b29..6933f14 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Server=HAMISI;Database=EBUCOREDB;Integrated Security=True;TrustServerCertificate=True;MultipleActiveResultSets=True;"
+    "DefaultConnection": "Server=HUB;Database=VaultDB;Integrated Security=True;TrustServerCertificate=True;MultipleActiveResultSets=True;"
   },
   "Logging": {
     "LogLevel": {
diff --git a/wwwroot/css/site.css b/wwwroot/css/site.css
index 3359ac5..8afb8bb 100644
--- a/wwwroot/css/site.css
+++ b/wwwroot/css/site.css
@@ -6,6 +6,15 @@ html {
     html {
         font-size: 16px;
     }
+
+}
+
+@media (max-width: 640px) {
+    .login-container {
+        margin: 1rem;
+        max-width: 100%;
+    }
+
 }
 
 .btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
@@ -17,10 +26,320 @@ html {
     min-height: 100%;
 }
 
+
+
+/* Login Page Styles */
+/* Reset and base styles */
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
 body {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+    /*    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    min-height: 100vh;
+    display: flex;*/
+    /*align-items: center;*/
+    justify-content: center;
+    /*padding: 20px;*/
     margin-bottom: 60px;
 }
 
+/* Main login container */
+/* Simple centering approach - add this to your existing CSS */
+.login-container {
+    background: rgba(255, 255, 255, 0.95);
+    backdrop-filter: blur(10px);
+    border-radius: 20px;
+    padding: 48px 40px;
+    width: 100%;
+    max-width: 550px;
+    box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    margin: 50px auto;
+    position: relative;
+}
+
+/* Add background to the page */
+/*body {
+    min-height: 100vh;
+}*/
+
+/* Header section */
+.login-header {
+    text-align: center;
+    margin-bottom: 40px;
+}
+
+.login-title {
+    font-size: 28px;
+    font-weight: 700;
+    color: #2d3748;
+    margin-bottom: 8px;
+    letter-spacing: -0.5px;
+}
+
+.login-subtitle {
+    font-size: 16px;
+    color: #718096;
+    font-weight: 400;
+    line-height: 1.5;
+}
+
+/* Form styling */
+form {
+    margin-bottom: 32px;
+}
+
+.form-group {
+    margin-bottom: 24px;
+}
+
+.form-label {
+    display: block;
+    font-size: 14px;
+    font-weight: 600;
+    color: #4a5568;
+    margin-bottom: 8px;
+    letter-spacing: 0.02em;
+}
+
+.form-input {
+    width: 100%;
+    padding: 14px 16px;
+    border: 1.5px solid #e2e8f0;
+    border-radius: 12px;
+    font-size: 16px;
+    background: #ffffff;
+    transition: all 0.2s ease;
+    outline: none;
+    color: #2d3748;
+}
+
+    .form-input::placeholder {
+        color: #a0aec0;
+        font-size: 15px;
+    }
+
+    .form-input:focus {
+        border-color: #667eea;
+        box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+        transform: translateY(-1px);
+    }
+
+    .form-input:hover {
+        border-color: #cbd5e0;
+    }
+
+/* Remember me and forgot password section */
+.remember-forgot {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 32px;
+    flex-wrap: wrap;
+    gap: 12px;
+}
+
+.remember-me {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+    .remember-me input[type="checkbox"] {
+        width: 18px;
+        height: 18px;
+        accent-color: #667eea;
+        border-radius: 4px;
+    }
+
+    .remember-me label {
+        font-size: 14px;
+        color: #4a5568;
+        cursor: pointer;
+        user-select: none;
+    }
+
+.remember-forgot a {
+    color: #667eea;
+    text-decoration: none;
+    font-size: 14px;
+    font-weight: 500;
+    transition: color 0.2s ease;
+}
+
+    .remember-forgot a:hover {
+        color: #5a67d8;
+        text-decoration: underline;
+    }
+
+/* Sign In button */
+.login-button {
+    width: 100%;
+    padding: 16px;
+    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    border: none;
+    border-radius: 12px;
+    color: white;
+    font-size: 16px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    text-transform: none;
+    letter-spacing: 0.02em;
+    box-shadow: 0 4px 15px rgba(102, 126, 234, 0.3);
+}
+
+    .login-button:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 8px 25px rgba(102, 126, 234, 0.4);
+        background: linear-gradient(135deg, #5a67d8 0%, #6b46c1 100%);
+    }
+
+    .login-button:active {
+        transform: translateY(0);
+        box-shadow: 0 4px 15px rgba(102, 126, 234, 0.3);
+    }
+
+/* Create account section */
+.create-account {
+    text-align: center;
+    font-size: 14px;
+    color: #718096;
+    line-height: 1.5;
+}
+
+    .create-account a {
+        color: #667eea;
+        text-decoration: none;
+        font-weight: 500;
+        transition: color 0.2s ease;
+    }
+
+        .create-account a:hover {
+            color: #5a67d8;
+            text-decoration: underline;
+        }
+
+/* Validation errors */
+.validation-error {
+    display: block;
+    color: #e53e3e;
+    font-size: 12px;
+    margin-top: 6px;
+    font-weight: 500;
+}
+
+/* Responsive design */
+@media (max-width: 480px) {
+    .login-container {
+        padding: 32px 24px;
+        margin: 16px;
+        border-radius: 16px;
+    }
+
+    .login-title {
+        font-size: 24px;
+    }
+
+    .login-subtitle {
+        font-size: 14px;
+    }
+
+    .form-input {
+        padding: 12px 14px;
+        font-size: 15px;
+    }
+
+    .login-button {
+        padding: 14px;
+        font-size: 15px;
+    }
+
+    .remember-forgot {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 16px;
+    }
+}
+
+@media (max-width: 360px) {
+    .login-container {
+        padding: 24px 20px;
+    }
+
+    .login-title {
+        font-size: 22px;
+    }
+}
+
+/* Enhanced focus states for accessibility */
+.form-input:focus,
+.login-button:focus,
+.remember-me input:focus {
+    outline: 2px solid #667eea;
+    outline-offset: 2px;
+}
+
+/* Loading state for button (optional) */
+.login-button:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+    transform: none;
+}
+
+/* Smooth animations */
+.login-container {
+    animation: fadeInUp 0.6s ease-out;
+}
+
+@keyframes fadeInUp {
+    from {
+        opacity: 0;
+        transform: translateY(30px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+/* Input field animations */
+.form-input {
+    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+/* Hover effects for better UX */
+.form-group:hover .form-input {
+    border-color: #cbd5e0;
+}
+
+.form-group:hover .form-label {
+    color: #2d3748;
+}
+
+/* Custom scrollbar for overflow content */
+::-webkit-scrollbar {
+    width: 6px;
+}
+
+::-webkit-scrollbar-track {
+    background: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3px;
+}
+
+    ::-webkit-scrollbar-thumb:hover {
+        background: #a8a8a8;
+    }
+
 .card {
     border-radius: 16px;
 }