From e5fe82786cf5347813d69e68da2091d06c315c50 Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 24 Jan 2024 23:47:28 +0100 Subject: [PATCH] feat: created navbar, started with homeview, started with footer, updated favicon --- FediNews.sln | 1 + FediNews/Components/App.razor | 4 +- FediNews/Components/Items/PostListView.razor | 20 ++++ .../Components/Items/PostListView.razor.css | 34 ++++++ FediNews/Components/Layout/Footer.razor | 7 ++ FediNews/Components/Layout/Footer.razor.css | 0 FediNews/Components/Layout/MainLayout.razor | 10 +- .../Components/Layout/MainLayout.razor.css | 78 ++----------- FediNews/Components/Layout/NavBar.razor | 22 ++++ FediNews/Components/Layout/NavBar.razor.css | 55 +++++++++ FediNews/Components/Layout/NavMenu.razor | 29 ----- FediNews/Components/Layout/NavMenu.razor.css | 105 ------------------ FediNews/Components/Pages/Home.razor | 9 +- FediNews/Components/Pages/Weather.razor | 2 +- FediNews/Components/_Imports.razor | 3 +- FediNews/wwwroot/app.css | 14 ++- FediNews/wwwroot/favicon.png | Bin 1148 -> 654 bytes FediNews/wwwroot/logo.png | Bin 0 -> 654 bytes 18 files changed, 167 insertions(+), 226 deletions(-) create mode 100644 FediNews/Components/Items/PostListView.razor create mode 100644 FediNews/Components/Items/PostListView.razor.css create mode 100644 FediNews/Components/Layout/Footer.razor create mode 100644 FediNews/Components/Layout/Footer.razor.css create mode 100644 FediNews/Components/Layout/NavBar.razor create mode 100644 FediNews/Components/Layout/NavBar.razor.css delete mode 100644 FediNews/Components/Layout/NavMenu.razor delete mode 100644 FediNews/Components/Layout/NavMenu.razor.css create mode 100644 FediNews/wwwroot/logo.png diff --git a/FediNews.sln b/FediNews.sln index 9a21dff..6f4074b 100644 --- a/FediNews.sln +++ b/FediNews.sln @@ -12,5 +12,6 @@ Global {7BB03026-8EA4-49F1-8198-1918C9E84C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BB03026-8EA4-49F1-8198-1918C9E84C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BB03026-8EA4-49F1-8198-1918C9E84C2C}.Release|Any CPU.Build.0 = Release|Any CPU + {7BB03026-8EA4-49F1-8198-1918C9E84C2C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU EndGlobalSection EndGlobal diff --git a/FediNews/Components/App.razor b/FediNews/Components/App.razor index 57518b9..990bffc 100644 --- a/FediNews/Components/App.razor +++ b/FediNews/Components/App.razor @@ -5,7 +5,7 @@ - + @* *@ @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/FediNews/Components/Items/PostListView.razor b/FediNews/Components/Items/PostListView.razor new file mode 100644 index 0000000..f83c925 --- /dev/null +++ b/FediNews/Components/Items/PostListView.razor @@ -0,0 +1,20 @@ + + +@code { + [Parameter] public int PostNr { get; set; } + +} diff --git a/FediNews/Components/Items/PostListView.razor.css b/FediNews/Components/Items/PostListView.razor.css new file mode 100644 index 0000000..40a8f78 --- /dev/null +++ b/FediNews/Components/Items/PostListView.razor.css @@ -0,0 +1,34 @@ +.link { + width: 100%; + display: flex; + flex-direction: row; + /*align-items: center;*/ + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + +.score { + display: flex; + flex-direction: row; + /*align-items: center;*/ + margin-right: 0.5rem; + min-width: 2.3rem; + margin-left: 0; + +} + +.content { + +} + +.head { + display: flex; + flex-direction: row; + align-items: center; +} + +.tail { + display: flex; + flex-direction: row; + align-items: center; +} diff --git a/FediNews/Components/Layout/Footer.razor b/FediNews/Components/Layout/Footer.razor new file mode 100644 index 0000000..0858f05 --- /dev/null +++ b/FediNews/Components/Layout/Footer.razor @@ -0,0 +1,7 @@ + + +@code { + +} diff --git a/FediNews/Components/Layout/Footer.razor.css b/FediNews/Components/Layout/Footer.razor.css new file mode 100644 index 0000000..e69de29 diff --git a/FediNews/Components/Layout/MainLayout.razor b/FediNews/Components/Layout/MainLayout.razor index df0c2d6..bc0fd31 100644 --- a/FediNews/Components/Layout/MainLayout.razor +++ b/FediNews/Components/Layout/MainLayout.razor @@ -1,15 +1,9 @@ @inherits LayoutComponentBase
- +
-
- About -
-
@Body
@@ -20,4 +14,4 @@ An unhandled error has occurred. Reload 🗙 -
\ No newline at end of file + diff --git a/FediNews/Components/Layout/MainLayout.razor.css b/FediNews/Components/Layout/MainLayout.razor.css index 038baf1..c97e23c 100644 --- a/FediNews/Components/Layout/MainLayout.razor.css +++ b/FediNews/Components/Layout/MainLayout.razor.css @@ -1,79 +1,15 @@ .page { - position: relative; display: flex; flex-direction: column; + align-content: center; + + max-width: 1000px; + margin: 8px auto auto; + background-color: #f6f6ef; } -main { - flex: 1; -} - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); -} - -.top-row { - background-color: #f7f7f7; - border-bottom: 1px solid #d6d5d5; - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; -} - - .top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - text-decoration: none; - } - - .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; - } - - .top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } - -@media (max-width: 640.98px) { - .top-row { - justify-content: space-between; - } - - .top-row ::deep a, .top-row ::deep .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .top-row { - position: sticky; - top: 0; - z-index: 1; - } - - .top-row.auth ::deep a:first-child { - flex: 1; - text-align: right; - width: 0; - } - - .top-row, article { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } +@media (max-width: 1000px) { + margin: 0 auto auto; } #blazor-error-ui { diff --git a/FediNews/Components/Layout/NavBar.razor b/FediNews/Components/Layout/NavBar.razor new file mode 100644 index 0000000..0b40dd9 --- /dev/null +++ b/FediNews/Components/Layout/NavBar.razor @@ -0,0 +1,22 @@ + + +@code { + +} diff --git a/FediNews/Components/Layout/NavBar.razor.css b/FediNews/Components/Layout/NavBar.razor.css new file mode 100644 index 0000000..fa771ef --- /dev/null +++ b/FediNews/Components/Layout/NavBar.razor.css @@ -0,0 +1,55 @@ +nav { + display: flex; + flex-direction: column; + background-color: #8422e8; + position: sticky; + color: white !important; + width: 100%; + padding: 2px; +} + +.logo { + display: flex; + padding: 2px; + border: white 1px solid; + margin-right: 0.3rem; +} + +.logo img { + /*width: 16px;*/ + /*height: 16px;*/ + height: 1rem; + width: 1rem; +} + +.navigation { + width: 100%; + display: flex; + flex-direction: row; + align-items: center; +} + +.name { + font-weight: bolder; + margin-right: 0.6rem; + color: white; + text-decoration: none; + display: flex; + align-items: center; +} + +.name span { +} + +.navlinks a { + color: white; +} + +.account { + margin-left: auto; + margin-right: 1rem; +} + +.account a { + color: white; +} diff --git a/FediNews/Components/Layout/NavMenu.razor b/FediNews/Components/Layout/NavMenu.razor deleted file mode 100644 index 9524282..0000000 --- a/FediNews/Components/Layout/NavMenu.razor +++ /dev/null @@ -1,29 +0,0 @@ - - - - - \ No newline at end of file diff --git a/FediNews/Components/Layout/NavMenu.razor.css b/FediNews/Components/Layout/NavMenu.razor.css deleted file mode 100644 index 4e15395..0000000 --- a/FediNews/Components/Layout/NavMenu.razor.css +++ /dev/null @@ -1,105 +0,0 @@ -.navbar-toggler { - appearance: none; - cursor: pointer; - width: 3.5rem; - height: 2.5rem; - color: white; - position: absolute; - top: 0.5rem; - right: 1rem; - border: 1px solid rgba(255, 255, 255, 0.1); - background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); -} - -.navbar-toggler:checked { - background-color: rgba(255, 255, 255, 0.5); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; -} - -.bi-house-door-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); -} - -.bi-plus-square-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); -} - -.bi-list-nested-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep .nav-link { - color: #d7d7d7; - background: none; - border: none; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - width: 100%; - } - -.nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; -} - -.nav-item ::deep .nav-link:hover { - background-color: rgba(255,255,255,0.1); - color: white; -} - -.nav-scrollable { - display: none; -} - -.navbar-toggler:checked ~ .nav-scrollable { - display: block; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .nav-scrollable { - /* Never collapse the sidebar for wide screens */ - display: block; - - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/FediNews/Components/Pages/Home.razor b/FediNews/Components/Pages/Home.razor index dfcdf75..2d86cb2 100644 --- a/FediNews/Components/Pages/Home.razor +++ b/FediNews/Components/Pages/Home.razor @@ -1,7 +1,8 @@ @page "/" -Home +Fedi News -

Hello, world!

- -Welcome to your new app. \ No newline at end of file +@for (int i = 1; i < 31; i++) +{ + +} diff --git a/FediNews/Components/Pages/Weather.razor b/FediNews/Components/Pages/Weather.razor index f31f2ee..4074a91 100644 --- a/FediNews/Components/Pages/Weather.razor +++ b/FediNews/Components/Pages/Weather.razor @@ -64,4 +64,4 @@ else public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); } -} \ No newline at end of file +} diff --git a/FediNews/Components/_Imports.razor b/FediNews/Components/_Imports.razor index 31841cb..a0f7616 100644 --- a/FediNews/Components/_Imports.razor +++ b/FediNews/Components/_Imports.razor @@ -7,4 +7,5 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using FediNews -@using FediNews.Components \ No newline at end of file +@using FediNews.Components +@using FediNews.Components.Items diff --git a/FediNews/wwwroot/app.css b/FediNews/wwwroot/app.css index 2bd9b78..1ea5e24 100644 --- a/FediNews/wwwroot/app.css +++ b/FediNews/wwwroot/app.css @@ -1,5 +1,13 @@ html, body { - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + /*font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ + font-family: Verdana, Geneva, sans-serif; + font-size: 0.9rem; +} + +* { + margin: 0; + padding: 0; + box-sizing: border-box; } a, .btn-link { @@ -16,10 +24,6 @@ a, .btn-link { box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; } -.content { - padding-top: 1.1rem; -} - h1:focus { outline: none; } diff --git a/FediNews/wwwroot/favicon.png b/FediNews/wwwroot/favicon.png index 8422b59695935d180d11d5dbe99653e711097819..5d185a9ff4489be2d2327012993aea6a9c8d26af 100644 GIT binary patch delta 630 zcmV-+0*U?n2#y7iBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmP!xqvQ>7vmhZYoZ z$WWc^q9Wp?RVYG*P%E_RVDi#GXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOitj8+nEzVk{##;B}FAV4Pm1VBe8b%U}Sb_u* z3Th~$0vmDKb$?PUr0G22;~#SU61fy|mBGldfGRY|t{?mle$Un_OpJR;;RMkA;y528 zKxh|e)*a{j*m0UCK=2v3(%b%O1DO6Kz24ShM?n8JaBw3VS*31(gF|4nNZIQ??|<&;oZG)Wt@-@`xGHkOM_@gM z00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru=m8fL zAtY_yk4FFi02y>eSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{003o4L_t(o z!((hwdT;TcVE_RW!vKR(2e1&MNGFet!9QP+WW%o>|HiN(=JRM2P#y*7pjG+hXf7Ca zz^DTTHXByo6(^|X(&29mn-e~dM!{%FIO>2=2aGyk)B%Iv0gR)4!x8TQ0LgX~gRe=b QasU7T07*qoM6N<$g0{jDWB>pF delta 1128 zcmV-u1eg1c1^ft*BYy-#Nkl9h26h2-Cs%i*@Moc3?#6qJID|D#|3|2Hn z7gTIYEkr|%Xjp);YgvFmB&0#2E2b=|kVr)lMv9=KqwN&%obTp-$<51T%rx*NCwceh z-E+=&e(oLO`@Z~7gybJ#U|^tB2Pai}RN@5%1qsZ1e@R(XC4Z)}#hH$)EK*sna+7Na z!Jk&XUI!3KG?YjDAQh4sWtLh=_x_aAhd)U7>u)lzqEIaDlI;8{mydrGpzT_p%qlOCYz9Cn zXxm~vh)52&rGMVR%kDSdW#xvk0#JEl?Q0>x01eM*020K~7N%Fp&M)Sme*Gp~1voU_ z$2F0KON#_(J)eS6?wT>sA`%LEZL@V9ExmsJleD+>OFo!2cZB)3(XtT)of=u>u?mC+ zBoH$!B3oU>BS(1>nK8`unqCbG`_4`==Y<^QaVp=d@qc>x=)_>!S==FkTu62**xoy{fKhy8~E;*$~i|Y+C1xh>f>$JLl9F)UTqa+)UCt$63a>)Fb z1Ke=l_kV1i%dM-u0*u##7OxI7wwyCGpS?4UBFAr(%GBv5j$jS@@t@iI8?ZqE36I^4 zt+P^J9D^ELbS5KMtZ{Qn#JnSd$15nJ$ggkF%I4yUQC+BjDF z^}AtB7w348EL>7#sAsLWs}ndp8^DsAcOIL9TYny?aRN#Zo*Zf(T@nst^PcpB-Z%{~ z)ctLsOlxBkIK+eG1q~o=LSu?cLIN;1(AR@?PEXMz2>eGjgQ(R~MYt3XRC$c^o@*hy z8xQ9lUZ`uRbJRR _z{glespUbPj33%w+ha#GK#BP5+pCsh2#&CmT6vmg2m)lYql z4}Wh@Vr--?+UX~seZstv?zeqry=s1k-+J*a=lnDASJ+Q+*C9PBWw?7>8KRT8dXL~P zZ`KP4*x58$!!lfURCO`KS(0Fi6_XX{5t}sTEIE|BQh#3vCj>3bb|~Px4X8gj2?x3N zcvj^!5|r;hH-#|=dZ;`I&t~H(74&o}Vt;!@v%%{I2WM5fKpjB0JbGoS%+p-K9fD?M zF~+<#g5ayzF2ay7L&3zX-e!`E6@s^3#%kaj0ZE94#Q!W-pzBExtO8x^u`M|TWuOp1 z^MNsS%U&9fl8?U#;Z{kL-J`c5_Ml>*oUyN=@=OT6h@!SdhT&~<>>V$poRY3`O<~ye zI;j$6>~k@IMwD42=8$$!+R^@5o6HX(*n~EX>4Tx04R}tkv&MmP!xqvQ>7vmhZYoZ$WWc^q9Wp?RVYG*P%E_RVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOiznMuzRM~TH^2P+-SN~T6UNgPu(o$`gO z$13M7&RV6$TKD8H4CnQgWvu?YAB-u8*$ooQY@tDJmKRXa{Usy6mpfp z$gzMbG{~+W{11N5)+$Vldr9F0(EZ{#A0t3$7iiWU=lj@knkPW;8MxBh{%Ql5{v^HL z)?!CM|2A-O-PV*n;Bp5Td@^KHcBLRKp-=$c&*++e)kfB+nZh(VB zV6;ft>pt)9>73iYJ+1lu0Jti0!be~|h5!Hn24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j~G86d@#S-j7EB000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0001GNkl|HiN(=JRM2P#y*7pjG+hXf7Caz^DTTHXByo6(^|X(&29mn-e~dM!{%FIO>2= o2aGyk)B%Iv0gR)4!x8TQ0LgX~gRe=basU7T07*qoM6N<$f(^M6H2?qr literal 0 HcmV?d00001