Removing extra themes. Fixes #905 (#910)

LemmyNet · Feb 3, 2023 · 31715ca · 31715ca
1 parent 87c3070
commit 31715ca
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 257 deletions.
diff --git a/src/assets/css/themes/cyborg.css b/src/assets/css/themes/cyborg.css
diff --git a/src/assets/css/themes/i386.css b/src/assets/css/themes/i386.css
diff --git a/src/assets/css/themes/journal.css b/src/assets/css/themes/journal.css
diff --git a/src/assets/css/themes/litera.css b/src/assets/css/themes/litera.css
diff --git a/src/assets/css/themes/materia.css b/src/assets/css/themes/materia.css
diff --git a/src/assets/css/themes/minty.css b/src/assets/css/themes/minty.css
diff --git a/src/assets/css/themes/nord.css b/src/assets/css/themes/nord.css
diff --git a/src/assets/css/themes/sketchy.css b/src/assets/css/themes/sketchy.css
diff --git a/src/assets/css/themes/solar.css b/src/assets/css/themes/solar.css
diff --git a/src/assets/css/themes/united.css b/src/assets/css/themes/united.css
diff --git a/src/assets/css/themes/vaporwave-dark.css b/src/assets/css/themes/vaporwave-dark.css
diff --git a/src/assets/css/themes/vaporwave.css b/src/assets/css/themes/vaporwave.css
diff --git a/src/server/index.tsx b/src/server/index.tsx
@@ -71,29 +71,18 @@ server.get("/css/themes/:name", async (req, res) => {
     res.sendFile(customTheme);
   } else {
     const internalTheme = path.resolve(`./dist/assets/css/themes/${theme}`);
-    res.sendFile(internalTheme);
+
+    // If the theme doesn't exist, just send litely
+    if (fs.existsSync(internalTheme)) {
+      res.sendFile(internalTheme);
+    } else {
+      res.sendFile(path.resolve("./dist/assets/css/themes/litely.css"));
+    }
   }
 });
 
 function buildThemeList(): string[] {
-  let themes = [
-    "litera",
-    "materia",
-    "minty",
-    "solar",
-    "united",
-    "cyborg",
-    "darkly",
-    "darkly-red",
-    "journal",
-    "sketchy",
-    "vaporwave",
-    "vaporwave-dark",
-    "i386",
-    "litely",
-    "litely-red",
-    "nord",
-  ];
+  let themes = ["darkly", "darkly-red", "litely", "litely-red"];
   if (fs.existsSync(extraThemesFolder)) {
     let dirThemes = fs.readdirSync(extraThemesFolder);
     let cssThemes = dirThemes