diff --git a/HR.LeaveManagement.API/HR.LeaveManagement.API.csproj b/HR.LeaveManagement.API/HR.LeaveManagement.API.csproj index c756f34..3954bcb 100644 --- a/HR.LeaveManagement.API/HR.LeaveManagement.API.csproj +++ b/HR.LeaveManagement.API/HR.LeaveManagement.API.csproj @@ -23,6 +23,7 @@ + diff --git a/HR.LeaveManagement.API/Program.cs b/HR.LeaveManagement.API/Program.cs index ce3565f..138c2ee 100644 --- a/HR.LeaveManagement.API/Program.cs +++ b/HR.LeaveManagement.API/Program.cs @@ -1,5 +1,6 @@ using HR.LeaveManagement.API.Middlewares; using HR.LeaveManagement.Application; +using HR.LeaveManagement.Identity; using HR.LeaveManagement.Infrastructure; using HR.LeaveManagement.Persistence; @@ -15,6 +16,7 @@ builder.Services.AddApplicationServices(); builder.Services.AddInfrastructureServices(builder.Configuration); builder.Services.AddPersistenceServices(builder.Configuration); +builder.Services.AddIdentityServices(builder.Configuration); builder.Services.AddControllers(); @@ -49,6 +51,7 @@ app.UseCors("all"); app.UseAuthentication(); + app.UseAuthorization(); app.MapControllers(); diff --git a/HR.LeaveManagement.API/appsettings.json b/HR.LeaveManagement.API/appsettings.json index 2ca08ba..d2db756 100644 --- a/HR.LeaveManagement.API/appsettings.json +++ b/HR.LeaveManagement.API/appsettings.json @@ -6,7 +6,7 @@ } }, "ConnectionStrings": { - "HrDatabaseConnectionString": "Server=LAPTOP-B438U61N\\SQLEXPRESS;Database=db_hr_leavemanagement;Trusted_Connection=True;MultipleActiveResultSets=true" + "HrDatabaseConnectionString": "Server=LAPTOP-B438U61N\\SQLEXPRESS;Database=db_hr_leavemanagement;Trusted_Connection=True;MultipleActiveResultSets=true;Encrypt=False" }, "EmailSettings": { "ApiKey": "SendGrid-Key", diff --git a/HR.LeaveManagement.BlazorUI/App.razor b/HR.LeaveManagement.BlazorUI/App.razor index 5212a2b..29a66ad 100644 --- a/HR.LeaveManagement.BlazorUI/App.razor +++ b/HR.LeaveManagement.BlazorUI/App.razor @@ -1,6 +1,21 @@ - + + - + + + @if (context.User?.Identity?.IsAuthenticated == false) + { + + } + else + { + Not Authorized + +

Sorry, you cannot view this page

+
+ } +
+
@@ -9,4 +24,5 @@

Sorry, there's nothing at this address.

-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/HR.LeaveManagement.BlazorUI/Pages/Index.razor b/HR.LeaveManagement.BlazorUI/Pages/Index.razor index ebd8d44..3dc02fa 100644 --- a/HR.LeaveManagement.BlazorUI/Pages/Index.razor +++ b/HR.LeaveManagement.BlazorUI/Pages/Index.razor @@ -1,6 +1,6 @@ @page "/" -Index +Home

Welcome to HR Leave Management System


diff --git a/HR.LeaveManagement.BlazorUI/Pages/LeaveRequests/Index.razor b/HR.LeaveManagement.BlazorUI/Pages/LeaveRequests/Index.razor index 0bbeeb0..81ec59b 100644 --- a/HR.LeaveManagement.BlazorUI/Pages/LeaveRequests/Index.razor +++ b/HR.LeaveManagement.BlazorUI/Pages/LeaveRequests/Index.razor @@ -1,5 +1,8 @@ @page "/leaverequests/" -

Index

+ +Leave Requests + +

Leave Requests

Add Leave Request diff --git a/HR.LeaveManagement.BlazorUI/Pages/LeaveTypes/Index.razor b/HR.LeaveManagement.BlazorUI/Pages/LeaveTypes/Index.razor index 699495e..de6006b 100644 --- a/HR.LeaveManagement.BlazorUI/Pages/LeaveTypes/Index.razor +++ b/HR.LeaveManagement.BlazorUI/Pages/LeaveTypes/Index.razor @@ -1,5 +1,7 @@ @page "/leavetypes/" +Leave Types +

Leave Types

diff --git a/HR.LeaveManagement.BlazorUI/Pages/Login.razor b/HR.LeaveManagement.BlazorUI/Pages/Login.razor index fdf5acd..8850b5b 100644 --- a/HR.LeaveManagement.BlazorUI/Pages/Login.razor +++ b/HR.LeaveManagement.BlazorUI/Pages/Login.razor @@ -1,5 +1,7 @@ @page "/login" +Login +

Login

@if (string.IsNullOrEmpty(Message) == false) { diff --git a/HR.LeaveManagement.BlazorUI/Pages/Register.razor b/HR.LeaveManagement.BlazorUI/Pages/Register.razor index 212d9f9..9b23347 100644 --- a/HR.LeaveManagement.BlazorUI/Pages/Register.razor +++ b/HR.LeaveManagement.BlazorUI/Pages/Register.razor @@ -1,5 +1,7 @@ @page "/register" +Register +

Register

@if (string.IsNullOrEmpty(Message) == false) diff --git a/HR.LeaveManagement.BlazorUI/Shared/MainLayout.razor.css b/HR.LeaveManagement.BlazorUI/Shared/MainLayout.razor.css index e9459c5..ed1d27f 100644 --- a/HR.LeaveManagement.BlazorUI/Shared/MainLayout.razor.css +++ b/HR.LeaveManagement.BlazorUI/Shared/MainLayout.razor.css @@ -56,7 +56,7 @@ main { } .sidebar { - width: 250px; + width: 290px; height: 100vh; position: sticky; top: 0; diff --git a/HR.LeaveManagement.BlazorUI/Shared/NavMenu.razor b/HR.LeaveManagement.BlazorUI/Shared/NavMenu.razor index 1548211..102e9a3 100644 --- a/HR.LeaveManagement.BlazorUI/Shared/NavMenu.razor +++ b/HR.LeaveManagement.BlazorUI/Shared/NavMenu.razor @@ -1,6 +1,6 @@