chore: resolve merge conflicts

app.vue

@@ -34,10 +34,9 @@ import Menu from "@/components/Menu/Menu.vue"
 import MenuBar from "@/components/MenuBar/MenuBar.vue"
 import FSnackbar from "@/components/field/f-snackbar.vue"
 import {onBeforeMount, onMounted, provide, ref} from 'vue'
-import PageFoot from "@/components/common/PageFoot.vue"
 import FixedBtnZone from "@/components/common/FixedBtnZone.vue"
 import {useTheme} from "vuetify"
-import {addRouteMiddleware, useAsyncData, useNuxtApp, useRoute, useRouter, useState} from "#app"
+import {addRouteMiddleware, useNuxtApp, useRoute, useRouter, useState} from "#app"
 import {Tab} from "~/components/field/type"
 import build_meta from "~/field.meta"
 

components/CommentZone/CommentCard.vue

@@ -35,7 +35,7 @@
                 icon="mdi-reply"
                 size="1.1rem"
                 v-show="replyBtnAlwaysOn||replyBtnVisibility"
-                @click="$emit('replyClick')"
+                @click="emits('replyClick')"
             />
           </transition>
         </div>
@@ -63,9 +63,10 @@ import {onMounted, ref} from "vue"
 import {formatToDateTime} from "@/scripts/util/time"
 import FTextRender from "@/components/field/f-text-render.vue"
 
