Merge branch 'main' into memoTag

traP-jp · Sep 1, 2024 · 1696343 · 1696343
2 parents d6ce286 + 7062d43
commit 1696343
Show file tree

Hide file tree

Showing 18 changed files with 404 additions and 247 deletions.
diff --git a/docs/openapi.yaml b/docs/openapi.yaml
@@ -276,7 +276,7 @@ paths:
             schema:
               type: object
               properties:
-                memoId:
+                wikiId:
                   type: string
                   example: 123
       responses:
@@ -321,7 +321,7 @@ paths:
             schema:
               type: object
               properties:
-                memoId:
+                wikiId:
                   type: string
                   example: 123
       responses:
@@ -342,7 +342,7 @@ paths:
             schema:
               type: object
               properties:
-                memoId:
+                wikiId:
                   type: string
                   example: 123
       responses:
@@ -417,7 +417,7 @@ components:
           example: Introduction to Computer Science
         content:
           type: string
-          example: マークダウン形式 資料へのリンク
+          example: 資料へのリンク(URL)のみ
         folderpath:
           type: string
           example: /School/ComputerScience
@@ -509,6 +509,12 @@ components:
           items:
             type: string
           example: [ComputerScience, Python]
+        resultCount:
+          type: integer
+          example: 10
+        from:
+          type: integer
+          example: 0
     lectureWithoutId:
       type: object
       properties:
@@ -643,4 +649,4 @@ components:
           example: 123
         tag:
           type: string
-          example: ComputerScience
+          example: ComputerScience
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "highlight.js": "^11.10.0",
     "marked": "^14.0.0",
     "marked-highlight": "^2.1.4",
+    "pinia": "^2.2.2",
     "vue": "^3.4.35",
     "vue-router": "^4.4.3",
     "vue-toast-notification": "^3.1.2",

diff --git a/src/App.vue b/src/App.vue
@@ -1,18 +1,39 @@
 <script setup lang="ts">
 import Header from "./components/Header.vue";
+import { ref, onMounted } from 'vue'
+import { useUserStore } from './store/user.js';
+import {useToast} from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
+
+const userStore = useUserStore();
+const existUser = ref<boolean>(false);
+const $toast = useToast();
+
+onMounted(async() =>{
+  await userStore.setUser();
+  existUser.value = userStore.traqId != "";
+  if(!existUser.value){
+    $toast.error("can't get id", {
+      duration: 1200,
+      position:  'top-right'
+    })
+  }
+})
 </script>
 
 <template>
-  <div>
+  <div :class="$style.page">
     <Header />
-    <div :class="$style.contents">
-      <router-view />
-    </div>
+    <router-view :class="$style.contents" />
   </div>
 </template>
 <style module>
+.page {
+  height: 100%;
+  background: #f2f2f2;
+  overflow-x: hidden;
+}
 .contents {
-  margin-top: 93px;
-  height: 100vh;
+  height: fit-content;
 }
 </style>
diff --git a/src/components/Header.vue b/src/components/Header.vue
@@ -1,56 +1,43 @@
 <template>
-  <div :class="$style.header_header">QuickWiki</div>
-  <header :class="$style.header">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css">
-    <ul>
-      <router-link to="/wiki/mywiki">
-            <li>QuickWiki</li>
+  <div :class="$style.header">
+    <div :class="$style.header_header">QuickWiki</div>
+    <header :class="$style.header_list">
+      <ul>
+        <router-link to="/wiki/mywiki">
+          <li>QuickWiki</li>
         </router-link>
         <router-link to="/createsodan">
-            <li>匿名質問</li>
+          <li>匿名質問</li>
         </router-link>
         <router-link to="/creatememo">
-            <li>Wikiを書く</li>
+          <li>Wikiを書く</li>
         </router-link>
         <router-link to="/lectures/sougou">
-            <li>講習会資料</li>
+          <li>講習会資料</li>
         </router-link>
-        <!-- 後で消す！！！ -->
-        <router-link to="/sodan/1">
-            <li>sodan1</li>
-        </router-link>
-        <router-link to="/memo/1">
-            <li>memo1</li>
-        </router-link>
-        <!-- ここまで -->
-    </ul>
-  </header>
+      </ul>
+    </header>
+  </div>
 </template>
 
 <style module>
-
 .header {
   position: sticky;
-  top: 93px;
-  z-index: 999;
-  display: flex;
-  width: 100%;
-  justify-content: center;
+  top: 0;
+  z-index: 10;
   background-color: #ffffff;
   box-shadow: 0px 2px 1px 0px #5e5e5e;
 }
 
-.header a {
+.header_list a {
   font-size: 25px;
   color: #1a1a1a;
   user-select: none;
 }
 
 .header_header {
-  position: fixed;
   top: 0;
-  width: 100%;
-  z-index: 999;
+  z-index: 10;
   color: rgb(253, 122, 0);
   font-size: 62px;
   background-color: #ffffff;
@@ -59,35 +46,36 @@
   user-select: none;
 }
 
-.header ul {
+.header_list ul {
   padding-left: 10px;
   text-align: left;
   font-size: 20px;
   list-style: none;
   margin: 5px;
   display: block;
   height: 100%;
-  width: 100%;
   line-height: 40px;
   color: #1a1a1a;
 }
 
-.header li a {
+.header_list li a {
   color: #1a1a1a;
 }
 
-.header li a:hover {
+.header_list li a:hover {
   font-size: 25px;
   color: #1a1a1a;
 }
 
-.header ul li:hover {
+.header_list ul li:hover {
   background-color: #dedede;
   border-radius: 10px;;
 }
 
-.header li {
+.header_list li {
   display: inline-block;
   padding: 0px 10px;
 }
 </style>
+<script setup>
+</script>
diff --git a/src/components/MarkDownEditor.vue b/src/components/MarkDownEditor.vue
@@ -908,7 +908,7 @@ onMounted(async() =>{
     border-left: 3px solid lightgray;
     color: gray;
 }
-input{
+.title{
     border:1px solid lightgray;
     width: 90%;
 }