to integration from master

.github/workflows/azure_deploy.yml → .github/workflows/Azure-Deploy.yml

@@ -1,68 +1,67 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-
-name: Build and deploy ASP.Net Core app to Azure Web App - CheckDriver
-
-on:
-  push:
-    branches:
-      - master
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '8.x'
-          include-prerelease: true
-
-      - name: Build with dotnet
-        run: dotnet build --configuration Release
-        working-directory: CheckDrive.Web
-
-      - name: dotnet publish
-        run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp
-        working-directory: CheckDrive.Web
-
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v3
-        with:
-          name: .net-app
-          path: ${{env.DOTNET_ROOT}}/myapp
-
-  deploy:
-    runs-on: windows-latest
-    needs: build
-    environment:
-      name: 'Production'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    permissions:
-      id-token: write #This is required for requesting the JWT
-
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v3
-        with:
-          name: .net-app
-
-      - name: Login to Azure
-        uses: azure/login@v1
-        with:
-          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_E9AF348E5C5C43AA8D4DC6D5D7832550 }}
-          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_C81C36AF407F47E0841F8C513B2E4689 }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_548C4B80BB1545B19DFB28DE2B816ED6 }}
-
-      - name: Deploy to Azure Web App
-        id: deploy-to-webapp
-        uses: azure/webapps-deploy@v2
-        with:
-          app-name: 'CheckDriver'
-          slot-name: 'Production'
-          package: .
-
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy ASP.Net Core app to Azure Web App - atp-garaj
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.x'
+
+      - name: Build with dotnet
+        run: dotnet build --configuration Release
+        working-directory: CheckDrive.Web
+
+      - name: dotnet publish
+        run: dotnet publish -c Release -o "${{env.DOTNET_ROOT}}/CheckDrive.Web"
+        working-directory: CheckDrive.Web
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/CheckDrive.Web
+
+  deploy:
+    runs-on: windows-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: .net-app
+
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_279F79A3A14745E19F51BFF7917E4B2D }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_E60C40B70B324D0DB04BC5600FF11804 }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_D88C36E96A8740BB8F8121A45BF9CD0F }}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'atp-garaj'
+          slot-name: 'Production'
+          package: .
+

CheckDrive.Web/CheckDrive.Web/CheckDrive.Web.csproj

@@ -13,25 +13,14 @@
     <None Remove="Controllers\**" />
     <Content Remove="wwwroot\css\LogOutButtun.css" />
     <_ContentIncludedByDefault Remove="appsettings.Production.json" />
-    <Compile Include="Controllers\AccountsController.cs" />
     <Compile Include="Controllers\AuthController.cs" />
     <Compile Include="Controllers\CarsController.cs" />
     <Compile Include="Controllers\CheckPointController.cs" />
-    <Compile Include="Controllers\DashboardController.cs" />
     <Compile Include="Controllers\DebtsController.cs" />
-    <Compile Include="Controllers\DispatcherReviewsController.cs" />
-    <Compile Include="Controllers\DoctorReviewsController.cs" />
-    <Compile Include="Controllers\DoctorsController.cs" />
-    <Compile Include="Controllers\DriversController.cs" />
+    <Compile Include="Controllers\EmployeesController.cs" />
     <Compile Include="Controllers\ErrorController.cs" />
+    <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\OilMarksController.cs" />
-    <Compile Include="Controllers\RolesController.cs" />
-    <Compile Include="Controllers\MechanicAcceptancesController.cs" />
-    <Compile Include="Controllers\MechanicHandoversController.cs" />
-    <Compile Include="Controllers\MechanicsController.cs" />
-    <Compile Include="Controllers\OperatorReviewsController.cs" />
-    <Compile Include="Controllers\OperatorsController.cs" />
-    <Compile Include="Controllers\TechniciansController.cs" />
     <None Include="wwwroot\css\LogOutButtun.css" />
     <None Include="wwwroot\font-awesome\js\all.js" />
     <None Include="wwwroot\font-awesome\js\all.min.js" />
@@ -56,8 +45,15 @@
     <None Include="wwwroot\font-awesome\webfonts\fa-v4compatibility.woff2" />
     <PackageReference Include="CheckDrive.ApiContracts" Version="1.4.9" />
     <PackageReference Include="CheckDrive.DTOs" Version="1.0.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.3" />
+    <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
+    <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.1-dev-00046" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.1.50" />
     <PackageReference Include="Syncfusion.Licensing" Version="27.1.50" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />

CheckDrive.Web/CheckDrive.Web/Configurations/CheckDriveApiSettings.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace CheckDrive.Web.Configurations;
+
+public sealed class CheckDriveApiSettings
+{
+    public const string SectionName = "CheckDriveApi";
+
+    [Required(ErrorMessage = "API Base address is required.")]
+    public required string BaseAddress { get; init; }
+
+    [Required(ErrorMessage = "Timeout seconds required.")]
+    public int TimeoutSeconds { get; set; }
+}

CheckDrive.Web/CheckDrive.Web/Constants/ConfigurationConstants.cs

@@ -0,0 +1,8 @@
+namespace CheckDrive.Web.Constants;
+
+public static class ConfigurationConstants
+{
+    public const string JwtToken = "JwtToken";
+    public const string SynfusionLicenseKey = nameof(SynfusionLicenseKey);
+    public const string AuthorizationCookieHeader = "AuthToken";
+}

CheckDrive.Web/CheckDrive.Web/Constants/HeaderConstants.cs

@@ -0,0 +1,8 @@
+namespace CheckDrive.Web.Constants;
+
+public static class HeaderConstants
+{
+    public const string AccessTokenHeader = "access_token";
+    public const string RefreshTokenHeader = "refresh_token";
+    public const string AuthenticationSchema = "Bearer";
+}