Merge pull request #433 from Sidekick-Poe/feature/updater-continue

Allow to continue when the auto updater fails
Sidekick-Poe · Dec 30, 2024 · 5978fed · 5978fed
2 parents ecc2df0 + 98058b0
commit 5978fed
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 66 deletions.
diff --git a/src/Sidekick.Common.Ui/wwwroot/css/app.css b/src/Sidekick.Common.Ui/wwwroot/css/app.css
@@ -1500,11 +1500,6 @@ video {
   margin-bottom: 0px;
 }
 
-.my-1 {
-  margin-top: 0.25rem;
-  margin-bottom: 0.25rem;
-}
-
 .my-2 {
   margin-top: 0.5rem;
   margin-bottom: 0.5rem;
@@ -1536,10 +1531,6 @@ video {
   margin-bottom: 0.75rem;
 }
 
-.mb-4 {
-  margin-bottom: 1rem;
-}
-
 .ml-0 {
   margin-left: 0px;
 }
@@ -1564,22 +1555,10 @@ video {
   margin-left: auto;
 }
 
-.mr-1 {
-  margin-right: 0.25rem;
-}
-
 .mr-2 {
   margin-right: 0.5rem;
 }
 
-.mr-3 {
-  margin-right: 0.75rem;
-}
-
-.mr-4 {
-  margin-right: 1rem;
-}
-
 .mt-1 {
   margin-top: 0.25rem;
 }
@@ -1596,10 +1575,6 @@ video {
   margin-top: 1rem;
 }
 
-.mt-6 {
-  margin-top: 1.5rem;
-}
-
 .mt-9 {
   margin-top: 2.25rem;
 }
@@ -1940,10 +1915,6 @@ video {
   flex-grow: 1;
 }
 
-.flex-grow-0 {
-  flex-grow: 0;
-}
-
 .grow {
   flex-grow: 1;
 }
@@ -3332,10 +3303,6 @@ video {
   padding-bottom: 1rem;
 }
 
-.pb-0 {
-  padding-bottom: 0px;
-}
-
 .pb-2 {
   padding-bottom: 0.5rem;
 }
@@ -3352,10 +3319,6 @@ video {
   padding-bottom: 4px;
 }
 
-.pl-12 {
-  padding-left: 3rem;
-}
-
 .pl-2 {
   padding-left: 0.5rem;
 }
@@ -3372,22 +3335,6 @@ video {
   padding-right: 0.5rem;
 }
 
-.pr-4 {
-  padding-right: 1rem;
-}
-
-.pt-0 {
-  padding-top: 0px;
-}
-
-.pt-2 {
-  padding-top: 0.5rem;
-}
-
-.pt-4 {
-  padding-top: 1rem;
-}
-
 .pt-\[4px\] {
   padding-top: 4px;
 }

diff --git a/src/Sidekick.Common.Updater/Components/Update.razor b/src/Sidekick.Common.Updater/Components/Update.razor
@@ -13,28 +13,39 @@
     </TopContent>
 
     <ChildContent>
-        <AppContainer>
-            @if (Error)
-            {
-                <AlertError>@Resources["Update_Cant_Download"]</AlertError>
-            }
-            else if (NewLauncher)
-            {
+        @if (Error)
+        {
+            <AlertError>@Resources["Update_Cant_Download"]</AlertError>
+        }
+        else if (NewLauncher)
+        {
+            <AppContainer>
                 <Heading3 Class="mb-2 text-center">@Resources["NewLauncher"]</Heading3>
                 <TextBase
                     Class="text-center">@Resources["NewLauncherText"]</TextBase>
-            }
-            else
-            {
+            </AppContainer>
+        }
+        else
+        {
+            <AppContainer>
                 <Heading3 Class="mb-2 text-center"> @Resources["Checking_For_Updates"] </Heading3>
                 <ProgressBar Indeterminate="true"/>
-            }
-        </AppContainer>
+            </AppContainer>
+        }
     </ChildContent>
 
     <BottomContent>
         <div class="px-3 py-2 flex justify-center gap-2">
-            @if (NewLauncher)
+            @if (Error)
+            {
+                <ButtonSecondary OnClick="Exit">
+                    @Resources["Exit"]
+                </ButtonSecondary>
+                <ButtonPrimary OnClick="Continue">
+                    @Resources["Continue"]
+                </ButtonPrimary>
+            }
+            else if (NewLauncher)
             {
                 <ButtonSecondary OnClick="Exit">
                     @Resources["Exit"]