Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Hau Vo
pleroma-fe
Commits
1fecac9b
Commit
1fecac9b
authored
Feb 26, 2019
by
Tae Hoon
Browse files
Update naming
parent
8dd42cfc
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/components/basic_user_card/basic_user_card.vue
View file @
1fecac9b
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
<slot
name=
"secondary-area"
></slot>
<slot
name=
"secondary-area"
></slot>
</div>
</div>
</div>
</div>
<div
class=
"user-card-t
hird
-area"
>
<div
class=
"user-card-t
ertiary
-area"
>
<slot
name=
"t
hird
-area"
></slot>
<slot
name=
"t
ertiary
-area"
></slot>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/components/follow_card/follow_card.js
View file @
1fecac9b
...
@@ -8,7 +8,7 @@ const FollowCard = {
...
@@ -8,7 +8,7 @@ const FollowCard = {
],
],
data
()
{
data
()
{
return
{
return
{
p
rogress
:
false
,
inP
rogress
:
false
,
requestSent
:
false
,
requestSent
:
false
,
updated
:
false
updated
:
false
}
}
...
@@ -25,17 +25,17 @@ const FollowCard = {
...
@@ -25,17 +25,17 @@ const FollowCard = {
},
},
methods
:
{
methods
:
{
followUser
()
{
followUser
()
{
this
.
p
rogress
=
true
this
.
inP
rogress
=
true
requestFollow
(
this
.
user
,
this
.
$store
).
then
(({
sent
,
updated
})
=>
{
requestFollow
(
this
.
user
,
this
.
$store
).
then
(({
sent
,
updated
})
=>
{
this
.
p
rogress
=
false
this
.
inP
rogress
=
false
this
.
requestSent
=
sent
this
.
requestSent
=
sent
this
.
updated
=
updated
this
.
updated
=
updated
})
})
},
},
unfollowUser
()
{
unfollowUser
()
{
this
.
p
rogress
=
true
this
.
inP
rogress
=
true
requestUnfollow
(
this
.
user
,
this
.
$store
).
then
(({
updated
})
=>
{
requestUnfollow
(
this
.
user
,
this
.
$store
).
then
(({
updated
})
=>
{
this
.
p
rogress
=
false
this
.
inP
rogress
=
false
this
.
updated
=
updated
this
.
updated
=
updated
})
})
}
}
...
...
src/components/follow_card/follow_card.vue
View file @
1fecac9b
...
@@ -5,10 +5,10 @@
...
@@ -5,10 +5,10 @@
v-if=
"showFollow"
v-if=
"showFollow"
class=
"btn btn-default"
class=
"btn btn-default"
@
click=
"followUser"
@
click=
"followUser"
:disabled=
"
p
rogress"
:disabled=
"
inP
rogress"
:title=
"requestSent ? $t('user_card.follow_again') : ''"
:title=
"requestSent ? $t('user_card.follow_again') : ''"
>
>
<template
v-if=
"
p
rogress"
>
<template
v-if=
"
inP
rogress"
>
{{
$t
(
'
user_card.follow_progress
'
)
}}
{{
$t
(
'
user_card.follow_progress
'
)
}}
</
template
>
</
template
>
<
template
v-else-if=
"requestSent"
>
<
template
v-else-if=
"requestSent"
>
...
@@ -18,8 +18,8 @@
...
@@ -18,8 +18,8 @@
{{
$t
(
'
user_card.follow
'
)
}}
{{
$t
(
'
user_card.follow
'
)
}}
</
template
>
</
template
>
</button>
</button>
<button
v-if=
"following"
class=
"btn btn-default pressed"
@
click=
"unfollowUser"
:disabled=
"
p
rogress"
>
<button
v-if=
"following"
class=
"btn btn-default pressed"
@
click=
"unfollowUser"
:disabled=
"
inP
rogress"
>
<
template
v-if=
"
p
rogress"
>
<
template
v-if=
"
inP
rogress"
>
{{
$t
(
'
user_card.follow_progress
'
)
}}
{{
$t
(
'
user_card.follow_progress
'
)
}}
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
</
template
>
</
template
>
</button>
</button>
</template>
</template>
<
template
slot=
"t
hird
-area"
>
<
template
slot=
"t
ertiary
-area"
>
<span
class=
"faint"
v-if=
"!noFollowsYou && user.follows_you"
>
<span
class=
"faint"
v-if=
"!noFollowsYou && user.follows_you"
>
{{
isMe
?
$t
(
'
user_card.its_you
'
)
:
$t
(
'
user_card.follows_you
'
)
}}
{{
isMe
?
$t
(
'
user_card.its_you
'
)
:
$t
(
'
user_card.follows_you
'
)
}}
</span>
</span>
...
...
src/components/follow_request_card/follow_request_card.vue
View file @
1fecac9b
<
template
>
<
template
>
<basic-user-card
:user=
"user"
>
<basic-user-card
:user=
"user"
>
<template
slot=
"t
hird
-area"
>
<template
slot=
"t
ertiary
-area"
>
<div
class=
"follow-request-card-action-buttons-container"
>
<div
class=
"follow-request-card-action-buttons-container"
>
<button
class=
"btn btn-default"
@
click=
"approveUser"
>
{{
$t
(
'
user_card.approve
'
)
}}
</button>
<button
class=
"btn btn-default"
@
click=
"approveUser"
>
{{
$t
(
'
user_card.approve
'
)
}}
</button>
<button
class=
"btn btn-default"
@
click=
"denyUser"
>
{{
$t
(
'
user_card.deny
'
)
}}
</button>
<button
class=
"btn btn-default"
@
click=
"denyUser"
>
{{
$t
(
'
user_card.deny
'
)
}}
</button>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment