Skip to content

Commit 0b91f68

Browse files
RossDScottRossDScott
committed
Wired up to API
1 parent 43eabed commit 0b91f68

32 files changed

Lines changed: 153 additions & 220 deletions

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient.sln‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.BlazorClient", "P
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.Shared", "..\PocketDDD.Shared\PocketDDD.Shared.csproj", "{78B080B5-3396-487C-9469-31186AD778B5}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.Server.WebAPI", "..\PocketDDD.Server\PocketDDD.Server.WebAPI\PocketDDD.Server.WebAPI.csproj", "{2C3332D0-463B-414C-8B1D-32360A42D5BB}"
11-
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.Server.Services", "..\PocketDDD.Server\PocketDDD.Server.Services\PocketDDD.Server.Services.csproj", "{74F3F941-F2AC-403F-AFEA-3A47DBD9CC78}"
13-
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.Server.Model", "..\PocketDDD.Server\PocketDDD.Server.Model\PocketDDD.Server.Model.csproj", "{6FC7A020-7462-4DC1-A7A0-04A9359BC303}"
15-
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.Server.DB", "..\PocketDDD.Server\PocketDDD.Server.DB\PocketDDD.Server.DB.csproj", "{48A20EF1-0384-4934-8632-5B7AE5B02C0F}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketDDD.BlazorClient.LocalStorage", "PocketDDD.BlazorClient.LocalStorage\PocketDDD.BlazorClient.LocalStorage.csproj", "{5CBDD65B-BAB5-4E97-A1A2-445511B3D6B3}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketDDD.BlazorClient.LocalStorage", "PocketDDD.BlazorClient.LocalStorage\PocketDDD.BlazorClient.LocalStorage.csproj", "{5CBDD65B-BAB5-4E97-A1A2-445511B3D6B3}"
1911
EndProject
2012
Global
2113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,22 +23,6 @@ Global
3123
{78B080B5-3396-487C-9469-31186AD778B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
3224
{78B080B5-3396-487C-9469-31186AD778B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
3325
{78B080B5-3396-487C-9469-31186AD778B5}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{2C3332D0-463B-414C-8B1D-32360A42D5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{2C3332D0-463B-414C-8B1D-32360A42D5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{2C3332D0-463B-414C-8B1D-32360A42D5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{2C3332D0-463B-414C-8B1D-32360A42D5BB}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{74F3F941-F2AC-403F-AFEA-3A47DBD9CC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39-
{74F3F941-F2AC-403F-AFEA-3A47DBD9CC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{74F3F941-F2AC-403F-AFEA-3A47DBD9CC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{74F3F941-F2AC-403F-AFEA-3A47DBD9CC78}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{6FC7A020-7462-4DC1-A7A0-04A9359BC303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{6FC7A020-7462-4DC1-A7A0-04A9359BC303}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{6FC7A020-7462-4DC1-A7A0-04A9359BC303}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{6FC7A020-7462-4DC1-A7A0-04A9359BC303}.Release|Any CPU.Build.0 = Release|Any CPU
46-
{48A20EF1-0384-4934-8632-5B7AE5B02C0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{48A20EF1-0384-4934-8632-5B7AE5B02C0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{48A20EF1-0384-4934-8632-5B7AE5B02C0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
49-
{48A20EF1-0384-4934-8632-5B7AE5B02C0F}.Release|Any CPU.Build.0 = Release|Any CPU
5026
{5CBDD65B-BAB5-4E97-A1A2-445511B3D6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5127
{5CBDD65B-BAB5-4E97-A1A2-445511B3D6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
5228
{5CBDD65B-BAB5-4E97-A1A2-445511B3D6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/EventScore/Store/EventScoreEffects.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Fluxor;
2+
using PocketDDD.BlazorClient.Features.EventScore.Components;
23
using PocketDDD.BlazorClient.Features.Sync.Store;
34
using PocketDDD.BlazorClient.Services;
45

@@ -24,5 +25,6 @@ public async Task OnFetchExistingEventScore(FetchExistingEventScoreAction action
2425
public async Task OnEventScoreUpdated(EventScoreUpdatedAction action, IDispatcher dispatcher)
2526
{
2627
await _localStorage.EventScore.SetAsync(action.Score);
28+
dispatcher.Dispatch(new SetEventScoreAction(action.Score));
2729
}
2830
}

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/EventData.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@foreach(var timeSlot in State.Value.EventMetaData)
1111
{
1212
<MudListSubheader Class="pb-0 pl-1 border-b border-solid mud-border-primary">
13-
<h2>@timeSlot.From.ToString("hh:mm") to @timeSlot.To.ToString("hh:mm")</h2>
13+
<h2>@timeSlot.From.ToString("HH:mm")</h2>
1414
</MudListSubheader>
1515
@if(timeSlot.Info is not null)
1616
{

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Security/Store/SecurityEffects.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Blazored.LocalStorage;
33
using Fluxor;
44
using MudBlazor;
5+
using PocketDDD.BlazorClient.Features.EventScore.Store;
56
using PocketDDD.BlazorClient.Features.Home.Store;
67
using PocketDDD.BlazorClient.Services;
78
using static MudBlazor.CategoryTypes;
@@ -61,8 +62,16 @@ public async Task OnLogin(LoginAction action, IDispatcher dispatcher)
6162
public Task OnLoginSuccess(SetLoginSuccessAction action, IDispatcher dispatcher)
6263
{
6364
dispatcher.Dispatch(new SetCurrentUserAction(action.User));
65+
dispatcher.Dispatch(new EventScoreUpdatedAction(1));
6466
currentDialogReference?.Close();
6567
currentDialogReference = null;
6668
return Task.CompletedTask;
6769
}
70+
71+
[EffectMethod]
72+
public Task OnLoginSuccess(SetCurrentUserAction action, IDispatcher dispatcher)
73+
{
74+
_pocketDDDAPI.SetUserAuthToken(action.User.Token);
75+
return Task.CompletedTask;
76+
}
6877
}

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Session/Store/SessionActions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ namespace PocketDDD.BlazorClient.Features.Session.Store;
44

55
public record ViewSessionAction(int SessionId);
66
public record SetSessionAction(
7-
PocketDDD.Shared.API.ResponseDTOs.Session Session,
8-
PocketDDD.Shared.API.ResponseDTOs.Track Track,
9-
PocketDDD.Shared.API.ResponseDTOs.TimeSlot TimeSlot,
7+
PocketDDD.Shared.API.ResponseDTOs.SessionDTO Session,
8+
PocketDDD.Shared.API.ResponseDTOs.TrackDTO Track,
9+
PocketDDD.Shared.API.ResponseDTOs.TimeSlotDTO TimeSlot,
1010
bool IsBookmarked);
1111
public record ToggleBookmarkedAction(int SessionId, bool Bookmarked);

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Components/SessionFeedback.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
{
9797
var feedback = new Models.SessionFeedback
9898
{
99-
SessionId = State.Value.SessionId,
99+
SessionId = Id,
100100
SpeakerKnowledgeRating = _speakersKnowledge,
101101
SpeakingSkillRating = _speakingSkills,
102102
Comments = _comments

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/SessionFeedback/Store/SessionFeedbackEffects.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public async Task OnSubmitSessionFeedbackAction(SubmitSessionFeedbackAction acti
5656
await _localStorage.SessionFeedbacks.SetAsync(feedbackItems);
5757
var syncItem = new SubmitSessionFeedbackDTO
5858
{
59+
SessionId = action.Feedback.SessionId,
5960
CreatedOn = DateTimeOffset.Now,
6061
SpeakerKnowledgeRating = feedback.SpeakerKnowledgeRating,
6162
SpeakingSkillRating= feedback.SpeakingSkillRating,

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Sync/Store/SyncActions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ public record SyncAction();
77
public record SyncEventFeedbackItemsAction(IList<SubmitEventFeedbackDTO> syncItems);
88
public record SyncSessionFeedbackItemsAction(IList<SubmitSessionFeedbackDTO> syncItems);
99
public record SyncCompletedAction();
10-
public record SetEventDataVersionAction(int Version);

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Sync/Store/SyncEffects.cs‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,21 @@ public async Task OnSync(SyncAction action, IDispatcher dispatcher)
2929
{
3030
try
3131
{
32-
var metaDataVersion = _state.Value.EventDataVersion;
33-
var newEventData = await _pocketDDDAPI.FetchLatestEventData(new EventDataUpdateRequestDTO { Version = metaDataVersion });
34-
if (newEventData is not null)
32+
var eventData = await _localStorage.EventData.GetAsync();
33+
var eventDataVersion = eventData?.Version ?? 0;
34+
35+
try
36+
{
37+
var newEventData = await _pocketDDDAPI.FetchLatestEventData(new EventDataUpdateRequestDTO { Version = eventDataVersion });
38+
39+
if (newEventData is not null)
40+
{
41+
await _localStorage.EventData.SetAsync(newEventData);
42+
}
43+
}
44+
catch
3545
{
36-
await _localStorage.EventData.SetAsync(newEventData);
37-
dispatcher.Dispatch(new SetEventDataVersionAction(newEventData.Version));
46+
// ignored
3847
}
3948

4049
var eventFeedbackItems = await _localStorage.EventFeedbackSync.GetAllSyncItemsAsync();
@@ -43,6 +52,10 @@ public async Task OnSync(SyncAction action, IDispatcher dispatcher)
4352
dispatcher.Dispatch(new SyncEventFeedbackItemsAction(eventFeedbackItems));
4453
dispatcher.Dispatch(new SyncSessionFeedbackItemsAction(sessionFeedbackItems));
4554
}
55+
catch
56+
{
57+
// ignored
58+
}
4659
finally
4760
{
4861
dispatcher.Dispatch(new SyncCompletedAction());
@@ -61,7 +74,10 @@ public async Task OnSyncEventFeedbackItems(SyncEventFeedbackItemsAction action,
6174
await _localStorage.EventFeedbackSync.RemoveSyncItemAsync(result.ClientId);
6275
dispatcher.Dispatch(new EventScoreUpdatedAction(result.Score));
6376
}
64-
catch { }
77+
catch
78+
{
79+
// ignored
80+
}
6581
}
6682
}
6783

@@ -77,7 +93,10 @@ public async Task OnSyncSessionFeedbackItems(SyncSessionFeedbackItemsAction acti
7793
await _localStorage.SessionFeedbackSync.RemoveSyncItemAsync(result.ClientId);
7894
dispatcher.Dispatch(new EventScoreUpdatedAction(result.Score));
7995
}
80-
catch { }
96+
catch
97+
{
98+
// ignored
99+
}
81100
}
82101
}
83102
}

‎PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Sync/Store/SyncReducer.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ public static SyncState OnSync(SyncState state, SyncAction action) =>
1414
public static SyncState OnSyncCompleted(SyncState state, SyncCompletedAction action) =>
1515
state with { IsSyncing = false };
1616

17-
[ReducerMethod]
18-
public static SyncState OnSetEventDataVersion(SyncState state, SetEventDataVersionAction action) =>
19-
state with { EventDataVersion = action.Version };
20-
2117
[ReducerMethod]
2218
public static SyncState OnSetEventScore(SyncState state, SetEventScoreAction action) =>
2319
state with { EventScore = action.Score };

0 commit comments

Comments
 (0)