From d88dcceba9c33f8f1209ed63eb0042feca67f868 Mon Sep 17 00:00:00 2001
From: SunWuyuan <1847261658@qq.com>
Date: Sun, 22 Sep 2024 16:25:53 +0800
Subject: [PATCH] 1

---
 src/pages/projects/[id]/fork.vue  |   4 +-
 src/pages/projects/[id]/index.vue |  70 +++------
 src/pages/projects/[id]/push.vue  |   2 +-
 src/pages/proxy/[id]/fork.vue     | 229 +++++++++++++++++-------------
 src/pages/proxy/[id]/index.vue    |  16 ++-
 src/pages/proxy/[id]/push.vue     | 129 -----------------
 6 files changed, 170 insertions(+), 280 deletions(-)
 delete mode 100644 src/pages/proxy/[id]/push.vue

diff --git a/src/pages/projects/[id]/fork.vue b/src/pages/projects/[id]/fork.vue
index 1ace365..8e6b948 100644
--- a/src/pages/projects/[id]/fork.vue
+++ b/src/pages/projects/[id]/fork.vue
@@ -11,7 +11,7 @@
       </template>
 
       <template v-slot:subtitle>
-      作者{{ project.author_display_name }}，发布于：{{ project.time }}，{{ project.view_count }}次浏览
+      作者{{ project.author.display_name }}，发布于：{{ project.time }}，{{ project.view_count }}次浏览
       </template>
 
       <template v-slot:text>
