Layout improvements

RossDScott · RossDScott · commit aacf35637a7e · 2023-04-22T20:08:49.000+01:00
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/EventData.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/EventData.razor
@@ -10,23 +10,29 @@
     @foreach(var timeSlot in State.Value.EventMetaData)
     {
         <MudListSubheader Class="pb-0 pl-1 border-b border-solid mud-border-primary">
-            <h2>@timeSlot.From.ToString("h:mm") @timeSlot.From.ToString("tt").ToLowerInvariant()</h2>
+            <MudText Typo="Typo.h6">
+                @timeSlot.From.ToString("h:mm")
+                @timeSlot.From.ToString("tt").ToLowerInvariant()
+            </MudText>
         </MudListSubheader>
         @if(timeSlot.Info is not null)
         {
-            <MudListItem Class="ml-1">
-                <h2>@timeSlot.Info</h2>
+            <MudListItem Class="ml-6">
+                <MudText Typo="Typo.h5">@timeSlot.Info</MudText>
             </MudListItem>
         }
         @foreach(var sessionItem in timeSlot.Sessions.Select((session, index) => (session, index)))
         {
             <MudListItem 
-                Class="ml-1"
-                Icon="@sessionItem.session.BookmarkIconIfBookmarked"
                 OnClick="() => ViewSession(sessionItem.session.Id)">
-                <h2>@sessionItem.session.Title</h2>
-                <h3>@sessionItem.session.SpeakerName</h3>
-                <h3>@sessionItem.session.TrackName (@sessionItem.session.RoomName)</h3>
+                <MudPaper Class="pa-4">
+                    <MudText Typo="Typo.subtitle1">
+                        @WhenBookmarkedShowIcon(sessionItem.session) 
+                        @sessionItem.session.Title
+                    </MudText>
+                    <MudText Typo="Typo.subtitle2">@sessionItem.session.SpeakerName</MudText>
+                    <MudText Typo="Typo.subtitle2">@sessionItem.session.TrackName (@sessionItem.session.RoomName)</MudText>
+                </MudPaper>
             </MudListItem>
 
             @if (sessionItem.index != timeSlot.Sessions.Count -1)
@@ -38,7 +44,12 @@
 
 </MudList>
 
-@*@JsonSerializer.Serialize(State.Value)*@
+@code{
+    RenderFragment? WhenBookmarkedShowIcon(Features.Home.Store.Session session) =>
+        session.IsBookmarked
+            ? @<MudIcon Icon="@Icons.Material.Filled.Bookmark" Title="Bookmarked" />
+            : null;
+}
 
 @code {
     void ViewSession(int sessionId) => Dispatcher.Dispatch(new ViewSessionAction(sessionId));
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Session/Components/Session.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Session/Components/Session.razor
@@ -13,7 +13,7 @@
 
 @if (State.Value.Session is not null)
 {
-    <MudCard>
+    <MudCard Class="ma-3">
         <MudCardHeader>
             <CardHeaderContent>
                 <MudText Typo="Typo.h5">@State.Value.Session.Title</MudText>
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Components/SessionFeedback.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Components/SessionFeedback.razor
@@ -9,6 +9,15 @@
     <TitleContent><MudText Typo="Typo.h6" Align="Align.Center">Session Feedback</MudText></TitleContent>
     <DialogContent>
 
+        <MudCard>
+            <MudCardHeader>
+                <CardHeaderContent>
+                    <MudText Typo="Typo.h5">@State.Value.SessionTitle</MudText>
+                    <MudText Typo="Typo.h6">@State.Value.SpeakerName</MudText>
+                </CardHeaderContent>
+            </MudCardHeader>
+        </MudCard>
+
         @WhenFeedbackAlreadySubmittedShowWarning()
 
         <MudCard Class="mt-3">
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackActions.cs b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackActions.cs
@@ -1,6 +1,7 @@
 ﻿namespace PocketDDD.BlazorClient.Features.SessionFeedback.Store;
 
 public record FetchExistingSessionFeedbackAction(int SessionId);
+public record SetSessionDetailsAction(string SessionTitle, string SpeakerName);
 public record SetTimeSlotAlreadyHasFeedbackAction();
 public record SetSessionFeedbackAction(Models.SessionFeedback Feedback);
 public record SubmitSessionFeedbackAction(Models.SessionFeedback Feedback);
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackEffects.cs b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackEffects.cs
@@ -21,20 +21,20 @@ public EventFeedbackEffects(IState<SessionFeedbackState> state, IDispatcher disp
     [EffectMethod]
     public async Task OnFetchExistingSessionFeedback(FetchExistingSessionFeedbackAction action, IDispatcher dispatcher)
     {
+        var eventData = await _localStorage.EventData.GetAsync();
+        var session = eventData!.Sessions.Single(x => x.Id == action.SessionId);
+
+        dispatcher.Dispatch(new SetSessionDetailsAction(session.Title, session.Speaker));
+
         var feedbackItems = await _localStorage.SessionFeedbacks.GetOrDefaultAsync();
         var feedback = feedbackItems.FirstOrDefault(x => x.SessionId == action.SessionId);
         int? timeSlotId = feedback?.TimeSlotId;
 
         if (feedback is not null)
-        {
             dispatcher.Dispatch(new SetSessionFeedbackAction(feedback));
-        }
 
         if (timeSlotId is null)
-        {
-            var eventData = await _localStorage.EventData.GetAsync();
             timeSlotId = eventData!.Sessions.Single(x => x.Id == action.SessionId).TimeSlotId;
-        }
 
         if (feedbackItems.Any(x => x.SessionId != action.SessionId &&
                                    x.TimeSlotId == timeSlotId))
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackReducer.cs b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackReducer.cs
@@ -6,10 +6,11 @@ namespace PocketDDD.BlazorClient.Features.SessionFeedback.Store;
 public static class SessionFeedbackReducer
 {
     [ReducerMethod]
-    public static SessionFeedbackState OnFetchExistingSessionFeedback(SessionFeedbackState state, FetchExistingSessionFeedbackAction action) =>
+    public static SessionFeedbackState OnSetSessionDetails(SessionFeedbackState state, SetSessionDetailsAction action) =>
         state with
         {
-            SessionId = action.SessionId,
+            SessionTitle = action.SessionTitle,
+            SpeakerName = action.SpeakerName,
             TimeSlotAlreadyHasFeedback = false
         };
 
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackState.cs b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackState.cs
@@ -5,6 +5,7 @@ namespace PocketDDD.BlazorClient.Features.SessionFeedback.Store;
 [FeatureState]
 public record SessionFeedbackState
 {
-    public int SessionId { get; init; }
+    public string SessionTitle { get; set; } = string.Empty;
+    public string SpeakerName { get; set; } = string.Empty;
     public bool TimeSlotAlreadyHasFeedback { get; init; } = false;
 }
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Sync/Components/SyncStatus.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Sync/Components/SyncStatus.razor
@@ -56,7 +56,7 @@
 @code {
     RenderFragment WhenSyncingShowSyncAlert() =>
         State.Value.IsSyncing
-            ? @<MudAlert Class="mt-2" Severity="Severity.Info"> Syncing...</MudAlert>
+        ? @<MudAlert Class="mt-2" Severity="Severity.Info" Icon="@Icons.Material.Filled.CloudSync"> Syncing...</MudAlert>
             : null;
 }
 
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Shared/MainLayout.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Shared/MainLayout.razor
@@ -11,7 +11,7 @@
 
 <MudLayout>
     <HeaderBar />
-    <MudMainContent>
+    <MudMainContent Class="">
         @Body
     </MudMainContent>
 </MudLayout>
@@ -25,6 +25,7 @@
         if (firstRender)
         {
             _isDarkMode = await _mudThemeProvider.GetSystemPreference();
+            //_isDarkMode = false;
             StateHasChanged();
         }
     }
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Shared/NavMenu.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Shared/NavMenu.razor

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`@if (State.Value.Session is not null)`
`15`	`15`	`{`
`16`		`- <MudCard>`
	`16`	`+ <MudCard Class="ma-3">`
`17`	`17`	`<MudCardHeader>`
`18`	`18`	`<CardHeaderContent>`
`19`	`19`	`<MudText Typo="Typo.h5">@State.Value.Session.Title</MudText>`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,11 @@ namespace PocketDDD.BlazorClient.Features.SessionFeedback.Store;`
`6`	`6`	`public static class SessionFeedbackReducer`
`7`	`7`	`{`
`8`	`8`	`[ReducerMethod]`
`9`		`- public static SessionFeedbackState OnFetchExistingSessionFeedback(SessionFeedbackState state, FetchExistingSessionFeedbackAction action) =>`
	`9`	`+ public static SessionFeedbackState OnSetSessionDetails(SessionFeedbackState state, SetSessionDetailsAction action) =>`
`10`	`10`	`state with`
`11`	`11`	`{`
`12`		`- SessionId = action.SessionId,`
	`12`	`+ SessionTitle = action.SessionTitle,`
	`13`	`+ SpeakerName = action.SpeakerName,`
`13`	`14`	`TimeSlotAlreadyHasFeedback = false`
`14`	`15`	`};`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ namespace PocketDDD.BlazorClient.Features.SessionFeedback.Store;`
`5`	`5`	`[FeatureState]`
`6`	`6`	`public record SessionFeedbackState`
`7`	`7`	`{`
`8`		`- public int SessionId { get; init; }`
	`8`	`+ public string SessionTitle { get; set; } = string.Empty;`
	`9`	`+ public string SpeakerName { get; set; } = string.Empty;`
`9`	`10`	`public bool TimeSlotAlreadyHasFeedback { get; init; } = false;`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`@code {`
`57`	`57`	`RenderFragment WhenSyncingShowSyncAlert() =>`
`58`	`58`	`State.Value.IsSyncing`
`59`		`- ? @<MudAlert Class="mt-2" Severity="Severity.Info"> Syncing...</MudAlert>`
	`59`	`+ ? @<MudAlert Class="mt-2" Severity="Severity.Info" Icon="@Icons.Material.Filled.CloudSync"> Syncing...</MudAlert>`
`60`	`60`	`: null;`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`<MudLayout>`
`13`	`13`	`<HeaderBar />`
`14`		`- <MudMainContent>`
	`14`	`+ <MudMainContent Class="">`
`15`	`15`	`@Body`
`16`	`16`	`</MudMainContent>`
`17`	`17`	`</MudLayout>`
`@@ -25,6 +25,7 @@`
`25`	`25`	`if (firstRender)`
`26`	`26`	`{`
`27`	`27`	`_isDarkMode = await _mudThemeProvider.GetSystemPreference();`
	`28`	`+ //_isDarkMode = false;`
`28`	`29`	`StateHasChanged();`
`29`	`30`	`}`
`30`	`31`	`}`