Merge branch 'main' into feature/admin

2024-02-29 22:38:06 +00:00 · 2024-02-29 22:38:06 +00:00 · f949bded9b
parent e11c8327ec 18cb6aa806
commit f949bded9b
15 changed files with 165 additions and 68 deletions
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@ -14,7 +14,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
    - name: Add NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
    - name: Restore dependencies
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@ -17,7 +17,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x

    - name: Add GitHub NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -17,7 +17,7 @@ jobs:
    - name: Setup .NET
      uses: actions/setup-dotnet@v3
      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x

    - name: Add GitHub NuGet source
      run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
--- a/OliverBooth.sln
+++ b/OliverBooth.sln
@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OliverBooth", "OliverBooth\OliverBooth.csproj", "{A58A6FA3-480C-400B-822A-3786741BF39C}"
 EndProject
--- a/OliverBooth/Pages/Blog/Index.cshtml
+++ b/OliverBooth/Pages/Blog/Index.cshtml
@ -8,8 +8,21 @@
@{
    ViewData["Title"] = "Blog";
    MastodonStatus latestStatus = MastodonService.GetLatestStatus();
+    bool doAprilFools = DateOnly.FromDateTime(DateTime.UtcNow) == new DateOnly(2024, 04, 01) || Environment.GetEnvironmentVariable("DO_AF") == "1";
 }

+@if (doAprilFools)
+{
+    <h1>UNDER CONSTRUCTION</h1>
+    <div style="text-align: center">
+        <img src="~/img/construction_90x85.gif">
+        <img src="~/img/underconstruction_323x118.gif">
+        <img src="~/img/construction_90x85.gif">
+        <p>Coming soon WATCH THIS SPACE</p>
+    </div>
+}
+else
+{
    <div class="card text-center mastodon-update-card">
        <div class="card-body">
            @Html.Raw(latestStatus.Content)
@ -79,3 +92,4 @@
            {{/each}}
        </div>
    </script>
+}
--- a/OliverBooth/Pages/Shared/_Layout.cshtml
+++ b/OliverBooth/Pages/Shared/_Layout.cshtml
@ -8,6 +8,7 @@
@{
    HttpRequest request = Context.Request;
    var url = new Uri($"{request.Scheme}://{request.Host}{request.Path}{request.QueryString}");
+    bool doAprilFools = DateOnly.FromDateTime(DateTime.UtcNow) == new DateOnly(2024, 04, 01) || Environment.GetEnvironmentVariable("DO_AF") == "1";
 }
 <!DOCTYPE html>
 <html lang="en" data-bs-theme="dark">
@ -66,13 +67,29 @@
    <link rel="stylesheet" href="~/css/app.min.css" asp-append-version="true">
    <link rel="stylesheet" href="~/css/ribbon.min.css" asp-append-version="true">
    @await RenderSectionAsync("Styles", required: false)
+    @if (doAprilFools)
+    {
+        <link rel="stylesheet" href="~/css/af-app.min.css" asp-append-version="true">
+    }
    <base href="~/">
 </head>
 <body>
 <header class="container" style="margin-top: 20px;">
    <div id="site-title" class="text-center">
        <h1>
+            @if (doAprilFools)
+            {
+                <marquee>
+                    <a href="/">
+                        <img src="~/img/ob-af-256x256.png" alt="Oliver Booth" height="128">
+                        <img src="~/img/af-oliverbooth-1236x293.png" alt="Oliver Booth" height="128">
+                    </a>
+                </marquee>
+            }
+            else
+            {
                <a href="/"><img src="~/img/ob-256x256.png" alt="Oliver Booth" height="128"> Oliver Booth</a>
+            }
        </h1>
    </div>
 </header>
@ -101,7 +118,7 @@

 <div style="margin:50px 0;"></div>

-@if (DateTimeOffset.UtcNow < new DateTime(2024, 03, 08))
+@if (!doAprilFools && DateTimeOffset.UtcNow < new DateTime(2024, 03, 08))
 {
    <div id="usa-countdown" class="container">
        <div class="row">
@ -116,6 +133,13 @@
 <div style="margin:50px 0;"></div>

 <div class="container">
+    @if (doAprilFools)
+    {
+        <h1 style="text-decoration: underline; color: #0f0 !important; margin: 20px 0;">
+            <img src="~/img/af-homepage_500x383.jpg" alt="WELCOME TO MY HOMEPAGE!!!!111SHIFT+1">
+        </h1>
+    }
+
    <main role="main" class="pb-3">
        @RenderBody()
    </main>
@ -133,7 +157,7 @@
        </ul>

        <ul class="footer-nav" style="margin-top: 20px;">
-            <li>&copy; @DateTime.UtcNow.Year</li>
+            <li>@(doAprilFools ? "(C) 2003" : Html.Raw($"&copy; {DateTime.UtcNow.Year}"))</li>
            <li><a asp-page="/privacy/index">Privacy</a></li>
            @if (SessionService.TryGetSession(Context.Request, out ISession? session) &&
                 UserService.TryGetUser(session.UserId, out _))
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "7.0.0",
+    "version": "8.0.0",
    "rollForward": "latestMajor",
    "allowPrerelease": false
  }
--- a/src/img/af-homepage_500x383.jpg
+++ b/src/img/af-homepage_500x383.jpg
--- a/src/img/af-oliverbooth-1236x293.png
+++ b/src/img/af-oliverbooth-1236x293.png
--- a/src/img/af-oliverbooth.png
+++ b/src/img/af-oliverbooth.png
--- a/src/img/cloud_672x148.gif
+++ b/src/img/cloud_672x148.gif
--- a/src/img/construction_90x85.gif
+++ b/src/img/construction_90x85.gif
--- a/src/img/ob-af-256x256.png
+++ b/src/img/ob-af-256x256.png
--- a/src/img/underconstruction_323x118.gif
+++ b/src/img/underconstruction_323x118.gif
--- a/src/scss/af-app.scss
+++ b/src/scss/af-app.scss
@ -0,0 +1,59 @@
+$font: "Comic Sans MS", cursive !important;
+
+html, body {
+  background: #c7e7ff url("/img/cloud_672x148.gif") repeat !important;
+}
+
+html, body, * {
+  font-family: serif !important;
+  color: #f00;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: $font;
+  text-transform: uppercase !important;
+}
+
+a:link {
+  color: #00f !important;
+  text-decoration: underline !important;
+}
+
+a:visited {
+  color: #909 !important;
+  text-decoration: underline !important;
+}
+a:hover {
+  color: #00f !important;
+  text-decoration: underline !important;
+}
+a:active {
+  color: #909 !important;
+  text-decoration: underline !important;
+}
+
+footer, footer *{
+  color: #000 !important;
+}
+
+.rounded-circle {
+  border-radius: 0 !important;
+}
+
+main.container {
+  background: #ff0 !important;
+}
+
+.alert {
+  border-radius: 0 !important;
+}
+
+input.form-control, textarea.form-control {
+  background: #fff !important;
+  color: #000 !important;
+  font-family: $font;
+  
+  &::placeholder {
+    color: #9e9e9e !important;
+  }
+}