Merge branch 'main' of github.com:Heroic-Games-Launcher/HeroicGamesLa…

…uncher
Heroic-Games-Launcher · Dec 16, 2021 · 45e8969 · 45e8969
2 parents 779ddcd + 83a114e
commit 45e8969
Show file tree

Hide file tree

Showing 23 changed files with 839 additions and 498 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,7 +7,8 @@
   "extends": [
     "eslint:recommended",
     "plugin:react/recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
   ],
   "root": true,
   "parser": "@typescript-eslint/parser",
@@ -18,10 +19,7 @@
     "ecmaVersion": 12,
     "sourceType": "module"
   },
-  "plugins": [
-    "react",
-    "@typescript-eslint"
-  ],
+  "plugins": ["react", "@typescript-eslint"],
   "settings": {
     "react": {
       "version": "17.0"
@@ -32,9 +30,10 @@
     "@typescript-eslint/no-explicit-any": "error",
     "@typescript-eslint/no-unused-vars": "error",
     "complexity": "off",
-    "comma-dangle": ["error", "never"],
-    "indent": ["error", 2],
-    "no-trailing-spaces": "error",
-    "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }]
+    "quotes": [
+      "error",
+      "single",
+      { "avoidEscape": true, "allowTemplateLiterals": true }
+    ]
   }
 }
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,6 +1,6 @@
 {
-  "trailingComma": "none",
-  "tabWidth": 2,
-  "semi": false,
-  "singleQuote": true
-}
+    "trailingComma": "none",
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": true
+}
diff --git a/electron/legendary/library.ts b/electron/legendary/library.ts
@@ -313,10 +313,8 @@ class LegendaryLibrary {
    */
   private loadFile(fileName: string): string {
     fileName = `${libraryPath}/${fileName}`
-    const { app_name, metadata, asset_info } = JSON.parse(
-      readFileSync(fileName, 'utf-8')
-    )
-    const { namespace } = asset_info
+    const { app_name, metadata } = JSON.parse(readFileSync(fileName, 'utf-8'))
+    const { namespace } = metadata
     const is_game = namespace !== 'ue' ? true : false
     const {
       description,
@@ -377,20 +375,20 @@ class LegendaryLibrary {
 
     const gameBoxTall = is_game
       ? keyImages.filter(
-        ({ type }: KeyImage) => type === 'DieselGameBoxTall'
-      )[0]
+          ({ type }: KeyImage) => type === 'DieselGameBoxTall'
+        )[0]
       : gameBox
 
     const gameBoxStore = is_game
       ? keyImages.filter(
-        ({ type }: KeyImage) => type === 'DieselStoreFrontTall'
-      )[0]
+          ({ type }: KeyImage) => type === 'DieselStoreFrontTall'
+        )[0]
       : gameBox
 
     const logo = is_game
       ? keyImages.filter(
-        ({ type }: KeyImage) => type === 'DieselGameBoxLogo'
-      )[0]
+          ({ type }: KeyImage) => type === 'DieselGameBoxLogo'
+        )[0]
       : keyImages.filter(({ type }: KeyImage) => type === 'Thumbnail')[0]
 
     const fallBackImage =

diff --git a/package.json b/package.json
@@ -77,14 +77,16 @@
             "packageCategory": "games",
             "depends": [
                 "gawk",
-                "curl"
+                "curl",
+                "libzstd"
             ]
         },
         "rpm": {
             "packageCategory": "games",
             "depends": [
                 "gawk",
-                "curl"
+                "curl",
+                "libzstd"
             ]
         }
     },
@@ -163,10 +165,11 @@
         "@types/react-router-dom": "^5.1.6",
         "@typescript-eslint/eslint-plugin": "^4.26.0",
         "@typescript-eslint/parser": "^4.26.0",
-        "electron": "^16.0.1",
+        "electron": "^16.0.4",
         "electron-builder": "^22.11.7",
         "electron-devtools-installer": "^3.2.0",
         "eslint": "^7.27.0",
+        "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-react": "^7.24.0",
         "eslint-plugin-sort-exports": "^0.4.0",
         "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",

diff --git a/public/bin/darwin/legendary b/public/bin/darwin/legendary
diff --git a/public/bin/linux/legendary b/public/bin/linux/legendary
diff --git a/public/bin/win32/legendary.exe b/public/bin/win32/legendary.exe
diff --git a/public/locales/en/gamepage.json b/public/locales/en/gamepage.json
@@ -41,7 +41,7 @@
     "button": {
         "cancel": "Pause/Cancel",
         "continue": "Continue Download",
-        "import": "Import",
+        "import": "Import Game",
         "install": "Install",
         "uninstall": "Uninstall",
         "update": "Update"
@@ -117,4 +117,4 @@
         "store": "Store Page",
         "verify": "Verify and Repair"
     }
-}
+}
diff --git a/src/App.css b/src/App.css
@@ -83,9 +83,14 @@ html,
     background: var(--secondary);
 }
 
+.button.is-tertiary {
+    background: var(--tertiary);
+    color: white;
+}
+
 .button.is-secondary:hover {
     background: var(--secondary-hover);
-    color: var(--text-tertiary)
+    color: var(--text-tertiary);
 }
 
 .button.is-empty {
@@ -97,7 +102,7 @@ html,
     background: var(--success);
 }
 
-.button.button.is-success:hover {
+.button.is-success:hover {
     background: var(--success-hover);
 }
 
@@ -183,6 +188,23 @@ html,
     box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
 }
 
+.settingText {
+    margin-bottom: 14px;
+    font-family: Cabin;
+    font-style: normal;
+    font-weight: normal;
+    font-size: 16px;
+    line-height: 19px;
+    color: var(--text-primary);
+}
+
+.smallMessage {
+    font-size: 12px;
+    width: 513px;
+    white-space: break-spaces;
+    padding-top: 4px;
+}
+
 svg.disabled {
     color: var(--background);
 }
diff --git a/src/components/UI/Sidebar/index.css b/src/components/UI/Sidebar/index.css
@@ -3,7 +3,6 @@
     --sidebar-vertical-padding: 24px;
     height: 100%;
     background: var(--background);
-    box-shadow: 0px 4.00313px 10.0078px #161616;
     display: grid;
     grid-template-rows: 1fr 15% 1fr;
     grid-template-areas: 'links' 'layout' 'other';
@@ -13,11 +12,13 @@
     position: relative;
     z-index: 10;
 }
+
 .sidebar>* {
     width: 100%;
 }
+
 .sidebar button,
 .sidebar a {
     width: 100%;
     padding: 7px var(--sidebar-horizontal-padding);
-}
+}