Remove (almost) server side data rendering from repo-search component (#2317)
* Rename some shorthands * Remove (almost) server side data rendering from repo-search component template
This commit is contained in:
Morlinest
Lunny Xiao
parent
2c6a0fdca8
commit
7455604f0c
2 changed files with 74 additions and 46 deletions
|
|
@ -1687,13 +1687,33 @@ function initVueComponents(){
|
||||||
type: Number,
|
type: Number,
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
organizations: {
|
||||||
|
type: Array,
|
||||||
|
default: []
|
||||||
|
},
|
||||||
|
isOrganization: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true
|
||||||
|
},
|
||||||
|
canCreateOrganization: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
|
organizationsTotalCount: {
|
||||||
|
type: Number,
|
||||||
|
default: 0
|
||||||
|
},
|
||||||
|
moreReposLink: {
|
||||||
|
type: String,
|
||||||
|
default: ''
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function() {
|
data: function() {
|
||||||
return {
|
return {
|
||||||
tab: 'repos',
|
tab: 'repos',
|
||||||
repos: [],
|
repos: [],
|
||||||
reposTotal: 0,
|
reposTotalCount: 0,
|
||||||
reposFilter: 'all',
|
reposFilter: 'all',
|
||||||
searchQuery: '',
|
searchQuery: '',
|
||||||
isLoading: false
|
isLoading: false
|
||||||
|
|
@ -1741,7 +1761,7 @@ function initVueComponents(){
|
||||||
if (searchedQuery == self.searchQuery) {
|
if (searchedQuery == self.searchQuery) {
|
||||||
self.repos = result.data;
|
self.repos = result.data;
|
||||||
if (searchedQuery == "") {
|
if (searchedQuery == "") {
|
||||||
self.reposTotal = request.getResponseHeader('X-Total-Count');
|
self.reposTotalCount = request.getResponseHeader('X-Total-Count');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}).always(function() {
|
}).always(function() {
|
||||||
|
|
|
||||||
|
|
@ -8,19 +8,34 @@
|
||||||
{{template "user/dashboard/feeds" .}}
|
{{template "user/dashboard/feeds" .}}
|
||||||
</div>
|
</div>
|
||||||
<div id="app" class="six wide column">
|
<div id="app" class="six wide column">
|
||||||
<repo-search :search-limit="searchLimit" :suburl="suburl" :uid="uid" inline-template v-cloak>
|
<repo-search
|
||||||
<div>
|
:search-limit="searchLimit"
|
||||||
|
:suburl="suburl"
|
||||||
|
:uid="uid"
|
||||||
|
:more-repos-link="'{{.ContextUser.HomeLink}}'"
|
||||||
{{if not .ContextUser.IsOrganization}}
|
{{if not .ContextUser.IsOrganization}}
|
||||||
<div class="ui two item stackable tabable menu">
|
:organizations="[
|
||||||
<a :class="{item: true, active: tab === 'repos'}" @click="changeTab('repos')">{{.i18n.Tr "repository"}}</a>
|
{{range .ContextUser.Orgs}}
|
||||||
<a :class="{item: true, active: tab === 'orgs'}" @click="changeTab('orgs')">{{.i18n.Tr "organization"}}</a>
|
{name: '{{.Name}}', num_repos: '{{.NumRepos}}'},
|
||||||
</div>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
<div v-if="tab === 'repos'" class="ui tab active list">
|
]"
|
||||||
|
:is-organization="false"
|
||||||
|
:organizations-total-count="{{.ContextUser.GetOrganizationCount}}"
|
||||||
|
:can-create-organization="{{.SignedUser.CanCreateOrganization}}"
|
||||||
|
{{end}}
|
||||||
|
inline-template
|
||||||
|
v-cloak
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<div v-if="!isOrganization" class="ui two item stackable tabable menu">
|
||||||
|
<a :class="{item: true, active: tab === 'repos'}" @click="changeTab('repos')">{{.i18n.Tr "repository"}}</a>
|
||||||
|
<a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{.i18n.Tr "organization"}}</a>
|
||||||
|
</div>
|
||||||
|
<div v-show="tab === 'repos'" class="ui tab active list">
|
||||||
<h4 class="ui top attached header">
|
<h4 class="ui top attached header">
|
||||||
{{.i18n.Tr "home.my_repos"}} <span class="ui grey label">${ reposTotal }</span>
|
{{.i18n.Tr "home.my_repos"}} <span class="ui grey label">${reposTotalCount}</span>
|
||||||
<div class="ui right">
|
<div class="ui right">
|
||||||
<a class="poping up" href="{{AppSubUrl}}/repo/create" data-content="{{.i18n.Tr "new_repo"}}" data-variation="tiny inverted" data-position="left center">
|
<a class="poping up" :href="suburl + '/repo/create>'" data-content="{{.i18n.Tr "new_repo"}}" data-variation="tiny inverted" data-position="left center">
|
||||||
<i class="plus icon"></i>
|
<i class="plus icon"></i>
|
||||||
<span class="sr-only">{{.i18n.Tr "new_repo"}}</span>
|
<span class="sr-only">{{.i18n.Tr "new_repo"}}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
@ -42,51 +57,44 @@
|
||||||
<div class="ui attached table segment">
|
<div class="ui attached table segment">
|
||||||
<ul class="repo-owner-name-list">
|
<ul class="repo-owner-name-list">
|
||||||
<li v-for="repo in repos" :class="{'private': repo.private}" v-show="showRepo(repo, reposFilter)">
|
<li v-for="repo in repos" :class="{'private': repo.private}" v-show="showRepo(repo, reposFilter)">
|
||||||
<a :href="'{{AppSubUrl}}/' + repo.full_name">
|
<a :href="suburl + '/' + repo.full_name">
|
||||||
<i :class="repoClass(repo)"></i>
|
<i :class="repoClass(repo)"></i>
|
||||||
<strong class="text truncate item-name">${ repo.full_name }</strong>
|
<strong class="text truncate item-name">${repo.full_name}</strong>
|
||||||
<span class="ui right text light grey">
|
<span class="ui right text light grey">
|
||||||
${ repo.stars_count } <i class="octicon octicon-star rear"></i>
|
${repo.stars_count} <i class="octicon octicon-star rear"></i>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li v-if="repos.length < reposTotal">
|
<li v-if="repos.length < reposTotalCount">
|
||||||
<a href="{{.ContextUser.HomeLink}}">{{.i18n.Tr "home.show_more_repos"}}</a>
|
<a :href="moreReposLink">{{.i18n.Tr "home.show_more_repos"}}</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="!isOrganization" v-show="tab === 'organizations'" class="ui tab active list">
|
||||||
{{if not .ContextUser.IsOrganization}}
|
|
||||||
<div v-if="tab === 'orgs'" class="ui tab active list">
|
|
||||||
<h4 class="ui top attached header">
|
<h4 class="ui top attached header">
|
||||||
{{.i18n.Tr "home.my_orgs"}} <span class="ui grey label">{{.ContextUser.GetOrganizationCount}}</span>
|
{{.i18n.Tr "home.my_orgs"}} <span class="ui grey label">${organizationsTotalCount}</span>
|
||||||
<div class="ui right">
|
<div v-if="canCreateOrganization" class="ui right">
|
||||||
{{if .SignedUser.CanCreateOrganization}}
|
<a class="poping up" :href="suburl + '/org/create'" data-content="{{.i18n.Tr "new_org"}}" data-variation="tiny inverted" data-position="left center">
|
||||||
<a class="poping up" href="{{AppSubUrl}}/org/create" data-content="{{.i18n.Tr "new_org"}}" data-variation="tiny inverted" data-position="left center">
|
|
||||||
<i class="plus icon"></i>
|
<i class="plus icon"></i>
|
||||||
<span class="sr-only">{{.i18n.Tr "new_org"}}</span>
|
<span class="sr-only">{{.i18n.Tr "new_org"}}</span>
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
|
||||||
</div>
|
</div>
|
||||||
</h4>
|
</h4>
|
||||||
<div class="ui attached table segment">
|
<div class="ui attached table segment">
|
||||||
<ul class="repo-owner-name-list">
|
<ul class="repo-owner-name-list">
|
||||||
{{range .ContextUser.Orgs}}
|
<li v-for="org in organizations">
|
||||||
<li>
|
<a :href="suburl + '/' + org.name">
|
||||||
<a href="{{AppSubUrl}}/{{.Name}}">
|
|
||||||
<i class="octicon octicon-organization"></i>
|
<i class="octicon octicon-organization"></i>
|
||||||
<strong class="text truncate item-name">{{.Name}}</strong>
|
<strong class="text truncate item-name">${org.name}</strong>
|
||||||
<span class="ui right text light grey">
|
<span class="ui right text light grey">
|
||||||
{{.NumRepos}} <i class="octicon octicon-repo rear"></i>
|
${org.num_repos} <i class="octicon octicon-repo rear"></i>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{{end}}
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
|
||||||
</div>
|
</div>
|
||||||
</repo-search>
|
</repo-search>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue