Merge remote-tracking branch 'origin/repo-square' into repo-square

templates/explore/repos/search.tmpl

@@ -1,6 +1,8 @@
 {{template "base/head_home" .}}
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-repos-search.css?v={{MD5 AppVer}}" />
-<div id="__vue-root">
-</div>
+<script>
+  var staticSquareTopics = {{ .SquareTopics }};
+</script>
+<div id="__vue-root"></div>
 <script src="{{StaticUrlPrefix}}/js/vp-repos-search.js?v={{MD5 AppVer}}"></script>
 {{template "base/footer" .}}

templates/explore/repos/square.tmpl

@@ -1,6 +1,16 @@
 {{template "base/head_home" .}}
+{{ if .SquareBanners }}
+  {{ range .SquareBanners }}
+    <img preload style="height:0;width:0;position:absolute;left:-2000px;" src="{{.src}}" />
+  {{ end }}
+{{ end }}
 <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/vp-repos-square.css?v={{MD5 AppVer}}" />
-<div id="__vue-root">
-</div>
+<script>
+  var staticSquareBanners = {{ .SquareBanners }};
+  var staticSquarePreferredRepos = {{ .SquarePreferredRepos }};
+  var staticSquareTopics = {{ .SquareTopics }};
+  var staticSquareRecommendRepos = {{ .SquareRecommendRepos }};
+</script>
+<div id="__vue-root"></div>
 <script src="{{StaticUrlPrefix}}/js/vp-repos-square.js?v={{MD5 AppVer}}"></script>
 {{template "base/footer" .}}

web_src/vuepages/langs/config/en-US.js

@@ -311,6 +311,7 @@ const en = {
     watch: 'Watch',
     star: 'Star',
     fork: 'Fork',
+    noReposfound: 'No matching repositories found.',
   }
 }
 

web_src/vuepages/langs/config/zh-CN.js

@@ -328,6 +328,7 @@ const zh = {
     watch: '关注',
     star: '点赞',
     fork: '派生',
+    noReposfound: '未找到匹配的项目。',
   },
 }
 

web_src/vuepages/pages/repos/components/RecommendRepos.vue

