Skip to content

Commit 6c8dc49

Browse files
modstartmodstart
committed
feat: ueditor upgrade
1 parent 94a885f commit 6c8dc49

File tree

27 files changed

+438
-26714
lines changed

27 files changed

+438
-26714
lines changed

‎config/module.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
]
3030
],
3131
'Partner' => [
32-
'enable' => true,
33-
'config' => [
34-
'position' => '[{"k":"home","v":"首页"}]',
35-
],
32+
'enable' => true
3633
],
3734
'Banner' => [
3835
'enable' => true,

‎module/Blog/Admin/Controller/ConfigController.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
use Illuminate\Routing\Controller;
77
use ModStart\Admin\Layout\AdminConfigBuilder;
8+
use ModStart\Support\Concern\HasFields;
89
use Module\Vendor\Provider\Captcha\CaptchaProvider;
910
use Module\Vendor\Provider\SuperSearch\SuperSearchProvider;
1011

@@ -23,6 +24,12 @@ public function index(AdminConfigBuilder $builder)
2324
$builder->select('Blog_BlogCaptchaProvider', '博客评论验证')->options(CaptchaProvider::nameTitleMap());
2425
$builder->select('Blog_MessageCaptchaProvider', '博客留言验证')->options(CaptchaProvider::nameTitleMap());
2526
$builder->select('Blog_BlogSuperSearchProvider', '博客超级搜索驱动')->options(SuperSearchProvider::allDefaultMap());
27+
$builder->switch('Blog_DarkModeEnable', '启用暗黑模式')
28+
->when('=', true, function ($builder) {
29+
30+
$builder->time('Blog_DarkModeStart', '开始');
31+
$builder->time('Blog_DarkModeEnd', '结束');
32+
});
2633
$builder->formClass('wide');
2734
return $builder->perform();
2835
}

‎module/Blog/Docs/release.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## 2.6.0
22

3+
- 新增：博客新增暗黑模式
34
- 新增：博客支持超级搜索ElasticSearch（需要安装SuperSearchES）
45
- 新增：博客主动URL推送功能
56
- 修复：博客列表移动端标题显示异常问题

‎module/Blog/Util/BlogThemeUtil.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
3+
4+
namespace Module\Blog\Util;
5+
6+
7+
class BlogThemeUtil
8+
{
9+
public static function isDark()
10+
{
11+
if (!modstart_config('Blog_DarkModeEnable', false)) {
12+
return false;
13+
}
14+
$start = modstart_config('Blog_DarkModeStart');
15+
$end = modstart_config('Blog_DarkModeEnd');
16+
if (!$start || !$end) {
17+
return false;
18+
}
19+
$time = date('H:i:s');
20+
if ($time > $start && $time < $end) {
21+
return true;
22+
}
23+
return false;
24+
}
25+
}

‎module/Blog/View/pc/blog/about.blade.php‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,32 @@
44
@section('pageKeywords')关于博主@endsection
55
@section('pageDescription')关于博主@endsection
66

7+
@if(\Module\Blog\Util\BlogThemeUtil::isDark())
8+
@section('htmlProperties')data-theme="dark"@endsection
9+
@endif
10+
711
@section('bodyContent')
812

9-
<div class="ub-container">
13+
<div class="ub-container margin-top">
1014
<div class="row">
11-
<div class="col-md-8 margin-top">
15+
<div class="col-md-8 margin-bottom">
1216

13-
<div class="tw-p-6 tw-bg-white tw-rounded">
14-
<div class="tw-text-lg">
15-
<i class="iconfont icon-user ub-text-primary"></i>
16-
关于我
17-
</div>
18-
<div class="tw-mt-4">
19-
<div class="ub-html lg">
20-
{!! modstart_config('Blog_AboutContent') !!}
17+
<div class="ub-content-box">
18+
<div class="tw-p-3">
19+
<div class="tw-text-lg">
20+
<i class="iconfont icon-user"></i>
21+
关于我
22+
</div>
23+
<div class="tw-mt-4">
24+
<div class="ub-html lg">
25+
{!! modstart_config('Blog_AboutContent') !!}
26+
</div>
2127
</div>
2228
</div>
2329
</div>
2430