-defineEmits<{
-  (e: 'replyClick'): void
-}>()
+const emits =
+    defineEmits<{
+      (e: 'replyClick'): void
+    }>()
 
 withDefaults(
     defineProps<{

components/CommentZone/CommentEditor.vue

@@ -72,7 +72,7 @@
             :disabled="!body"
             :warning="isReply"
             :text="isReply ? '回复' : '提交'"
-            @click="$emit('createComment',body)"
+            @click="emits('createComment',body)"
             @disable-click="showGlobalSnackbar('mdi-tooltip-edit','填写评论内容是必要的','red')"
         />
       </div>
@@ -99,9 +99,10 @@ const props =
       isReply: boolean,
     }>()
 
-defineEmits<{
-  (e: 'createComment'): void
-}>()
+const emits =
+    defineEmits<{
+      (e: 'createComment'): void
+    }>()
 
 const body = ref("")
 const currentMode = ref(Mode.Edit)

components/CommentZone/CommentZone.vue

@@ -106,7 +106,7 @@ import FCard from "@/components/field/f-card.vue"
 import FSlider from "@/components/field/f-slider.vue"
 import FDivider from "@/components/field/f-divider.vue"
 import FTextRender from "@/components/field/f-text-render.vue"
-import {Rsp as Comment} from "@/ws/client/api/comment/create/rsp"
+import {Resp as Comment} from "@/ws/client/api/comment/create/resp"
 import FData from "~/components/field/f-data.vue"
 
 const props =

components/MenuBar/Drawer.vue

@@ -21,11 +21,11 @@
         <f-tab
             class="menu-tab"
             :title="tab.title"
-            @click="$emit('tabClick');router.push(tab.route)"
+            @click="emits('tabClick');router.push(tab.route)"
         />
       </f-tabs>
 
-      <div class="info cursor-pointer" v-html="info" @click="$emit('infoClick')"/>
+      <div class="info cursor-pointer" v-html="info" @click="emits('infoClick')"/>
 
     </div>
 
@@ -42,10 +42,11 @@ import {useRouter} from "#app"
 
 const router = useRouter()
 
-const emits = defineEmits<{
-  (e: 'tabClick'): void,
-  (e: 'infoClick'): void
-}>()
+const emits =
+    defineEmits<{
+      (e: 'tabClick'): void,
+      (e: 'infoClick'): void
+    }>()
 
 const props = withDefaults(
     defineProps<{

components/MenuBar/MenuBar.vue

@@ -44,6 +44,7 @@
 </template>
 
 <script lang="ts" setup>
+
 import {onMounted, ref} from 'vue'
 import {makeDebounce} from "@/scripts/util/debounce"
 import Drawer from "./Drawer.vue"

components/PostCard/Body.vue

@@ -19,7 +19,6 @@
 
 <script setup lang="ts">
 
-import {onMounted, toRefs} from "vue"
 import FTextRender from "@/components/field/f-text-render.vue"
 
 const props =

components/btn/GoUpBtn.vue

@@ -22,7 +22,7 @@
 
 <script lang="ts" setup>
 
-import {onMounted, ref} from "vue";
+import {onMounted, ref} from "vue"
 import {makeThrottle} from "@/scripts/util/throttle"
 
 const visibility = ref(false)

components/btn/ThemeToggleBtn.vue

@@ -20,7 +20,6 @@
 <script lang="ts" setup>
 
 import {useTheme} from "vuetify"
-import {inject} from "vue";
 
 const theme = useTheme()
 

components/chip/ArchiveChip.vue

@@ -16,7 +16,7 @@
 
 <script setup lang="ts">
 
-import {inject, ref} from "vue"
+import {inject} from "vue"
 
 const showGlobalSnackbar = inject('showGlobalSnackbar')
 

components/chip/CreateTimeChip.vue

@@ -6,7 +6,7 @@
         variant="text"
         :style="'color:'+genTimeColor()"
     >
-      创建于 {{ genTimeText() }}
+      发表于 {{ genTimeText() }}
     </v-chip>
 
   </div>

components/chip/ModifyTimeChip.vue

@@ -15,7 +15,7 @@
 <script lang="ts" setup>
 
 import {toRefs} from "vue"
-import {formatToDate, formatToDateTime} from "@/scripts/util/time"
+import {formatToDateTime} from "@/scripts/util/time"
 
 const props = withDefaults(
     defineProps<{

components/chip/ScheduleChip.vue

@@ -15,7 +15,7 @@
 
 <script setup lang="ts">
 
-import {inject, ref} from "vue"
+import {inject} from "vue"
 
 const showGlobalSnackbar = inject('showGlobalSnackbar')
 

components/common/PageFoot.vue

@@ -11,12 +11,13 @@
 
 <script lang="ts" setup>
 
-import {ref, onMounted} from "vue"
+import {onMounted, ref} from "vue"
 
-const emits = defineEmits<{
-  (e: 'fullyVisible'): void,
-  (e: 'fullyInvisible'): void,
-}>()
+const emits =
+    defineEmits<{
+      (e: 'fullyVisible'): void,
+      (e: 'fullyInvisible'): void,
+    }>()
 
 const props =
     defineProps<{

components/common/SwitchZone.vue

@@ -48,8 +48,8 @@
 <script lang="ts" setup>
 
 import {removeHtmlTags} from "@/scripts/util/text"
-import {useAsyncData, useRoute, useRouter, useState} from "#app"
-import {Rsp} from "@/ws/client/api/post/get/rsp"
+import {useRoute, useRouter, useState} from "#app"
+import {Resp} from "@/ws/client/api/post/get_one/resp"
 
 const props =
     defineProps<{
@@ -65,16 +65,16 @@ const prev_post = await (async () => {
   if (post_id === "-1")
     return null
   else {
-    const cache = <Rsp>useState(`post:${post_id}`).value
+    const cache = <Resp>useState(`post:${post_id}`).value
     if (cache)
       return cache
     else
       return useState(`post:${post_id}`, async () => {
         const {handler: getPost} = await (async () => {
           if (process.server)
-            return import("@/ws/server/api/post/get/handler")
+            return import("@/ws/server/api/post/get_one/handler")
           else
-            return import("@/ws/client/api/post/get/handler")
+            return import("@/ws/client/api/post/get_one/handler")
         })()
         const post = await getPost({Id: post_id})
         if (post.Ok) {
@@ -91,16 +91,16 @@ const next_post = await (async () => {
   if (post_id === "-1")
     return null
   else {
-    const cache = <Rsp>useState(`post:${post_id}`).value
+    const cache = <Resp>useState(`post:${post_id}`).value
     if (cache)
       return cache
     else
       return useState(`post:${post_id}`, async () => {
         const {handler: getPost} = await (async () => {
           if (process.server)
-            return import("@/ws/server/api/post/get/handler")
+            return import("@/ws/server/api/post/get_one/handler")
           else
-            return import("@/ws/client/api/post/get/handler")
+            return import("@/ws/client/api/post/get_one/handler")
         })()
         const post = await getPost({Id: post_id})
         if (post.Ok) {

components/field/f-btn.vue

@@ -8,7 +8,7 @@
                  'reject':reject,
                  'light':!theme.global.current.value.dark,
                  'dark':theme.global.current.value.dark}"
-        @click="disabled?disableCLick():$emit('click')"
+        @click="disabled?disableCLick():emits('click')"
         type="submit"
         v-ripple
         v-ripple.stop="!disabled"
@@ -25,10 +25,11 @@ import {useTheme} from "vuetify"
 
 const theme = useTheme()
 
-const emits = defineEmits<{
-  (e: 'click'): void,
-  (e: 'disableClick'): void
-}>()
+const emits =
+    defineEmits<{
+      (e: 'click'): void,
+      (e: 'disableClick'): void
+    }>()
 
 withDefaults(
     defineProps<{

components/field/f-data.vue

@@ -6,7 +6,7 @@
 
 <script lang="ts" setup>
 
-import {onBeforeMount, onMounted, ref} from "vue"
+import {onBeforeMount, ref} from "vue"
 
 const props = withDefaults(
     defineProps<{

components/field/f-slider.vue

@@ -15,6 +15,7 @@
 </template>
 
 <script setup lang="ts">
+
 import {ref} from "vue"
 
 const props = withDefaults(

components/field/f-tab.vue

@@ -6,7 +6,7 @@
         :class="{'cursor-pointer':!disabled}"
         v-ripple
         v-ripple.stop="!disabled"
-        @click="disabled?()=>{}:$emit('click')"
+        @click="disabled?()=>{}:emits('click')"
     >
       <div
           :style="{color:disabled?'grey':'',
@@ -21,9 +21,10 @@
 
 <script lang="ts" setup>
 
-const emits = defineEmits<{
-  (e: 'click'): void
-}>()
+const emits =
+    defineEmits<{
+      (e: 'click'): void
+    }>()
 
 const props = withDefaults(
     defineProps<{

components/field/f-text-render.vue

@@ -13,7 +13,7 @@
 <script lang="ts" setup>
 
 import {queueTypeSet} from "@/scripts/mathjax/render"
-import {onMounted, Ref, ref, watch} from "vue"
+import {onMounted, ref} from "vue"
 import {useTheme} from "vuetify"
 import Prism from 'prismjs'
 

components/field/f-textarea.vue

@@ -24,15 +24,15 @@ const props =
 
 const emits =
     defineEmits<{
-      (e: 'update:modelValue', string): void
+      (e: 'update:modelValue', newValue: string): void
     }>()
 
 const value = computed({
   get() {
     return props.modelValue
   },
-  set(value) {
-    emits('update:modelValue', value)
+  set(newValue) {
+    emits('update:modelValue', newValue)
   }
 })