@@ -15,7 +15,10 @@ import { getHomePageData } from '~/apis/modules/repos';
 
 export default {
   name: "RecommendRepos",
-  props: {},
+  props: {
+    static: { type: Boolean, default: false },
+    staticSwiperData: { type: Array, default: () => [] },
+  },
   components: {},
   data() {
     return {
@@ -93,11 +96,15 @@ export default {
     }
   },
   mounted() {
-    getHomePageData().then(res => {
-      this.renderRepos(res.data.repo);
-    }).catch(err => {
-      console.log(err);
-    });
+    if (this.static) {
+      this.renderRepos(this.staticSwiperData);
+    } else {
+      getHomePageData().then(res => {
+        this.renderRepos(res.data.repo);
+      }).catch(err => {
+        console.log(err);
+      });
+    }
   },
 };
 </script>

web_src/vuepages/pages/repos/components/ReposList.vue

@@ -4,6 +4,7 @@
       <div class="repos-item-container" v-for="(item, index) in list" :key="item.ID">
         <ReposItem :data="item" :topic="topic"></ReposItem>
       </div>
+      <div v-show="(!list.length && !loading)" class="repos-no-data">{{ $t('repos.noReposfound') }}</div>
     </div>
     <div class="center">
       <el-pagination background @current-change="currentChange" @size-change="sizeChange" :current-page="page"
@@ -118,4 +119,11 @@ export default {
 .center {
   text-align: center;
 }
+
+.repos-no-data {
+  height: 60px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>

web_src/vuepages/pages/repos/components/SearchBar.vue

@@ -66,6 +66,8 @@ export default {
     searchValue: { type: String, default: '' },
     topic: { type: String, default: '' },
     sort: { type: String, default: '' },
+    static: { type: Boolean, default: false },
+    staticTopicsData: { type: String, default: '[]' },
   },
   components: {},
   data() {
@@ -83,6 +85,10 @@ export default {
     setDefaultSearch(params) {
       this.searchInputValue = params.q || '';
       this.selectTopic = params.topic || '';
+      this.selectTopic && this.changeTopic({
+        k: this.selectTopic.toLocaleLowerCase(),
+        v: this.selectTopic,
+      })
     },
     changeTopic(topicItem) {
       const index_ori = this.topicOri.findIndex((item) => {
@@ -108,21 +114,7 @@ export default {
       }
       this.search();
     },
-    search() {
-      if (this.type == 'square') {
-        window.location.href = `/explore/repos?q=${this.searchInputValue}&sort=${this.sort}&topic=${this.selectTopic}`;
-      } else {
-        this.$emit('change', {
-          q: this.searchInputValue,
-          topic: this.selectTopic,
-        });
-      }
-    }
-  },
-  watch: {},
-  mounted() {
-    getPromoteData('/repos/recommend_topics').then(res => {
-      const data = res.data;
+    handlerTopicsData(data) {
       try {
         const topicsData = JSON.parse(data);
         const topics = topicsData.map((item) => {
@@ -148,9 +140,33 @@ export default {
       } catch (err) {
         console.log(err);
       }
-    }).catch(err => {
-      console.log(err);
-    });
+    },
+    search() {
+      if (this.type == 'square') {
+        window.location.href = `/explore/repos?q=${this.searchInputValue}&sort=${this.sort}&topic=${this.selectTopic}`;
+      } else {
+        this.$emit('change', {
+          q: this.searchInputValue,
+          topic: this.selectTopic,
+        });
+      }
+    }
+  },
+  mounted() {
+    if (this.static) {
+      try {
+        this.handlerTopicsData(this.staticTopicsData);
+      } catch (err) {
+        console.log(err);
+      }
+    } else {
+      getPromoteData('/repos/recommend_topics').then(res => {
+        const data = res.data;
+        this.handlerTopicsData(data);
+      }).catch(err => {
+        console.log(err);
+      });
+    }
   },
 };
 </script>

web_src/vuepages/pages/repos/components/SquareTop.vue

@@ -40,7 +40,11 @@ import { getReposSquareTabData } from '~/apis/modules/repos';
 
 export default {
   name: "SquareTop",
-  props: {},
+  props: {
+    static: { type: Boolean, default: false },
+    staticSwiperData: { type: Array, default: () => [] },
+    staticBannerData: { type: String, default: '[]' },
+  },
   components: {},
   data() {
     return {
@@ -147,8 +151,17 @@ export default {
   },
   mounted() {
     this.initSwiper();
-    this.getBannerData();
-    this.getTabData();
+    if (this.static) {
+      try {
+        this.bannerData = JSON.parse(this.staticBannerData);
+      } catch (err) {
+        console.log(err);
+      }
+      this.renderSwiper(this.staticSwiperData);
+    } else {
+      this.getBannerData();
+      this.getTabData();
+    }
   },
 };
 </script>

web_src/vuepages/pages/repos/search/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
     <div class="ui container">
-      <SearchBar ref="searchBarRef" type="search" :sort="reposListSortType" :searchValue="reposListQurey"
-        :topic="reposListTopic" @change="searchBarChange"></SearchBar>
+      <SearchBar ref="searchBarRef" type="search" :static="true" :staticTopicsData="staticSquareTopics"
+        :sort="reposListSortType" :searchValue="reposListQurey" :topic="reposListTopic" @change="searchBarChange">
+      </SearchBar>
     </div>
     <div class="ui container">
       <div class="ui grid">
@@ -34,12 +35,16 @@ import ActiveUsers from '../components/ActiveUsers.vue';
 import ActiveOrgs from '../components/ActiveOrgs.vue';
 import { getUrlSearchParams } from '~/utils';
 
+const staticSquareTopics = JSON.stringify(window.staticSquareTopics || []);
+
 export default {
   data() {
     return {
       reposListSortType: 'mostpopular',
       reposListQurey: '',
       reposListTopic: '',
+
+      staticSquareTopics: staticSquareTopics,
     };
   },
   components: {
@@ -71,10 +76,12 @@ export default {
     this.reposListTopic = urlParams.topic || '';
     this.reposListSortType = urlParams.sort || 'mostpopular';
     this.search();
-    this.$refs.reposFiltersRef.setDefaultFilter(this.reposListSortType);
-    this.$refs.searchBarRef.setDefaultSearch({
-      q: this.reposListQurey,
-      topic: this.reposListTopic,
+    this.$nextTick(() => {
+      this.$refs.reposFiltersRef.setDefaultFilter(this.reposListSortType);
+      this.$refs.searchBarRef.setDefaultSearch({
+        q: this.reposListQurey,
+        topic: this.reposListTopic,
+      });
     });
   },
   beforeDestroy() { },

web_src/vuepages/pages/repos/square/index.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
     <div>
-      <SquareTop></SquareTop>
+      <SquareTop :static="true" :staticBannerData="staticSquareBanners" :staticSwiperData="staticSquarePreferredRepos">
+      </SquareTop>
     </div>
     <div class="ui container">
-      <SearchBar ref="searchBarRef" type="square" :sort="``" :searchValue="reposListQurey" :topic="``"
-        @change="searchBarChange"></SearchBar>
+      <SearchBar :static="true" :staticTopicsData="staticSquareTopics" ref="searchBarRef" type="square" :sort="``"
+        :searchValue="reposListQurey" :topic="``" @change="searchBarChange"></SearchBar>
     </div>
     <div class="recommend-repos-c">
-      <RecommendRepos></RecommendRepos>
+      <RecommendRepos :static="true" :staticSwiperData="staticSquareRecommendRepos"></RecommendRepos>
     </div>
     <div class="ui container">
       <div class="ui grid">
@@ -41,12 +42,22 @@ import ReposList from '../components/ReposList.vue';
 import ActiveUsers from '../components/ActiveUsers.vue';
 import ActiveOrgs from '../components/ActiveOrgs.vue';
 
+const staticSquareBanners = JSON.stringify(window.staticSquareBanners || []);
+const staticSquarePreferredRepos = window.staticSquarePreferredRepos || [];
+const staticSquareTopics = JSON.stringify(window.staticSquareTopics || []);
+const staticSquareRecommendRepos = window.staticSquareRecommendRepos || [];
+
 export default {
   data() {
     return {
       reposListSortType: 'mostpopular',
       reposListQurey: '',
       reposListTopic: '',
+
+      staticSquareBanners: staticSquareBanners,
+      staticSquarePreferredRepos: staticSquarePreferredRepos,
+      staticSquareTopics: staticSquareTopics,
+      staticSquareRecommendRepos: staticSquareRecommendRepos,
     };
   },
   components: {