2531
</div>
26-
<div class="col-md-4 margin-top">
32+
<div class="col-md-4 margin-bottom">
2733

2834
@include('module::Blog.View.pc.blog.inc.info')
2935

‎module/Blog/View/pc/blog/inc/blogItems.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
@endif
1111
@foreach($records as $record)
12-
<div class="ub-text-blog tw-border-0 tw-border-b tw-border-gray-100 tw-border-solid tw-pb-6 tw-mb-6"
12+
<div class="ub-text-blog tw-border-0 ub-border-bottom tw-pb-6 tw-mb-6"
1313
data-scroll-animate="animated fadeInUp"
1414
>
1515
<div>
@@ -30,7 +30,7 @@
3030
</span>
3131
@endif
3232
<a href="{{modstart_web_url('blog/'.$record['id'])}}"
33-
class="pb-keywords-highlight tw-align-top tw-inline-block tw-leading-6 tw-text-gray-800 tw-text-xl">
33+
class="pb-keywords-highlight tw-align-top tw-inline-block tw-leading-6 ub-text-default tw-text-xl">
3434
{{$record['title']}}
3535
</a>
3636
</div>
@@ -59,10 +59,10 @@ class="pb-keywords-highlight tw-align-top tw-inline-block tw-leading-6 tw-text-g
5959
</div>
6060
@endif
6161
@if(!empty($record['tag']))
62-
<div class="tw-pt-2 tw-flex tw-flex-wrap pb-keywords-highlight">
62+
<div class="tw-pt-2 pb-keywords-highlight">
6363
@foreach($record['tag'] as $t)
6464
<a href="{{modstart_web_url('blogs',['keywords'=>$t])}}"
65-
class="tw-rounded-3xl tw-text-gray-400 tw-block tw-bg-gray-100 tw-leading-6 tw-mb-3 tw-px-2 tw-mr-2">
65+
class="btn btn-round btn-sm tw-mr-1 tw-mb-1">
6666
{{$t}}
6767
</a>
6868
@endforeach

‎module/Blog/View/pc/blog/inc/blogLatest.blade.php‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<div class="tw-p-6 margin-top tw-bg-white tw-rounded">
2-
<div class="tw-text-lg">
3-
<i class="iconfont icon-list ub-text-primary"></i>
4-
最新博客
5-
</div>
6-
<div class="tw-mt-4">
7-
@foreach(MBlog::latestBlog(5) as $b)
8-
<div class="tw-pb-2">
9-
<a href="{{modstart_web_url('blog/'.$b['id'])}}"
10-
class="tw-block tw-overflow-ellipsis tw-overflow-hidden tw-text-gray-800 tw-truncate">
11-
<i class="iconfont icon-angle-right ub-text-muted tw-mr-1"></i>
12-
{{$b['title']}}
13-
</a>
14-
</div>
15-
@endforeach
1+
<div class="ub-content-box margin-bottom">
2+
<div class="tw-p-3">
3+
<div class="tw-text-lg">
4+
<i class="iconfont icon-list"></i>
5+
最新博客
6+
</div>
7+
<div class="tw-mt-4">
8+
@foreach(MBlog::latestBlog(5) as $b)
9+
<div class="tw-pb-2">
10+
<a href="{{modstart_web_url('blog/'.$b['id'])}}"
11+
class="tw-block tw-overflow-ellipsis tw-overflow-hidden ub-text-default tw-truncate">
12+
<i class="iconfont icon-angle-right ub-text-muted tw-mr-1"></i>
13+
{{$b['title']}}
14+
</a>
15+
</div>
16+
@endforeach
17+
</div>
1618
</div>
1719
</div>

