Merge pull request #200 from LiamMorrow/feed

.gitattributes

@@ -63,3 +63,5 @@
 #*.RTF   diff=astextplain
 *.cs linguist-language=C#
 *.razor linguist-language=C#
+
+LiftLog.Ui/wwwroot/tailwind.js linguist-vendored

LiftLog.Ui/LiftLog.Ui.csproj

@@ -44,7 +44,6 @@
         <Content Remove="wwwroot\load-tailwind.js" />
         <Content Remove="wwwroot\tailwind.js" />
         <Content Remove="wwwroot\twconf.json" />
-        <Content Remove="wwwroot\export.liftlogbackup.gz" />
         <Content Remove="Pages\Screenshot\ScreenshotCollectorPage.razor" />
     </ItemGroup>
 

LiftLog.Ui/Models/ExportedDataDao/ExportedDataDaoV2.cs

@@ -11,12 +11,14 @@ internal partial class ExportedDataDaoV2
     public ExportedDataDaoV2(
         IEnumerable<SessionDaoV2> sessions,
         IDictionary<string, ProgramBlueprintDaoV1> savedPrograms,
-        Guid activeProgramId
+        Guid activeProgramId,
+        FeedStateDaoV1? feedState
     )
     {
         Sessions.AddRange(sessions);
         ActiveProgramId = activeProgramId.ToString();
         SavedPrograms.Add(savedPrograms);
+        FeedState = feedState;
     }
 
     public static ExportedDataDaoV2 FromV1(ExportedDataDaoV1 v1)
@@ -36,7 +38,8 @@ public static ExportedDataDaoV2 FromV1(ExportedDataDaoV1 v1)
         return new ExportedDataDaoV2(
             v1.Sessions.Select(x => x.ToModel()).Select(SessionDaoV2.FromModel),
             plans,
-            activePlanId
+            activePlanId,
+            null
         );
     }
 }

LiftLog.Ui/Models/ExportedDataDao/ExportedDataDaoV2.proto

@@ -4,11 +4,13 @@ package LiftLog.Ui.Models.ExportedDataDao;
 import "Models/SessionHistoryDao/SessionHistoryDaoV2.proto";
 import "Models/SessionBlueprintDao/SessionBlueprintDaoV2.proto";
 import "Models/ProgramBlueprintDao/ProgramBlueprintDaoV1.proto";
+import "Models/FeedStateDao.proto";
 import "google/protobuf/wrappers.proto";
 
 message ExportedDataDaoV2 {
     repeated LiftLog.Ui.Models.SessionHistoryDao.SessionDaoV2 sessions = 1;
     repeated LiftLog.Ui.Models.SessionBlueprintDao.SessionBlueprintDaoV2 program = 2;
     map<string, LiftLog.Ui.Models.ProgramBlueprintDao.ProgramBlueprintDaoV1> saved_programs = 3;
     google.protobuf.StringValue active_program_id = 4;
+    LiftLog.Ui.Models.FeedStateDaoV1 feed_state = 5;
 }

LiftLog.Ui/Pages/Feed/FeedPage.razor

@@ -111,22 +111,15 @@
 }
 
 
-<Dialog @ref="deleteUserDialog">
-    <span slot="headline">Unfollow user</span>
-    <span slot="content" class="block text-left">This will unfollow <span class="text-primary font-bold">@(userToDelete?.Nickname ?? userToDelete?.Name ?? "Anonymous User")</span> and remove all their content on your device.</span>
-    <div slot="actions">
-        <AppButton Type="AppButtonType.Text" OnClick="@(() => deleteUserDialog?.Close())">Cancel</AppButton>
-        <AppButton Type="AppButtonType.Text" OnClick="DeleteUser">Unfollow</AppButton>
-    </div>
-</Dialog>
-<Dialog @ref="removeFollowerDialog">
-    <span slot="headline">Remove follower</span>
-    <span slot="content" class="block text-left">This will stop <span class="text-primary font-bold">@(userToDelete?.Nickname ?? userToDelete?.Name ?? "Anonymous User")</span> from following you and remove all your content from their device.</span>
-    <div slot="actions">
-        <AppButton Type="AppButtonType.Text" OnClick="@(() => removeFollowerDialog?.Close())">Cancel</AppButton>
-        <AppButton Type="AppButtonType.Text" OnClick="RemoveFollower">Unfollow</AppButton>
-    </div>
-</Dialog>
+<ConfirmationDialog @ref="deleteUserDialog" OkText="Unfollow" OnOk="DeleteUser">
+    <Headline>Unfollow user</Headline>
+    <TextContent>This will unfollow <span class="text-primary font-bold">@(userToDelete?.Nickname ?? userToDelete?.Name ?? "Anonymous User")</span> and remove all their content on your device.</TextContent>
+</ConfirmationDialog>
+
+<ConfirmationDialog @ref="removeFollowerDialog" OkText="Remove" OnOk="RemoveFollower">
+    <Headline>Remove follower</Headline>
+    <TextContent>This will stop <span class="text-primary font-bold">@(userToDelete?.Nickname ?? userToDelete?.Name ?? "Anonymous User")</span> from following you and remove all your content from their device.</TextContent>
+</ConfirmationDialog>
 
 @code
 {
@@ -139,8 +132,8 @@
 
 
     private ElementReference tabs;
-    private Dialog? deleteUserDialog;
-    private Dialog? removeFollowerDialog;
+    private ConfirmationDialog? deleteUserDialog;
+    private ConfirmationDialog? removeFollowerDialog;
     private FeedUser? userToDelete;
     private FullScreenDialog? settingsDialog;
     private FeedIdentityManager? feedIdentityManager;

LiftLog.Ui/Pages/Index.razor

@@ -88,21 +88,17 @@ else
     </Fab>
 </FloatingBottomContainer>
 
-<Dialog @ref="replaceCurrentSesisonDialog">
-    <span slot="headline">Replace current session</span>
-    <span slot="content" class="block text-left">
+<ConfirmationDialog @ref="replaceCurrentSesisonDialog" OkText="Replace" OnOk="ReplaceSession">
+    <Headline>Replace current session</Headline>
+    <TextContent>
         There is already a current session in progress, start a new one without
         saving?
-    </span>
-    <div slot="actions">
-        <AppButton Type="AppButtonType.Text" OnClick="@(() => replaceCurrentSesisonDialog?.Close())">Cancel</AppButton>
-        <AppButton Type="AppButtonType.Text" OnClick="ReplaceSession">Replace</AppButton>
-    </div>
-</Dialog>
+    </TextContent>
+</ConfirmationDialog>
 
 @code {
 
-    private Dialog? replaceCurrentSesisonDialog;
+    private ConfirmationDialog? replaceCurrentSesisonDialog;
     private Session? selectedSession;
 
     protected override async Task OnInitializedAsync()

LiftLog.Ui/Pages/Settings/BackupAndRestorePage.razor

@@ -4,7 +4,7 @@
 @inherits Fluxor.Blazor.Web.Components.FluxorComponent
 
 <md-list>
-    <md-list-item type="button" class="text-left" multi-line-supporting-text @onclick="ExportData">
+    <md-list-item type="button" class="text-left" multi-line-supporting-text @onclick="()=>exportFeedDialog?.Open()">
         <md-icon slot="start">backup</md-icon>
         <span slot="headline">Export data</span>
         <span slot="supporting-text">Export your data to a file for backup or transfer</span>
@@ -16,11 +16,35 @@
     </md-list-item>
 </md-list>
 
+
+<ConfirmationDialog @ref="importFeedDialog" OkText="Import" CancelText="No" OnOk="ImportFeedData">
+    <Headline>Import Feed Data?</Headline>
+    <TextContent>
+        <p>This backup includes a feed account. Would you like to import it?</p>
+        <p>You will lose access to your current account without a backup.</p>
+        <p class="text-error font-bold">This will replace your current account and cannot be undone!</p>
+    </TextContent>
+</ConfirmationDialog>
+
+<ConfirmationDialog @ref="exportFeedDialog" OkText="Include Feed" CancelText="Just my data" OnOk="()=>ExportData(true)" OnCancel="()=>ExportData(false)">
+    <Headline>Backup Feed Account</Headline>
+    <TextContent>
+        <p>Include your feed account and followed users in this backup?</p>
+        <p class="text-error font-bold">Caution: This would allow anyone with this backup to post feed content with your account</p>
+    </TextContent>
+</ConfirmationDialog>
+
+
 @code {
+
+    private FeedState? importedFeedState;
+    private ConfirmationDialog? importFeedDialog;
+    private ConfirmationDialog? exportFeedDialog;
     protected override void OnInitialized()
     {
         Dispatcher.Dispatch(new SetPageTitleAction("Backup and Restore"));
         Dispatcher.Dispatch(new SetBackNavigationUrlAction("/settings"));
+        SubscribeToAction<BeginFeedImportAction>(OnBeginFeedImport);
         base.OnInitialized();
     }
 
@@ -31,5 +55,23 @@
         Dispatcher.Dispatch(new SetStatsIsDirtyAction(true));
     }
 
-    private void ExportData() => Dispatcher.Dispatch(new ExportDataAction());
+    private void ExportData(bool includeFeed) => Dispatcher.Dispatch(new ExportDataAction(includeFeed));
+
+    private void OnBeginFeedImport(BeginFeedImportAction action)
+    {
+        importedFeedState = action.FeedState;
+        importFeedDialog?.Open();
+    }
+
+    private void ImportFeedData()
+    {
+        if (importedFeedState is null)
+        {
+            return;
+        }
+
+        Dispatcher.Dispatch(new SetFeedStateAction(importedFeedState));
+        importedFeedState = null;
+        importFeedDialog?.Close();
+    }
 }

LiftLog.Ui/Pages/Settings/NotificationsPage.razor

@@ -8,7 +8,7 @@
     <ListSwitch Headline="Rest notifications" SupportingText="Show a notification when the rest timer is up" Value="@SettingsState.Value.RestNotifications" OnSwitched="SetRestNotifications" />
 </md-list>
 
-<AndroidNotificationAlert ForceShow="true" />
+<AndroidNotificationAlert />
 
 @code {
     protected override void OnInitialized()

LiftLog.Ui/Shared/MainLayout.razor

@@ -57,7 +57,7 @@
 
 <Microsoft.AspNetCore.Components.Sections.SectionOutlet SectionName="FullscreenDialog"></Microsoft.AspNetCore.Components.Sections.SectionOutlet>
 <Microsoft.AspNetCore.Components.Sections.SectionOutlet SectionName="Dialog"></Microsoft.AspNetCore.Components.Sections.SectionOutlet>
-
+<Microsoft.AspNetCore.Components.Sections.SectionOutlet SectionName="AndroidNotificationDialog"></Microsoft.AspNetCore.Components.Sections.SectionOutlet>
 <div class="hidden">
     <ApexChart
         TItem="DummyChartType"

LiftLog.Ui/Shared/Presentation/ConfirmationDialog.razor

@@ -0,0 +1,51 @@
+
+<Dialog @ref="dialog" @ondialog-cancel="OnCancel">
+    <span slot="headline">@Headline</span>
+    <span slot="content" class="block text-left">
+        @TextContent
+    </span>
+    <div slot="actions">
+        <AppButton Type="AppButtonType.Text" OnClick="async () => { dialog?.Close(); await OnCancel.InvokeAsync(); }">@CancelText</AppButton>
+        <AppButton Type="AppButtonType.Text" OnClick="async () => { dialog?.Close(); await OnOk.InvokeAsync(); }">@OkText</AppButton>
+    </div>
+</Dialog>
+
+@code {
+    [Parameter]
+    [EditorRequired]
+    public RenderFragment Headline {get;set;} = null!;
+    [Parameter]
+    [EditorRequired]
+    public RenderFragment TextContent {get;set;} = null!;
+
+    [Parameter]
+    public string CancelText {get;set;} = "Cancel";
+
+    [Parameter]
+    public EventCallback OnCancel { get; set; }
+
+    [Parameter]
+    public string OkText { get; set; } = "Ok";
+
+    [Parameter]
+    public EventCallback OnOk { get; set; }
+
+    [Parameter] public string SectionName { get; set; } = "Dialog";
+
+    private Dialog? dialog;
+
+    public void Open()
+    {
+        dialog?.Open();
+    }
+
+    public void Close()
+    {
+        dialog?.Close();
+    }
+
+    public Task CloseWait()
+    {
+        return dialog?.CloseWait() ?? Task.CompletedTask;
+    }
+}

LiftLog.Ui/Shared/Presentation/Dialog.razor

@@ -3,7 +3,7 @@
 @if (opened)
 {
     @* Put the dialog into a section in the main layout so that the scrim covers parent elements on ios *@
-    <Microsoft.AspNetCore.Components.Sections.SectionContent SectionName="Dialog">
+    <Microsoft.AspNetCore.Components.Sections.SectionContent SectionName="@SectionName">
         <md-dialog
             @ondialog-close="HandleDialogClose"
             @ondialog-cancel="HandleDialogCancel"
@@ -28,6 +28,8 @@
 
     [Parameter] public RenderFragment? ChildContent { get; set; }
 
+    [Parameter] public string SectionName { get; set; } = "Dialog";
+
     public async void Open()
     {
         opened = true;

LiftLog.Ui/Shared/Smart/AndroidNotificationAlert.razor

@@ -7,24 +7,22 @@
 
 @inject IDeviceService DeviceService
 
-<Dialog @ref="androidNotificationDialog" OnCancel="DisableNotifications">
-    <span slot="headline">Enable Notifications?</span>
-    <span slot="content" class="block text-left">Newer Android devices require an additional permission to ensure that rest notifications are delivered on time.
+<ConfirmationDialog @ref="androidNotificationDialog"
+    OkText="Grant"
+    OnOk="DeviceService.RequestExactNotificationPermission"
+    CancelText="Disable Notifications"
+    OnCancel="DisableNotifications"
+    SectionName="AndroidNotificationDialog">
+    <Headline>Enable Notifications?</Headline>
+    <TextContent>Newer Android devices require an additional permission to ensure that rest notifications are delivered on time.
         Without this permission, they will arrive late and largely be useless.
-        On the next screen, please grant LiftLog the permission.</span>
-    <div slot="actions">
-        <AppButton Type="AppButtonType.Text" OnClick="() => { androidNotificationDialog?.Close(); DisableNotifications(); }">Disable Notifications</AppButton>
-        <AppButton Type="AppButtonType.Text" OnClick="() => { androidNotificationDialog?.Close(); DeviceService.RequestExactNotificationPermission(); }">Grant</AppButton>
-    </div>
-</Dialog>
+        On the next screen, please grant LiftLog the permission.</TextContent>
+</ConfirmationDialog>
 
 @code
 {
-    [Parameter]
-    public bool ForceShow { get; set; }
-
-    private Dialog? androidNotificationDialog;
 
+    private ConfirmationDialog? androidNotificationDialog;
 
     protected override void OnAfterRender(bool firstRender)
     {

LiftLog.Ui/Store/Feed/FeedActions.cs

@@ -36,6 +36,8 @@ public record PutFollowedUsersAction(FeedUser User);
 
 public record SetSharedFeedUserAction(FeedUser? User);
 
+public record SetFeedStateAction(FeedState FeedState);
+
 public record FetchAndSetSharedFeedUserAction(
     string IdOrLookup,
     string? Name,

LiftLog.Ui/Store/Feed/FeedReducers.cs

@@ -141,4 +141,8 @@ state with
         {
             SharedItem = action.SharedItem
         };
+
+    [ReducerMethod]
+    public static FeedState SetFeedState(FeedState state, SetFeedStateAction action) =>
+        action.FeedState;
 }

LiftLog.Ui/Store/Settings/SettingsActions.cs

@@ -1,15 +1,18 @@
 using LiftLog.Lib;
 using LiftLog.Lib.Models;
 using LiftLog.Ui.Services;
+using LiftLog.Ui.Store.Feed;
 
 namespace LiftLog.Ui.Store.Settings;
 
-public record ExportDataAction();
+public record ExportDataAction(bool ExportFeed);
 
 public record ImportDataAction();
 
 public record ImportDataBytesAction(byte[] Bytes);
 
+public record BeginFeedImportAction(FeedState FeedState);
+
 public record GenerateAiPlanAction(AiWorkoutAttributes Attributes);
 
 public record SetAiPlanAction(AiWorkoutPlan? Plan);