Merge pull request #1455 from rommapp/romm-1453

[ROMM-1433] Rework columns in table view
rommapp · Jan 11, 2025 · ddb51f6 · ddb51f6
2 parents c671bbb + e84f7af
commit ddb51f6
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 39 deletions.
diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py
@@ -123,6 +123,7 @@ class RomSchema(BaseModel):
     # Metadata fields
     first_release_date: int | None
     youtube_video_id: str | None
+    average_rating: float | None
     alternative_names: list[str]
     genres: list[str]
     franchises: list[str]

diff --git a/backend/models/rom.py b/backend/models/rom.py
@@ -167,9 +167,26 @@ def alternative_names(self) -> list[str]:
     @property
     def first_release_date(self) -> int:
         if self.igdb_metadata:
-            return self.igdb_metadata.get("first_release_date", 0)
+            return self.igdb_metadata.get("first_release_date", 0) * 1000
         return 0
 
+    @property
+    def average_rating(self) -> float | None:
+        igdb_rating = (
+            float(self.igdb_metadata.get("total_rating", 0))
+            if self.igdb_metadata
+            else 0.0
+        )
+        moby_rating = (
+            float(self.moby_metadata.get("moby_score", 0))
+            if self.moby_metadata
+            else 0.0
+        )
+
+        ratings = [r for r in [igdb_rating, moby_rating * 10] if r != 0.0]
+
+        return sum(ratings) / len([r for r in ratings if r]) if any(ratings) else None
+
     @property
     def genres(self) -> list[str]:
         return (

diff --git a/frontend/src/__generated__/models/DetailedRomSchema.ts b/frontend/src/__generated__/models/DetailedRomSchema.ts
diff --git a/frontend/src/__generated__/models/RomSchema.ts b/frontend/src/__generated__/models/RomSchema.ts
diff --git a/frontend/src/__generated__/models/SimpleRomSchema.ts b/frontend/src/__generated__/models/SimpleRomSchema.ts
diff --git a/frontend/src/components/Details/Title.vue b/frontend/src/components/Details/Title.vue
@@ -11,7 +11,7 @@ import { useDisplay } from "vuetify";
 const props = defineProps<{ rom: DetailedRom }>();
 const { smAndDown } = useDisplay();
 const releaseDate = new Date(
-  Number(props.rom.first_release_date) * 1000,
+  Number(props.rom.first_release_date),
 ).toLocaleDateString("en-US", {
   day: "2-digit",
   month: "short",

diff --git a/frontend/src/components/common/Game/FavBtn.vue b/frontend/src/components/common/Game/FavBtn.vue
@@ -88,9 +88,8 @@ async function switchFromFavourites() {
     @click.stop="switchFromFavourites"
     class="translucent text-shadow"
     rouded="0"
-    size="x-small"
+    size="small"
     variant="text"
-    icon
     ><v-icon color="romm-accent-1">{{
       collectionsStore.isFav(rom) ? "mdi-star" : "mdi-star-outline"
     }}</v-icon></v-btn

diff --git a/frontend/src/components/common/Game/Table.vue b/frontend/src/components/common/Game/Table.vue
@@ -47,36 +47,47 @@ const HEADERS = [
     key: "name",
   },
   {
-    title: "",
+    title: "Size",
     align: "start",
-    sortable: false,
-    key: "is_fav",
+    sortable: true,
+    key: "file_size_bytes",
   },
   {
-    title: "Size",
+    title: "Added",
     align: "start",
     sortable: true,
-    key: "file_size_bytes",
+    key: "created_at",
   },
   {
-    title: "Reg",
+    title: "Released",
     align: "start",
     sortable: true,
-    key: "regions",
+    key: "first_release_date",
   },
   {
-    title: "Lang",
+    title: "Rating",
     align: "start",
     sortable: true,
+    key: "average_rating",
+  },
+  {
+    title: "Languages",
+    align: "start",
+    sortable: false,
     key: "languages",
   },
   {
-    title: "Rev",
+    title: "Regions",
     align: "start",
-    sortable: true,
-    key: "revision",
+    sortable: false,
+    key: "regions",
+  },
+  {
+    title: "",
+    align: "center",
+    key: "actions",
+    sortable: false,
   },
-  { title: "", align: "end", key: "actions", sortable: false },
 ] as const;
 
 const selectedRomIDs = computed(() => selectedRoms.value.map((rom) => rom.id));
@@ -170,26 +181,26 @@ onMounted(() => {
     </template>
     <template #item.name="{ item }">
       <td>
-        <v-list-item :min-width="400" class="px-0">
+        <v-list-item class="px-0">
           <template #prepend>
             <r-avatar-rom :rom="item" />
           </template>
           <v-row no-gutters>
-            <v-col>{{ item.name }}</v-col></v-row
-          >
-          <v-row no-gutters
-            ><v-col class="text-romm-accent-1">{{
-              item.file_name
-            }}</v-col></v-row
-          >
+            <v-col>{{ item.name }}</v-col>
+          </v-row>
+          <v-row no-gutters>
+            <v-col class="text-romm-accent-1">
+              {{ item.file_name }}
+            </v-col>
+          </v-row>
           <template #append>
             <v-chip
               v-if="
                 item.sibling_roms &&
                 item.sibling_roms.length > 0 &&
                 showSiblings
               "
-              class="translucent-dark ml-2"
+              class="translucent-dark ml-4"
               size="x-small"
             >
               <span class="text-caption">+{{ item.sibling_roms.length }}</span>
@@ -198,26 +209,78 @@ onMounted(() => {
         </v-list-item>
       </td>
     </template>
-    <template #item.is_fav="{ item }">
-      <fav-btn :rom="item" />
-    </template>
     <template #item.file_size_bytes="{ item }">
-      <v-chip size="x-small" label>{{
-        formatBytes(item.file_size_bytes)
-      }}</v-chip>
+      <span class="text-no-wrap">{{ formatBytes(item.file_size_bytes) }}</span>
     </template>
-    <template #item.regions="{ item }">
-      <span class="px-1" v-for="region in item.regions">
-        {{ regionToEmoji(region) }}
-      </span>
+    <template #item.created_at="{ item }">
+      <span v-if="item.created_at" class="text-no-wrap">{{
+        new Date(item.created_at).toLocaleDateString("en-US", {
+          day: "2-digit",
+          month: "short",
+          year: "numeric",
+        })
+      }}</span>
+      <span v-else>-</span>
+    </template>
+    <template #item.first_release_date="{ item }">
+      <span v-if="item.first_release_date" class="text-no-wrap">{{
+        new Date(item.first_release_date).toLocaleDateString("en-US", {
+          day: "2-digit",
+          month: "short",
+          year: "numeric",
+        })
+      }}</span>
+      <span v-else>-</span>
+    </template>
+    <template #item.average_rating="{ item }">
+      <span v-if="item.average_rating" class="text-no-wrap">{{
+        Intl.NumberFormat("en-US", {
+          maximumSignificantDigits: 3,
+        }).format(item.average_rating)
+      }}</span>
+      <span v-else>-</span>
     </template>
     <template #item.languages="{ item }">
-      <span class="px-1" v-for="language in item.languages">
-        {{ languageToEmoji(language) }}
-      </span>
+      <div class="text-no-wrap" v-if="item.languages.length > 0">
+        <span
+          class="emoji"
+          v-for="language in item.languages.slice(0, 3)"
+          :title="`Languages: ${item.languages.join(', ')}`"
+          :class="{ 'emoji-collection': item.regions.length > 3 }"
+        >
+          {{ languageToEmoji(language) }}
+        </span>
+        <spa class="reglang-super">
+          {{
+            item.languages.length > 3
+              ? `&nbsp;+${item.languages.length - 3}`
+              : ""
+          }}
+        </spa>
+      </div>
+      <span v-else>-</span>
+    </template>
+    <template #item.regions="{ item }">
+      <div class="text-no-wrap" v-if="item.regions.length > 0">
+        <span
+          class="emoji"
+          v-for="region in item.regions.slice(0, 3)"
+          :title="`Regions: ${item.regions.join(', ')}`"
+          :class="{ 'emoji-collection': item.regions.length > 3 }"
+        >
+          {{ regionToEmoji(region) }}
+        </span>
+        <spa class="reglang-super">
+          {{
+            item.regions.length > 3 ? `&nbsp;+${item.regions.length - 3}` : ""
+          }}
+        </spa>
+      </div>
+      <span v-else>-</span>
     </template>
     <template #item.actions="{ item }">
-      <v-btn-group divided density="compact">
+      <v-btn-group density="compact">
+        <fav-btn :rom="item" />
         <v-btn
           :disabled="downloadStore.value.includes(item.id)"
           download
@@ -291,3 +354,11 @@ onMounted(() => {
     </template>
   </v-data-table>
 </template>
+
+<style scoped>
+.reglang-super {
+  vertical-align: super;
+  font-size: 75%;
+  opacity: 75%;
+}
+</style>