Merge branch 'dev' into beta

EmuDeck · Mar 13, 2024 · 42b6a40 · 42b6a40
2 parents 583ceae + 8ed1da5
commit 42b6a40
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/data/emuData.json b/src/data/emuData.json
@@ -213,7 +213,7 @@
     "code": "Yuzu",
 
     "description": "Yuzu was a Nintendo Switch emulator, it was shutdown after a settlement with Nintendo and it's no longer available to install. Emudeck does not download nor can it guarantee support if you run into any issues.",
-    "special_configuration": " If you already have your yuzu.AppImage in the /home/deck/Applications folder it will keep working. Same if you are on windows and you have it on your USERFOLDER/EmuDeck/EmulationStation-DE/Emulators/yuzu folder. Firmware: Place keys and firmware place in: Emulation/bios/yuzu.",
+    "special_configuration": " If you already have your yuzu.AppImage in the /home/deck/Applications folder it will keep working. Same if you are on windows and you have it on your USERFOLDER/EmuDeck/EmulationStation-DE/Emulators/yuzu/yuzu-windows-msvc folder. Firmware: Place keys and firmware place in: Emulation/bios/yuzu.",
     "bios": ["nswitch"],
     "systems": "Nintendo Switch",
     "hotkeys": {

diff --git a/src/renderer/components b/src/renderer/components
diff --git a/src/renderer/pages/CloudSyncConfigPage.jsx b/src/renderer/pages/CloudSyncConfigPage.jsx
@@ -203,7 +203,7 @@ function CloudSyncPageConfig() {
 
     const modalData = {
       active: true,
-      header: <span className="h4">Installing CloudSync</span>,
+      header: <span className="h4">Installing Cloud{CloudSyncType}</span>,
       css: 'emumodal--xs',
       body: (
         <p>
@@ -216,11 +216,7 @@ function CloudSyncPageConfig() {
     setStatePage({ ...statePage, disableButton: true, modal: modalData });
 
     let cloudFunction;
-    if (cloudSyncType === 'Sync') {
-      cloudFunction = 'cloud_sync_install_and_config ';
-    } else {
-      cloudFunction = 'cloud_backup_install_and_config';
-    }
+    cloudFunction = 'cloud_sync_install_and_config ';
 
     ipcChannel.sendMessage('emudeck', [
       `cloud_saves|||${cloudFunction} ${cloudSync}`,
@@ -234,7 +230,7 @@ function CloudSyncPageConfig() {
         // checkHealth();
         modalData = {
           active: true,
-          header: <span className="h4">CloudSync Configured</span>,
+          header: <span className="h4">Cloud{CloudSyncType} Configured</span>,
           body: (
             <>
               <p>
@@ -283,17 +279,19 @@ function CloudSyncPageConfig() {
         // checkHealth();
         let warningChrome;
         if (system !== 'win32') {
-          warningChrome = `Make sure you have Google Chrome installed, Firefox won't work. Once you have CloudSync installed you can remove Chrome`;
+          warningChrome = `Make sure you have Google Chrome installed, Firefox won't work. Once you have Cloud${cloudSyncType} installed you can remove Chrome`;
         }
         modalData = {
           active: true,
-          header: <span className="h4">Error Installing CloudSync</span>,
+          header: (
+            <span className="h4">Error Installing Cloud{cloudSyncType}</span>
+          ),
           css: 'emumodal--xs',
           body: (
             <>
               <p>
-                There's been an issue installing CloudSync, please try again.
-                Make sure your credentials are correct.
+                There's been an issue installing Cloud{cloudSyncType}, please
+                try again. Make sure your credentials are correct.
               </p>
               <p>
                 <strong>{warningChrome}</strong>
@@ -358,8 +356,8 @@ function CloudSyncPageConfig() {
         body: (
           <p>
             Make sure you have Google Chrome or any other Chromium browser set
-            as your default browser to install CloudSync. You can set your old
-            browser by default once the installation is complete.
+            as your default browser to install Cloud{cloudSyncType}. You can set
+            your old browser by default once the installation is complete.
           </p>
         ),
         css: 'emumodal--sm',
@@ -382,7 +380,7 @@ function CloudSyncPageConfig() {
     <div style={{ height: '100vh' }}>
       <Wrapper>
         <PatreonLogin>
-          <Header title="Cloud Saves - Select your provider" />
+          <Header title={`Cloud${cloudSyncType} - Select your provider`} />
           <CloudSyncConfig
             onClick={cloudSyncSet}
             onClickInstall={installRclone}
+6 −4		molecules/Aside/aside.scss
+1 −1		molecules/SelectorMenu/SelectorMenu.jsx
+7 −7		organisms/Wrappers/CloudSync.jsx
+4 −2		organisms/Wrappers/CloudSyncConfig.jsx