@@ -104,7 +104,7 @@ export default {
   methods: {
     async getproject() {
       this.project = await request({
-        url: '/api/projectinfo?id=' + this.$route.params.id,
+        url: "/project/" + this.$route.params.id,
         method: 'get',
       })
       console.log(this.project)
diff --git a/src/pages/projects/[id]/index.vue b/src/pages/projects/[id]/index.vue
index d5d2194..99017a6 100644
--- a/src/pages/projects/[id]/index.vue
+++ b/src/pages/projects/[id]/index.vue
@@ -1,43 +1,27 @@
 <template>
   <v-container>
-    <v-row
-      ><v-col cols="8" md="8" lg="8" xl="8" sm="8" xs="8">
+    <v-row><v-col cols="8" md="8" lg="8" xl="8" sm="8" xs="8">
         <ProjectRunner :type="project.type" :id="project.id" />
       </v-col>
 
       <v-col cols="4">
-        <v-card hover
-          ><v-card-item>
+        <v-card hover><v-card-item>
             <v-card-title>{{ project.title }}</v-card-title>
             <v-card-subtitle>{{ project.description }}</v-card-subtitle>
           </v-card-item>
           <div class="px-4 d-flex ga-2 mb-2">
             <v-chip pill>
               <v-avatar start>
-                <v-img
-                  :src="
-                    'https://s4-1.wuyuan.1r.ink/user/' + project.author_images
-                  "
-                ></v-img> </v-avatar
-              >{{ project.author_display_name }}</v-chip
-            >
+                <v-img :src="'https://s4-1.wuyuan.1r.ink/user/' + project.author.images
+                  "></v-img> </v-avatar>{{ project.author.display_name }}</v-chip>
           </div>
           <div class="px-4 d-flex ga-2 mb-2">
-            <v-chip pill prepend-icon="mdi-eye"
-              >{{ project.view_count }}浏览</v-chip
-            >
+            <v-chip pill prepend-icon="mdi-eye">{{ project.view_count }}浏览</v-chip>
             <v-chip pill prepend-icon="mdi-clock">{{ project.time }}</v-chip>
           </div>
           <div class="px-4 d-flex ga-2 mb-2">
-            <v-chip pill prepend-icon="mdi-xml" v-if="project.state == 'public'"
-              >开源作品</v-chip
-            >
-            <v-chip
-              pill
-              prepend-icon="mdi-xml"
-              v-if="project.state == 'private'"
-              >私密作品</v-chip
-            >
+            <v-chip pill prepend-icon="mdi-xml" v-if="project.state == 'public'">开源作品</v-chip>
+            <v-chip pill prepend-icon="mdi-xml" v-if="project.state == 'private'">私密作品</v-chip>
 
             <v-chip pill prepend-icon="mdi-application">{{
               project.type
@@ -49,15 +33,9 @@
             </div>
           </div>
           <div class="px-4 d-flex ga-2 mb-2">
-            <v-btn @click="openEditor(project.id, project.type)" variant="text"
-              >打开创造页</v-btn
-            >
-            <v-btn
-              v-if="project.authorid != localuser.user.id"
-              :to="'/projects/' + project.id + '/fork'"
-              variant="text"
-              >改编</v-btn
-            >
+            <v-btn @click="openEditor(project.id, project.type)" variant="text">打开创造页</v-btn>
+            <v-btn v-if="project.authorid != localuser.user.id" :to="'/projects/' + project.id + '/fork'"
+              variant="text">改编</v-btn>
           </div>
 
           <div class="px-4">
@@ -65,23 +43,18 @@
               <v-card-item>
                 <template v-slot:prepend>
                   <v-avatar>
-                    <v-img
-                      :alt="project.author_display_name"
-                      :src="
-                        'https://s4-1.wuyuan.1r.ink/user/' +
-                        project.author_images
-                      "
-                    ></v-img>
+                    <v-img :alt="project.author.display_name" :src="'https://s4-1.wuyuan.1r.ink/user/' +
+                      project.author.images
+                      "></v-img>
                   </v-avatar>
                 </template>
                 <v-card-title class="text-white">
-                  {{ project.author_display_name }}
+                  {{ project.author.display_name }}
                 </v-card-title>
                 <v-card-subtitle class="text-white">
-                  {{ project.author_motto }}
+                  {{ project.author.motto }}
                 </v-card-subtitle>
-              </v-card-item></v-card
-            >
+              </v-card-item></v-card>
           </div>
 
           <br />
@@ -120,9 +93,12 @@ export default {
         tags: "",
         likeid: "",
         favoid: "",
-        author_display_name: "加载中",
-        author_images: "10d366468781c064f087c75708bf24b9",
-        author_motto: "加载中",
+        author: {
+          id: 1,
+          display_name: "加载中",
+          images: "加载中",
+        }
+
       },
       openEditor: openEditor,
       localuser: localuser,
@@ -153,7 +129,7 @@ export default {
   methods: {
     async getproject() {
       this.project = await request({
-        url: "/api/projectinfo?id=" + this.$route.params.id,
+        url: "/project/" + this.$route.params.id,
         method: "get",
       });
       console.log(this.project);
diff --git a/src/pages/projects/[id]/push.vue b/src/pages/projects/[id]/push.vue
index 9afe5ea..d80581b 100644
--- a/src/pages/projects/[id]/push.vue
+++ b/src/pages/projects/[id]/push.vue
@@ -90,7 +90,7 @@ export default {
   methods: {
     async getproject() {
       this.project = await request({
-        url: '/api/projectinfo?id=' + this.$route.params.id,
+        url: "/project/" + this.$route.params.id,
         method: 'get',
       })
       console.log(this.project)
diff --git a/src/pages/proxy/[id]/fork.vue b/src/pages/proxy/[id]/fork.vue
index 1ace365..90c19f9 100644
--- a/src/pages/proxy/[id]/fork.vue
+++ b/src/pages/proxy/[id]/fork.vue
@@ -1,143 +1,172 @@
 <template>
   <v-container class="pa-md-12">
-    <div class="d-flex justify-space-between">
-      <h1 class="text-h4">Fork <span v-text="project.title"></span></h1>
-
-
-    </div><br />
-    <v-card>
-      <template v-slot:title>
-        {{project.title}}
-      </template>
-
-      <template v-slot:subtitle>
-      作者{{ project.author_display_name }}，发布于：{{ project.time }}，{{ project.view_count }}次浏览
-      </template>
-
-      <template v-slot:text>
-        {{project.description}}
-      </template>
-
-    </v-card><br/>
-    <v-card>
-      <template v-slot:title>
-        你正在分叉一个项目
-      </template>
-
-      <template v-slot:subtitle>
-        等等，确认点事 </template>
-
-      <template v-slot:text>
-        你正在分叉 <span v-text="project.title"></span> ，这将会从此项目的生产环境创建一个一模一样的项目，新的项目将拥有一样的名称，简介与源代码内容。分叉是一个技术概念，不代表作者对你有任何授权。
-        <br />改编设立的目的是为了让社区中的作品得到更好的发展，请不要滥用改编，更不能直接抄袭。
-      </template>
-      <v-card-actions>
-        <v-checkbox label="我已了解并确认" v-model="checkknow"></v-checkbox>
-      </v-card-actions>
+
+    <v-card style="aspect-ratio: 4/3" rounded="lg">
+      <v-img :src="'https://scratch.192325.xyz/thumbnails/' + project.id" class="align-end"
+        lazy-src="../assets/43-lazyload.png" height="100%" gradient="to bottom, rgba(0,0,0,.1), rgba(0,0,0,.5)" cover>
+        <v-card-item>
+          <v-card-title>{{ project.title }} </v-card-title>
+          <v-card-subtitle>{{ project.description }} </v-card-subtitle>
+        </v-card-item>
+        <!--<v-card-text>
+                    <v-chip size="small">{{ item.type }}</v-chip>
+                  </v-card-text>-->
+      </v-img>
     </v-card>
-    <br /><v-card>
-      <template v-slot:title>
-        {{ project.license }}
-      </template>
-
-      <template v-slot:subtitle>
-        你需要遵守：{{ project.license }}许可证。
-      </template>
-
-      <template v-slot:text> <v-btn :href="'https://choosealicense.com/licenses/' + project.license" target="_blank"
-          variant="outlined">了解此许可证</v-btn>
-        <br /><br />
-        开源许可证授予你合理的权利，但前提是你必须遵守许可证的条款。如果没有许可证(显示为NULL)，则默认受专有版权保护，在你分发(开源作品)前，你需要尝试联系作者获得授权。<br />
-        避风港原则，许可证不限制ZeroCatNext分发您的作品。
-      </template>
-      <v-card-actions>
-        <v-checkbox label="我已了解并确认" v-model="checklicense"></v-checkbox>
-
-      </v-card-actions>
-    </v-card><br /> <v-text>如果您已了解以上内容，请在下方的输入框中输入</v-text>
-    <br /><br />
+
+    <br />
+    <v-text>如果您已了解以上内容，请在下方的输入框中输入</v-text> <br /><br />
     <v-text-field hint="请准确输入上方的话" label="我保证会好好对待改编的作品" type="input" v-model="checktext" :rules="textRules" required
       variant="outlined" clearable></v-text-field>
     <br />
     <v-btn class="text-none" color="primary" rounded="xl" text="Fork" variant="flat" size="large"
-      @click="forkproject(project.id)" append-icon="mdi-arrow-right"
-      :disabled="!checkknow || !checklicense || !checktext"></v-btn> <!-- login button -->
-
+      @click="getProjectFile(project.id)" append-icon="mdi-arrow-right" :disabled="!checktext"></v-btn>
+    <!-- login button  -->
   </v-container>
 </template>
 
 <script>
 import openEditor from "../../../stores/openEdit";
 
-import request from '../../../axios/axios'
-import '@waline/client/style';
+import request from "../../../axios/axios";
+import "@waline/client/style";
 import { localuser } from "@/stores/user";
 export default {
   data() {
     return {
       project: {},
+      projectfile: {},
+      newid: '',
       openEditor: openEditor,
       localuser: localuser,
-      checktext: '',
-      checkknow: false, checklicense: false,
+      checktext: "",
+      checkknow: false,
+      checklicense: false,
+      scratch_proxy: import.meta.env.VITE_APP_SCRATCH_PROXY,
 
       textRules: [
-        value => {
-          if (value) return true
+        (value) => {
+          if (value) return true;
 
-          return '记得输入内容哦~'
+          return "记得输入内容哦~";
         },
-        value => {
-          if (value != '我保证会好好对待改编的作品') {
-
-            return '输的不太对~'
+        (value) => {
+          if (value != "我保证会好好对待改编的作品") {
+            return "输的不太对~";
           }
         },
       ],
-    }
+    };
   },
 
   async created() {
-    await this.getproject()
+    await this.getproject();
   },
 
   methods: {
     async getproject() {
       this.project = await request({
-        url: '/api/projectinfo?id=' + this.$route.params.id,
-        method: 'get',
-      })
-      console.log(this.project)
+        url: this.scratch_proxy + "/projects/" + this.$route.params.id,
+        method: "get",
+      });
+      console.log(this.project);
     },
-  async forkproject(id) {
-
-    await request({
-      url: '/project/' + id + '/fork',
-      method: 'post',
-    }).then(res => {
-      console.log(res)
-        this.$toast.add({
-          severity: 'success',
-          summary: '成功',
-          detail: '分叉成功',
-          life: 3000,
+    async forkproject(id) {
+      await request({
+        url: "/project/" + id + "/fork",
+        method: "post",
+      })
+        .then((res) => {
+          console.log(res);
+          this.$toast.add({
+            severity: "success",
+            summary: "成功",
+            detail: "分叉成功",
+            life: 3000,
+          });
+          if (res.id) {
+            this.$router.push("/projects/" + res.id);
+          }
         })
-        if (res.id){
-          this.$router.push('/projects/' + res.id)
-        }
-    }).catch(err => {
-      console.log(err)
+        .catch((err) => {
+          console.log(err);
+          this.$toast.add({
+            severity: "error",
+            summary: "错误",
+            detail: err,
+            life: 3000,
+          });
+        });
+    },
+    async getProjectFile() {
+  try {
+    // 获取项目详情
+    await this.getproject();
+
+    // 获取项目文件
+    const projectFileRes = await request({
+      url: `${this.scratch_proxy}/projects/source/${this.$route.params.id}?token=${this.project.project_token}`,
+      method: 'get',
+    });
+
+    console.log(projectFileRes);
+    this.$toast.add({
+      severity: 'success',
+      summary: '成功',
+      detail: '获取项目文件成功',
+      life: 3000,
+    });
+    this.projectfile = projectFileRes;
+
+    // 提交项目
+    const createProjectRes = await request.post('/project/', {
+      title: this.project.title,
+      type: 'scratch',
+      state: 'public',
+    });
+
+    console.log(createProjectRes);
+    this.$toast.add({
+      severity: 'info',
+      summary: '信息',
+      detail: createProjectRes,
+      life: 3000,
+    });
+
+    if (createProjectRes.status === '1') {
+      this.newid = createProjectRes.id;
+
+      // 上传项目文件
+      const uploadRes = await request.put(`/project/${this.newid}/source`, this.projectfile);
+      console.log(uploadRes);
+      this.$toast.add({
+        severity: 'info',
+        summary: '信息',
+        detail: uploadRes,
+        life: 3000,
+      });
+
+      // 推送项目
+      const pushRes = await request.post(`/project/${this.newid}/push`);
+      console.log(pushRes);
       this.$toast.add({
-        severity: 'error',
-        summary: '错误',
-        detail: err,
+        severity: 'info',
+        summary: '信息',
+        detail: pushRes,
         life: 3000,
-      }
-      )
-    })
+      });
+    }
+  } catch (error) {
+    console.error(error);
+    this.$toast.add({
+      severity: 'error',
+      summary: '错误',
+      detail: '操作失败，请稍后再试',
+      life: 3000,
+    });
   }
-  },
 }
 
-
+  },
+};
 </script>
diff --git a/src/pages/proxy/[id]/index.vue b/src/pages/proxy/[id]/index.vue
index 5779185..62f167e 100644
--- a/src/pages/proxy/[id]/index.vue
+++ b/src/pages/proxy/[id]/index.vue
@@ -94,6 +94,20 @@
           </div>
 
           <br />
+        </v-card> <br />
+        <v-card
+          subtitle="此项目可以被存储到ZeroCat服务器"
+          title="存储此项目"
+        >
+          <v-card-text class="bg-surface-light pt-4">
+            此项目可以被存储到ZeroCat服务器
+          </v-card-text>
+          <template v-slot:actions>
+
+            <v-btn :to="'/proxy/' + project.id + '/fork'" variant="text"
+              >保存到ZeroCat</v-btn
+            >
+          </template>
         </v-card>
         <br />
         <v-card
@@ -103,7 +117,7 @@
           <v-card-text class="bg-surface-light pt-4">
             我们使用这种方式促进Scratch及其社区的发展，这些内容是按照<a
               >署名-相同方式共享 2.0 通用</a
-            >协议传播的，您可以在<a>https://creativecommons.org/licenses/by-sa/2.0/</a>查看协议全文。
+            >协议传播的，您可以在<a href="https://creativecommons.org/licenses/by-sa/2.0/">creativecommons.org</a>查看协议全文。
           </v-card-text>
           <template v-slot:actions>
             <v-btn
diff --git a/src/pages/proxy/[id]/push.vue b/src/pages/proxy/[id]/push.vue
deleted file mode 100644
index 9afe5ea..0000000
--- a/src/pages/proxy/[id]/push.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <v-container class="pa-md-12">
-    <div class="d-flex justify-space-between">
-      <h1 class="text-h4">推送 <span v-text="project.title"></span></h1>
-
-
-    </div><br />
-    <v-card>
-      <template v-slot:title>
-        {{ project.title }}
-      </template>
-
-      <template v-slot:subtitle>
-        发布于：{{ project.time }}，{{ project.view_count }}次浏览
-      </template>
-
-      <template v-slot:text>
-        {{ project.description }}
-      </template>
-
-    </v-card><br />
-    <v-card>
-      <template v-slot:title>
-        你正在推送你的项目
-      </template>
-
-      <template v-slot:subtitle>
-        等等，确认点事 </template>
-
-      <template v-slot:text>
-        你正在推送 <span v-text="project.title"></span> ，这将会从项目开发分支代码复制到生产分支，并创建一份历史记录，您的用户将会看到新的作品。
-      </template>
-
-    </v-card>
-    <br /><v-card>
-      <template v-slot:title>
-        您可以执行推送
-      </template>
-
-      <template v-slot:subtitle>
-        分支保护
-      </template>
-
-      <template v-slot:text> 没有有关的分支保护
-      </template>
-      <v-card-actions>
-        <v-checkbox label="我已了解并确认" v-model="checkprotect"></v-checkbox>
-
-      </v-card-actions>
-    </v-card><br />
-    <br /><br />
-
-    <br />
-    <v-btn class="text-none" color="primary" rounded="xl" text="Push" variant="flat" size="large"
-      @click="pushproject(project.id)" append-icon="mdi-arrow-right" :disabled="!checkprotect"></v-btn>
-    <!-- login button -->
-
-  </v-container>
-</template>
-
-<script>
-
-import request from '../../../axios/axios'
-import '@waline/client/style';
-import { localuser } from "@/stores/user";
-export default {
-  data() {
-    return {
-      project: {},
-      localuser: localuser,
-      checkprotect: true,
-
-
-    }
-  },
-
-  async created() {
-    await this.getproject()
-    if (!this.localuser.user && this.project.authorid != this.localuser.user.id) {
-      this.$toast.add({
-        severity: 'error',
-        summary: '错误',
-        detail: '您不是项目所有者或您未登录',
-        life: 3000,
-      })
-      this.$router.push('/')
-    }
-  },
-
-  methods: {
-    async getproject() {
-      this.project = await request({
-        url: '/api/projectinfo?id=' + this.$route.params.id,
-        method: 'get',
-      })
-      console.log(this.project)
-    },
-    async pushproject(id) {
-
-      await request({
-        url: '/project/' + id + '/push',
-        method: 'post',
-      }).then(res => {
-        console.log(res)
-        this.$toast.add({
-          severity: 'success',
-          summary: '成功',
-          detail: '推送成功',
-          life: 3000,
-        })
-        if (res.status=='1') {
-          this.$router.push('/projects/' + this.project.id)
-        }
-      }).catch(err => {
-        console.log(err)
-        this.$toast.add({
-          severity: 'error',
-          summary: '错误',
-          detail: err,
-          life: 3000,
-        }
-        )
-      })
-    }
-  },
-}
-
-
-</script>