From cc2def38c0c69b27fce2997d757f4af5034a46c5 Mon Sep 17 00:00:00 2001 From: jackfiled Date: Tue, 25 Jun 2024 14:39:42 +0800 Subject: [PATCH] add: Divide Layout into two layouts. --- YaeBlog/Components/App.razor | 9 +- YaeBlog/Components/Routes.razor | 10 ++- YaeBlog/Layout/BlogLayout.razor | 77 +++++++++++++++++ YaeBlog/Layout/BlogLayout.razor.css | 4 + YaeBlog/Layout/MainLayout.razor | 80 +++--------------- YaeBlog/Layout/MainLayout.razor.css | 4 - YaeBlog/Pages/About.razor | 2 +- YaeBlog/Pages/Archives.razor | 4 +- YaeBlog/Pages/{Home.razor => BlogIndex.razor} | 8 +- .../{Home.razor.css => BlogIndex.razor.css} | 0 YaeBlog/Pages/Error.razor | 36 -------- YaeBlog/Pages/Essay.razor | 2 +- YaeBlog/Pages/Index.razor | 76 +++++++++++++++++ YaeBlog/Pages/Index.razor.css | 15 ++++ YaeBlog/Pages/Links.razor | 2 +- YaeBlog/Pages/Tags.razor | 6 +- YaeBlog/YaeBlog.csproj | 24 ------ YaeBlog/appsettings.json | 2 +- YaeBlog/wwwroot/images/blog-icon.png | Bin 0 -> 675 bytes YaeBlog/wwwroot/images/git-icon.png | Bin 0 -> 1859 bytes YaeBlog/wwwroot/images/wiki-icon.png | Bin 0 -> 1269 bytes 21 files changed, 214 insertions(+), 147 deletions(-) create mode 100644 YaeBlog/Layout/BlogLayout.razor create mode 100644 YaeBlog/Layout/BlogLayout.razor.css rename YaeBlog/Pages/{Home.razor => BlogIndex.razor} (96%) rename YaeBlog/Pages/{Home.razor.css => BlogIndex.razor.css} (100%) delete mode 100644 YaeBlog/Pages/Error.razor create mode 100644 YaeBlog/Pages/Index.razor create mode 100644 YaeBlog/Pages/Index.razor.css create mode 100644 YaeBlog/wwwroot/images/blog-icon.png create mode 100644 YaeBlog/wwwroot/images/git-icon.png create mode 100644 YaeBlog/wwwroot/images/wiki-icon.png diff --git a/YaeBlog/Components/App.razor b/YaeBlog/Components/App.razor index 2fb0132..073c765 100644 --- a/YaeBlog/Components/App.razor +++ b/YaeBlog/Components/App.razor @@ -1,4 +1,5 @@ - +@using Microsoft.FluentUI.AspNetCore.Components.DesignTokens + @@ -6,6 +7,7 @@ + @@ -13,6 +15,11 @@ + + + + + diff --git a/YaeBlog/Components/Routes.razor b/YaeBlog/Components/Routes.razor index 2641859..281a9c4 100644 --- a/YaeBlog/Components/Routes.razor +++ b/YaeBlog/Components/Routes.razor @@ -1,6 +1,14 @@  - + @if (routeData.Template is not null && routeData.Template.StartsWith("/blog")) + { + + } + else + { + + } + diff --git a/YaeBlog/Layout/BlogLayout.razor b/YaeBlog/Layout/BlogLayout.razor new file mode 100644 index 0000000..7eae5bc --- /dev/null +++ b/YaeBlog/Layout/BlogLayout.razor @@ -0,0 +1,77 @@ +@using YaeBlog.Core.Models +@inherits LayoutComponentBase + +@inject BlogOptions BlogOptionsInstance + + + + +
+ + + + @BlogOptionsInstance.Author + + + + + + +
+ + + 首页 + +
+ + + +
+ + + 归档 + +
+ + + +
+ + + 标签 + +
+ + + +
+ + + 关于 + +
+ + + +
+ + + 友链 + +
+ + +
+ + + +
+ @Body +
+ + diff --git a/YaeBlog/Layout/BlogLayout.razor.css b/YaeBlog/Layout/BlogLayout.razor.css new file mode 100644 index 0000000..4a33391 --- /dev/null +++ b/YaeBlog/Layout/BlogLayout.razor.css @@ -0,0 +1,4 @@ +.quick-link { + display: flex; + align-items: center; +} diff --git a/YaeBlog/Layout/MainLayout.razor b/YaeBlog/Layout/MainLayout.razor index 1b3010a..5e956ca 100644 --- a/YaeBlog/Layout/MainLayout.razor +++ b/YaeBlog/Layout/MainLayout.razor @@ -1,77 +1,21 @@ -@using YaeBlog.Core.Models @inherits LayoutComponentBase -@inject BlogOptions BlogOptionsInstance - - + - -
- - - - @BlogOptionsInstance.Author - - - - - - -
- - - 首页 - -
- - - -
- - - 归档 - -
- - - -
- - - 标签 - -
- - - -
- - - 关于 - -
- - - -
- - - 友链 - -
- - -
- + + + Ricardo's Index + + - + +
@Body
+ +@code { + +} diff --git a/YaeBlog/Layout/MainLayout.razor.css b/YaeBlog/Layout/MainLayout.razor.css index 4a33391..e69de29 100644 --- a/YaeBlog/Layout/MainLayout.razor.css +++ b/YaeBlog/Layout/MainLayout.razor.css @@ -1,4 +0,0 @@ -.quick-link { - display: flex; - align-items: center; -} diff --git a/YaeBlog/Pages/About.razor b/YaeBlog/Pages/About.razor index c99fc80..5cea198 100644 --- a/YaeBlog/Pages/About.razor +++ b/YaeBlog/Pages/About.razor @@ -1,4 +1,4 @@ -@page "/about" +@page "/blog/about" @using YaeBlog.Core.Models @inject BlogOptions BlogOptionsInstance diff --git a/YaeBlog/Pages/Archives.razor b/YaeBlog/Pages/Archives.razor index 61d8c38..fa8a96d 100644 --- a/YaeBlog/Pages/Archives.razor +++ b/YaeBlog/Pages/Archives.razor @@ -1,4 +1,4 @@ -@page "/archives" +@page "/blog/archives" @using YaeBlog.Core.Models @using YaeBlog.Core.Services @@ -40,7 +40,7 @@ @foreach (KeyValuePair pair in group) {
- + @(pair.Value.PublishTime.ToString("MM-dd")) diff --git a/YaeBlog/Pages/Home.razor b/YaeBlog/Pages/BlogIndex.razor similarity index 96% rename from YaeBlog/Pages/Home.razor rename to YaeBlog/Pages/BlogIndex.razor index b37b24d..6c13851 100644 --- a/YaeBlog/Pages/Home.razor +++ b/YaeBlog/Pages/BlogIndex.razor @@ -1,4 +1,4 @@ -@page "/" +@page "/blog" @using YaeBlog.Core.Models @using YaeBlog.Core.Services @@ -33,14 +33,14 @@ {
- + @(essay.Value.Title)
- +
@(essay.Value.Description)
@@ -172,7 +172,7 @@ if (flag is false) { - NavigationManagerInstance.NavigateTo("NotFount"); + NavigationManagerInstance.NavigateTo("/NotFount"); } } diff --git a/YaeBlog/Pages/Home.razor.css b/YaeBlog/Pages/BlogIndex.razor.css similarity index 100% rename from YaeBlog/Pages/Home.razor.css rename to YaeBlog/Pages/BlogIndex.razor.css diff --git a/YaeBlog/Pages/Error.razor b/YaeBlog/Pages/Error.razor deleted file mode 100644 index e1369dc..0000000 --- a/YaeBlog/Pages/Error.razor +++ /dev/null @@ -1,36 +0,0 @@ -@page "/Error" -@using System.Diagnostics - -Error - -

Error.

-

An error occurred while processing your request.

- -@if (ShowRequestId) -{ -

- Request ID: @RequestId -

-} - -

Development Mode

-

- Swapping to Development environment will display more detailed information about the error that occurred. -

-

- The Development environment shouldn't be enabled for deployed applications. - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development - and restarting the app. -

- -@code{ - [CascadingParameter] private HttpContext? HttpContext { get; set; } - - private string? RequestId { get; set; } - private bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - - protected override void OnInitialized() => - RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier; - -} diff --git a/YaeBlog/Pages/Essay.razor b/YaeBlog/Pages/Essay.razor index 76e4c76..206fd82 100644 --- a/YaeBlog/Pages/Essay.razor +++ b/YaeBlog/Pages/Essay.razor @@ -1,4 +1,4 @@ -@page "/essays/{Filename}" +@page "/blog/essays/{Filename}" @using YaeBlog.Core.Models @using YaeBlog.Core.Services diff --git a/YaeBlog/Pages/Index.razor b/YaeBlog/Pages/Index.razor new file mode 100644 index 0000000..3f4feaf --- /dev/null +++ b/YaeBlog/Pages/Index.razor @@ -0,0 +1,76 @@ +@page "/" + + + 初冬的朝阳个人主页 + + + + + +
+ + + + + 2021 - 2023 By Ricardo Ren + + + + 蜀ICP备2022004429号-1 + + + + + +@code { + +} diff --git a/YaeBlog/Pages/Index.razor.css b/YaeBlog/Pages/Index.razor.css new file mode 100644 index 0000000..b77f461 --- /dev/null +++ b/YaeBlog/Pages/Index.razor.css @@ -0,0 +1,15 @@ +.index-container { + background-color: #f0f2f5; +} + +.avatar-image { + margin: 25px; + width: 100%; + height: auto; + max-width: 300px; + max-height: 300px; +} + +.footer-zone { + text-align: center; +} diff --git a/YaeBlog/Pages/Links.razor b/YaeBlog/Pages/Links.razor index 8d10eb0..c5fb922 100644 --- a/YaeBlog/Pages/Links.razor +++ b/YaeBlog/Pages/Links.razor @@ -1,4 +1,4 @@ -@page "/links" +@page "/blog/links" @using YaeBlog.Core.Models @inject BlogOptions BlogOptionsInstance diff --git a/YaeBlog/Pages/Tags.razor b/YaeBlog/Pages/Tags.razor index f04960f..d988d8f 100644 --- a/YaeBlog/Pages/Tags.razor +++ b/YaeBlog/Pages/Tags.razor @@ -1,4 +1,4 @@ -@page "/tags" +@page "/blog/tags" @using YaeBlog.Core.Models @using YaeBlog.Core.Services @@ -33,7 +33,7 @@ @foreach (KeyValuePair pair in EssayContentInstance.Tags) {
- + @pair.Key @@ -52,7 +52,7 @@ {
- + @(essay.PublishTime.ToString("yyyy-MM-dd")) diff --git a/YaeBlog/YaeBlog.csproj b/YaeBlog/YaeBlog.csproj index b498de4..8c04e9b 100644 --- a/YaeBlog/YaeBlog.csproj +++ b/YaeBlog/YaeBlog.csproj @@ -4,30 +4,6 @@ - - - - - - - - - - - - - - <_ContentIncludedByDefault Remove="Components\Pages\About.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\Archives.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\Error.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\Essay.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\Home.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\Links.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\NotFound.razor" /> - <_ContentIncludedByDefault Remove="Components\Pages\Tags.razor" /> - <_ContentIncludedByDefault Remove="Components\Layout\MainLayout.razor" /> - - net8.0 enable diff --git a/YaeBlog/appsettings.json b/YaeBlog/appsettings.json index 3ebd202..9bc3b85 100644 --- a/YaeBlog/appsettings.json +++ b/YaeBlog/appsettings.json @@ -29,7 +29,7 @@ }, { "Name": "志田千陽", - "Description": "日出多期待", + "Description": "日出多值得", "Link": "https://zzachary.top/", "AvatarImage": "https://zzachary.top/img/ztqy_hub928259802d192ff5718c06370f0f2c4_48203_300x0_resize_q75_box.jpg" }, diff --git a/YaeBlog/wwwroot/images/blog-icon.png b/YaeBlog/wwwroot/images/blog-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6f05694e827bc6d969d1bb744d96982f9440c637 GIT binary patch literal 675 zcmV;U0$lxxP)E2C{$^)>>`79}EU!m-!!nj8=fi^qGDMAOR$R z1dsp{KmterrvU29OhD~7PtO$OG_S-t^%Q4?(F&4IscNGj~=g$OAe) zIhX)ve5%re3&70yJq}9s<=_Hv-}zxs%2R?1z>Ew%^9KO=T+3h5W1&AW0hr1Ts5Ms- z4-iRe(>2h3w9y5xSy$o93x5I}3B4)+(2y{Ou`%m!03Ktc+_DO4L$<#Gl*%-IDvJ!g zF7!D7m9hL?7zg(~@(^I~sTg2kB<48!!l*C~8F=Cy0DgB@II+3;E9N-n){?jaZ%e!b zKpnS*6EkD&bJQ52Th=k?ea`?`8*Ftj8EX^#B^CNtUIJr%Qd~uK50vK@Jp^Fuce>B= z2^uS7bSupI$B%7~#_CT?Uw!IhT)Ef+KwWv3NgQT^L7y80^0l5zpBv)8MKjcy>pcLk z!s4gs5OErVw3CZ10M^@>%C2k4oBP|KHeNkHfa9g46X)5}1`l=T+seTa026*w#CHzc zMq3KpbI11ljsf^`YR%!>XWS2-`lv0}9nI|uz@d@>zrRoS_^BvqoBSNWz4yS4FA^>S zoT>;t14y_Ov~SIzPxf-LYZ89UKYF=6-~aVDs~;r+60N`k8~}l$0M2}ECUO7(002ov JPDHLkV1o5bC8_`b literal 0 HcmV?d00001 diff --git a/YaeBlog/wwwroot/images/git-icon.png b/YaeBlog/wwwroot/images/git-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cfb543676a17d1607bcd08d98dca85387451f584 GIT binary patch literal 1859 zcmV-J2fX-+P)_~YUBs{>@2?P)K~c7&=vmE!482ngY@ktQ8 zFg3Em_aS^wi&lW(+cCUOd^&-@(_1_e{4YO!D17<(3qyE0`?7%7AqGEE1QNpZ&mZlt zzv2!yLm*5J84D=k+w8!#O2Lox{B>ax(Ql^S7ry%9#X-;ywCIVQCU^E_0gnxzHk9Z( ze+h!;r$$%#elPG7w-MeaNo?Soz<=utsNg+T;94wF40fKM1WZg^-oAHdksoLWs(T*$ zJ!L*E5d>kpKX>+Jfm@Bh(sQW&DK&%hg-;1k?Mo7JIR#*Ubs3V|0wi~LVE_3lV3*Q| zr)X}FV$geb5(F>Y8(rdWBYc0`k$`gJVvmP|fFz+_NkIU9wAWa`T`vYV(6)5y5=QWH z_LZGyfAyKJ0Ilt(ParPWy&B$SPRBs&=}DyFJAfbXY6Vnnlgh?u9pL}1HJKrf;D!QC zb-+4J!1jBVHYeLoHUQ>?*XjF7o--EUSa^*BYtA}|%XO~@@2nMr>+>ugTSA1tKeogV zc7nKRvk55L=KhLt3Gq+nMS<5S;KN{2b*~X{pn$zb46d)Ga0#*7d^VmRyz1Z*riS5= zP3Q`|ef1L7+g-5cFu^*8A3@`;I&Jo40ozS{V)Wd~U*ZUUs0+kRn~#9%&=T$r!X9o| zW#;!&E%xm{FTsxzB;Z3(QG(#r0t9cX2G&}IfzNJtZV3_o!34s013%bNaQ4*)m%LuP z>cQ9Jfj!^akwn1T1b#aTV5S4M8i+e;wb_>iEK=ZiEf`8@;PcJC-pHIfb>&5!ha%A3 zk|7bqHz5mz5SVc&1r+d&l^8c5fx&h*X(f)}hY^0LGgIK0*;fjzBm6qP1$u_)O$6j} z`Wto@e}_ZtT!%YvV0U>DxRGvc_GN*F3JjG*_~FAV!h`V@ez;2uUr71r%sfW|DR}BU zeysfsl#us?dL;!Ozr!O5sNw4=%Ee&Yolipj{qL3t_s75IM=0|K0>{k0TEK?_eiR5e zrS7w{FmKpycb6UmW6{aJEMUGa2J3Y^DiKC|V}|ermrv%zDK8~_0O14p77nuZ4|&-k2FXd*GPb= zy%sFl>hXNXol5qdnt5Md8Soe(6xdx}GAsJC^2 z%OY@`?5hQWSVAIvN+5!7U9XJjvlxE22#=X3fvA}z(gF+$_^Pk|`qK3AJ7OmyiH+`- zdG3S=K^IriRDB=f5!$0z7nF1DFK9!A$Ytl4ezfmomnm| zy_|6th!S1RC}AW}SoW0yAruIu1U7IJZ;ArduxY&sTb61FW48%gD#eYfgpbt|d^yA^ z>PW%>UMUgkaL;omXr0PmTSo#Kcm$_Ffv`0#5NRZMNg##-@%jSbbtMc&=3Lq5@kjk0 z_Huc>c{~FVoNPB!0$Vsb&MWg(QF?1;J;$32)P!(a3C+{k?4M5$B#T3D{EtdBJ~DIDCdg zn`4eGpnQ^CmJ>F?q~S695!}F0t0WLZfj9~<*gi!841diD;4>sz?X#@G$gJ)>bPr^- zk~AWu1R}Tx&Ky2d!Zyq1A+Y!7ABF<|K3h=0OWBWE2)+^+iUz5KP8D7$5p1!}usN;? z>8_MUVomwb35z331ouGHCJDq);9TIf5?Ss!>COjRCS{wZN;+ZbZ(Vo`!Bhn)%NaUMUf1ZkT1W-E*P< zgCj)5UYiA867biR&7B*(QX=R!&#>9x+dU@=B=8L|*gi!8EFr)7`o+V`ODrcx?Q}vTpuMOfc%Qj^ zzG&d(MZb;$_L}KLmV3?w3i!p%nPPz{^XNuvPu0ye6dD_t#ezKfJuw x%F8dUHC8?fTC27K4L7!4naaMU&(7kz{sYren!^$<&&dD)002ovPDHLkV1lB*Uoijx literal 0 HcmV?d00001 diff --git a/YaeBlog/wwwroot/images/wiki-icon.png b/YaeBlog/wwwroot/images/wiki-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..436f27f734687913ef88cd360f97d18de7e305b0 GIT binary patch literal 1269 zcmVFMd@?Cgx=j*gBAV@*y@((ye#J+%)ZCnqP-U=tG)lGy6%YL2_PxuM^E zj|mSCr{^CZA4y0^h~!wKqobU>jg5`G9B6KC=EUyq?&#{M!#O)UlarGZjx8-M{eWp~ zY^3KpIyxk;2g19%yX5WdO%#GU3-I^%CoeBAoLE&=l_a*Vu8!k2H#bGI2Z6|g`}=$1 z?d>f&MrvxR#+cVy031unY-?*v5{GJWdwa{V85tS;9E<<1t}cz&8X6j+xWd9h{Rzm- z%oHVaQc{v6wzIR7<7Q@N=rJTH!s6lKf%y9RN`BYP&5f?m#l;0J4tf)SP}teo;lxHp zMkKL*etzWX>51Z49Ovif)6d=A-5Re`US3XdD5+oJ^<@F@nwlCe00cF~@xZ_U$M*L2 zlGW8!^8EZvOR1)700+@wVPX0gfI5ujWmaEbFNwvhg9wZjfWE#yjpO4x+9a>m0^ZN; z{{Fsbqk8Yt)6*Oa5y8R18plRyg%uPO7)}6oSD|HPWl3VOdouehDX|-4!$g^NaBwi3 z0QlP48YhNXmck+Nu}aKJN=hWLxw*MoC$G)|(8LKtLn<+Se0*rjz-(h zp`oFM7l0l0`uds^Yiny$i)(3V;iZ%r!b+V`OoX<{tFr(&c2i~$15v{BE-o(Q^74`# z9v+GkpKWYHudS`sDS2fHKqvY7`pSv1djsaIGsSy!bTr4QYtXj0x3$`N^&$X1H#f(L z2^%-G4SRcgM5$EL)&R$rmXBRHk(ijMF$@hVASWkBR8o_Zlj-r|;$r%_wY8OF zi;9Xk4*d|@#rymFbxvN{0O;a%8!Pf1A;t(2VP)tdk~5*LQ| z&#-7IVDt0yvahQ*0l4M7y1Jsj8GVLLOG_gM2L~iFGSYMez(4!_#!zlDzm0wiFjqH! z0p|QCpUSWQ7k{(