cloud sync proper navigation

EmuDeck · May 31, 2023 · 128f01e · 128f01e
1 parent ad31e83
commit 128f01e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 39 deletions.
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EmuDeck",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "description": "Play all your RetroGames",
   "license": "MIT",
   "author": {

diff --git a/src/renderer/pages/CloudSyncConfigPage.jsx b/src/renderer/pages/CloudSyncConfigPage.jsx
@@ -160,7 +160,7 @@ function CloudSyncPageConfig() {
     if (type === 'welcome') {
       return false;
     }
-    return mode === 'easy' ? 'end' : 'emulator-selector';
+    return 'copy-games';
   };
 
   return (
@@ -176,7 +176,7 @@ function CloudSyncPageConfig() {
 
       <Footer
         next={nextButtonStatus()}
-        nextText={mode === 'easy' ? 'Finish' : 'Next'}
+        nextText="Copy games"
         disabledNext={disabledNext}
         disabledBack={disabledBack}
       />

diff --git a/src/renderer/pages/CloudSyncPage.jsx b/src/renderer/pages/CloudSyncPage.jsx
@@ -28,9 +28,7 @@ function CloudSyncPage() {
       return cloudSyncType === 'none' ? false : `cloud-sync-config/${type}`;
     }
     return cloudSyncType === 'none'
-      ? mode === 'easy'
-        ? 'end'
-        : 'emulator-selector'
+      ? 'copy-games'
       : `cloud-sync-config/${type}`;
   };
 
@@ -42,17 +40,12 @@ function CloudSyncPage() {
         disableButton={disableButton}
         showNo={type !== 'welcome'}
       />
+
       <Footer
         next={nextButtonStatus()}
-        nextText={
-          cloudSyncType === 'none'
-            ? mode === 'easy'
-              ? 'Finish'
-              : 'Next'
-            : 'Next'
-        }
+        nextText={cloudSyncType === 'none' ? 'Copy Games' : 'Next'}
         disabledNext={disabledNext}
-        disabledBack={disabledBack}
+        disabledBack={type !== 'welcome'}
       />
     </Wrapper>
   );

diff --git a/src/renderer/pages/DeviceSelectorPage.jsx b/src/renderer/pages/DeviceSelectorPage.jsx
@@ -126,8 +126,8 @@ function DeviceSelectorPage() {
         )}
       </DeviceSelector>
       <Footer
-        next="cloud-sync"
-        nextText="Next"
+        next={mode === 'easy' ? 'end' : 'emulator-selector'}
+        nextText={mode === 'easy' ? 'Finish' : 'Next'}
         disabledNext={disabledNext}
         disabledBack={disabledBack}
       />

diff --git a/src/renderer/pages/EndPage.jsx b/src/renderer/pages/EndPage.jsx
@@ -619,30 +619,28 @@ function EndPage() {
           Watch Log
         </BtnSimple>
 
-        {gamemode === false && (
-          <BtnSimple
-            css="btn-simple--1"
-            type="button"
-            aria="Go Next"
-            disabled={disabledNext && 'true'}
-            onClick={() => navigate('/copy-games')}
+        <BtnSimple
+          css="btn-simple--1"
+          type="button"
+          aria="Go Next"
+          disabled={disabledNext && 'true'}
+          onClick={() => navigate('/cloud-sync')}
+        >
+          Next
+          <svg
+            className="rightarrow"
+            width="32"
+            height="32"
+            viewBox="0 0 32 32"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
           >
-            Add games!
-            <svg
-              className="rightarrow"
-              width="32"
-              height="32"
-              viewBox="0 0 32 32"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                fill="currentColor"
-                d="M16.4091 8.48003L21.5024 13.5734L1.98242 13.5734L1.98242 18.0178H21.5024L16.4091 23.1111L19.5558 26.2578L30.018 15.7956L19.5558 5.33337L16.4091 8.48003Z"
-              />
-            </svg>
-          </BtnSimple>
-        )}
+            <path
+              fill="currentColor"
+              d="M16.4091 8.48003L21.5024 13.5734L1.98242 13.5734L1.98242 18.0178H21.5024L16.4091 23.1111L19.5558 26.2578L30.018 15.7956L19.5558 5.33337L16.4091 8.48003Z"
+            />
+          </svg>
+        </BtnSimple>
       </footer>
     </Wrapper>
   );