From b51db3b259d8383f8ddd6d35434b2d8d2299ae24 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Sun, 24 Nov 2024 16:12:19 +1100
Subject: [PATCH] feat(ui): more ui improvements

---
 server/components/GamePanel.vue               |  2 +-
 server/components/UploadFileDialog.vue        |  6 +-
 server/pages/store/[id]/index.vue             | 74 ++++++++++++++----
 server/pages/store/index.vue                  | 47 +++++++++---
 .../migration.sql                             |  8 ++
 server/prisma/schema/content.prisma           |  9 ++-
 server/server/api/v1/store/released.get.ts    | 15 ++++
 server/server/api/v1/store/updated.get.ts     | 10 ++-
 .../server/internal/clients/capabilities.ts   |  4 +-
 server/server/internal/metadata/giantbomb.ts  | 14 ++++
 server/server/internal/metadata/index.ts      | 21 ++---
 server/server/internal/metadata/types.d.ts    | 76 ++++++++++---------
 12 files changed, 201 insertions(+), 85 deletions(-)
 create mode 100644 server/prisma/migrations/20241124042825_add_released_date_for_the_game/migration.sql
 create mode 100644 server/server/api/v1/store/released.get.ts

diff --git a/server/components/GamePanel.vue b/server/components/GamePanel.vue
index aa244a2d..8ad2a871 100644
--- a/server/components/GamePanel.vue
+++ b/server/components/GamePanel.vue
@@ -2,7 +2,7 @@
   <NuxtLink
     v-if="game"
     :href="`/store/${game.id}`"
-    class="rounded overflow-hidden w-48 h-64 group relative transition-all duration-300 text-left transform-3d hover:rotate-y-180"
+    class="rounded overflow-hidden w-48 h-64 group relative transition-all duration-300 text-left"
   >
     <img :src="useObject(game.mCoverId)" class="w-full h-full object-cover" />
     <div
diff --git a/server/components/UploadFileDialog.vue b/server/components/UploadFileDialog.vue
index 6edcdfad..f44bc6b2 100644
--- a/server/components/UploadFileDialog.vue
+++ b/server/components/UploadFileDialog.vue
@@ -38,17 +38,17 @@
                   <div class="mt-2">
                     <label
                       for="file-upload"
-                      class="cursor-pointer transition relative block w-full rounded-lg border-2 border-dashed border-zinc-800 p-12 text-center hover:border-zinc-700 focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2"
+                      class="group cursor-pointer transition relative block w-full rounded-lg border-2 border-dashed border-zinc-600 p-12 text-center hover:border-zinc-700 focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2"
                     >
                       <ArrowUpTrayIcon
-                        class="mx-auto h-6 w-6 text-zinc-700"
+                        class="transition mx-auto h-6 w-6 text-zinc-600 group-hover:text-zinc-700"
                         stroke="currentColor"
                         fill="none"
                         viewBox="0 0 48 48"
                         aria-hidden="true"
                       />
                       <span
-                        class="mt-2 block text-sm font-semibold text-zinc-100"
+                        class="transition mt-2 block text-sm font-semibold text-zinc-400 group-hover:text-zinc-500"
                         >Upload file</span
                       >
                       <p class="mt-1 text-xs text-zinc-400" v-if="currentFile">
diff --git a/server/pages/store/[id]/index.vue b/server/pages/store/[id]/index.vue
index 679f1fdc..1d0867ce 100644
--- a/server/pages/store/[id]/index.vue
+++ b/server/pages/store/[id]/index.vue
@@ -49,19 +49,60 @@
               aria-hidden="true"
             />
           </NuxtLink>
