Merge pull request #108 from DeckThemes/dev

Version 2.0.3: Minor bug fixes
DeckThemes · Jan 12, 2024 · 9ea96f3 · 9ea96f3
2 parents a321e9e + 22519a1
commit 9ea96f3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SDH-CssLoader",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A css loader",
   "scripts": {
     "build": "shx rm -rf dist && rollup -c",

diff --git a/rollup.config.js b/rollup.config.js
@@ -26,13 +26,13 @@ export default defineConfig({
     }),
   ],
   context: "window",
-  external: ["react", "react-dom"],
+  external: ["react", "react-dom", "decky-frontend-lib"],
   output: {
     file: "dist/index.js",
     globals: {
       react: "SP_REACT",
       "react-dom": "SP_REACTDOM",
-      // "decky-frontend-lib": "DFL",
+      "decky-frontend-lib": "DFL",
     },
     format: "iife",
     exports: "default",

diff --git a/src/api.ts b/src/api.ts
@@ -165,7 +165,9 @@ export async function genericGET(
         throw new Error(`No json returned!`);
       })
       .catch((err) => {
-        console.error(`Error fetching ${fetchPath}`, err);
+        if (!failSilently) {
+          console.error(`Error fetching ${fetchPath}`, err);
+        }
         onError();
       });
   }

diff --git a/src/components/QAMTab/MOTDDisplay.tsx b/src/components/QAMTab/MOTDDisplay.tsx
@@ -11,7 +11,7 @@ export function MOTDDisplay() {
   const { hiddenMotd, setGlobalState } = useCssLoaderState();
   useEffect(() => {
     async function getMotd() {
-      const res = await genericGET("/motd", false);
+      const res = await genericGET("/motd", false, undefined, () => {}, true);
       setMotd(res);
     }
     getMotd();

diff --git a/src/pages/theme-manager/ExpandedView.tsx b/src/pages/theme-manager/ExpandedView.tsx
@@ -255,7 +255,11 @@ export const ExpandedViewPage: VFC = () => {
                     width={selectedImageWidth}
                     height={selectedImageHeight}
                     style={{ objectFit: "contain" }}
-                    src={`https://api.deckthemes.com/blobs/${fullThemeData.images[focusedImage].id}`}
+                    src={
+                      fullThemeData.images.length > 0
+                        ? `https://api.deckthemes.com/blobs/${fullThemeData.images?.[focusedImage]?.id}`
+                        : `https://share.deckthemes.com/cssplaceholder.png`
+                    }
                   />
                   {fullThemeData.images.length > 1 && (
                     <div className="image-number-container">