update theme

app/Http/Controllers/Admin/ConfigController.php

@@ -29,7 +29,6 @@ class ConfigController extends Controller
                     'app_url' => config('v2board.app_url'),
                     'subscribe_url' => config('v2board.subscribe_url'),
                     'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
-                    'plan_transfer_hour' => config('v2board.plan_transfer_hour', 12),
                     'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0),
                     'try_out_hour' => (int)config('v2board.try_out_hour', 1),
                     'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
@@ -56,7 +55,9 @@ class ConfigController extends Controller
                     'paytaro_app_secret' => config('v2board.paytaro_app_secret')
                 ],
                 'frontend' => [
-                    'frontend_theme' => config('v2board.frontend_theme', 1),
+                    'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
+                    'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
+                    'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
                     'frontend_background_url' => config('v2board.frontend_background_url')
                 ],
                 'server' => [

app/Http/Controllers/User/OrderController.php

@@ -51,7 +51,6 @@ class OrderController extends Controller
             abort(500, '订单不存在');
         }
         $order['plan'] = Plan::find($order->plan_id);
-        $order['plan_transfer_hour'] = config('v2board.plan_transfer_hour', 12);
         $order['try_out_plan_id'] = (int)config('v2board.try_out_plan_id');
         if (!$order['plan']) {
             abort(500, '订阅不存在');

app/Http/Requests/Admin/ConfigSave.php

@@ -18,7 +18,6 @@ class ConfigSave extends FormRequest
         'app_description' => '',
         'app_url' => 'url',
         'subscribe_url' => 'url',
-        'plan_transfer_hour' => 'numeric',
         'plan_change_enable' => 'in:0,1',
         'try_out_enable' => 'in:0,1',
         'try_out_plan_id' => 'integer',
@@ -47,7 +46,9 @@ class ConfigSave extends FormRequest
         'paytaro_app_id' => '',
         'paytaro_app_secret' => '',
         // frontend
-        'frontend_theme' => 'in:1,2',
+        'frontend_theme_sidebar' => 'in:dark,light',
+        'frontend_theme_header' => 'in:dark,light',
+        'frontend_theme_color' => 'in:default,bluedark,black',
         'frontend_background_url' => 'nullable|url',
         // tutorial
         'apple_id' => 'email',

public/assets/user/env.example.js

@@ -6,7 +6,11 @@ window.v2board = {
   // API
   host: '',
   // 主题
-  theme: '1',
+  theme: {
+    sidebar: 'light',
+    header: 'dark',
+    color: 'default'
+  },
   // 背景
   background_url: ''
 }

resources/views/admin.blade.php

@@ -13,7 +13,11 @@
     <script>
         window.v2board = {
             title: '{{$title}}',
-            theme: '{{$theme}}',
+            theme: {
+                sidebar: '{{$theme_sidebar}}',
+                header: '{{$theme_header}}',
+                color: '{{$theme_color}}',
+            },
             verison: '{{$verison}}',
             background_url: '{{$backgroun_url}}'
         }

resources/views/app.blade.php

@@ -13,7 +13,11 @@
     <script>
         window.v2board = {
             title: '{{$title}}',
-            theme: '{{$theme}}',
+            theme: {
+                sidebar: '{{$theme_sidebar}}',
+                header: '{{$theme_header}}',
+                color: '{{$theme_color}}',
+            },
             verison: '{{$verison}}',
             background_url: '{{$backgroun_url}}',
             description: '{{$description}}'

routes/web.php

@@ -21,7 +21,9 @@ Route::get('/', function (Request $request) {
     }
     return view('app', [
         'title' => config('v2board.app_name', 'V2Board'),
-        'theme' => config('v2board.frontend_theme', 1),
+        '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'),
         'description' => config('v2board.app_description', 'V2Board is best')
@@ -31,7 +33,9 @@ Route::get('/', function (Request $request) {
 Route::get('/admin', function () {
     return view('admin', [
         'title' => config('v2board.app_name', 'V2Board'),
-        'theme' => config('v2board.frontend_theme', 1),
+        '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')
     ]);