-          <div class="inline-flex items-center gap-x-3">
-            <span class="text-zinc-100 font-semibold">Available on:</span>
-            <component
-              v-for="platform in platforms"
-              :is="icons[platform]"
-              class="text-blue-600 w-6 h-6"
-            />
-            <span
-              v-if="platforms.length == 0"
-              class="font-semibold text-blue-600"
-              >coming soon</span
-            >
-          </div>
+          <table class="min-w-full">
+            <tbody>
+              <tr>
+                <td
+                  class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-zinc-100 sm:pl-3"
+                >
+                  Released
+                </td>
+                <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
+                  {{ moment(game.mReleased).format("Do MMMM, YYYY") }}
+                </td>
+              </tr>
+              <tr>
+                <td
+                  class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-zinc-100 sm:pl-3"
+                >
+                  Platform(s)
+                </td>
+                <td
+                  class="whitespace-nowrap inline-flex gap-x-4 px-3 py-4 text-sm text-zinc-400"
+                >
+                  <component
+                    v-for="platform in platforms"
+                    :is="icons[platform]"
+                    class="text-blue-600 w-6 h-6"
+                  />
+                  <span
+                    v-if="platforms.length == 0"
+                    class="font-semibold text-blue-600"
+                    >coming soon</span
+                  >
+                </td>
+              </tr>
+              <tr>
+                <td
+                  class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-zinc-100 sm:pl-3"
+                >
+                  Rating
+                </td>
+                <td
+                  class="whitespace-nowrap flex flex-row items-center  gap-x-1 px-3 py-4 text-sm text-zinc-400"
+                >
+                  <StarIcon
+                    v-for="value in ratingArray"
+                    :class="[
+                      value ? 'text-yellow-600' : 'text-zinc-600',
+                      'w-4 h-4',
+                    ]"
+                  />
+                  <span class="text-zinc-600">({{ game.mReviewCount }} reviews)</span>
+                </td>
+              </tr>
+            </tbody>
+          </table>
         </div>
 
         <div class="row-start-2 lg:row-start-1 lg:col-span-3">
@@ -118,8 +159,10 @@
 <script setup lang="ts">
 import { PlusIcon } from "@heroicons/vue/20/solid";
 import { ArrowTopRightOnSquareIcon } from "@heroicons/vue/24/outline";
+import { StarIcon } from "@heroicons/vue/24/solid";
 import { Platform, type Game, type GameVersion } from "@prisma/client";
 import MarkdownIt from "markdown-it";
+import moment from "moment";
 import LinuxLogo from "~/components/icons/LinuxLogo.vue";
 import WindowsLogo from "~/components/WindowsLogo.vue";
 
@@ -168,6 +211,11 @@ const icons = {
   [Platform.Windows]: WindowsLogo,
 };
 
+const rating = Math.round(game.mReviewRating * 5);
+const ratingArray = Array(5)
+  .fill(null)
+  .map((_, i) => i + 1 <= rating);
+
 useHead({
   title: game.mName,
 });
