diff --git a/Caching-MySQL b/Caching-MySQL index db69b6d4..b57e038c 160000 --- a/Caching-MySQL +++ b/Caching-MySQL @@ -1 +1 @@ -Subproject commit db69b6d4d0531652b3a00e4ccefc6ebb5db3adc1 +Subproject commit b57e038ca5409e7f41dd4b63f579765d3738fcbc diff --git a/Dockerfile b/Dockerfile index 26f59125..43b54a80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN dotnet publish -c $BUILD_CONFIG --self-contained -r linux-x64 \ FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-bookworm-slim WORKDIR /app -ENV USER=nobody TZ=Europe/Warsaw +ENV USER=nobody ARG BUILD_CONFIG=${BUILD_CONFIG:-Release} COPY --from=build --chown="$USER":"$USER" /build/DotnetPlayground.Web/bin/$BUILD_CONFIG/net8.0/linux-x64/publish/ /build/startApp.sh ./ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 1b479c3b..ea300011 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -35,7 +35,7 @@ RUN dotnet publish -c $BUILD_CONFIG --self-contained -r linux-musl-x64 \ FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine RUN apk add tzdata WORKDIR /app -ENV USER=nobody TZ=Europe/Warsaw +ENV USER=nobody ARG BUILD_CONFIG=${BUILD_CONFIG:-Release} COPY --from=build --chown="$USER":"$USER" /build/DotnetPlayground.Web/bin/$BUILD_CONFIG/net8.0/linux-musl-x64/publish/ /build/startApp.sh ./ diff --git a/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj b/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj index 30a9d5d5..54e44221 100644 --- a/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj +++ b/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj @@ -10,21 +10,21 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Login.cshtml b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Login.cshtml index 9b6d68cf..975d567d 100644 --- a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Login.cshtml +++ b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Login.cshtml @@ -4,6 +4,16 @@ ViewData["Title"] = "Log in"; } +@section headElements +{ + + + + + + +} +

@ViewData["Title"]

diff --git a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml index 6be02440..98e385ac 100644 --- a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml +++ b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml @@ -5,6 +5,16 @@ ViewData["ActivePage"] = ManageNavPages.ExternalLogins; } +@section headElements +{ + + + + + + +} + @if (Model.CurrentLogins?.Count > 0) { diff --git a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml index b8b3a3f6..f21036db 100644 --- a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml +++ b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml @@ -8,7 +8,10 @@ Layout = "/Areas/Identity/Pages/_Layout.cshtml"; } } - +@section headElements +{ + @RenderSection("headElements", required: false) +}

Manage your account

diff --git a/DotnetPlayground.Web/DotnetPlayground.Web.csproj b/DotnetPlayground.Web/DotnetPlayground.Web.csproj index e3780d0a..8064e879 100644 --- a/DotnetPlayground.Web/DotnetPlayground.Web.csproj +++ b/DotnetPlayground.Web/DotnetPlayground.Web.csproj @@ -37,25 +37,27 @@ - - - - - - - + + + buildTransitive + + + + + + - + - - - - - - - + + + + + + + @@ -77,9 +79,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DotnetPlayground.Web/Pages/WebCamGallery.cshtml b/DotnetPlayground.Web/Pages/WebCamGallery.cshtml index 74fd7cf6..959982df 100644 --- a/DotnetPlayground.Web/Pages/WebCamGallery.cshtml +++ b/DotnetPlayground.Web/Pages/WebCamGallery.cshtml @@ -17,7 +17,7 @@ - @@ -137,7 +137,7 @@ - diff --git a/DotnetPlayground.Web/Views/Hashes/VirtualScroll.cshtml b/DotnetPlayground.Web/Views/Hashes/VirtualScroll.cshtml index 986ed13f..42095a81 100644 --- a/DotnetPlayground.Web/Views/Hashes/VirtualScroll.cshtml +++ b/DotnetPlayground.Web/Views/Hashes/VirtualScroll.cshtml @@ -44,7 +44,7 @@ - @@ -56,7 +56,7 @@ - diff --git a/DotnetPlayground.Web/Views/Home/Contact.cshtml b/DotnetPlayground.Web/Views/Home/Contact.cshtml index ab8a27c9..4c678172 100644 --- a/DotnetPlayground.Web/Views/Home/Contact.cshtml +++ b/DotnetPlayground.Web/Views/Home/Contact.cshtml @@ -24,7 +24,7 @@ - diff --git a/DotnetPlayground.Web/Views/Shared/_Layout.cshtml b/DotnetPlayground.Web/Views/Shared/_Layout.cshtml index c7ef79ff..a183faea 100644 --- a/DotnetPlayground.Web/Views/Shared/_Layout.cshtml +++ b/DotnetPlayground.Web/Views/Shared/_Layout.cshtml @@ -7,144 +7,139 @@ - - - - - - - @ViewData["Title"] - @Conf["AppTitleName"] - - - - - - - - - - - @RenderSection("headElements", required: false) + + + + + + + @ViewData["Title"] - @Conf["AppTitleName"] + + + + + + + + + + + @RenderSection("headElements", required: false) -
- -
-
- @RenderBody() -
-
-
- -

© 2022 - @Conf["AppTitleName"]

-
- - - - - @*This is the fix, to enforce manual loading, but why? https://github.com/dotnet/aspnetcore/issues/39715 *@ - @* *@ - - - - - - +
+ +
+
+ @RenderBody() +
+
+
+ +

© 2022 - @Conf["AppTitleName"]

+
+ + + + + @*This is the fix, to enforce manual loading, but why? https://github.com/dotnet/aspnetcore/issues/39715 *@ + @* *@ + + + + + + - @RenderSection("scripts", required: false) + @RenderSection("scripts", required: false) diff --git a/DotnetPlayground.Web/Views/Shared/_LoginPartial.cshtml b/DotnetPlayground.Web/Views/Shared/_LoginPartial.cshtml index db8f3b76..2c5e9758 100644 --- a/DotnetPlayground.Web/Views/Shared/_LoginPartial.cshtml +++ b/DotnetPlayground.Web/Views/Shared/_LoginPartial.cshtml @@ -7,27 +7,27 @@ @inject UserManager UserManager \ No newline at end of file diff --git a/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml b/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml index d0bca55d..ab698f48 100644 --- a/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/DotnetPlayground.Web/Views/Shared/_ValidationScriptsPartial.cshtml @@ -3,7 +3,7 @@ - diff --git a/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml b/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml index adc19ad0..9f88edd5 100644 --- a/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml +++ b/DotnetPlayground.Web/Views/ViewCodeGenerator/Index.cshtml @@ -17,13 +17,13 @@ - - - +