feats

src/layouts/NoteLayout.vue

@@ -17,9 +17,15 @@
 </template>
 
 <script setup>
+// import { watch } from 'vue';
+// import { useModel } from '@zjxpcyc/vue-tiny-store'
 import Header from './components/Header.vue'
 import SiderBar from './components/SiderBar.vue';
 
+// const { getRepo, getBranches, user : userRef } = useModel('repo')
+// const { getTree } = useModel('note')
+// const { user } = useModel('user')
+
 const siderWidth = '300px';
 const menuStyle = { width: siderWidth, height: '100%' };
 

src/layouts/components/SiderBar.vue

@@ -38,7 +38,7 @@ const props = defineProps({
 
 const { user } = useModel('user')
 const { curMenu, menus, getMenus } = useModel('menu')
-const { getNote } = useModel('note')
+const { getNote, getFiles } = useModel('note')
 const { newFile, newFolder } = useModel('repo')
 
 if (!menus || !menus.length) {

src/pages/login/index.vue

@@ -8,10 +8,10 @@
         <a-form-item has-feedback label="密码" name="password">
           <a-input type="password" v-model:value="formData.password"></a-input>
         </a-form-item>
-        <a-form-item has-feedback label="client_id" name="client_id">
+        <a-form-item has-feedback label="Client ID" name="client_id">
           <a-input v-model:value="formData.client_id"></a-input>
         </a-form-item>
-        <a-form-item has-feedback label="client_secret" name="client_secret">
+        <a-form-item has-feedback label="Client Secret" name="client_secret">
           <a-input v-model:value="formData.client_secret"></a-input>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 14, offset: 4 }">

src/service/gitee.js

@@ -44,6 +44,12 @@ export const newRepo = (name = 'my-note') => {
   return request.post('/api/v5/user/repos', data)
 }
 
+// 获取分支信息
+export const getBranches = (user, repo = 'my-note') => {
+  const { access_token } = getToken() || {}
+  return request.get(`/api/v5/repos/${user.login}/${repo}/branches`, { params: { access_token } })
+}
+
 // 创建分支
 export const newBranch = (user, branch_name = 'master', repo = 'my-note') => {
   const { access_token } = getToken() || {}
@@ -56,9 +62,8 @@ export const newBranch = (user, branch_name = 'master', repo = 'my-note') => {
 }
 
 // 获取文件树
-export const getTree = (user, repo = 'my-note') => {
+export const getTree = (user, sha, repo = 'my-note') => {
   const { access_token } = getToken() || {}
-  const sha = '4f26aeafdb2367620a393c973eddbe8f8b846ebd' // master
   return request.get(`/api/v5/repos/${user.login}/${repo}/git/trees/${sha}`, { params: { access_token, recursive: 1 } })
 }
 
@@ -92,9 +97,9 @@ export const newFolder = (user, path, repo = 'my-note') => {
 }
 
 // 更新文件
-export const updateFile = (user, content, fileInfo) => {
+export const updateFile = (user, fileInfo) => {
   const { access_token } = getToken() || {}
-  const { url, sha } = fileInfo
+  const { path, sha, content } = fileInfo
   const data = {
     access_token,
     content: Base64.encode(content),
@@ -102,7 +107,5 @@ export const updateFile = (user, content, fileInfo) => {
     message: new Date().toJSON(),
   }
 
-  const filePath = url.replace(BASE_URL, '')
-
-  return request.put(filePath, data)
+  return request.put(path, data)
 }

src/store/model/menu.js

@@ -5,10 +5,8 @@ export default function useMenu() {
   const menus = reactive([])
   const curMenu = ref()
 
-  const getMenus = (user, path = '', repo = 'my-note') => {
-    gitee.getTree(user, repo).then(console.log)
-
-    return gitee.getFiles(user, path, repo).then(res => {
+  const getMenus = (user, repo = 'my-note') => {
+    return gitee.getFiles(user, '', repo).then(res => {
       menus.push(...res)
     })
   }

src/store/model/note.js

@@ -1,37 +1,48 @@
-import { ref } from 'vue'
-import request, { BASE_URL } from '@/utils/request'
-import { Base64 } from 'js-base64'
+import { reactive, ref } from 'vue'
 import { message } from 'ant-design-vue';
+import * as gitee from '@/service/gitee'
 
 export default function useNote() {
+  const fileArr = ref([])
+  const fileTree = reactive([])
   const note = ref()
 
+  // 获取目录下所有问题件
+  const getFiles = (user, path, repo = 'my-note') => {
+    return gitee.getFiles(user, path, repo).then(res => {
+      const files = (res || []).filter (x => x.path.indexOf('.gitignore') === -1)
+
+      if (!path) {
+        fileArr.value = files
+        fileTree.push(...files)
+      } else {
+        const dir = fileArr.value.filter(x => x.type === 'dir' && x.name === path)[0]
+        dir.children = files
+        fileArr.value = fileArr.value.concat(files)
+      }
+    })
+  }
+
   const getNote = (user, path = '', repo = 'my-note') => {
-    const { access_token } = user.token
-    return request.get(`/api/v5/repos/${user.login}/${repo}/contents/${path}`, { params: { access_token } }).then(res => note.value = res)
+    return gitee.getFile(user, path, repo).then(res => note.value = res)
   }
 
   const updateNote = (content, user) => {
-    const { url, sha } = note.value
-    const { access_token } = user.token
-    const data = {
-      access_token,
-      content: Base64.encode(content),
-      sha,
-      message: new Date().toJSON(),
-    }
-
-    const filePath = url.replace(BASE_URL, '')
+    const filePath = note.value.url.replace(BASE_URL, '')
+    const fileInfo = { filePath, sha: note.value.sha, content }
 
-    return request.put(filePath, data).then(() => {
+    return gitee.updateFile(user, content, fileInfo).then(() => {
       message.success('保存成功');
       // 获取最新的数据, 目的是更新 sha 值
-      request.get(filePath, { params: { access_token } }).then(res => note.value = res)
+      gitee.getFile(user, filePath, 'my-note').then(res => note.value = res)
     })
   }
   
   return {
+    fileArr,
+    fileTree,
     note,
+    getFiles,
     getNote,
     updateNote,
   }

src/store/model/repo.js

@@ -3,15 +3,26 @@ import * as gitee from '@/service/gitee'
 
 export default function useRepo() {
   const repo = reactive({})
+  const branches = ref([])
   const user = ref()
 
+  // 获取仓库信息
   const getRepo = (user, repo = 'my-note') => {
     return gitee.getRepo(user, repo).then(res => Object.assign(repo, res))
   }
 
+  // 新增仓库
   const newRepo = (user, name = 'my-note') => {
     return gitee.newRepo(data).then(res => Object.assign(repo, res))
   }
+  
+  // 获取所有分支
+  const getBranches = (user, repo = 'my-note') => {
+    return gitee.getBranches(user, repo).then(res => {
+      branches.value = res
+      return res;
+    })
+  }
 
   const newBranch = (user, branch_name = 'master', repo = 'my-note') => {
     return gitee.newBranch(user, branch_name, repo).then(res => Object.assign(repo, res))
@@ -29,8 +40,10 @@ export default function useRepo() {
 
   return {
     repo,
+    user,
     getRepo,
     newRepo,
+    getBranches,
     newBranch,
     newFile,
     newFolder,