feat: adding filter bar for galgame companies, tags and resources

Author: KUN1007

components/edit/toolset/Toolset.vue

@@ -141,11 +141,11 @@ const handleUpdatePageLink = (value: string | number) => {
     </div>
 
     <div class="space-y-2">
-      <div class="text-xl font-medium">主页 / 下载链接</div>
+      <div class="text-xl font-medium">主页</div>
       <KunTextarea
         :model-value="form.homepage.toString()"
         @update:model-value="handleUpdatePageLink"
-        placeholder="如果有多个链接, 使用英语逗号分隔每个下载链接"
+        placeholder="工具的官网, GitHub 仓库等等, 如果有多个链接, 使用英语逗号分隔每个下载链接"
       />
     </div>
 

components/galgame/card/Nav.vue

@@ -53,6 +53,7 @@ const toggleIncludeProvider = (key: ProviderKey) => {
 const toggleExcludeOnlyProvider = (key: ProviderKey) => {
   advStore.toggleExcludeOnlyProvider(key)
 }
+const props = defineProps<{ showAdvanced?: boolean }>()
 </script>
 
 <template>
@@ -99,6 +100,7 @@ const toggleExcludeOnlyProvider = (key: ProviderKey) => {
 
     <div class="flex shrink-0 items-center gap-2">
       <KunPopover
+        v-if="props.showAdvanced !== false"
         :auto-position="true"
         position="bottom-end"
         :inner-class="'min-w-64 p-3'"

components/galgame/rating/Publish.vue

@@ -342,6 +342,10 @@ const submit = async () => {
         auto-grow
       />
 
+      <div v-if="showAdvanced" class="pt-2">
+        <GalgameRatingAdvanced v-model="dims" />
+      </div>
+
       <div class="flex items-center justify-between">
         <KunButton variant="flat" @click="showAdvanced = !showAdvanced">
           {{ showAdvanced ? '收起高级评分' : '展开高级评分' }}
@@ -360,10 +364,6 @@ const submit = async () => {
         如需长评, 建议前往话题区发布话题后将链接放在短评中。评分可较为随意填写,
         我们的算法会帮您摆平一切!
       </p>
-
-      <div v-if="showAdvanced" class="pt-2">
-        <GalgameRatingAdvanced v-model="dims" />
-      </div>
     </div>
   </KunModal>
 </template>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kun-galgame-nuxt3",
-  "version": "4.4.75",
+  "version": "4.4.76",
   "packageManager": "[email protected]",
   "private": true,
   "scripts": {

pages/galgame-official/[id].vue

@@ -11,11 +11,8 @@ const officialId = computed(() => {
   return Number((route.params as { id: string }).id)
 })
 
-const pageData = reactive({
-  page: 1,
-  limit: 24,
-  officialId: officialId.value
-})
+const { page, limit, type, language, platform, sortField, sortOrder } =
+  storeToRefs(useTempGalgameStore())
 
 const showOfficialModal = ref(false)
 const editingOfficial = ref<UpdateGalgameOfficialPayload>(
@@ -26,7 +23,16 @@ const { data, status } = await useFetch(
   `/api/galgame-official/${officialId.value}`,
   {
     method: 'GET',
-    query: pageData,
+    query: {
+      page,
+      limit,
+      type,
+      language,
+      platform,
+      sortField,
+      sortOrder,
+      officialId
+    },
     ...kungalgameResponseHandler
   }
 )
@@ -121,6 +127,8 @@ useKunSeoMeta({
       </template>
     </KunHeader>
 
+    <GalgameCardNav :show-advanced="false" />
+
     <GalgameOfficialModal
       v-model="showOfficialModal"
       :initial-data="editingOfficial"
@@ -134,9 +142,9 @@ useKunSeoMeta({
     />
 
     <KunPagination
-      v-if="data.galgameCount > pageData.limit"
-      v-model:current-page="pageData.page"
-      :total-page="Math.ceil(data.galgameCount / pageData.limit)"
+      v-if="data.galgameCount > limit"
+      v-model:current-page="page"
+      :total-page="Math.ceil(data.galgameCount / limit)"
       :is-loading="status === 'pending'"
     />
 

pages/galgame-tag/[id].vue

@@ -11,18 +11,24 @@ const tagId = computed(() => {
   return Number((route.params as { id: string }).id)
 })
 
-const pageData = reactive({
-  page: 1,
-  limit: 24,
-  tagId: tagId.value
-})
+const { page, limit, type, language, platform, sortField, sortOrder } =
+  storeToRefs(useTempGalgameStore())
 
 const showTagModal = ref(false)
 const editingTag = ref<UpdateGalgameTagPayload>({} as UpdateGalgameTagPayload)
 
 const { data, status } = await useFetch(`/api/galgame-tag/${tagId.value}`, {
   method: 'GET',
-  query: pageData,
+  query: {
+    page,
+    limit,
+    type,
+    language,
+    platform,
+    sortField,
+    sortOrder,
+    tagId
+  },
   ...kungalgameResponseHandler
 })
 
@@ -124,6 +130,8 @@ if (data.value) {
       </template>
     </KunHeader>
 
+    <GalgameCardNav :show-advanced="false" />
+
     <GalgameTagModal
       v-model="showTagModal"
       :initial-data="editingTag"
@@ -137,9 +145,9 @@ if (data.value) {
     />
 
     <KunPagination
-      v-if="data.galgameCount > pageData.limit"
-      v-model:current-page="pageData.page"
-      :total-page="Math.ceil(data.galgameCount / pageData.limit)"
+      v-if="data.galgameCount > limit"
+      v-model:current-page="page"
+      :total-page="Math.ceil(data.galgameCount / limit)"
       :is-loading="status === 'pending'"
     />
 

server/api/galgame-official/[name].get.ts

@@ -12,9 +12,23 @@ export default defineEventHandler(async (event) => {
 
   const nsfw = getNSFWCookie(event)
 
-  const { officialId, page, limit } = input
+  const {
+    officialId,
+    page,
+    limit,
+    type,
+    language,
+    platform,
+    sortField,
+    sortOrder
+  } = input
   const skip = (page - 1) * limit
 
+  const resourceFilters = []
+  if (type !== 'all') resourceFilters.push({ type })
+  if (language !== 'all') resourceFilters.push({ language })
+  if (platform !== 'all') resourceFilters.push({ platform })
+
   const data = await prisma.galgame_official.findUnique({
     where: { id: officialId },
     include: {
@@ -27,14 +41,16 @@ export default defineEventHandler(async (event) => {
       galgame: {
         where: {
           galgame: {
-            content_limit: nsfw === 'sfw' ? 'sfw' : undefined
+            content_limit: nsfw === 'sfw' ? 'sfw' : undefined,
+            resource: { some: { AND: resourceFilters } }
           }
         },
         skip,
         take: limit,
         orderBy: {
           galgame: {
-            resource_update_time: 'desc'
+            [sortField === 'time' ? 'resource_update_time' : sortField]:
+              sortOrder
           }
         },
         include: {

server/api/galgame-tag/[name].get.ts

@@ -12,9 +12,15 @@ export default defineEventHandler(async (event) => {
 
   const nsfw = getNSFWCookie(event)
 
-  const { tagId, page, limit } = input
+  const { tagId, page, limit, type, language, platform, sortField, sortOrder } =
+    input
   const skip = (page - 1) * limit
 
+  const resourceFilters = []
+  if (type !== 'all') resourceFilters.push({ type })
+  if (language !== 'all') resourceFilters.push({ language })
+  if (platform !== 'all') resourceFilters.push({ platform })
+
   const data = await prisma.galgame_tag.findUnique({
     where: { id: tagId },
     include: {
@@ -27,14 +33,16 @@ export default defineEventHandler(async (event) => {
       galgame: {
         where: {
           galgame: {
-            content_limit: nsfw === 'sfw' ? 'sfw' : undefined
+            content_limit: nsfw === 'sfw' ? 'sfw' : undefined,
+            resource: { some: { AND: resourceFilters } }
           }
         },
         skip,
         take: limit,
         orderBy: {
           galgame: {
-            resource_update_time: 'desc'
+            [sortField === 'time' ? 'resource_update_time' : sortField]:
+              sortOrder
           }
         },
         include: {

validations/galgame-official.ts

@@ -1,5 +1,10 @@
 import { z } from 'zod'
 import { KUN_GALGAME_OFFICIAL_TYPE } from '~/constants/galgameOfficial'
+import {
+  KUN_RESOURCE_LANGUAGE_CONST,
+  KUN_RESOURCE_PLATFORM_CONST,
+  KUN_RESOURCE_TYPE_CONST
+} from '~/constants/galgame'
 
 export const getGalgameOfficialSchema = z.object({
   page: z.coerce.number().min(1).max(9999999),
@@ -9,7 +14,12 @@ export const getGalgameOfficialSchema = z.object({
 export const getGalgameByOfficialSchema = getGalgameOfficialSchema.merge(
   z.object({
     officialId: z.coerce.number().min(1).max(9999999),
-    limit: z.coerce.number().min(1).max(24)
+    limit: z.coerce.number().min(1).max(24),
+    type: z.enum([...KUN_RESOURCE_TYPE_CONST, 'all']),
+    language: z.enum([...KUN_RESOURCE_LANGUAGE_CONST, 'all']),
+    platform: z.enum([...KUN_RESOURCE_PLATFORM_CONST, 'all']),
+    sortField: z.enum(['time', 'created', 'view']),
+    sortOrder: z.enum(['asc', 'desc'])
   })
 )
 

validations/galgame-tag.ts

@@ -1,5 +1,10 @@
 import { z } from 'zod'
 import { KUN_GALGAME_TAG_TYPE } from '~/constants/galgameTag'
+import {
+  KUN_RESOURCE_LANGUAGE_CONST,
+  KUN_RESOURCE_PLATFORM_CONST,
+  KUN_RESOURCE_TYPE_CONST
+} from '~/constants/galgame'
 
 export const getGalgameTagSchema = z.object({
   page: z.coerce.number().min(1).max(9999999),
@@ -9,7 +14,12 @@ export const getGalgameTagSchema = z.object({
 export const getGalgameByTagSchema = getGalgameTagSchema.merge(
   z.object({
     tagId: z.coerce.number().min(1).max(9999999),
-    limit: z.coerce.number().min(1).max(24)
+    limit: z.coerce.number().min(1).max(24),
+    type: z.enum([...KUN_RESOURCE_TYPE_CONST, 'all']),
+    language: z.enum([...KUN_RESOURCE_LANGUAGE_CONST, 'all']),
+    platform: z.enum([...KUN_RESOURCE_PLATFORM_CONST, 'all']),
+    sortField: z.enum(['time', 'created', 'view']),
+    sortOrder: z.enum(['asc', 'desc'])
   })
 )