Skip to content

Commit

Permalink
更新:优化版主权限显示
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhuchunshu
zhuchunshu committed Feb 20, 2023
1 parent e47bdfb commit 64d95a8
Show file tree
Hide file tree
Showing 7 changed files with 549 additions and 233 deletions.
35 changes: 35 additions & 0 deletions app/Plugins/Topic/resources/views/Tags/data.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,41 @@
</div>
</div>
</div>

@if($data->moderator->count())

<div class="modal modal-blur fade" id="modal-moderator-list" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">版主列表</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="list-group list-group-flush">
@foreach($data->moderator as $moderator)
<div class="list-group-item">
<div class="row">
<div class="col-auto">
<a href="/users/{{$moderator->user->id}}.html" class="avatar" style="background-image: url({{avatar($moderator->user)}})"></a>
</div>
<div class="col text-truncate">
<a href="/users/{{$moderator->user->id}}.html" class="text-body d-block">{{$moderator->user->username}}</a>
<div class="text-muted text-truncate mt-n1">@if($moderator->user->Options->qianming && $moderator->user->Options->qianming!=='no bio') {{$moderator->user->Options->qianming}}@else{{"没有签名"}}@endif</div>
</div>
</div>
</div>
@endforeach
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn me-auto" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">好的</button>
</div>
</div>
</div>
</div>
@endif
@endsection


Expand Down
5 changes: 5 additions & 0 deletions app/Plugins/Topic/src/Models/TopicTag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ public function topic(): \Hyperf\Database\Model\Relations\HasMany
{
return $this->hasMany(Topic::class, 'tag_id', 'id');
}

public function moderator(): \Hyperf\Database\Model\Relations\HasMany
{
return $this->hasMany(Moderator::class, 'tag_id', 'id');
}
}
61 changes: 53 additions & 8 deletions app/Plugins/User/resources/views/data.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

<div class="col-md-12">
<div class="border-0 card">
<a data-fslightbox href="{{get_user_settings($user->id,'backgroundImg','/plugins/Core/image/user_background.jpg')}}"
<a data-fslightbox
href="{{get_user_settings($user->id,'backgroundImg','/plugins/Core/image/user_background.jpg')}}"
class="card-cover card-cover-blurred"
style="background-image: url({{get_user_settings($user->id,'backgroundImg','/plugins/Core/image/user_background.jpg')}});min-height: 200px">
</a>
Expand All @@ -28,24 +29,26 @@ class="card-cover card-cover-blurred"
style="background-image: url({{super_avatar($user)}});margin-top:-220px"></span>
<div>
<span class="card-title mb-1"
style="font-size: 25px;display: inline">{!!u_username($user,['extends' => true,'users_home' => true,'link' => false]) !!}</span>
<a href="/users/group/{{$user->class_id}}.html" class="badge badge-outline"
style="color: {{$user->Class->color}}">{{$user->Class->name}}</a>
style="font-size: 25px;display: inline">{!!u_username($user,['extends' => true,'users_home' => true,'link' => false]) !!}
</span>
</div>
</div>
</div>
</div>
<div class="col-auto align-self-center text-center">
<div class="dropdown">
<button type="button" class="btn dropdown-toggle" data-bs-toggle="dropdown">
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-plus" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-plus"
width="24" height="24" viewBox="0 0 24 24" stroke-width="2"
stroke="currentColor" fill="none" stroke-linecap="round"
stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
<line x1="12" y1="5" x2="12" y2="19"></line>
<line x1="5" y1="12" x2="19" y2="12"></line>
</svg>
</button>
<div class="dropdown-menu">
<a class="dropdown-item" user-click="user_follow"
<a class="dropdown-item" user-click="user_follow"
user-id="{{ $user->id }}">
<span>关注</span>
</a>
Expand All @@ -58,7 +61,11 @@ class="card-cover card-cover-blurred"
</div>
</div>
</div>
<div class="text-muted"> @if($user->options->qianming && $user->options->qianming!=='no bio'){{$user->options->qianming}}@else{{__("user.no bio")}} @endif</div>
<div class="text-muted"> @if($user->options->qianming && $user->options->qianming!=='no bio')
{{$user->options->qianming}}
@else
{{__("user.no bio")}}
@endif</div>

</div>
</div>
Expand All @@ -70,7 +77,7 @@ class="card-cover card-cover-blurred"
<ul class="nav nav-pills nav-vertical">
@foreach(Itf()->get('users_home_menu') as $key => $value)
@if($value['quanxian']!==null)
{{-- {{\Opis\Closure\unserialize((string)$value['quanxian'])}}--}}
{{-- {{\Opis\Closure\unserialize((string)$value['quanxian'])}}--}}
@if(call_user_func(\Opis\Closure\unserialize((string)$value['quanxian']),$user)===true)
<li class="nav-item">
<a href="?m={{$key}}"
Expand Down Expand Up @@ -224,6 +231,44 @@ class="injected-svg DownloadModal__ImageFile-sc-p17csy-5 iIfSkb grid_media"
<style>
{{get_user_settings($user->id,'home_css_code')}}
</style>
@if($user->moderator->count())
<div class="modal modal-blur fade" id="modal-user-moderator" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">管理论坛(标签)</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="list-group list-group-flush">
<div class="row row-cards">
@foreach($user->moderator as $moderator)
<div class="col-md-6 col-lg-4">
<a href="/tags/{{$moderator->tag->id}}.html" class="card card-link text-primary-fg" style="background-color: {{$moderator->tag->color}}!important;">
<div class="card-stamp">
<div class="card-stamp-icon bg-yellow">
<!-- Download SVG icon from http://tabler-icons.io/i/star -->
{!! $moderator->tag->icon !!}
</div>
</div>
<div class="card-body">
<h3 class="card-title">{{$moderator->tag->name}}</h3>
<p>{{ \Hyperf\Utils\Str::limit(core_default($moderator->tag->description, __("app.no description")), 32) }}</p>
</div>
</a>
</div>
@endforeach
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn me-auto" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">好的</button>
</div>
</div>
</div>
</div>
@endif

@endsection

Expand Down
10 changes: 9 additions & 1 deletion app/Plugins/User/resources/views/group_data.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@
<div class="card-body">
<div class="row">
<div class="col-auto">
<span class="avatar" style="background-color: {{$data->color}}"></span>
<span class="avatar bg-azure-lt">
{!! $data->icon?:'<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-users" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
<path d="M9 7m-4 0a4 4 0 1 0 8 0a4 4 0 1 0 -8 0"></path>
<path d="M3 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2"></path>
<path d="M16 3.13a4 4 0 0 1 0 7.75"></path>
<path d="M21 21v-2a4 4 0 0 0 -3 -3.85"></path>
</svg>' !!}
</span>
</div>
<div class="col">
<div class="row"><div class="col-auto"><h2>{{$data->name}}</h2></div><div class="col text-red">
Expand Down

0 comments on commit 64d95a8

Please sign in to comment.