Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ilja
pleroma-fe
Commits
0d283c3f
Commit
0d283c3f
authored
6 years ago
by
Tae Hoon
Browse files
Options
Downloads
Patches
Plain Diff
Remove UserCard
parent
96e7e823
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/user_card/user_card.js
+0
-64
0 additions, 64 deletions
src/components/user_card/user_card.js
src/components/user_card/user_card.vue
+0
-159
0 additions, 159 deletions
src/components/user_card/user_card.vue
with
0 additions
and
223 deletions
src/components/user_card/user_card.js
deleted
100644 → 0
+
0
−
64
View file @
96e7e823
import
UserCardContent
from
'
../user_card_content/user_card_content.vue
'
import
UserAvatar
from
'
../user_avatar/user_avatar.vue
'
import
generateProfileLink
from
'
src/services/user_profile_link_generator/user_profile_link_generator
'
import
{
requestFollow
,
requestUnfollow
}
from
'
../../services/follow_manipulate/follow_manipulate
'
const
UserCard
=
{
props
:
[
'
user
'
,
'
noFollowsYou
'
,
'
showApproval
'
],
data
()
{
return
{
userExpanded
:
false
,
followRequestInProgress
:
false
,
followRequestSent
:
false
,
updated
:
false
}
},
components
:
{
UserCardContent
,
UserAvatar
},
computed
:
{
currentUser
()
{
return
this
.
$store
.
state
.
users
.
currentUser
},
following
()
{
return
this
.
updated
?
this
.
updated
.
following
:
this
.
user
.
following
},
showFollow
()
{
return
!
this
.
showApproval
&&
(
!
this
.
following
||
this
.
updated
&&
!
this
.
updated
.
following
)
}
},
methods
:
{
toggleUserExpanded
()
{
this
.
userExpanded
=
!
this
.
userExpanded
},
approveUser
()
{
this
.
$store
.
state
.
api
.
backendInteractor
.
approveUser
(
this
.
user
.
id
)
this
.
$store
.
dispatch
(
'
removeFollowRequest
'
,
this
.
user
)
},
denyUser
()
{
this
.
$store
.
state
.
api
.
backendInteractor
.
denyUser
(
this
.
user
.
id
)
this
.
$store
.
dispatch
(
'
removeFollowRequest
'
,
this
.
user
)
},
userProfileLink
(
user
)
{
return
generateProfileLink
(
user
.
id
,
user
.
screen_name
,
this
.
$store
.
state
.
instance
.
restrictedNicknames
)
},
followUser
()
{
this
.
followRequestInProgress
=
true
requestFollow
(
this
.
user
,
this
.
$store
).
then
(({
sent
,
updated
})
=>
{
this
.
followRequestInProgress
=
false
this
.
followRequestSent
=
sent
this
.
updated
=
updated
})
},
unfollowUser
()
{
this
.
followRequestInProgress
=
true
requestUnfollow
(
this
.
user
,
this
.
$store
).
then
(({
updated
})
=>
{
this
.
followRequestInProgress
=
false
this
.
updated
=
updated
})
}
}
}
export
default
UserCard
This diff is collapsed.
Click to expand it.
src/components/user_card/user_card.vue
deleted
100644 → 0
+
0
−
159
View file @
96e7e823
<
template
>
<div
class=
"card"
>
<router-link
:to=
"userProfileLink(user)"
>
<UserAvatar
class=
"avatar"
@
click.prevent.native=
"toggleUserExpanded"
:src=
"user.profile_image_url"
/>
</router-link>
<div
class=
"user-card-main-content"
>
<div
class=
"usercard"
v-if=
"userExpanded"
>
<user-card-content
:user=
"user"
:switcher=
"false"
></user-card-content>
</div>
<div
class=
"name-and-screen-name"
v-if=
"!userExpanded"
>
<div
:title=
"user.name"
class=
"user-name"
>
<span
v-if=
"user.name_html"
v-html=
"user.name_html"
></span>
<span
v-else
>
{{
user
.
name
}}
</span>
</div>
<div
class=
"user-link-action"
>
<router-link
class=
'user-screen-name'
:to=
"userProfileLink(user)"
>
@
{{
user
.
screen_name
}}
</router-link>
</div>
</div>
<div
class=
"follow-box"
v-if=
"!userExpanded"
>
<span
class=
"faint"
v-if=
"!noFollowsYou && user.follows_you"
>
{{
currentUser
.
id
==
user
.
id
?
$t
(
'
user_card.its_you
'
)
:
$t
(
'
user_card.follows_you
'
)
}}
</span>
<button
v-if=
"showFollow"
class=
"btn btn-default"
@
click=
"followUser"
:disabled=
"followRequestInProgress"
:title=
"followRequestSent ? $t('user_card.follow_again') : ''"
>
<template
v-if=
"followRequestInProgress"
>
{{
$t
(
'
user_card.follow_progress
'
)
}}
</
template
>
<
template
v-else-if=
"followRequestSent"
>
{{
$t
(
'
user_card.follow_sent
'
)
}}
</
template
>
<
template
v-else
>
{{
$t
(
'
user_card.follow
'
)
}}
</
template
>
</button>
<button
v-if=
"following"
class=
"btn btn-default pressed"
@
click=
"unfollowUser"
:disabled=
"followRequestInProgress"
>
<
template
v-if=
"followRequestInProgress"
>
{{
$t
(
'
user_card.follow_progress
'
)
}}
</
template
>
<
template
v-else
>
{{
$t
(
'
user_card.follow_unfollow
'
)
}}
</
template
>
</button>
</div>
<div
class=
"approval"
v-if=
"showApproval"
>
<button
class=
"btn btn-default"
@
click=
"approveUser"
>
{{ $t('user_card.approve') }}
</button>
<button
class=
"btn btn-default"
@
click=
"denyUser"
>
{{ $t('user_card.deny') }}
</button>
</div>
</div>
</div>
</template>
<
script
src=
"./user_card.js"
></
script
>
<
style
lang=
"scss"
>
@import
'../../_variables.scss'
;
.user-card-main-content
{
display
:
flex
;
flex-direction
:
column
;
flex
:
1
1
100%
;
margin-left
:
0
.7em
;
min-width
:
0
;
}
.name-and-screen-name
{
text-align
:
left
;
width
:
100%
;
.user-name
{
img
{
object-fit
:
contain
;
height
:
16px
;
width
:
16px
;
vertical-align
:
middle
;
}
}
.user-link-action
{
display
:
flex
;
align-items
:
flex-start
;
justify-content
:
space-between
;
}
}
.card
{
display
:
flex
;
flex
:
1
0
;
padding-top
:
0
.6em
;
padding-right
:
1em
;
padding-bottom
:
0
.6em
;
padding-left
:
1em
;
border-bottom
:
1px
solid
;
margin
:
0
;
border-bottom-color
:
$fallback--border
;
border-bottom-color
:
var
(
--
border
,
$fallback--border
);
.avatar
{
padding
:
0
;
}
.follow-box
{
text-align
:
center
;
flex-shrink
:
0
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
flex-wrap
:
wrap
;
line-height
:
1
.5em
;
.btn
{
margin-top
:
0
.5em
;
margin-left
:
auto
;
width
:
10em
;
}
}
}
.usercard
{
width
:
fill-available
;
border-radius
:
$fallback--panelRadius
;
border-radius
:
var
(
--
panelRadius
,
$fallback--panelRadius
);
border-style
:
solid
;
border-color
:
$fallback--border
;
border-color
:
var
(
--
border
,
$fallback--border
);
border-width
:
1px
;
overflow
:
hidden
;
.panel-heading
{
background
:
transparent
;
flex-direction
:
column
;
align-items
:
stretch
;
}
p
{
margin-bottom
:
0
;
}
}
.approval
{
display
:
flex
;
flex-direction
:
row
;
flex-wrap
:
wrap
;
button
{
margin-top
:
0
.5em
;
margin-right
:
0
.5em
;
flex
:
1
1
;
max-width
:
12em
;
min-width
:
8em
;
}
}
</
style
>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment