Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Dima Krasner
Sharkey
Commits
926eb346
Commit
926eb346
authored
3 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
fix errors
parent
e6e33fae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/client/src/components/users-dialog.vue
+0
-147
0 additions, 147 deletions
packages/client/src/components/users-dialog.vue
packages/client/src/pages/admin/instance.vue
+3
-33
3 additions, 33 deletions
packages/client/src/pages/admin/instance.vue
with
3 additions
and
180 deletions
packages/client/src/components/users-dialog.vue
deleted
100644 → 0
+
0
−
147
View file @
e6e33fae
<
template
>
<div
class=
"mk-users-dialog"
>
<div
class=
"header"
>
<span>
{{
title
}}
</span>
<button
class=
"_button"
@
click=
"close()"
><i
class=
"fas fa-times"
></i></button>
</div>
<div
class=
"users"
>
<MkA
v-for=
"item in items"
class=
"user"
:key=
"item.id"
:to=
"userPage(extract ? extract(item) : item)"
>
<MkAvatar
:user=
"extract ? extract(item) : item"
class=
"avatar"
:disable-link=
"true"
:show-indicator=
"true"
/>
<div
class=
"body"
>
<MkUserName
:user=
"extract ? extract(item) : item"
class=
"name"
/>
<MkAcct
:user=
"extract ? extract(item) : item"
class=
"acct"
/>
</div>
</MkA>
</div>
<button
class=
"more _button"
v-appear=
"$store.state.enableInfiniteScroll ? fetchMore : null"
@
click=
"fetchMore"
v-show=
"more"
:disabled=
"moreFetching"
>
<template
v-if=
"!moreFetching"
>
{{
$ts
.
loadMore
}}
</
template
>
<
template
v-if=
"moreFetching"
><i
class=
"fas fa-spinner fa-pulse fa-fw"
></i></
template
>
</button>
<p
class=
"empty"
v-if=
"empty"
>
{{ $ts.noUsers }}
</p>
<MkError
v-if=
"error"
@
retry=
"init()"
/>
</div>
</template>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'
vue
'
;
import
paging
from
'
@/scripts/paging
'
;
import
{
userPage
}
from
'
@/filters/user
'
;
export
default
defineComponent
({
mixins
:
[
paging
({}),
],
props
:
{
title
:
{
required
:
true
},
pagination
:
{
required
:
true
},
extract
:
{
required
:
false
}
},
data
()
{
return
{
};
},
methods
:
{
userPage
}
});
</
script
>
<
style
lang=
"scss"
scoped
>
.mk-users-dialog
{
width
:
350px
;
height
:
350px
;
background
:
var
(
--
panel
);
border-radius
:
var
(
--
radius
);
overflow
:
hidden
;
display
:
flex
;
flex-direction
:
column
;
>
.header
{
display
:
flex
;
flex-shrink
:
0
;
>
button
{
height
:
58px
;
width
:
58px
;
@media
(
max-width
:
500px
)
{
height
:
42px
;
width
:
42px
;
}
}
>
span
{
flex
:
1
;
line-height
:
58px
;
padding-left
:
32px
;
font-weight
:
bold
;
@media
(
max-width
:
500px
)
{
line-height
:
42px
;
padding-left
:
16px
;
}
}
}
>
.users
{
flex
:
1
;
overflow
:
auto
;
&
:empty
{
display
:
none
;
}
>
.user
{
display
:
flex
;
align-items
:
center
;
font-size
:
14px
;
padding
:
8px
32px
;
@media
(
max-width
:
500px
)
{
padding
:
8px
16px
;
}
>
*
{
pointer-events
:
none
;
user-select
:
none
;
}
>
.avatar
{
width
:
45px
;
height
:
45px
;
}
>
.body
{
padding
:
0
8px
;
overflow
:
hidden
;
>
.name
{
display
:
block
;
font-weight
:
bold
;
}
>
.acct
{
opacity
:
0
.5
;
}
}
}
}
>
.empty
{
text-align
:
center
;
opacity
:
0
.5
;
}
}
</
style
>
This diff is collapsed.
Click to expand it.
packages/client/src/pages/admin/instance.vue
+
3
−
33
View file @
926eb346
...
@@ -125,7 +125,6 @@
...
@@ -125,7 +125,6 @@
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
defineComponent
,
markRaw
}
from
'
vue
'
;
import
{
defineComponent
,
markRaw
}
from
'
vue
'
;
import
XModalWindow
from
'
@/components/ui/modal-window.vue
'
;
import
XModalWindow
from
'
@/components/ui/modal-window.vue
'
;
import
MkUsersDialog
from
'
@/components/users-dialog.vue
'
;
import
MkSelect
from
'
@/components/form/select.vue
'
;
import
MkSelect
from
'
@/components/form/select.vue
'
;
import
MkButton
from
'
@/components/ui/button.vue
'
;
import
MkButton
from
'
@/components/ui/button.vue
'
;
import
MkSwitch
from
'
@/components/form/switch.vue
'
;
import
MkSwitch
from
'
@/components/form/switch.vue
'
;
...
@@ -201,44 +200,15 @@ export default defineComponent({
...
@@ -201,44 +200,15 @@ export default defineComponent({
},
},
showFollowing
()
{
showFollowing
()
{
os
.
modal
(
MkUsersDialog
,
{
// TODO: ページ遷移
title
:
this
.
$ts
.
instanceFollowing
,
pagination
:
{
endpoint
:
'
federation/following
'
,
limit
:
10
,
params
:
{
host
:
this
.
instance
.
host
}
},
extract
:
item
=>
item
.
follower
});
},
},
showFollowers
()
{
showFollowers
()
{
os
.
modal
(
MkUsersDialog
,
{
// TODO: ページ遷移
title
:
this
.
$ts
.
instanceFollowers
,
pagination
:
{
endpoint
:
'
federation/followers
'
,
limit
:
10
,
params
:
{
host
:
this
.
instance
.
host
}
},
extract
:
item
=>
item
.
followee
});
},
},
showUsers
()
{
showUsers
()
{
os
.
modal
(
MkUsersDialog
,
{
// TODO: ページ遷移
title
:
this
.
$ts
.
instanceUsers
,
pagination
:
{
endpoint
:
'
federation/users
'
,
limit
:
10
,
params
:
{
host
:
this
.
instance
.
host
}
}
});
},
},
bytes
,
bytes
,
...
...
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