Browse Source

update: custom logo

tokumeikoi 2 năm trước cách đây
mục cha
commit
1ddc05652d

+ 2 - 1
app/Http/Controllers/Guest/CommController.php

@@ -21,7 +21,8 @@ class CommController extends Controller
                 'is_recaptcha' => (int)config('v2board.recaptcha_enable', 0) ? 1 : 0,
                 'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
                 'app_description' => config('v2board.app_description'),
-                'app_url' => config('v2board.app_url')
+                'app_url' => config('v2board.app_url'),
+                'logo' => config('v2board.logo'),
             ]
         ]);
     }

+ 3 - 1
app/Http/Requests/Admin/ConfigSave.php

@@ -22,6 +22,7 @@ class ConfigSave extends FormRequest
         'commission_distribution_l2' => 'nullable|numeric',
         'commission_distribution_l3' => 'nullable|numeric',
         // site
+        'logo' => 'nullable|url',
         'force_https' => 'in:0,1',
         'safe_mode_enable' => 'in:0,1',
         'stop_register' => 'in:0,1',
@@ -134,7 +135,8 @@ class ConfigSave extends FormRequest
             'subscribe_url.url' => '订阅URL格式不正确,必须携带http(s)://',
             'server_token.min' => '通讯密钥长度必须大于16位',
             'tos_url.url' => '服务条款URL格式不正确,必须携带http(s)://',
-            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式,必须携带http(s)://'
+            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式,必须携带http(s)://',
+            'logo.url' => 'LOGO URL格式不正确,必须携带https(s)://'
         ];
     }
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
public/assets/admin/umi.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
public/theme/v2board/assets/umi.js


+ 2 - 1
public/theme/v2board/dashboard.blade.php

@@ -39,7 +39,8 @@
                 'vi-VN',
                 'ko-KR',
                 'zh-TW'
-            ]
+            ],
+            logo: '{{$logo}}'
         }
     </script>
     <script src="/theme/{{$theme}}/assets/i18n/zh-CN.js?v={{$version}}"></script>

+ 9 - 8
resources/views/admin.blade.php

@@ -2,9 +2,9 @@
 <html>
 
 <head>
-    <link rel="stylesheet" href="/assets/admin/components.chunk.css?v={{$verison}}">
-    <link rel="stylesheet" href="/assets/admin/umi.css?v={{$verison}}">
-    <link rel="stylesheet" href="/assets/admin/custom.css?v={{$verison}}">
+    <link rel="stylesheet" href="/assets/admin/components.chunk.css?v={{$version}}">
+    <link rel="stylesheet" href="/assets/admin/umi.css?v={{$version}}">
+    <link rel="stylesheet" href="/assets/admin/custom.css?v={{$version}}">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
     <title>{{$title}}</title>
@@ -18,17 +18,18 @@
                 header: '{{$theme_header}}',
                 color: '{{$theme_color}}',
             },
-            verison: '{{$verison}}',
-            background_url: '{{$backgroun_url}}'
+            version: '{{$version}}',
+            background_url: '{{$background_url}}',
+            logo: '{{$logo}}'
         }
     </script>
 </head>
 
 <body>
 <div id="root"></div>
-<script src="/assets/admin/vendors.async.js?v={{$verison}}"></script>
-<script src="/assets/admin/components.async.js?v={{$verison}}"></script>
-<script src="/assets/admin/umi.js?v={{$verison}}"></script>
+<script src="/assets/admin/vendors.async.js?v={{$version}}"></script>
+<script src="/assets/admin/components.async.js?v={{$version}}"></script>
+<script src="/assets/admin/umi.js?v={{$version}}"></script>
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-P1E9Z5LRRK"></script>
 <script>

+ 5 - 3
routes/web.php

@@ -24,7 +24,8 @@ Route::get('/', function (Request $request) {
         'theme' => config('v2board.frontend_theme', 'v2board'),
         'theme_path' => '/theme/' . config('v2board.frontend_theme', 'v2board') . '/assets/',
         'version' => config('app.version'),
-        'description' => config('v2board.app_description', 'V2Board is best')
+        'description' => config('v2board.app_description', 'V2Board is best'),
+        'logo' => config('v2board.logo')
     ];
     $renderParams['theme_config'] = config('theme.' . config('v2board.frontend_theme', 'v2board'));
     return view('theme::' . config('v2board.frontend_theme', 'v2board') . '.dashboard', $renderParams);
@@ -36,7 +37,8 @@ Route::get('/' . config('v2board.frontend_admin_path', 'admin'), function () {
         'theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
         'theme_header' => config('v2board.frontend_theme_header', 'dark'),
         'theme_color' => config('v2board.frontend_theme_color', 'default'),
-        'backgroun_url' => config('v2board.frontend_background_url'),
-        'verison' => config('app.version')
+        'background_url' => config('v2board.frontend_background_url'),
+        'version' => config('app.version'),
+        'logo' => config('v2board.logo')
     ]);
 });

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác