diff --git a/WatchIt.Website/WatchIt.Website/App.razor b/WatchIt.Website/WatchIt.Website/App.razor index b7ea5bd..4492067 100644 --- a/WatchIt.Website/WatchIt.Website/App.razor +++ b/WatchIt.Website/WatchIt.Website/App.razor @@ -9,12 +9,18 @@ - + + + + + + + diff --git a/WatchIt.Website/WatchIt.Website/Components/ErrorComponent.razor b/WatchIt.Website/WatchIt.Website/Components/ErrorComponent.razor index 9624ad0..bc34f73 100644 --- a/WatchIt.Website/WatchIt.Website/Components/ErrorComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/ErrorComponent.razor @@ -1,5 +1,5 @@
-
+
diff --git a/WatchIt.Website/WatchIt.Website/Components/ListItemComponent.razor b/WatchIt.Website/WatchIt.Website/Components/ListItemComponent.razor index 562ce9b..cb879cc 100644 --- a/WatchIt.Website/WatchIt.Website/Components/ListItemComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/ListItemComponent.razor @@ -1,4 +1,4 @@ -
+
picture diff --git a/WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor b/WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor index d25f4ec..4903e4d 100644 --- a/WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/SearchPage/SearchResultComponent.razor @@ -6,7 +6,7 @@
-
+

@(Title)

@@ -46,12 +46,12 @@
diff --git a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor index 24e27be..bacd53c 100644 --- a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor +++ b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor @@ -9,49 +9,60 @@ @if (_loaded) {
-
- +
-

Menu

-
-
-
- @if (_user is null) - { - Sign in - } - else - { - +
- } +
-
+
@Body
+ + diff --git a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs index 9485fc0..941eb4f 100644 --- a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs +++ b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.cs @@ -27,15 +27,12 @@ public partial class MainLayout : LayoutComponentBase #region FIELDS - private bool _loaded = false; - + private bool _loaded; + + private User? _user; private PhotoResponse? _defaultBackgroundPhoto; - - private User? _user = null; private AccountProfilePictureResponse? _userProfilePicture; - private bool _menuUserIsActive; - #endregion diff --git a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.css b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.css index 7538cab..443c860 100644 --- a/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.css +++ b/WatchIt.Website/WatchIt.Website/Layout/MainLayout.razor.css @@ -8,24 +8,6 @@ h1 { /* IDS */ -#user-menu { - position: fixed; -} - - - -/* CLASSES */ - -.logo { +#logo { font-size: 40px; -} - -.header { - position: sticky; - top: 10px; - height: 60px; -} - -.body-content { - padding-top: 100px; } \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor index 7be53a9..c13c42f 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/AdminPage.razor @@ -2,7 +2,7 @@ WatchIt administrator panel -
+
@if (_loaded) { if (_authenticated) diff --git a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor index a804363..1766091 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/HomePage.razor @@ -2,7 +2,7 @@ WatchIt -
+
@if (_loaded) { if (string.IsNullOrWhiteSpace(_error)) @@ -10,7 +10,7 @@
-
+

Top 5 movies this week by popularity

@@ -25,7 +25,7 @@
poster -
+
@(i + 1)
@@ -48,7 +48,7 @@
-
+

Top 5 TV series this week by popularity

@@ -63,7 +63,7 @@
poster -
+
@(i + 1)
diff --git a/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor b/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor index 31550b0..461dfcc 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/MediaEditPage.razor @@ -40,7 +40,7 @@ } -
+
@if (_loaded) { if (string.IsNullOrWhiteSpace(_error)) @@ -57,7 +57,7 @@
-
+
poster @@ -77,12 +77,12 @@
@@ -96,12 +96,12 @@
@@ -115,7 +115,7 @@
-
+
@@ -183,12 +183,12 @@
@@ -202,7 +202,7 @@
-
+
@@ -226,12 +226,12 @@ @@ -248,7 +248,7 @@
@foreach (PhotoResponse photo in _photos) { -
+
photo @@ -301,10 +301,10 @@ } else { -
+
-
+
edit_photo @@ -321,7 +321,7 @@
-
+
diff --git a/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor b/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor index 27b1c79..ef9ff93 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/MediaPage.razor @@ -24,7 +24,7 @@ else -
+
@if (_loaded) { if (string.IsNullOrWhiteSpace(_error)) @@ -35,7 +35,7 @@ else
-
+

@@ -60,7 +60,7 @@ else
-
+
@@ -133,7 +133,7 @@ else
-
+

diff --git a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor index 61bac3b..48e98dc 100644 --- a/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor +++ b/WatchIt.Website/WatchIt.Website/Pages/SearchPage.razor @@ -12,7 +12,7 @@ -
+
@if (_loaded) { if (string.IsNullOrWhiteSpace(_error)) diff --git a/WatchIt.Website/WatchIt.Website/Program.cs b/WatchIt.Website/WatchIt.Website/Program.cs index ee79676..283995a 100644 --- a/WatchIt.Website/WatchIt.Website/Program.cs +++ b/WatchIt.Website/WatchIt.Website/Program.cs @@ -1,5 +1,8 @@ using System.Text.Json; using System.Text.Json.Serialization; +using Blazorise; +using Blazorise.Bootstrap5; +using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Components.Authorization; using WatchIt.Common.Services.HttpClient; using WatchIt.Website.Services.Utility.Authentication; @@ -53,6 +56,12 @@ public static class Program private static WebApplicationBuilder SetupServices(this WebApplicationBuilder builder) { builder.Services.AddSingleton(); + builder.Services.AddBlazorise(options => + { + options.Immediate = true; + }) + .AddBootstrap5Providers() + .AddFontAwesomeIcons(); // Utility builder.Services.AddSingleton(); diff --git a/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj b/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj index 0722800..3ba0027 100644 --- a/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj +++ b/WatchIt.Website/WatchIt.Website/WatchIt.Website.csproj @@ -35,10 +35,16 @@ <_ContentIncludedByDefault Remove="Components\Pages\Weather.razor" /> <_ContentIncludedByDefault Remove="wwwroot\bootstrap\bootstrap.min.css" /> <_ContentIncludedByDefault Remove="wwwroot\bootstrap\bootstrap.min.css.map" /> + <_ContentIncludedByDefault Remove="wwwroot\scripts\popper.min.js" /> + + + + + diff --git a/WatchIt.Website/WatchIt.Website/_Imports.razor b/WatchIt.Website/WatchIt.Website/_Imports.razor index 7376a6e..b8693f8 100644 --- a/WatchIt.Website/WatchIt.Website/_Imports.razor +++ b/WatchIt.Website/WatchIt.Website/_Imports.razor @@ -14,4 +14,5 @@ @using WatchIt.Website.Services.Utility.Tokens @using WatchIt.Website.Services.Utility.Authentication @using WatchIt.Website.Services.WebAPI.Accounts -@using WatchIt.Website.Services.WebAPI.Media \ No newline at end of file +@using WatchIt.Website.Services.WebAPI.Media +@using Blazorise \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/wwwroot/css/general.css b/WatchIt.Website/WatchIt.Website/wwwroot/css/general.css index eac2f26..443ec27 100644 --- a/WatchIt.Website/WatchIt.Website/wwwroot/css/general.css +++ b/WatchIt.Website/WatchIt.Website/wwwroot/css/general.css @@ -27,6 +27,14 @@ body, html { /* CLASSES */ +.container-grid { + padding: 0 !important; + margin: 0 !important; + --bs-gutter-x: 1.5rem; + --bs-gutter-y: 0; + width: 100%; +} + .logo { font-family: "Belanosima"; text-decoration: none; @@ -34,53 +42,16 @@ body, html { -webkit-text-fill-color: transparent; } -.main-button { - --r:10px; - --b:2px; - -webkit-background-clip: text; - background-clip: text; - -webkit-text-fill-color: transparent; - color: transparent; - padding: 5px 10px; - border-radius: var(--r); - display: block; - align-items: self-end; - position: relative; - z-index:0; - text-decoration: none; - transition: 0.3s; - font-family: Belanosima; + + +.top-3 { + top: 1rem !important; } -.main-button::before { - content:""; - position:absolute; - z-index:-1; - inset: 0; - border: var(--b) solid transparent; - border-radius: var(--r); - background: inherit; - background-origin: border-box; - background-clip: border-box; - -webkit-mask: - linear-gradient(#fff 0 0) padding-box, - linear-gradient(#fff 0 0); - -webkit-mask-composite: xor; - mask-composite: exclude; - -webkit-mask-repeat: no-repeat; -} - -.main-button:hover { - color: #fff; - -webkit-text-fill-color: #fff; - -webkit-background-clip: border-box; - background-clip: border-box; -} - -.main-button:hover::before { - -webkit-mask:none; +.mb-2rem { + margin-bottom: 2rem !important; } diff --git a/WatchIt.Website/WatchIt.Website/wwwroot/css/main_button.css b/WatchIt.Website/WatchIt.Website/wwwroot/css/main_button.css index e69de29..2bfc5c7 100644 --- a/WatchIt.Website/WatchIt.Website/wwwroot/css/main_button.css +++ b/WatchIt.Website/WatchIt.Website/wwwroot/css/main_button.css @@ -0,0 +1,50 @@ +/* CLASSES */ + +.main-button { + --r:10px; + --b:2px; + + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; + color: transparent; + padding: 5px 10px; + + border-radius: var(--r); + display: block; + align-items: self-end; + position: relative; + z-index:0; + text-decoration: none; + transition: 0.3s; + font-family: Belanosima; +} + +.main-button::before { + content:""; + position:absolute; + z-index:-1; + inset: 0; + border: var(--b) solid transparent; + border-radius: var(--r); + background: inherit; + background-origin: border-box; + background-clip: border-box; + -webkit-mask: + linear-gradient(#fff 0 0) padding-box, + linear-gradient(#fff 0 0); + -webkit-mask-composite: xor; + mask-composite: exclude; + -webkit-mask-repeat: no-repeat; +} + +.main-button:hover { + color: #fff; + -webkit-text-fill-color: #fff; + -webkit-background-clip: border-box; + background-clip: border-box; +} + +.main-button:hover::before { + -webkit-mask:none; +} \ No newline at end of file