change: directory structure

- 将来のnuxt4の仕様に則り、ディレクトリ構造を変更
- sharedディレクトリの作成

components/edit/items/index.vue → app/components/edit/items/index.vue

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import type { ItemCategory, SetupItem } from '#types';
 import { twMerge } from 'tailwind-merge';
 import { VueDraggable } from 'vue-draggable-plus';
 
@@ -29,8 +28,8 @@ const addItem = async (id: number) => {
 
     if (!data)
         return useToast().add(
-            getErrors().editSetup.addItemFailed.client.title,
-            getErrors().editSetup.addItemFailed.client.description
+            getErrors().editSetup.addItemFailed.client!.title,
+            getErrors().editSetup.addItemFailed.client!.description
         );
 
     const d: SetupItem = { ...data, note: '', unsupported: false };
@@ -40,8 +39,8 @@ const addItem = async (id: number) => {
 
     if (target.some((i) => i.id === id))
         useToast().add(
-            getErrors().publishSetup.sameItems.client.title,
-            getErrors().publishSetup.sameItems.client.description
+            getErrors().publishSetup.sameItems.client!.title,
+            getErrors().publishSetup.sameItems.client!.description
         );
     else {
         target.push(d);

components/modal/editorAddItem/url.vue → app/components/modal/editorAddItem/url.vue

@@ -16,33 +16,33 @@ const pasteFromClipboard = async () => {
 const addItemFromURL = async () => {
     if (!inputUrl.value)
         return useToast().add(
-            getErrors().editSetup.emptyUrl.client.title,
-            getErrors().editSetup.emptyUrl.client.description
+            getErrors().editSetup.emptyUrl.client!.title,
+            getErrors().editSetup.emptyUrl.client!.description
         );
 
     try {
         new URL(inputUrl.value);
     } catch {
         return useToast().add(
-            getErrors().editSetup.invalidUrl.client.title,
-            getErrors().editSetup.invalidUrl.client.description
+            getErrors().editSetup.invalidUrl.client!.title,
+            getErrors().editSetup.invalidUrl.client!.description
         );
     }
 
     const url = new URL(inputUrl.value);
 
     if (url.hostname.split('.').slice(-2).join('.') !== 'booth.pm')
         return useToast().add(
-            getErrors().editSetup.invalidUrl.client.title,
-            getErrors().editSetup.invalidUrl.client.description
+            getErrors().editSetup.invalidUrl.client!.title,
+            getErrors().editSetup.invalidUrl.client!.description
         );
 
     const id = url.pathname.split('/').slice(-1)[0];
 
     if (!id || !Number.isInteger(Number(id)))
         return useToast().add(
-            getErrors().editSetup.invalidUrl.client.title,
-            getErrors().editSetup.invalidUrl.client.description
+            getErrors().editSetup.invalidUrl.client!.title,
+            getErrors().editSetup.invalidUrl.client!.description
         );
 
     emit('add', Number(id));

components/setups/item/index.vue → app/components/setups/item/index.vue

@@ -40,7 +40,12 @@ onMounted(async () => {
             query: { id: props.item.id },
         });
 
-        if (response.data) item.value = response.data;
+        if (response.data)
+            item.value = {
+                ...response.data,
+                note: '',
+                unsupported: false,
+            };
         if (!response.data) item.value.outdated = true;
     }
 

components/ui/footer.vue → app/components/ui/footer.vue

@@ -68,7 +68,7 @@ const modal_feedback = ref(false);
                     to="https://liria.work"
                     new-tab
                     label="Liria"
-                    icon="avatio:liria"
+                    icon="liria"
                     variant="link"
                     class="gap-1 text-sm font-[Montserrat] font-semibold"
                 />

composables/setup.ts → app/composables/setup.ts

@@ -1,5 +1,3 @@
-import type { ApiResponse } from '#types';
-
 export const useDeleteSetup = async (id: number) => {
     const { error } = await $fetch<ApiResponse<{ id: number }>>('/api/setup', {
         method: 'DELETE',

pages/setup/edit.vue → app/pages/setup/edit.vue

@@ -45,30 +45,30 @@ const itemsFlatten = computed(() => [
 ]);
 
 const errorCheck = (options: { toast?: boolean } = { toast: true }) => {
-    const returnError = (message: string) => {
+    const returnError = (message: string | undefined) => {
         publishing.value = false;
-        if (options.toast) useToast().add(message);
+        if (options.toast && message) useToast().add(message);
         return true;
     };
 
     if (!title.value?.length)
-        return returnError(getErrors().publishSetup.noTitle.client.title);
+        return returnError(getErrors().publishSetup.noTitle.client?.title);
 
     if (title.value.length > setupLimits().title)
-        return returnError(getErrors().publishSetup.tooLongTitle.client.title);
+        return returnError(getErrors().publishSetup.tooLongTitle.client?.title);
 
     if (description.value.length > setupLimits().description)
         return returnError(
-            getErrors().publishSetup.tooLongDescription.client.title
+            getErrors().publishSetup.tooLongDescription.client?.title
         );
 
     if (tags.value.length > setupLimits().tags)
-        return returnError(getErrors().publishSetup.tooManyTags.client.title);
+        return returnError(getErrors().publishSetup.tooManyTags.client?.title);
 
     if (!itemsFlatten.value.length)
-        return returnError(getErrors().publishSetup.noItems.client.title);
+        return returnError(getErrors().publishSetup.noItems.client?.title);
     if (itemsFlatten.value.length > setupLimits().items)
-        return returnError(getErrors().publishSetup.tooManyItems.client.title);
+        return returnError(getErrors().publishSetup.tooManyItems.client?.title);
 
     return false;
 };
@@ -112,7 +112,7 @@ const PublishSetup = async () => {
         publishing.value = false;
         return useToast().add(
             '投稿に失敗しました',
-            response.error!.client.title || '不明なエラー'
+            response.error!.client?.title || '不明なエラー'
         );
     }
 

nuxt.config.ts

@@ -100,16 +100,18 @@ export default defineNuxtConfig({
     },
     fonts: { families: [{ name: 'Murecho', provider: 'google' }] },
     icon: {
-        customCollections: [{ prefix: 'avatio', dir: './public/icons/avatio' }],
-
+        customCollections: [{ prefix: 'avatio', dir: './app/assets/icons' }],
         clientBundle: {
             icons: [
                 'lucide:search',
-                'lucide:settings',
                 'lucide:plus',
                 'lucide:x',
                 'lucide:check',
                 'svg-spinners:ring-resize',
+                'lucide:bookmark',
+                'lucide:sun',
+                'lucide:moon',
+                'lucide:palette',
             ],
             scan: true,
             includeCustomCollections: true,
@@ -252,7 +254,7 @@ export default defineNuxtConfig({
                 flowType: 'pkce',
             },
         },
-        types: './types/database.ts',
+        types: './shared/types/database.d.ts',
     },
     turnstile: { siteKey: import.meta.env.NUXT_TURNSTILE_SITE_KEY },
 });

server/api/image.delete.ts

@@ -1,7 +1,6 @@
 import { serverSupabaseUser } from '#supabase/server';
 import { createStorage } from 'unstorage';
 import s3Driver from 'unstorage/drivers/s3';
-import type { ApiResponse } from '~/types';
 
 const runtime = useRuntimeConfig();
 

server/api/image.put.ts

@@ -2,7 +2,6 @@ import sharp from 'sharp';
 import { createStorage } from 'unstorage';
 import s3Driver from 'unstorage/drivers/s3';
 import { serverSupabaseUser } from '#supabase/server';
-import type { ApiResponse } from '~/types';
 
 export interface RequestBody {
     image: string;

server/api/item/booth.get.ts

@@ -1,8 +1,5 @@
 import { serverSupabaseClient } from '#supabase/server';
 import type { H3Event } from 'h3';
-import type { Item, ApiResponse, ItemCategory } from '~/types';
-import type { Booth } from '~/types/booth';
-import specificItemCategory from '~/utils/specificItemCategory';
 
 interface fetchedItem extends Omit<Item, 'updated_at'> {
     tags: string[];

server/api/setup.delete.ts

@@ -1,5 +1,4 @@
 import { serverSupabaseClient, serverSupabaseUser } from '#supabase/server';
-import type { ApiResponse } from '~/types';
 
 export interface RequestBody {
     id: number;
@@ -12,7 +11,11 @@ export default defineEventHandler(
             if (!user) throw new Error();
         } catch {
             return {
-                error: { status: 403, message: 'Forbidden.' },
+                error: {
+                    status: 403,
+                    message: 'Forbidden.',
+                    client: { title: 'アクセス拒否' },
+                },
                 data: null,
             };
         }
@@ -29,7 +32,10 @@ export default defineEventHandler(
 
         if (!setupData)
             return {
-                error: { status: 404, message: 'Failed to get setup.' },
+                error: {
+                    status: 404,
+                    message: 'Failed to get setup.',
+                },
                 data: null,
             };
 
@@ -40,7 +46,10 @@ export default defineEventHandler(
 
         if (error)
             return {
-                error: { status: 1, message: 'Failed to delete setup.' },
+                error: {
+                    status: 1,
+                    message: 'Failed to delete setup.',
+                },
                 data: null,
             };
 

server/api/setup.get.ts

@@ -1,5 +1,4 @@
 import { serverSupabaseClient } from '#supabase/server';
-import type { ApiResponse, SetupClient, SetupDB } from '~/types';
 
 export interface RequestQuery {
     id: number;
@@ -78,10 +77,14 @@ export default defineEventHandler(
         if (!data)
             return {
                 data: null,
-                error: { status: 404, message: 'Failed to get setup.' },
+                error: {
+                    status: 404,
+                    message: 'Failed to get setup.',
+                },
             };
 
         // アイテムをカテゴリごとに動的にグループ化
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const groupedItems: Record<string, any[]> = {};
         for (const i of data.items) {
             if (!i.data) continue;

server/api/setup.put.ts

@@ -1,7 +1,4 @@
 import { serverSupabaseClient, serverSupabaseUser } from '#supabase/server';
-import type { ApiResponse, ItemCategory } from '~/types';
-import getErrors, { type ErrorType } from '~/utils/getErrors';
-import setupLimits from '~/utils/setupLimits';
 
 export interface RequestBody {
     name: string;

server/api/setups/bookmarks.get.ts

@@ -1,6 +1,4 @@
 import { serverSupabaseClient, serverSupabaseUser } from '#supabase/server';
-import type { ApiResponse, SetupClient, SetupDB } from '~/types';
-import setupMoldingClient from '~/utils/setupMoldingClient';
 
 interface RequestQuery {
     userId: string;

server/api/setups/latest.get.ts

@@ -1,6 +1,4 @@
 import { serverSupabaseClient } from '#supabase/server';
-import type { ApiResponse, SetupClient } from '~/types';
-import setupMoldingClient from '~/utils/setupMoldingClient';
 
 interface RequestQuery {
     page: number;
@@ -54,6 +52,7 @@ export default defineEventHandler(
                             verified
                         ),
                         nsfw,
+                        likes,
                         source
                     ),
                     note,
@@ -80,7 +79,8 @@ export default defineEventHandler(
                 query.page * query.perPage,
                 query.page * query.perPage + (query.perPage - 1)
             )
-            .order('created_at', { ascending: false });
+            .order('created_at', { ascending: false })
+            .returns<SetupDB[]>();
 
         if (!data || !count)
             return {

server/api/setups/user.get.ts

@@ -1,6 +1,4 @@
 import { serverSupabaseClient } from '#supabase/server';
-import type { ApiResponse, SetupClient } from '~/types';
-import setupMoldingClient from '~/utils/setupMoldingClient';
 
 interface RequestQuery {
     userId: string;
@@ -81,7 +79,8 @@ export default defineEventHandler(
                 query.page * query.perPage,
                 query.page * query.perPage + (query.perPage - 1)
             )
-            .order('created_at', { ascending: false });
+            .order('created_at', { ascending: false })
+            .returns<SetupDB[]>();
 
         if (!data || !count)
             return {

server/api/shopVerification/verify.post.ts

@@ -4,7 +4,6 @@ import {
     serverSupabaseUser,
 } from '#supabase/server';
 import type { H3Event } from 'h3';
-import boothSubDomain from '~/utils/boothSubDomain';
 
 // レスポンス型の定義
 interface VerificationResponse {