Bump typescript from 5.1.6 to 5.7.3 in /web

.github/dependabot.yml

@@ -0,0 +1,31 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/web/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/API/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/API.Tests/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/DataFacade/" # Location of package manifests
+    schedule:
+      interval: "monthly"      
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/DataFacade.Tests/" # Location of package manifests
+    schedule:
+      interval: "monthly"      
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"      

.github/workflows/build.yml

@@ -0,0 +1,124 @@
+name: Build
+#concurrency: deploy
+
+on: 
+  push:
+    branches:
+      - "main"
+      - "release"
+  pull_request:
+    branches:
+      - "main"
+  schedule:
+    - cron: "0 4 * * 0" 
+
+env:
+  AZURE_NEXTJS_WEBAPP_NAME: 'RobertLynJANext'   
+  AZURE_WEBAPP_PACKAGE_PATH: './'         
+  WEB_WORKING_DIRECTORY: './web'
+  AZURE_API_WEBAPP_NAME: 'RobertLynJAApi'
+  DEPLOY: ${{ github.event_name == 'push' }}
+
+jobs:
+
+  build-web:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Lowercase the repo name
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+
+      - name: Build and push container image to registry
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ env.DEPLOY }}
+          tags: ghcr.io/${{ env.REPO }}-web:${{ github.sha }}
+          file: ./web/Dockerfile
+
+  deploy-web:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
+    needs: [build-web, build-api]
+
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Lowercase the repo name
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@2fdd5c3ebb4e540834e86ecc1f6fdcd5539023ee
+        with:
+          app-name: ${{ env.AZURE_NEXTJS_WEBAPP_NAME }}
+          publish-profile: ${{ secrets.AZURE_NEXTJS_PUBLISH_PROFILE_D }}
+          images: 'ghcr.io/${{ env.REPO }}-web:${{ github.sha }}'
+
+  build-api:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Lowercase the repo name
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+
+      - name: Build and push container image to registry
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ env.DEPLOY }}
+          tags: ghcr.io/${{ env.REPO }}-api:${{ github.sha }}
+          file: ./API/Dockerfile
+
+  deploy-api:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
+    needs: [build-web, build-api]
+
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Lowercase the repo name
+        run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@2fdd5c3ebb4e540834e86ecc1f6fdcd5539023ee
+        with:
+          app-name: ${{ env.AZURE_API_WEBAPP_NAME }}
+          publish-profile: ${{ secrets.AZURE_API_PUBLISH_PROFILE_D }}
+          images: 'ghcr.io/${{ env.REPO }}-api:${{ github.sha }}'

.github/workflows/cleanLogs.yml

@@ -0,0 +1,15 @@
+name: Clean Workflow Logs
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"  # Runs "At 00:00 on Monday." (see https://crontab.guru)
+
+jobs:
+  clean-logs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: igorjs/gh-actions-clean-workflow@v6
+        with:
+          runs_older_than: "14" # optional, default value: "7"
+          token: ${{ github.token }}

.github/workflows/cleanPackages.yml

@@ -0,0 +1,21 @@
+name: Clean Packages
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"  # Runs "At 00:00 on Monday." (see https://crontab.guru)
+
+jobs:
+  clean-packages:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/delete-package-versions@v5
+        with: 
+          package-name: 'blog2-api'
+          package-type: 'container'
+          min-versions-to-keep: 10
+      - uses: actions/delete-package-versions@v5
+        with: 
+          package-name: 'blog2-web'
+          package-type: 'container'
+          min-versions-to-keep: 10

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/API/appsettings.Local.json

API.Tests/API.Tests.csproj

@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Castle.Core" Version="5.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\API\API.csproj" />
+  </ItemGroup>
+
+</Project>

API.Tests/Controllers/SiteControllerTests.cs

@@ -0,0 +1,34 @@
+using API.Controllers;
+using API.Tests.TestExtensions;
+using Castle.Core.Logging;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using NSubstitute.Core.Arguments;
+
+namespace Api.Tests.Controllers;
+
+public class SiteControllerTests
+{
+    [Fact]
+    public void SiteController_Get_ReturnsText()
+    {
+        //Arrange
+        var logger = Substitute.For<ILogger<SiteController>>();
+        var controller = new SiteController(logger)
+        {
+            ControllerContext = new ControllerContext()
+            {
+                HttpContext = new DefaultHttpContext()
+            }
+        };
+
+        //Act
+        var contentResult = controller.GetHelloMessage();
+
+        // Assert
+        Assert.NotNull(contentResult);
+        Assert.Equal("Hello, I'm working :)", contentResult);
+        logger.Received().AnyLogOfType(LogLevel.Information);
+    }
+}

API.Tests/Controllers/StoriesControllerTests.cs

@@ -0,0 +1,12 @@
+using API.Controllers;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Api.Tests.Controllers;
+
+public class StoriesControllerTests
+{
+    [Fact]
+    public void Test1()
+    {
+    }
+}

API.Tests/TestExtensions/ILoggerExtensions.cs

@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace API.Tests.TestExtensions;
+
+public static class ILoggerExtensions
+{
+    public static void AnyLogOfType<T>(this ILogger<T> logger, LogLevel level) where T : class
+    {
+        logger.Log(level, Arg.Any<EventId>(), Arg.Any<object>(), Arg.Any<Exception>(),
+            Arg.Any<Func<object, Exception?, string>>());
+    }
+}

API.Tests/Usings.cs

@@ -0,0 +1,2 @@
+global using Xunit;
+global using NSubstitute;

API/API.csproj

@@ -1,13 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <None Remove="appsettings.Local.json.template" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.Local.json.template" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DataFacade\DataFacade.csproj" />
   </ItemGroup>
 
 </Project>

API/Controllers/SiteController.cs

@@ -0,0 +1,39 @@
+using MediatR;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Mvc;
+
+namespace API.Controllers;
+
+[Route("/")]
+[ApiController]
+public class SiteController(ILogger<SiteController> logger) : ControllerBase
+{
+    private readonly ILogger<SiteController> _logger = logger;
+
+    [HttpGet]
+    public string GetHelloMessage()
+    {
+        _logger.LogInformation("URL: {URL}", Request.GetDisplayUrl());
+        return "Hello, I'm working :)";
+    }
+
+    [Route("testadmin")]
+    [Authorize(Policy="Admin")]
+    [HttpGet]
+    public string TestAdmin()
+    {
+        _logger.LogInformation("URL: {URL}", Request.GetDisplayUrl());
+        return "Authorized Admin";
+    }
+
+    [Route("testuser")]
+    [Authorize]
+    [HttpGet]
+    public string TestUser()
+    {
+        _logger.LogInformation("URL: {URL}", Request.GetDisplayUrl());
+        return "Authorized User";
+    }
+}