From 7ee46167a9c57bd6927286e5e43b5fec8df68e4b Mon Sep 17 00:00:00 2001
From: tobinio <Tobias.frischmann1@gmail.com>
Date: Fri, 28 Jun 2024 11:19:02 +0200
Subject: [PATCH] feat: show all project types

---
 components/navigation/LinksContainer.vue | 46 +++++++++++++++++++++++
 layouts/default.vue                      | 48 +-----------------------
 server/api/stats.ts                      |  2 +-
 server/utils/allowed.ts                  |  2 +-
 server/utils/api/stats.ts                |  2 +-
 server/utils/statistics.ts               | 11 ++----
 server/utils/types/project.ts            |  1 -
 utils/project.ts                         |  2 +
 8 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 components/navigation/LinksContainer.vue
 delete mode 100644 server/utils/types/project.ts
 create mode 100644 utils/project.ts

diff --git a/components/navigation/LinksContainer.vue b/components/navigation/LinksContainer.vue
new file mode 100644
index 0000000..9273222
--- /dev/null
+++ b/components/navigation/LinksContainer.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import DropDownLink from "~/components/navigation/DropDownLink.vue";
+import {projectTypeList, type ProjectTypes} from "~/utils/project";
+
+let urls = new Map<ProjectTypes, {
+  download: { title: string, url: string }[],
+  count: { title: string, url: string }[]
+}>();
+
+for (let type of projectTypeList) {
+  const downloads = [
+    {title: "Major Versions", url: `/${type}/downloads/major`},
+    {title: "Minor Versions", url: `/${type}/downloads/minor`},
+    {title: "All Versions", url: `/${type}/downloads/all`},
+  ]
+
+  const counts = [
+    {title: "Major Versions", url: `/${type}/counts/major`},
+    {title: "Minor Versions", url: `/${type}/counts/minor`},
+    {title: "All Versions", url: `/${type}/counts/all`},
+  ]
+
+  urls.set(type, {download: downloads, count: counts})
+}
+</script>
+
+<template>
+  <div id="links">
+    <div class="groups" v-for="type in projectTypeList">
+      <DropDownLink :urls="urls.get(type)!.download" :title="`${type} Downloads`"/>
+      <DropDownLink :urls="urls.get(type)!.count" :title="`${type} Versions`"/>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+#links {
+  display: flex;
+  gap: 50px;
+
+  .groups {
+    display: flex;
+    gap: 20px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/layouts/default.vue b/layouts/default.vue
index 207206b..96a7320 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,34 +1,9 @@
 <script setup lang="ts">
-import DropDownLink from "~/components/navigation/DropDownLink.vue";
+import LinksContainer from "~/components/navigation/LinksContainer.vue";
 
 async function onUpdateData() {
   await $fetch("/api/update")
 }
-
-const modDownloadUrls = [
-  {title: "Major Versions", url: "/mod/downloads/major"},
-  {title: "Minor Versions", url: "/mod/downloads/minor"},
-  {title: "All Versions", url: "/mod/downloads/all"},
-]
-
-const modCountUrls = [
-  {title: "Major Versions", url: "/mod/counts/major"},
-  {title: "Minor Versions", url: "/mod/counts/minor"},
-  {title: "All Versions", url: "/mod/counts/all"},
-]
-
-const modpackDownloadUrls = [
-  {title: "Major Versions", url: "/modpack/downloads/major"},
-  {title: "Minor Versions", url: "/modpack/downloads/minor"},
-  {title: "All Versions", url: "/modpack/downloads/all"},
-]
-
-const modpackCountUrls = [
-  {title: "Major Versions", url: "/modpack/counts/major"},
-  {title: "Minor Versions", url: "/modpack/counts/minor"},
-  {title: "All Versions", url: "/modpack/counts/all"},
-]
-
 </script>
 
 <template>
@@ -37,16 +12,7 @@ const modpackCountUrls = [
       <NuxtLink id="header" href="/">
         Modrinth Statistics
       </NuxtLink>
-      <div id="links">
-        <div class="groups">
-          <DropDownLink :urls="modDownloadUrls" title="Mod Downloads"/>
-          <DropDownLink :urls="modCountUrls" title="Mod Versions"/>
-        </div>
-        <div class="groups">
-          <DropDownLink :urls="modpackDownloadUrls" title="Modpack Downloads"/>
-          <DropDownLink :urls="modpackCountUrls" title="Modpack Versions"/>
-        </div>
-      </div>
+      <LinksContainer/>
       <DevOnly>
         <button @click="onUpdateData">
           update Data
@@ -91,16 +57,6 @@ const modpackCountUrls = [
       font-size: xx-large;
     }
 
-    #links {
-      display: flex;
-      gap: 50px;
-
-      .groups {
-        display: flex;
-        gap: 20px;
-      }
-    }
-
     #github {
       transition: 0.1s scale ease-in-out;
 
diff --git a/server/api/stats.ts b/server/api/stats.ts
index 683b213..d2cc237 100644
--- a/server/api/stats.ts
+++ b/server/api/stats.ts
@@ -1,5 +1,5 @@
 import {exportStats, StatExport} from "~/server/utils/api/stats";
-import {ProjectTypes} from "~/server/utils/types/project";
+import {ProjectTypes} from "~/utils/project";
 
 export default defineEventHandler(async (event): Promise<StatExport> => {
     let query = getQuery(event);
diff --git a/server/utils/allowed.ts b/server/utils/allowed.ts
index 31ac35c..e70ab98 100644
--- a/server/utils/allowed.ts
+++ b/server/utils/allowed.ts
@@ -1,4 +1,4 @@
-import {ProjectTypes} from "~/server/utils/types/project";
+import {ProjectTypes} from "~/utils/project";
 
 const allowedModLoaders = ["fabric", "forge", "neoforge", "quilt", "liteloader", "modloader", "rift"]
 const allowedPluginLoaders = ["bukkit", "folia", "paper", "purpur", "spigot", "sponge"]
diff --git a/server/utils/api/stats.ts b/server/utils/api/stats.ts
index 33eafa9..0386624 100644
--- a/server/utils/api/stats.ts
+++ b/server/utils/api/stats.ts
@@ -1,5 +1,5 @@
 import {Stats, StatsValue} from "~/server/utils/types/stats";
-import {ProjectTypes} from "~/server/utils/types/project";
+import {ProjectTypes} from "~/utils/project";
 
 export type StatExport = {
     labels: string[]
diff --git a/server/utils/statistics.ts b/server/utils/statistics.ts
index 2f170d6..dc07532 100644
--- a/server/utils/statistics.ts
+++ b/server/utils/statistics.ts
@@ -1,17 +1,14 @@
 import {Stats} from "~/server/utils/types/stats";
 import {GameVersion, Version} from "~/server/utils/fetchData";
-import {ProjectTypes} from "~/server/utils/types/project";
+import {projectTypeList, ProjectTypes} from "~/utils/project";
 
 type StatsData = Map<string, Map<string, { downloads: number, count: number }>>
 type AllStats = { all: Stats, minor: Stats, major: Stats };
 
 export async function updateStatistics() {
-    await updateStatistic("mod")
-    await updateStatistic("modpack")
-    await updateStatistic("resourcepack")
-    await updateStatistic("shader")
-    await updateStatistic("plugin")
-    await updateStatistic("datapack")
+    for (let type of projectTypeList) {
+        await updateStatistic(type)
+    }
 }
 
 async function updateStatistic(type: ProjectTypes) {
diff --git a/server/utils/types/project.ts b/server/utils/types/project.ts
deleted file mode 100644
index e8b5955..0000000
--- a/server/utils/types/project.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ProjectTypes = "mod" | "plugin" | "datapack" | "shader" | "resourcepack" | "modpack"
\ No newline at end of file
diff --git a/utils/project.ts b/utils/project.ts
new file mode 100644
index 0000000..c15e3b0
--- /dev/null
+++ b/utils/project.ts
@@ -0,0 +1,2 @@
+export type ProjectTypes = "mod" | "plugin" | "datapack" | "shader" | "resourcepack" | "modpack"
+export const projectTypeList: ProjectTypes[] = ["mod", "plugin", "datapack", "shader", "resourcepack", "modpack"]
\ No newline at end of file
-- 
2.51.2