bugfix

mlogclub · Feb 4, 2024 · 043fd57 · 043fd57
1 parent 0ffe55e
commit 043fd57
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 78 deletions.
diff --git a/site/package.json b/site/package.json
@@ -21,8 +21,7 @@
     "eslint": "^8.56.0",
     "nuxt": "^3.10.0",
     "sass": "^1.70.0",
-    "typescript": "^5.3.3",
-    "vue": "^3.4.15"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@pinia/nuxt": "^0.5.1",

diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml
diff --git a/site/src/layouts/topics.vue b/site/src/layouts/topics.vue
diff --git a/site/src/pages/index.vue b/site/src/pages/index.vue
@@ -1,18 +1,32 @@
+<template>
+  <section class="main">
+    <div class="container main-container left-main size-320">
+      <div class="left-container">
+        <div class="main-content no-padding no-bg topics-wrapper">
+          <div class="topics-nav">
+            <topics-nav />
+          </div>
+          <div class="topics-main">
+            <load-more-async v-slot="{ results }" url="/api/topic/topics">
+              <topic-list :topics="results" show-sticky />
+            </load-more-async>
+          </div>
+        </div>
+      </div>
+      <div class="right-container">
+        <check-in />
+        <site-notice />
+        <score-rank />
+        <friend-links />
+      </div>
+    </div>
+  </section>
+</template>
+
 <script setup>
-definePageMeta({
-  layout: "topics",
-});
 useHead({
   title: useSiteTitle(),
 });
 </script>
 
-<template>
-  <div class="topics-main">
-    <load-more-async v-slot="{ results }" url="/api/topic/topics">
-      <topic-list :topics="results" show-sticky />
-    </load-more-async>
-  </div>
-</template>
-
 <style scoped></style>
diff --git a/site/src/pages/topics/index.vue b/site/src/pages/topics/index.vue
@@ -1,15 +1,29 @@
 <template>
-  <div class="topics-main">
-    <load-more-async v-slot="{ results }" url="/api/topic/topics">
-      <topic-list :topics="results" show-sticky />
-    </load-more-async>
-  </div>
+  <section class="main">
+    <div class="container main-container left-main size-320">
+      <div class="left-container">
+        <div class="main-content no-padding no-bg topics-wrapper">
+          <div class="topics-nav">
+            <topics-nav />
+          </div>
+          <div class="topics-main">
+            <load-more-async v-slot="{ results }" url="/api/topic/topics">
+              <topic-list :topics="results" show-sticky />
+            </load-more-async>
+          </div>
+        </div>
+      </div>
+      <div class="right-container">
+        <check-in />
+        <site-notice />
+        <score-rank />
+        <friend-links />
+      </div>
+    </div>
+  </section>
 </template>
 
 <script setup>
-definePageMeta({
-  layout: "topics",
-});
 useHead({
   title: useSiteTitle("话题"),
 });

diff --git a/site/src/pages/topics/node/[id].vue b/site/src/pages/topics/node/[id].vue
@@ -1,19 +1,33 @@
 <template>
-  <div class="topics-main">
-    <load-more-async
-      v-slot="{ results }"
-      url="/api/topic/topics"
-      :params="{ nodeId: nodeId }"
-    >
-      <topic-list :topics="results" show-sticky />
-    </load-more-async>
-  </div>
+  <section class="main">
+    <div class="container main-container left-main size-320">
+      <div class="left-container">
+        <div class="main-content no-padding no-bg topics-wrapper">
+          <div class="topics-nav">
+            <topics-nav />
+          </div>
+          <div class="topics-main">
+            <load-more-async
+              v-slot="{ results }"
+              url="/api/topic/topics"
+              :params="{ nodeId: nodeId }"
+            >
+              <topic-list :topics="results" show-sticky />
+            </load-more-async>
+          </div>
+        </div>
+      </div>
+      <div class="right-container">
+        <check-in />
+        <site-notice />
+        <score-rank />
+        <friend-links />
+      </div>
+    </div>
+  </section>
 </template>
 
 <script setup>
-definePageMeta({
-  layout: "topics",
-});
 const route = useRoute();
 
 let nodeId = Number.parseInt(route.params.id) || 0;

diff --git a/site/src/pages/topics/tag/[id].vue b/site/src/pages/topics/tag/[id].vue
@@ -1,23 +1,37 @@
 <template>
-  <div class="topics-main">
-    <load-more-async
-      v-slot="{ results }"
-      url="/api/topic/tag/topics"
-      :params="{ tagId: tagId }"
-    >
-      <topic-list :topics="results" />
-    </load-more-async>
-  </div>
+  <section class="main">
+    <div class="container main-container left-main size-320">
+      <div class="left-container">
+        <div class="main-content no-padding no-bg topics-wrapper">
+          <div class="topics-nav">
+            <topics-nav />
+          </div>
+          <div class="topics-main">
+            <load-more-async
+              v-slot="{ results }"
+              url="/api/topic/tag/topics"
+              :params="{ tagId: tagId }"
+            >
+              <topic-list :topics="results" />
+            </load-more-async>
+          </div>
+        </div>
+      </div>
+      <div class="right-container">
+        <check-in />
+        <site-notice />
+        <score-rank />
+        <friend-links />
+      </div>
+    </div>
+  </section>
 </template>
 
 <script setup>
 const route = useRoute();
 const tagId = route.params.id;
 const { data: tag } = await useAsyncData(() => useMyFetch(`/api/tag/${tagId}`));
 
-definePageMeta({
-  layout: "topics",
-});
 useHead({
   title: useSiteTitle(tag.value.name, "话题"),
   meta: [