Skip to content

Commit ee53de3

Browse files
zhuchunshuzhuchunshu
committedDec 16, 2022
优化:页面UI优化
·
v2.7.7v2.1.7
1 parent 29f9815 commit ee53de3

File tree

15 files changed

+243
-240
lines changed

15 files changed

+243
-240
lines changed
 

‎app/CodeFec/Menu/default.php

Lines changed: 68 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<?php
2-
// 仪表盘
3-
menu()->add(0,[
2+
3+
declare(strict_types=1);
4+
/**
5+
* This file is part of zhuchunshu.
6+
* @link https://github.com/zhuchunshu
7+
* @document https://github.com/zhuchunshu/super-forum
8+
* @contact laravel@88.com
9+
* @license https://github.com/zhuchunshu/super-forum/blob/master/LICENSE
10+
*/
11+
menu()->add(0, [
412
'url' => '/admin',
513
'name' => '仪表盘',
614
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-dashboard" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
@@ -11,7 +19,7 @@
1119
</svg>',
1220
]);
1321

14-
menu()->add(1,[
22+
menu()->add(1, [
1523
'url' => '/admin/plugins',
1624
'name' => '组件',
1725
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
@@ -23,10 +31,10 @@
2331
<line x1="16" y1="5.25" x2="8" y2="9.75"></line>
2432
</svg>',
2533
]);
26-
menu()->add(6,[
27-
'url' => '/admin/themes',
28-
'name' => '主题',
29-
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-template" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
34+
menu()->add(6, [
35+
'url' => '/admin/themes',
36+
'name' => '主题',
37+
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-template" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
3038
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
3139
<rect x="4" y="4" width="16" height="4" rx="1"></rect>
3240
<rect x="4" y="12" width="6" height="8" rx="1"></rect>
@@ -36,92 +44,115 @@
3644
</svg>',
3745
]);
3846

39-
menu()->add(101,[
40-
'url' => '/admin/plugins',
41-
'name' => '管理',
42-
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
47+
menu()->add(101, [
48+
'url' => '/admin/plugins',
49+
'name' => '管理',
50+
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
4351
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
4452
<polyline points="12 3 20 7.5 20 16.5 12 21 4 16.5 4 7.5 12 3"></polyline>
4553
<line x1="12" y1="12" x2="20" y2="7.5"></line>
4654
<line x1="12" y1="12" x2="12" y2="21"></line>
4755
<line x1="12" y1="12" x2="4" y2="7.5"></line>
4856
<line x1="16" y1="5.25" x2="8" y2="9.75"></line>
4957
</svg>',
50-
'parent_id' => 1,
58+
'parent_id' => 1,
5159
]);
5260

53-
menu()->add(102,[
54-
'url' => '/admin/plugins/upload',
55-
'name' => '上传',
56-
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
61+
menu()->add(102, [
62+
'url' => '/admin/plugins/upload',
63+
'name' => '上传',
64+
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
5765
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
5866
<polyline points="12 3 20 7.5 20 16.5 12 21 4 16.5 4 7.5 12 3"></polyline>
5967
<line x1="12" y1="12" x2="20" y2="7.5"></line>
6068
<line x1="12" y1="12" x2="12" y2="21"></line>
6169
<line x1="12" y1="12" x2="4" y2="7.5"></line>
6270
<line x1="16" y1="5.25" x2="8" y2="9.75"></line>
6371
</svg>',
64-
'parent_id' => 1,
72+
'parent_id' => 1,
6573
]);
66-
menu()->add(161,[
67-
'url' => '/admin/themes',
68-
'name' => '管理',
69-
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
74+
menu()->add(161, [
75+
'url' => '/admin/themes',
76+
'name' => '管理',
77+
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
7078
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
7179
<polyline points="12 3 20 7.5 20 16.5 12 21 4 16.5 4 7.5 12 3"></polyline>
7280
<line x1="12" y1="12" x2="20" y2="7.5"></line>
7381
<line x1="12" y1="12" x2="12" y2="21"></line>
7482
<line x1="12" y1="12" x2="4" y2="7.5"></line>
7583
<line x1="16" y1="5.25" x2="8" y2="9.75"></line>
7684
</svg>',
77-
'parent_id' => 6,
85+
'parent_id' => 6,
7886
]);
7987

80-
menu()->add(162,[
81-
'url' => '/admin/themes/upload',
82-
'name' => '上传',
83-
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
88+
menu()->add(162, [
89+
'url' => '/admin/themes/upload',
90+
'name' => '上传',
91+
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-package" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
8492
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
8593
<polyline points="12 3 20 7.5 20 16.5 12 21 4 16.5 4 7.5 12 3"></polyline>
8694
<line x1="12" y1="12" x2="20" y2="7.5"></line>
8795
<line x1="12" y1="12" x2="12" y2="21"></line>
8896
<line x1="12" y1="12" x2="4" y2="7.5"></line>
8997
<line x1="16" y1="5.25" x2="8" y2="9.75"></line>
9098
</svg>',
91-
'parent_id' => 6,
99+
'parent_id' => 6,
92100
]);
93101

94102
// 网站设置
95-
menu()->add(5,[
103+
menu()->add(5, [
104+
'url' => '/admin/setting',
105+
'name' => '站务',
106+
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-3d-cube-sphere" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
107+
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
108+
<path d="M6 17.6l-2 -1.1v-2.5"></path>
109+
<path d="M4 10v-2.5l2 -1.1"></path>
110+
<path d="M10 4.1l2 -1.1l2 1.1"></path>
111+
<path d="M18 6.4l2 1.1v2.5"></path>
112+
<path d="M20 14v2.5l-2 1.12"></path>
113+
<path d="M14 19.9l-2 1.1l-2 -1.1"></path>
114+
<line x1="12" y1="12" x2="14" y2="10.9"></line>
115+
<line x1="18" y1="8.6" x2="20" y2="7.5"></line>
116+
<line x1="12" y1="12" x2="12" y2="14.5"></line>
117+
<line x1="12" y1="18.5" x2="12" y2="21"></line>
118+
<path d="M12 12l-2 -1.12"></path>
119+
<line x1="6" y1="8.6" x2="4" y2="7.5"></line>
120+
</svg>',
121+
]);
122+
123+
124+
125+
menu()->add(501, [
96126
'url' => '/admin/setting',
97-
'name' => '设置',
127+
'name' => '站点设置',
98128
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-settings" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
99129
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
100130
<path d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z"></path>
101131
<circle cx="12" cy="12" r="3"></circle>
102132
</svg>',
133+
'parent_id' => 5,
103134
]);
104135

105-
menu()->add(10,[
106-
'url' => '#',
107-
'name' => '文件编辑',
136+
menu()->add(10, [
137+
'url' => '#',
138+
'name' => '文件编辑',
108139
'icon' => '<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-file" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
109140
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
110141
<path d="M14 3v4a1 1 0 0 0 1 1h4"></path>
111142
<path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z"></path>
112-
</svg>'
143+
</svg>',
113144
]);
114145

115-
menu()->add(1001,[
146+
menu()->add(1001, [
116147
'url' => '/admin/EditFile/css',
117148
'name' => '自定义CSS代码',
118149
'icon' => '',
119-
'parent_id' => 10
150+
'parent_id' => 10,
120151
]);
121152

122-
menu()->add(1002,[
153+
menu()->add(1002, [
123154
'url' => '/admin/EditFile/js',
124155
'name' => '自定义JS代码',
125156
'icon' => '',
126-
'parent_id' => 10
157+
'parent_id' => 10,
127158
]);

‎app/Plugins/Topic/resources/views/KeyWords/data/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class="card-title text-reset">{{$data->user->username}}</a>
4949
<div class="col-auto bottomLine">
5050
<a href="/tags/{{$data->tag->id}}.html" style="text-decoration:none">
5151
<div class="card-circle">
52-
<img src="{{$data->tag->icon}}" alt="">
52+
{!! $data->tag->icon !!}
5353
<span>{{$data->tag->name}}</span>
5454
</div>
5555
</a>

‎app/Plugins/Topic/resources/views/Tags/index.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<div class="col-md-6 col-lg-4">
4040
<a href="/tags/{{$value->id}}.html" class="card card-link text-primary-fg" style="background-color: {{$value->color}}!important;">
4141
<div class="card-stamp">
42-
<div class="card-stamp-icon bg-yellow" style=color:{{$value->font_color}}">
42+
<div class="card-stamp-icon bg-yellow">
4343
<!-- Download SVG icon from http://tabler-icons.io/i/star -->
4444
{!! $value->icon !!}
4545
</div>

‎app/Plugins/User/resources/views/data.blade.php

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
<div class="col-md-12">
1717
<div class="border-0 card">
18-
<a href="{{get_user_settings($user->id,'backgroundImg','https://images.unsplash.com/photo-1653185053677-26b081c1a214?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1632&q=80')}}"
18+
<a href="{{get_user_settings($user->id,'backgroundImg','/plugins/Core/image/user_background.jpg')}}"
1919
class="card-cover card-cover-blurred"
20-
style="background-image: url({{get_user_settings($user->id,'backgroundImg','https://images.unsplash.com/photo-1653185053677-26b081c1a214?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1632&q=80')}});min-height: 200px">
20+
style="background-image: url({{get_user_settings($user->id,'backgroundImg','/plugins/Core/image/user_background.jpg')}});min-height: 200px">
2121

2222
</a>
2323
<div class="card-body ms-1">
@@ -26,7 +26,7 @@ class="card-cover card-cover-blurred"
2626
<div class="row">
2727
<div class="col-auto text-center">
2828
<span class="avatar avatar-xl avatar-thumb text-light border-2 border-wide rounded"
29-
style="background-image: url({{super_avatar($user)}});margin-top:-70px"></span>
29+
style="background-image: url({{super_avatar($user)}});margin-top:-220px"></span>
3030
<div>
3131
<span class="card-title mb-1"
3232
style="font-size: 25px;display: inline">{{$user->username}}</span>
@@ -44,31 +44,25 @@ class="card-cover card-cover-blurred"
4444
</div>
4545
</div>
4646
</div>
47-
<div class="col-auto text-center">
48-
<a class="btn btn-outline-primary mt-1 mb-3" user-click="user_follow"
49-
user-id="{{ $user->id }}">
50-
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-user-plus"
51-
width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"
52-
fill="none" stroke-linecap="round" stroke-linejoin="round">
53-
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
54-
<circle cx="9" cy="7" r="4"></circle>
55-
<path d="M3 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2"></path>
56-
<path d="M16 11h6m-3 -3v6"></path>
57-
</svg>
58-
<span>关注</span>
59-
</a>
60-
<br>
61-
<a class="btn btn-outline-primary" href="/users/pm/{{$user->id}}" >
62-
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-send"
63-
width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor"
64-
fill="none" stroke-linecap="round" stroke-linejoin="round">
65-
<desc>Download more icon variants from https://tabler-icons.io/i/send</desc>
66-
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
67-
<line x1="10" y1="14" x2="21" y2="3"></line>
68-
<path d="M21 3l-6.5 18a0.55 .55 0 0 1 -1 0l-3.5 -7l-7 -3.5a0.55 .55 0 0 1 0 -1l18 -6.5"></path>
69-
</svg>
70-
<span>发私信</span>
71-
</a>
47+
<div class="col-auto align-self-center text-center">
48+
<div class="dropdown">
49+
<button type="button" class="btn dropdown-toggle" data-bs-toggle="dropdown">
50+
<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">
51+
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
52+
<line x1="12" y1="5" x2="12" y2="19"></line>
53+
<line x1="5" y1="12" x2="19" y2="12"></line>
54+
</svg>
55+
</button>
56+
<div class="dropdown-menu">
57+
<a class="dropdown-item" user-click="user_follow"
58+
user-id="{{ $user->id }}">
59+
<span>关注</span>
60+
</a>
61+
<a class="dropdown-item" href="/users/pm/{{$user->id}}">
62+
私信
63+
</a>
64+
</div>
65+
</div>
7266
</div>
7367
</div>
7468
</div>

‎app/Plugins/User/resources/views/draft.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<div class="col-auto bottomLine">
4545
<a href="/tags/{{$data->tag->id}}.html" style="text-decoration:none">
4646
<div class="card-circle">
47-
<img src="{{$data->tag->icon}}" alt="">
47+
{!! $data->tag->icon !!}
4848
<span>{{$data->tag->name}}</span>
4949
</div>
5050
</a>

0 commit comments

Comments
 (0)
Please sign in to comment.