‎module/Blog/View/pc/blog/inc/categories.blade.php‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
<div class="tw-p-6 margin-top tw-bg-white tw-rounded">
2-
<div class="tw-text-lg">
3-
<i class="iconfont icon-category ub-text-primary"></i>
4-
分类
5-
</div>
6-
<div class="tw-mt-4">
7-
<div class="row">
8-
@foreach(\MBlog::categoryTree() as $t)
9-
<div class="col-6">
10-
<a href="{{modstart_web_url('blogs',['categoryId'=>$t['id']])}}"
11-
class="hover:tw-shadow tw-text-gray-600 tw-block tw-bg-gray-100 tw-rounded tw-leading-10 tw-mb-3 tw-px-2 tw-truncate @if(!empty($category)&&$category['id']==$t['id']) ub-bg-primary ub-text-white @endif">
12-
<i class="iconfont icon-angle-right ub-text-muted"></i>
13-
{{$t['title']}}
14-
（{{$t['blogCount']?$t['blogCount']:0}}）
15-
</a>
16-
</div>
17-
@endforeach
1+
<div class="ub-content-box margin-bottom">
2+
<div class="tw-p-3">
3+
<div class="tw-text-lg">
4+
<i class="iconfont icon-category"></i>
5+
分类
6+
</div>
7+
<div class="tw-mt-4">
8+
<div class="row">
9+
@foreach(\MBlog::categoryTree() as $t)
10+
<div class="col-6">
11+
<a href="{{modstart_web_url('blogs',['categoryId'=>$t['id']])}}"
12+
class="hover:tw-shadow tw-block ub-content-block tw-rounded tw-leading-10 tw-mb-3 tw-px-2 tw-truncate @if(!empty($category)&&$category['id']==$t['id']) ub-bg-primary @endif">
13+
<i class="iconfont icon-angle-right ub-text-muted"></i>
14+
{{$t['title']}}
15+
（{{$t['blogCount']?$t['blogCount']:0}}）
16+
</a>
17+
</div>
18+
@endforeach
19+
</div>
1820
</div>
1921
</div>
2022
</div>

