Merge pull request #1893 from hydralauncher/fix/downloads-ui

fix: navigation on game image click not working

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydralauncher",
-  "version": "3.7.5",
+  "version": "3.7.6",
   "description": "Hydra",
   "main": "./out/main/index.js",
   "author": "Los Broxas",

src/locales/es/translation.json

@@ -458,6 +458,7 @@
     "description_confirmation_delete_all_sources": "Vas a eliminar todas las fuentes de descargas",
     "button_delete_all_sources": "Eliminar todo",
     "added_download_source": "Añadir fuente de descarga",
+    "adding": "Añadiendo…",
     "download_sources_synced": "Todas las fuentes de descarga están sincronizadas",
     "insert_valid_json_url": "Introducí una URL de json válida",
     "found_download_option_zero": "Sin opciones de descargas encontrada",
@@ -563,6 +564,19 @@
     "debrid_description": "Los servicios Debrid son descargadores premium sin restricciones que te dejan descargar más rápido archivos alojados en servicios de alojamiento siendo que la única limitación es tu velocidad de internet.",
     "enable_friend_start_game_notifications": "Cuando un amigo está jugando un juego",
     "autoplay_trailers_on_game_page": "Reproducir trailers automáticamente en la página del juego",
+    "change_achievement_sound": "Cambiar sonido de logro",
+    "download_source_already_exists": "Esta fuente de descarga URL ya existe.",
+    "download_source_failed": "Error",
+    "download_source_matched": "Actualizado",
+    "download_source_matching": "Actualizando",
+    "download_source_no_information": "Sin información disponible",
+    "download_source_pending_matching": "Actualizando pronto",
+    "download_sources_synced_successfully": "Todas las fuentes de descarga están sincronizadas",
+    "failed_add_download_source": "Error al añadir la fuente de descarga. Por favor intentá de nuevo.",
+    "hydra_cloud": "Hydra Cloud",
+    "preview_sound": "Vista previa de sonido",
+    "remove_achievement_sound": "Eliminar sonido de logros",
+    "removed_all_download_sources": "Todas las fuentes de descarga eliminadas",
     "hide_to_tray_on_game_start": "Ocultar Hydra en la bandeja al iniciar un juego"
   },
   "notifications": {

src/main/main.ts

@@ -33,9 +33,7 @@ export const loadState = async () => {
 
   await import("./events");
 
-  if (process.platform !== "darwin") {
+  Aria2.spawn();
-    Aria2.spawn();
-  }
 
   if (userPreferences?.realDebridApiToken) {
     RealDebridClient.authorize(userPreferences.realDebridApiToken);

src/main/services/aria2.ts

@@ -7,9 +7,12 @@ export class Aria2 {
   private static process: cp.ChildProcess | null = null;
 
   public static spawn() {
-    const binaryPath = app.isPackaged
+    const binaryPath =
-      ? path.join(process.resourcesPath, "aria2c")
+      process.platform === "darwin"
-      : path.join(__dirname, "..", "..", "binaries", "aria2c");
+        ? "aria2c"
+        : app.isPackaged
+          ? path.join(process.resourcesPath, "aria2c")
+          : path.join(__dirname, "..", "..", "binaries", "aria2c");
 
     this.process = cp.spawn(
       binaryPath,

src/main/services/hosters/gofile.ts

@@ -36,16 +36,13 @@ export class GofileApi {
   }
 
   public static async getDownloadLink(id: string) {
-    const searchParams = new URLSearchParams({
-      wt: WT,
-    });
-
     const response = await axios.get<{
       status: string;
       data: GofileContentsResponse;
-    }>(`https://api.gofile.io/contents/${id}?${searchParams.toString()}`, {
+    }>(`https://api.gofile.io/contents/${id}`, {
       headers: {
         Authorization: `Bearer ${this.token}`,
+        "X-Website-Token": WT,
       },
     });
 

src/main/services/hydra-api.ts

@@ -58,7 +58,13 @@ export class HydraApi {
     const decodedBase64 = atob(payload as string);
     const jsonData = JSON.parse(decodedBase64);
 
-    const { accessToken, expiresIn, refreshToken } = jsonData;
+    const {
+      accessToken,
+      expiresIn,
+      refreshToken,
+      featurebaseJwt,
+      workwondersJwt,
+    } = jsonData;
 
     const now = new Date();
 
@@ -85,6 +91,8 @@ export class HydraApi {
         accessToken,
         refreshToken,
         tokenExpirationTimestamp,
+        featurebaseJwt,
+        workwondersJwt,
       },
       { valueEncoding: "json" }
     );

src/main/services/window-manager.ts

@@ -138,7 +138,8 @@ export class WindowManager {
       (details, callback) => {
         if (
           details.webContentsId !== this.mainWindow?.webContents.id ||
-          details.url.includes("chatwoot")
+          details.url.includes("chatwoot") ||
+          details.url.includes("workwonders")
         ) {
           return callback(details);
         }
@@ -159,7 +160,8 @@ export class WindowManager {
         if (
           details.webContentsId !== this.mainWindow?.webContents.id ||
           details.url.includes("featurebase") ||
-          details.url.includes("chatwoot")
+          details.url.includes("chatwoot") ||
+          details.url.includes("workwonders")
         ) {
           return callback(details);
         }

src/renderer/src/components/bottom-panel/bottom-panel.tsx

@@ -122,10 +122,10 @@ export function BottomPanel() {
       </button>
 
       <button
-        data-featurebase-changelog
+        data-open-workwonders-changelog-mini
         className="bottom-panel__version-button"
       >
-        <small data-featurebase-changelog>
+        <small>
           {sessionHash ? `${sessionHash} -` : ""} v{version} &quot;
           {VERSION_CODENAME}&quot;
         </small>

src/renderer/src/pages/downloads/download-group.scss

@@ -108,16 +108,11 @@
       cursor: pointer;
       display: flex;
       align-items: center;
-      transition: opacity 0.2s ease;
+      transition: scale 0.2s ease;
       outline: none;
 
       &:hover {
-        opacity: 0.8;
+        scale: 1.05;
-      }
-
-      &:focus,
-      &:focus-visible {
-        outline: none;
       }
     }
 
@@ -395,6 +390,21 @@
     flex-shrink: 0;
     background-color: rgba(0, 0, 0, 0.3);
     border: 1px solid globals.$border-color;
+    padding: 0;
+    cursor: pointer;
+    transition:
+      opacity 0.2s ease,
+      transform 0.2s ease;
+
+    &:hover {
+      opacity: 0.9;
+    }
+
+    &:focus,
+    &:focus-visible {
+      outline: 2px solid rgba(255, 255, 255, 0.5);
+      outline-offset: 2px;
+    }
 
     img {
       width: 100%;
@@ -411,6 +421,21 @@
     gap: calc(globals.$spacing-unit / 1);
   }
 
+  &__simple-title-button {
+    background: none;
+    border: none;
+    padding: 0;
+    cursor: pointer;
+    text-align: left;
+    width: 100%;
+    transition: opacity 0.2s ease;
+
+    &:focus,
+    &:focus-visible {
+      outline: none;
+    }
+  }
+
   &__simple-title {
     font-size: 16px;
     font-weight: 600;

src/renderer/src/pages/downloads/download-group.tsx

@@ -436,6 +436,7 @@ export function DownloadGroup({
   seedingStatus,
 }: Readonly<DownloadGroupProps>) {
   const { t } = useTranslation("downloads");
+  const navigate = useNavigate();
 
   const userPreferences = useAppSelector(
     (state) => state.userPreferences.value
@@ -867,12 +868,22 @@ export function DownloadGroup({
         {downloadInfo.map(({ game, size, progress, isSeeding: seeding }) => {
           return (
             <li key={game.id} className="download-group__simple-card">
-              <div className="download-group__simple-thumbnail">
+              <button
+                type="button"
+                onClick={() => navigate(buildGameDetailsPath(game))}
+                className="download-group__simple-thumbnail"
+              >
                 <img src={game.libraryImageUrl || ""} alt={game.title} />
-              </div>
+              </button>
 
               <div className="download-group__simple-info">
-                <h3 className="download-group__simple-title">{game.title}</h3>
+                <button
+                  type="button"
+                  onClick={() => navigate(buildGameDetailsPath(game))}
+                  className="download-group__simple-title-button"
+                >
+                  <h3 className="download-group__simple-title">{game.title}</h3>
+                </button>
                 <div className="download-group__simple-meta">
                   <div className="download-group__simple-meta-row">
                     <Badge>{DOWNLOADER_NAME[game.download!.downloader]}</Badge>

src/types/level.types.ts

@@ -20,6 +20,8 @@ export interface Auth {
   accessToken: string;
   refreshToken: string;
   tokenExpirationTimestamp: number;
+  featurebaseJwt: string;
+  workwondersJwt: string;
 }
 
 export interface User {

yarn.lock

@@ -6330,7 +6330,7 @@ jsonwebtoken@^9.0.2:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-jwa@^1.4.1:
+jwa@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
   integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
@@ -6340,11 +6340,11 @@ jwa@^1.4.1:
     safe-buffer "^5.0.1"
 
 jws@^3.2.2:
-  version "3.2.2"
+  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.3.tgz#5ac0690b460900a27265de24520526853c0b8ca1"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  integrity sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==
   dependencies:
-    jwa "^1.4.1"
+    jwa "^1.4.2"
     safe-buffer "^5.0.1"
 
 keyv@^4.0.0, keyv@^4.5.3: