diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 4c75b53..ecc1cd8 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -18,7 +18,7 @@ jobs: - name: Build docker image. run: | proxy - podman pull mcr.microsoft.com/dotnet/aspnet:9.0 + podman pull mcr.microsoft.com/dotnet/aspnet:10.0 unproxy cd YaeBlog podman build . -t ccr.ccs.tencentyun.com/jackfiled/blog --build-arg COMMIT_ID=$(git rev-parse --short=10 HEAD) diff --git a/YaeBlog/Components/App.razor b/YaeBlog/Components/App.razor index 75b2658..2842d7a 100644 --- a/YaeBlog/Components/App.razor +++ b/YaeBlog/Components/App.razor @@ -5,16 +5,33 @@ - - - - + + + + + - - + + diff --git a/YaeBlog/Components/EssayCard.razor b/YaeBlog/Components/EssayCard.razor index 99cb3f1..955935f 100644 --- a/YaeBlog/Components/EssayCard.razor +++ b/YaeBlog/Components/EssayCard.razor @@ -3,7 +3,7 @@
- @(Essay.Title) + @(Essay.Title)
@@ -14,9 +14,7 @@ @foreach (string key in Essay.Tags) {
- - # @key - +
}
diff --git a/YaeBlog/Components/Layout/BlogLayout.razor b/YaeBlog/Components/Layout/BlogLayout.razor new file mode 100644 index 0000000..1eb1c78 --- /dev/null +++ b/YaeBlog/Components/Layout/BlogLayout.razor @@ -0,0 +1,28 @@ +@inherits LayoutComponentBase + +@attribute [StreamRendering] + +
+
+
+ + Ricardo's Blog + +
+ +
+
+ + + + +
+
+
+ +
+ @Body +
+ + +
diff --git a/YaeBlog/Layout/MainLayout.razor b/YaeBlog/Components/Layout/MainLayout.razor similarity index 100% rename from YaeBlog/Layout/MainLayout.razor rename to YaeBlog/Components/Layout/MainLayout.razor diff --git a/YaeBlog/Pages/About.razor b/YaeBlog/Components/Pages/About.razor similarity index 100% rename from YaeBlog/Pages/About.razor rename to YaeBlog/Components/Pages/About.razor diff --git a/YaeBlog/Pages/Archives.razor b/YaeBlog/Components/Pages/Archives.razor similarity index 100% rename from YaeBlog/Pages/Archives.razor rename to YaeBlog/Components/Pages/Archives.razor diff --git a/YaeBlog/Pages/BlogIndex.razor b/YaeBlog/Components/Pages/BlogIndex.razor similarity index 100% rename from YaeBlog/Pages/BlogIndex.razor rename to YaeBlog/Components/Pages/BlogIndex.razor diff --git a/YaeBlog/Pages/Essays.razor b/YaeBlog/Components/Pages/Essays.razor similarity index 100% rename from YaeBlog/Pages/Essays.razor rename to YaeBlog/Components/Pages/Essays.razor diff --git a/YaeBlog/Pages/Friends.razor b/YaeBlog/Components/Pages/Friends.razor similarity index 100% rename from YaeBlog/Pages/Friends.razor rename to YaeBlog/Components/Pages/Friends.razor diff --git a/YaeBlog/Pages/Index.razor b/YaeBlog/Components/Pages/Index.razor similarity index 95% rename from YaeBlog/Pages/Index.razor rename to YaeBlog/Components/Pages/Index.razor index 1546c3a..dab799c 100644 --- a/YaeBlog/Pages/Index.razor +++ b/YaeBlog/Components/Pages/Index.razor @@ -7,7 +7,7 @@
- Ricardo's Avatar + Ricardo's Avatar
diff --git a/YaeBlog/Pages/NotFound.razor b/YaeBlog/Components/Pages/NotFound.razor similarity index 100% rename from YaeBlog/Pages/NotFound.razor rename to YaeBlog/Components/Pages/NotFound.razor diff --git a/YaeBlog/Pages/Tags.razor b/YaeBlog/Components/Pages/Tags.razor similarity index 100% rename from YaeBlog/Pages/Tags.razor rename to YaeBlog/Components/Pages/Tags.razor diff --git a/YaeBlog/_Imports.razor b/YaeBlog/Components/_Imports.razor similarity index 96% rename from YaeBlog/_Imports.razor rename to YaeBlog/Components/_Imports.razor index e5a1ddf..e1cbac4 100644 --- a/YaeBlog/_Imports.razor +++ b/YaeBlog/Components/_Imports.razor @@ -6,5 +6,4 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using YaeBlog @using YaeBlog.Components diff --git a/YaeBlog/Directory.Build.targets b/YaeBlog/Directory.Build.targets new file mode 100644 index 0000000..fd87244 --- /dev/null +++ b/YaeBlog/Directory.Build.targets @@ -0,0 +1,53 @@ + + + pnpm install + pnpm run build + --output + + + + <_RestoreClientAssetsBeforeTargets Condition="'$(TargetFramework)' == ''">DispatchToInnerBuilds + + + + + + + + + + <_ClientAssetsOutputFullPath>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)ClientAssets')) + + + + + + + <_ClientAssetsBuildOutput Include="$(IntermediateOutputPath)ClientAssets\**"/> + + + + + + + + + + + + + + + + + + diff --git a/YaeBlog/Dockerfile b/YaeBlog/Dockerfile index fc49c56..933638a 100644 --- a/YaeBlog/Dockerfile +++ b/YaeBlog/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 +FROM mcr.microsoft.com/dotnet/aspnet:10.0 ARG COMMIT_ID ENV COMMIT_ID=${COMMIT_ID} WORKDIR /app -COPY bin/Release/net9.0/publish/ ./ +COPY bin/Release/net10.0/publish/ ./ COPY source/ ./source/ COPY appsettings.json . diff --git a/YaeBlog/Layout/BlogLayout.razor b/YaeBlog/Layout/BlogLayout.razor deleted file mode 100644 index 82ab91a..0000000 --- a/YaeBlog/Layout/BlogLayout.razor +++ /dev/null @@ -1,44 +0,0 @@ -@inherits LayoutComponentBase - -@attribute [StreamRendering] - -
-
-
- - Ricardo's Blog - -
- -
-
- - - - -
-
-
- -
- @Body -
- - -
diff --git a/YaeBlog/YaeBlog.csproj b/YaeBlog/YaeBlog.csproj index 29ba300..6a6d8a7 100644 --- a/YaeBlog/YaeBlog.csproj +++ b/YaeBlog/YaeBlog.csproj @@ -11,30 +11,13 @@ - net9.0 + net10.0 enable enable - - - - - - - - - - - - - - - - - - - - - + + pnpm install + pwsh build-tailwind.ps1 + diff --git a/YaeBlog/appsettings.json b/YaeBlog/appsettings.json index 27635cb..7f75dba 100644 --- a/YaeBlog/appsettings.json +++ b/YaeBlog/appsettings.json @@ -37,7 +37,7 @@ "Name": "万木长风", "Description": "世界渲染中...", "Link": "https://ryohai.fun", - "AvatarImage": "https://ryohai.fun/icon.jpg" + "AvatarImage": "https://ryohai.fun/static/favicons/favicon-32x32.png" } ] } diff --git a/YaeBlog/build-tailwind.ps1 b/YaeBlog/build-tailwind.ps1 new file mode 100644 index 0000000..cfb7e65 --- /dev/null +++ b/YaeBlog/build-tailwind.ps1 @@ -0,0 +1,7 @@ +[cmdletbinding()] +param( + [string]$output = "wwwroot" +) + +Write-Output "Output directory: $output" +pnpm tailwindcss -i wwwroot/tailwind.css -o $output/tailwind.g.css diff --git a/YaeBlog/docker-compose.yaml b/YaeBlog/docker-compose.yaml index a505b3d..bc985dd 100644 --- a/YaeBlog/docker-compose.yaml +++ b/YaeBlog/docker-compose.yaml @@ -1,13 +1,13 @@ version: '3.8' services: - blog: - image: registry.cn-beijing.aliyuncs.com/jackfiled/blog:latest - restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.blog.rule=Host(`rrricardo.top`) || Host(`www.rrricardo.top`)" - - "traefik.http.services.blog.loadbalancer.server.port=8080" - - "traefik.http.routers.blog.tls=true" - - "traefik.http.routers.blog.tls.certresolver=myresolver" - - "com.centurylinklabs.watchtower.enable=true" + blog: + image: registry.cn-beijing.aliyuncs.com/jackfiled/blog:latest + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.routers.blog.rule=Host(`rrricardo.top`) || Host(`www.rrricardo.top`)" + - "traefik.http.services.blog.loadbalancer.server.port=8080" + - "traefik.http.routers.blog.tls=true" + - "traefik.http.routers.blog.tls.certresolver=myresolver" + - "com.centurylinklabs.watchtower.enable=true" diff --git a/YaeBlog/wwwroot/globals.css b/YaeBlog/wwwroot/globals.css deleted file mode 100644 index ecbb546..0000000 --- a/YaeBlog/wwwroot/globals.css +++ /dev/null @@ -1,15 +0,0 @@ -@font-face { - font-family: "Font Awesome 6 Free"; - font-style: normal; - font-weight: 400; - font-display: block; - src: url(fonts/fa-regular-400.woff2) format("woff2"), url(fonts/fa-regular-400.ttf) format("truetype") -} - -@font-face { - font-family: "Font Awesome 6 Free"; - font-style: normal; - font-weight: 900; - font-display: block; - src: url(fonts/fa-solid-900.woff2) format("woff2"), url(fonts/fa-solid-900.ttf) format("truetype") -}