‎module/Blog/View/pc/blog/inc/contact.blade.php‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,53 @@
1-
<div class="tw-p-6 margin-top tw-bg-white tw-rounded">
2-
<div class="tw-text-lg">
3-
<i class="iconfont icon-phone ub-text-primary"></i>
4-
联系方式
5-
</div>
6-
<div class="tw-mt-4">
7-
@if(modstart_config('Blog_ContactQQ'))
8-
<div class="ub-pair">
9-
<div class="name">
10-
<i class="iconfont icon-qq"></i> QQ
11-
</div>
12-
<div class="value">
13-
{{modstart_config('Blog_ContactQQ')}}
14-
</div>
15-
</div>
16-
@endif
17-
@if(modstart_config('Blog_ContactEmail'))
18-
<div class="ub-pair">
19-
<div class="name">
20-
<i class="iconfont icon-email"></i>
21-
邮箱
22-
</div>
23-
<div class="value">
24-
<a class="tw-text-gray-600" href="mailto:{{modstart_config('Blog_ContactEmail')}}">{{modstart_config('Blog_ContactEmail')}}</a>
25-
</div>
1+
<div class="ub-content-box margin-bottom">
2+
<div class="tw-p-3">
3+
<div class="tw-text-lg">
4+
<i class="iconfont icon-phone"></i>
5+
联系方式
266
</div>
27-
@endif
28-
@if(modstart_config('Blog_ContactWeibo'))
29-
<div class="ub-pair">
30-
<div class="name">
31-
<i class="iconfont icon-weibo"></i>
32-
微博
33-
</div>
34-
<div class="value">
35-
<a class="tw-text-gray-600" href="{{modstart_config('Blog_ContactWeibo')}}" target="_blank">{{modstart_config('Blog_ContactWeibo')}}</a>
36-
</div>
37-
</div>
38-
@endif
39-
@if(modstart_config('Blog_ContactWechat'))
40-
<div class="ub-pair">
41-
<div class="name">
42-
<i class="iconfont icon-wechat"></i>
43-
微信
44-
</div>
45-
<div class="value">
46-
{{modstart_config('Blog_ContactWechat')}}
47-
</div>
7+
<div class="tw-mt-4">
8+
@if(modstart_config('Blog_ContactQQ'))
9+
<div class="ub-pair">
10+
<div class="name">
11+
<i class="iconfont icon-qq"></i> QQ
12+
</div>
13+
<div class="value">
14+
{{modstart_config('Blog_ContactQQ')}}
15+
</div>
16+
</div>
17+
@endif
18+
@if(modstart_config('Blog_ContactEmail'))
19+
<div class="ub-pair">
20+
<div class="name">
21+
<i class="iconfont icon-email"></i>
22+
邮箱
23+
</div>
24+
<div class="value">
25+
<a class="tw-text-gray-600" href="mailto:{{modstart_config('Blog_ContactEmail')}}">{{modstart_config('Blog_ContactEmail')}}</a>
26+
</div>
27+
</div>
28+
@endif
29+
@if(modstart_config('Blog_ContactWeibo'))
30+
<div class="ub-pair">
31+
<div class="name">
32+
<i class="iconfont icon-weibo"></i>
33+
微博
34+
</div>
35+
<div class="value">
36+
<a class="tw-text-gray-600" href="{{modstart_config('Blog_ContactWeibo')}}" target="_blank">{{modstart_config('Blog_ContactWeibo')}}</a>
37+
</div>
38+
</div>
39+
@endif
40+
@if(modstart_config('Blog_ContactWechat'))
41+
<div class="ub-pair">
42+
<div class="name">
43+
<i class="iconfont icon-wechat"></i>
44+
微信
45+
</div>
46+
<div class="value">
47+
{{modstart_config('Blog_ContactWechat')}}
48+
</div>
49+
</div>
50+
@endif
4851
</div>
49-
@endif
5052
</div>
5153
</div>

‎module/Blog/View/pc/blog/inc/info.blade.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
<div class="tw-bg-white tw-rounded tw-px-6 tw-py-12">
2-
<div>
3-
<div class="">
4-
<div class="contain hover:tw-scale-110 tw-duration-300 tw-ease-in-out tw-inline-block tw-m-auto tw-rounded tw-transform tw-w-28 ub-cover-1-1"
5-
style="background-image:url({{\ModStart\Core\Assets\AssetsUtil::fix(modstart_config('Blog_Avatar'))}})"></div>
1+
<div class="ub-content-box margin-bottom">
2+
<div class="tw-px-6 tw-py-12">
3+
<div class="tw-pb-1">
4+
<div class="">
5+
<div class="contain hover:tw-scale-110 tw-duration-300 tw-ease-in-out tw-inline-block tw-m-auto tw-rounded tw-transform tw-w-28 ub-cover-1-1"
6+
style="background-image:url({{\ModStart\Core\Assets\AssetsUtil::fix(modstart_config('Blog_Avatar'))}})"></div>
7+
</div>
8+
</div>
9+
<div class="tw-text-center tw-text-xl tw-mt-5">
10+
{{modstart_config('Blog_Name')}}
11+
</div>
12+
<div class="tw-text-center tw-text-gray-400 tw-mt-4">
13+
{{modstart_config('Blog_Slogan')}}
614
</div>
7-
</div>
8-
<div class="tw-text-center tw-text-xl tw-mt-5">
9-
{{modstart_config('Blog_Name')}}
10-
</div>
11-
<div class="tw-text-center tw-text-gray-400 tw-mt-4">
12-
{{modstart_config('Blog_Slogan')}}
1315
</div>
1416
</div>

0 commit comments

Comments
 (0)