diff --git a/server/pages/store/index.vue b/server/pages/store/index.vue
index 12602e8f..33d61672 100644
--- a/server/pages/store/index.vue
+++ b/server/pages/store/index.vue
@@ -13,9 +13,10 @@
   ```
 -->
 <template>
-  <div class="w-full">
+  <div class="w-full flex flex-col">
     <!-- Hero section -->
     <VueCarousel
+      v-if="recent.length > 0"
       :wrapAround="true"
       :items-to-show="1"
       :autoplay="15 * 1000"
@@ -32,7 +33,7 @@
             />
           </div>
           <div
-            class="relative w-full h-full bg-gray-900/75 px-6 py-32 sm:px-12 sm:py-40 lg:px-16"
+            class="relative w-full h-full bg-zinc-900/75 px-6 py-32 sm:px-12 sm:py-40 lg:px-16"
           >
             <div
               class="relative mx-auto flex max-w-xl flex-col items-center text-center"
@@ -62,19 +63,40 @@
         <CarouselPagination class="py-2" :items="recent" />
       </template>
     </VueCarousel>
+    <div
+      v-else
+      class="w-full h-full flex items-center justify-center bg-zinc-950/50 px-6 py-32 sm:px-12 sm:py-40 lg:px-16"
+    >
+      <h2
+        class="uppercase text-xl font-bold tracking-tight text-zinc-700 sm:text-3xl"
+      >
+        no game
+      </h2>
+    </div>
 
-    <!-- recently updated -->
+    <!-- new releases -->
     <div class="px-4 sm:px-12 py-4">
-      <h1 class="text-zinc-100 text-2xl font-bold font-display">Recently updated</h1>
+      <h1 class="text-zinc-100 text-2xl font-bold font-display">
+        Recently released
+      </h1>
       <NuxtLink class="text-blue-600 font-semibold"
         >Explore more &rarr;</NuxtLink
       >
       <div class="mt-4">
-        <GameCarousel
-          v-if="updated"
-          :items="updated.map((e) => e.game)"
-          :min="24"
-        />
+        <GameCarousel :items="released" :min="12" />
+      </div>
+    </div>
+
+    <!-- recently updated -->
+    <div class="px-4 sm:px-12 py-4">
+      <h1 class="text-zinc-100 text-2xl font-bold font-display">
+        Recently updated
+      </h1>
+      <NuxtLink class="text-blue-600 font-semibold"
+        >Explore more &rarr;</NuxtLink
+      >
+      <div class="mt-4">
+        <GameCarousel :items="updated" :min="12" />
       </div>
     </div>
   </div>
@@ -82,8 +104,11 @@
 
 <script setup lang="ts">
 const headers = useRequestHeaders(["cookie"]);
-const { data: recent } = await useFetch("/api/v1/store/recent", { headers });
-const { data: updated } = await useFetch("/api/v1/store/updated", { headers });
+const recent = await $fetch("/api/v1/store/recent", { headers });
+const updated = await $fetch("/api/v1/store/updated", { headers });
+const released = await $fetch("/api/v1/store/released", {
+  headers,
+});
 
 useHead({
   title: "Store",
diff --git a/server/prisma/migrations/20241124042825_add_released_date_for_the_game/migration.sql b/server/prisma/migrations/20241124042825_add_released_date_for_the_game/migration.sql
new file mode 100644
index 00000000..b2bea837
--- /dev/null
+++ b/server/prisma/migrations/20241124042825_add_released_date_for_the_game/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `mReleased` to the `Game` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Game" ADD COLUMN     "mReleased" TIMESTAMP(3) NOT NULL;
diff --git a/server/prisma/schema/content.prisma b/server/prisma/schema/content.prisma
index d9307b05..d304bc1d 100644
--- a/server/prisma/schema/content.prisma
+++ b/server/prisma/schema/content.prisma
@@ -17,9 +17,10 @@ model Game {
     mDescription      String // Supports markdown
     mDevelopers       Developer[]
     mPublishers       Publisher[]
+    mReleased         DateTime // When the game was released
 
     mReviewCount  Int
-    mReviewRating Float
+    mReviewRating Float // 0 to 1
 
     mIconId       String // linked to objects in s3
     mBannerId     String // linked to objects in s3
@@ -35,10 +36,10 @@ model Game {
 // A particular set of files that relate to the version
 model GameVersion {
     gameId      String
-    game        Game     @relation(fields: [gameId], references: [id])
+    game        Game   @relation(fields: [gameId], references: [id])
     versionName String // Sub directory for the game files
-    
-    created     DateTime @default(now())
+
+    created DateTime @default(now())
 
     platform        Platform
     launchCommand   String // Command to run to start. Platform-specific. Windows games on Linux will wrap this command in Proton/Wine
diff --git a/server/server/api/v1/store/released.get.ts b/server/server/api/v1/store/released.get.ts
new file mode 100644
index 00000000..494d5fe2
--- /dev/null
+++ b/server/server/api/v1/store/released.get.ts
@@ -0,0 +1,15 @@
+import prisma from "~/server/internal/db/database";
+
+export default defineEventHandler(async (h3) => {
+  const userId = await h3.context.session.getUserId(h3);
+  if (!userId) throw createError({ statusCode: 403 });
+
+  const games = await prisma.game.findMany({
+    orderBy: {
+      mReleased: "desc",
+    },
+    take: 12,
+  });
+
+  return games;
+});
diff --git a/server/server/api/v1/store/updated.get.ts b/server/server/api/v1/store/updated.get.ts
index 0a77df57..a1862163 100644
--- a/server/server/api/v1/store/updated.get.ts
+++ b/server/server/api/v1/store/updated.get.ts
@@ -12,14 +12,16 @@ export default defineEventHandler(async (h3) => {
     },
     select: {
       game: true,
-      created: true,
-      platform: true,
     },
     orderBy: {
       created: "desc",
     },
-    take: 8,
+    take: 12,
   });
 
-  return versions;
+  const games = versions
+    .map((e) => e.game)
+    .filter((v, i, a) => a.findIndex((e) => e.id === v.id) === i);
+
+  return games;
 });
diff --git a/server/server/internal/clients/capabilities.ts b/server/server/internal/clients/capabilities.ts
index 5d1d09db..472f5160 100644
--- a/server/server/internal/clients/capabilities.ts
+++ b/server/server/internal/clients/capabilities.ts
@@ -1,6 +1,6 @@
 import { EnumDictionary } from "../utils/types";
 import https from "https";
-import { useGlobalCertificateAuthority } from "~/server/plugins/ca";
+import { useCertificateAuthority } from "~/server/plugins/ca";
 import prisma from "../db/database";
 import { ClientCapabilities } from "@prisma/client";
 
@@ -48,7 +48,7 @@ class CapabilityManager {
       )
         return false;
 
-      const ca = useGlobalCertificateAuthority();
+      const ca = useCertificateAuthority();
       const serverCertificate = await ca.fetchClientCertificate("server");
       if (!serverCertificate)
         throw new Error(
diff --git a/server/server/internal/metadata/giantbomb.ts b/server/server/internal/metadata/giantbomb.ts
index cbc1d2c0..0f732b17 100644
--- a/server/server/internal/metadata/giantbomb.ts
+++ b/server/server/internal/metadata/giantbomb.ts
@@ -45,6 +45,11 @@ interface GameResult {
   publishers: Array<{ id: number; name: string }>;
 
   number_of_user_reviews: number; // Doesn't provide an actual rating, so kinda useless
+  original_release_date?: string;
+
+  expected_release_day?: number;
+  expected_release_month?: number;
+  expected_release_year?: number;
 
   image: {
     icon_url: string;
@@ -180,11 +185,20 @@ export class GiantBombProvider implements MetadataProvider {
 
     const images = [banner, ...imageURLs.map(createObject)];
 
+    const releaseDate = gameData.original_release_date
+      ? moment(gameData.original_release_date).toDate()
+      : moment(
+          `${gameData.expected_release_day ?? 1}/${
+            gameData.expected_release_month ?? 1
+          }/${gameData.expected_release_year ?? new Date().getFullYear()}`
+        ).toDate();
+
     const metadata: GameMetadata = {
       id: gameData.guid,
       name: gameData.name,
       shortDescription: gameData.deck,
       description: longDescription,
+      released: releaseDate,
 
       reviewCount: 0,
       reviewRating: 0,
diff --git a/server/server/internal/metadata/index.ts b/server/server/internal/metadata/index.ts
index 7a5a7691..c77d97a8 100644
--- a/server/server/internal/metadata/index.ts
+++ b/server/server/internal/metadata/index.ts
@@ -26,10 +26,10 @@ export abstract class MetadataProvider {
   abstract search(query: string): Promise<GameMetadataSearchResult[]>;
   abstract fetchGame(params: _FetchGameMetadataParams): Promise<GameMetadata>;
   abstract fetchPublisher(
-    params: _FetchPublisherMetadataParams,
+    params: _FetchPublisherMetadataParams
   ): Promise<PublisherMetadata>;
   abstract fetchDeveloper(
-    params: _FetchDeveloperMetadataParams,
+    params: _FetchDeveloperMetadataParams
   ): Promise<DeveloperMetadata>;
 }
 
@@ -56,7 +56,7 @@ export class MetadataHandler {
             Object.assign({}, result, {
               sourceId: provider.id(),
               sourceName: provider.name(),
-            }),
+            })
         );
         resolve(mappedResults);
       });
@@ -74,7 +74,7 @@ export class MetadataHandler {
 
   async createGame(
     result: InternalGameMetadataResult,
-    libraryBasePath: string,
+    libraryBasePath: string
   ) {
     const provider = this.providers.get(result.sourceId);
     if (!provider)
@@ -92,7 +92,7 @@ export class MetadataHandler {
 
     const [createObject, pullObjects, dumpObjects] = this.objectHandler.new(
       {},
-      ["internal:read"],
+      ["internal:read"]
     );
 
     let metadata;
@@ -127,6 +127,7 @@ export class MetadataHandler {
 
         mReviewCount: metadata.reviewCount,
         mReviewRating: metadata.reviewRating,
+        mReleased: metadata.released,
 
         mIconId: metadata.icon,
         mBannerId: metadata.bannerId,
@@ -144,7 +145,7 @@ export class MetadataHandler {
     return (await this.fetchDeveloperPublisher(
       query,
       "fetchDeveloper",
-      "developer",
+      "developer"
     )) as Developer;
   }
 
@@ -152,7 +153,7 @@ export class MetadataHandler {
     return (await this.fetchDeveloperPublisher(
       query,
       "fetchPublisher",
-      "publisher",
+      "publisher"
     )) as Publisher;
   }
 
@@ -161,7 +162,7 @@ export class MetadataHandler {
   private async fetchDeveloperPublisher(
     query: string,
     functionName: any,
-    databaseName: any,
+    databaseName: any
   ) {
     const existing = await (prisma as any)[databaseName].findFirst({
       where: {
@@ -173,7 +174,7 @@ export class MetadataHandler {
     for (const provider of this.providers.values() as any) {
       const [createObject, pullObjects, dumpObjects] = this.objectHandler.new(
         {},
-        ["internal:read"],
+        ["internal:read"]
       );
       let result;
       try {
@@ -206,7 +207,7 @@ export class MetadataHandler {
     }
 
     throw new Error(
-      `No metadata provider found a ${databaseName} for "${query}"`,
+      `No metadata provider found a ${databaseName} for "${query}"`
     );
   }
 }
diff --git a/server/server/internal/metadata/types.d.ts b/server/server/internal/metadata/types.d.ts
index 6bac79f7..9f1d5420 100644
--- a/server/server/internal/metadata/types.d.ts
+++ b/server/server/internal/metadata/types.d.ts
@@ -2,66 +2,68 @@ import { Developer, Publisher } from "@prisma/client";
 import { ObjectReference } from "../objects";
 
 export interface GameMetadataSearchResult {
-    id: string;
-    name: string;
-    icon: string;
-    description: string;
-    year: number;
+  id: string;
+  name: string;
+  icon: string;
+  description: string;
+  year: number;
 }
 
 export interface GameMetadataSource {
-    sourceId: string;
-    sourceName: string;
+  sourceId: string;
+  sourceName: string;
 }
 
-export type InternalGameMetadataResult = GameMetadataSearchResult & GameMetadataSource;
+export type InternalGameMetadataResult = GameMetadataSearchResult &
+  GameMetadataSource;
 
 export interface GameMetadata {
-    id: string;
-    name: string;
-    shortDescription: string;
-    description: string;
+  id: string;
+  name: string;
+  shortDescription: string;
+  description: string;
+  released: Date;
 
-    // These are created using utility functions passed to the metadata loader
-    // (that then call back into the metadata provider chain)
-    publishers: Publisher[]
-    developers: Developer[]
+  // These are created using utility functions passed to the metadata loader
+  // (that then call back into the metadata provider chain)
+  publishers: Publisher[];
+  developers: Developer[];
 
-    reviewCount: number;
-    reviewRating: number;
+  reviewCount: number;
+  reviewRating: number;
 
-    // Created with another utility function
-    icon: ObjectReference,
-    bannerId: ObjectReference,
-    coverId: ObjectReference;
-    images: ObjectReference[],
+  // Created with another utility function
+  icon: ObjectReference;
+  bannerId: ObjectReference;
+  coverId: ObjectReference;
+  images: ObjectReference[];
 }
 
 export interface PublisherMetadata {
-    id: string;
-    name: string;
-    shortDescription: string;
-    description: string;
+  id: string;
+  name: string;
+  shortDescription: string;
+  description: string;
 
-    logo: ObjectReference;
-    banner: ObjectReference;
-    website: String;
+  logo: ObjectReference;
+  banner: ObjectReference;
+  website: String;
 }
 
 export type DeveloperMetadata = PublisherMetadata;
 
 export interface _FetchGameMetadataParams {
-    id: string,
+  id: string;
 
-    publisher: (query: string) => Promise<Publisher>
-    developer: (query: string) => Promise<Developer>
+  publisher: (query: string) => Promise<Publisher>;
+  developer: (query: string) => Promise<Developer>;
 
-    createObject: (url: string) => ObjectReference
+  createObject: (url: string) => ObjectReference;
 }
 
 export interface _FetchPublisherMetadataParams {
-    query: string;
-    createObject: (url: string) => ObjectReference;
+  query: string;
+  createObject: (url: string) => ObjectReference;
 }
 
-export type _FetchDeveloperMetadataParams = _FetchPublisherMetadataParams;
\ No newline at end of file
+export type _FetchDeveloperMetadataParams = _FetchPublisherMetadataParams;