新的项目素材管理

Author: Sunwuyuan

public/scratch

@@ -62,9 +62,7 @@
               @click="notificationsCard?.fetchNotifications()"
             >
               <v-avatar
-                :image="
-                  s3BucketUrl + '/user/' + localuser.user.value.avatar
-                "
+                :image="localuser.getUserAvatar()"
               ></v-avatar>
             </v-btn>
           </template>
@@ -116,7 +114,7 @@
               <v-window-item value="profile">
                 <v-card
                   :append-avatar="
-                    s3BucketUrl + '/user/' + localuser.user.value.avatar
+                    localuser.getUserAvatar()
                   "
                   :subtitle="localuser.user.value.username"
                   :title="localuser.user.value.display_name"

src/components/AppHeader.vue

@@ -36,7 +36,7 @@
                 size="42"
               >
                 <v-img
-                  :src="s3BucketUrl + '/user/' + notification.actor.avatar"
+                  :src=" localuser.getUserAvatar(notification.actor.avatar)"
                   alt="用户头像"
                 ></v-img>
               </v-avatar>
@@ -163,7 +163,7 @@ import {
 } from "@/services/notificationService";
 import {getProjectInfo, getProjectListById} from "@/services/projectService";
 import {get} from "@/services/serverConfig";
-
+import { localuser } from "@/services/localAccount";
 export default {
   name: "NotificationsCardContent",
   props: {
@@ -608,6 +608,7 @@ export default {
       s3BucketUrl,
       projectCache,
       projectListCache,
+      localuser,
     };
   },
 };

src/components/NotificationsCardContent.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="search-component">
-
     <v-form @submit.prevent="handleSearch">
       <div class="d-flex align-center gap-2">
         <v-text-field
@@ -104,7 +103,7 @@
                       v-bind="props"
                     >
                       <v-img
-                        :src="s3BucketUrl + '/scratch_slt/' + item.id"
+                        :src="getS3staticurl(item.thumbnail)"
                         class="align-end"
                         cover
                         error-src="../assets/43-lazyload.png"
@@ -194,8 +193,7 @@
 </template>
 
 <script>
-import {get} from '@/services/serverConfig';
-import {getProjectInfo} from '@/services/projectService';
+import {getS3staticurl} from '@/services/projectService';
 import {
   loadSearchHistory,
   addToSearchHistory,
@@ -230,7 +228,7 @@ export default {
       totalHits: 0,
       totalPages: 0,
       urlMap: {},
-      s3BucketUrl: '',
+      getS3staticurl: getS3staticurl,
       hotSearches: ['Scratch', '游戏', '动画', '音乐', '艺术', '编程'],
     };
   },
@@ -255,7 +253,6 @@ export default {
 
   async created() {
     this.searchHistory = loadSearchHistory();
-    this.s3BucketUrl = await get('s3.staticurl');
   },
 
   methods: {

src/components/SearchComponent.vue

@@ -23,7 +23,7 @@
         width="150"
       >
         <v-img
-          :src="previewImage || (s3BucketUrl + '/user/' + userData.avatar)"
+          :src="previewImage || ( localuser.getUserAvatar())"
           class="bg-grey-lighten-3"
           cover
           height="150"
@@ -56,7 +56,7 @@
 <script>
 import Compressor from "compressorjs";
 import {uploadUserAvatar} from "@/services/accountService";
-
+import { localuser } from "@/services/localAccount";
 export default {
   name: "AvatarEditor",
   props: {
@@ -73,7 +73,8 @@ export default {
     return {
       loading: false,
       avatarFile: null,
-      previewImage: null
+      previewImage: null,
+      localuser,
     };
   },
   methods: {

src/components/account/AvatarEditor.vue

@@ -4,7 +4,7 @@
       <v-avatar class="ma-3" size="64">
         <v-img
           :alt="userData.display_name"
-          :src="s3BucketUrl + '/user/' + userData.avatar"
+          :src="localuser.getUserAvatar(userData.avatar)"
           cover
         ></v-img>
       </v-avatar>
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+import { localuser } from "@/services/localAccount";
 export default {
   name: "UserCard",
   props: {
@@ -56,6 +57,11 @@ export default {
       type: String,
       required: true
     }
-  }
+  },
+  data() {
+    return {
+      localuser,
+    };
+  },
 };
 </script>

src/components/account/UserCard.vue

@@ -27,7 +27,7 @@ import {computed} from 'vue'
 import TimeAgo from '../TimeAgo.vue'
 import Markdown from '../Markdown.vue'
 import {UAParser} from 'ua-parser-js'
-
+import { localuser } from "@/services/localAccount";
 const props = defineProps({
   comment: {
     type: Object,
@@ -41,7 +41,7 @@ const props = defineProps({
 
 const avatarUrl = computed(() => {
   if (props.comment?.user?.avatar) {
-    return props.s3BucketUrl + '/user/' + props.comment.user.avatar
+    return  localuser.getUserAvatar(props.comment.user.avatar)
   }
   return ''
 })

src/components/comment/CommentContent.vue

@@ -13,7 +13,7 @@
 
 <script setup>
 import {computed} from 'vue'
-
+import { localuser } from "@/services/localAccount";
 const props = defineProps({
   comment: {
     type: Object,
@@ -27,7 +27,7 @@ const props = defineProps({
 
 const avatarUrl = computed(() => {
   if (props.comment?.user?.avatar) {
-    return props.s3BucketUrl + '/user/' + props.comment.user.avatar
+    return  localuser.getUserAvatar(props.comment.user.avatar)
   }
   return ''
 })

src/components/comment/CommentListItem.vue

@@ -23,7 +23,7 @@
     </v-card>
     <!-- 作者信息区域 -->
     <v-card-item v-if="extension.author"
-                 :append-avatar="extension.author.avatar ? s3BucketUrl + '/user/' + extension.author.avatar : ''">
+                 :append-avatar="extension.author.avatar ? localuser.getUserAvatar(extension.author.avatar) : ''">
       <v-card-title>{{ extension.author.display_name || extension.author.username || "未知用户" }}</v-card-title>
       <v-card-subtitle>{{ extension.author.username || "" }}</v-card-subtitle>
     </v-card-item>
@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import { localuser } from "@/services/localAccount";
 export default {
   name: 'ExtensionCard',
   props: {
@@ -45,6 +46,11 @@ export default {
       required: true
     }
   },
+  data() {
+    return {
+      localuser,
+    };
+  },
   computed: {
     extensionTags() {
       if (!this.extension.project?.tags) return [];

src/components/extensions/ExtensionCard.vue

@@ -193,7 +193,7 @@
                     <template v-slot:prepend>
                       <v-avatar>
                         <v-img
-                          :src="s3BucketUrl + '/user/' + selectedSampleProject.author?.avatar || ''"
+                          :src="localuser.getUserAvatar(selectedSampleProject.author?.avatar) || ''"
                         ></v-img>
                       </v-avatar>
                     </template>
@@ -270,7 +270,7 @@
 <script>
 import request from "@/axios/axios";
 import { localuser } from "@/services/localAccount";
-import { get } from "@/services/serverConfig";
+
 import ProjectSelector from "../shared/ProjectSelector.vue";
 
 export default {
@@ -294,8 +294,7 @@ export default {
       formValid: false,
       loading: false,
       loadingCommits: false,
-      s3BucketUrl: '',
-
+      localuser,
       form: {
         branch: '',
         commit: '',
@@ -331,7 +330,7 @@ export default {
       }
 
       if (this.form.image) {
-        return this.s3BucketUrl + '/extension/' + this.form.image;
+        return localuser.getUserAvatar(this.form.image);
       }
 
       return null;
@@ -362,7 +361,6 @@ export default {
     }
   },
   async created() {
-    this.s3BucketUrl = await get('s3.staticurl');
     await this.fetchMyProjects();
   },
   methods: {