Oneric/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Pull requests Activity

Revert "recover border between basic-user-card using list component"

Browse source 
This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc.

# Conflicts:
#	src/components/follow_requests/follow_requests.vue
#	src/components/user_search/user_search.vue
#	src/components/who_to_follow/who_to_follow.vue
This commit is contained in:
taehoon 2019-04-16 23:29:11 -04:00
parent bd88a481c6
commit de945e5f88
6 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/follow_requests/follow_requests.js
View file

@ -1,10 +1,8 @@
import FollowRequestCard from '../follow_request_card/follow_request_card.vue' import FollowRequestCard from '../follow_request_card/follow_request_card.vue'
import List from '../list/list.vue'
const FollowRequests = { const FollowRequests = {
components: { components: {
FollowRequestCard, FollowRequestCard
List
}, },
computed: { computed: {
requests () { requests () {

6
src/components/follow_requests/follow_requests.vue
View file

@ -4,11 +4,7 @@
{{$t('nav.friend_requests')}} {{$t('nav.friend_requests')}}
</div> </div>
<div class="panel-body"> <div class="panel-body">
<List :items="requests"> <FollowRequestCard v-for="request in requests" :key="request.id" :user="request" class="list-item"/>
<template slot="item" slot-scope="{item}">
<FollowRequestCard :user="item" />
</template>
</List>
</div> </div>
</div> </div>
</template> </template>

4
src/components/user_search/user_search.js
View file

@ -1,10 +1,8 @@
import FollowCard from '../follow_card/follow_card.vue' import FollowCard from '../follow_card/follow_card.vue'
import List from '../list/list.vue'
import userSearchApi from '../../services/new_api/user_search.js' import userSearchApi from '../../services/new_api/user_search.js'
const userSearch = { const userSearch = {
components: { components: {
FollowCard, FollowCard
List
}, },
props: [ props: [
'query' 'query'

6
src/components/user_search/user_search.vue
View file

@ -13,11 +13,7 @@
<i class="icon-spin3 animate-spin"/> <i class="icon-spin3 animate-spin"/>
</div> </div>
<div v-else class="panel-body"> <div v-else class="panel-body">
<List :items="users"> <FollowCard v-for="user in users" :key="user.id" :user="user" class="list-item"/>
<template slot="item" slot-scope="{item}">
<FollowCard :user="item" />
</template>
</List>
</div> </div>
</div> </div>
</template> </template>

4
src/components/who_to_follow/who_to_follow.js
View file

@ -1,11 +1,9 @@
import apiService from '../../services/api/api.service.js' import apiService from '../../services/api/api.service.js'
import FollowCard from '../follow_card/follow_card.vue' import FollowCard from '../follow_card/follow_card.vue'
import List from '../list/list.vue'
const WhoToFollow = { const WhoToFollow = {
components: { components: {
FollowCard, FollowCard
List
}, },
data () { data () {
return { return {

6
src/components/who_to_follow/who_to_follow.vue
View file

@ -4,11 +4,7 @@
{{$t('who_to_follow.who_to_follow')}} {{$t('who_to_follow.who_to_follow')}}
</div> </div>
<div class="panel-body"> <div class="panel-body">
<List :items="users"> <FollowCard v-for="user in users" :key="user.id" :user="user" class="list-item"/>
<template slot="item" slot-scope="{item}">
<FollowCard :user="item" />
</template>
</List>
</div> </div>
</div> </div>
</template> </template>