chore: move traffic log to user/index

app/routes.php

@@ -77,8 +77,6 @@ return static function (Slim\App $app): void {
         $group->post('/ga_check', App\Controllers\User\MFAController::class . ':checkGa');
         $group->post('/ga_set', App\Controllers\User\MFAController::class . ':setGa');
         $group->post('/ga_reset', App\Controllers\User\MFAController::class . ':resetGa');
-        // 流量记录
-        $group->get('/traffic', App\Controllers\User\TrafficLogController::class . ':index');
         // 账户余额
         $group->get('/money', App\Controllers\User\MoneyController::class . ':index');
         $group->post('/giftcard', App\Controllers\User\MoneyController::class . ':applyGiftCard');

resources/views/tabler/user/header.tpl

@@ -112,12 +112,6 @@
                                     <i class="ti ti-chart-bar"></i>&nbsp;
                                     流量倍率
                                 </a>
-                                {if $public_setting['traffic_log']}
-                                <a class="dropdown-item" href="/user/traffic">
-                                    <i class="ti ti-traffic-lights"></i>&nbsp;
-                                    流量日志
-                                </a>
-                                {/if}
                             </div>
                         </li>
                         <li class="nav-item dropdown">

resources/views/tabler/user/index.tpl

@@ -448,50 +448,108 @@
                     </div>
                 </div>
                 <div class="col-lg-6 col-sm-12">
-                    <div class="card">
-                        <div class="card-body">
-                            <h3 class="card-title">流量用量</h3>
-                            <div class="progress progress-separated mb-3">
-                                {if $user->LastusedTrafficPercent() < '1'}
+                    <div class="vstack">
+                        <div class="card">
+                            <div class="card-body">
+                                <h3 class="card-title">流量用量</h3>
+                                <div class="progress progress-separated mb-3">
+                                    {if $user->LastusedTrafficPercent() < '1'}
                                     <div class="progress-bar bg-primary" role="progressbar" style="width: 1%"></div>
-                                {else}
+                                    {else}
                                     <div class="progress-bar bg-primary" role="progressbar"
                                          style="width: {$user->LastusedTrafficPercent()}%">
                                     </div>
-                                {/if}
-                                {if $user->TodayusedTrafficPercent() < '1'}
+                                    {/if}
+                                    {if $user->TodayusedTrafficPercent() < '1'}
                                     <div class="progress-bar bg-success" role="progressbar" style="width: 1%"></div>
-                                {else}
+                                    {else}
                                     <div class="progress-bar bg-success" role="progressbar"
                                          style="width: {$user->TodayusedTrafficPercent()}%"></div>
-                                {/if}
-                            </div>
-                            <div class="row">
-                                <div class="col-auto d-flex align-items-center pe-2">
-                                    <span class="legend me-2 bg-primary"></span>
-                                    <span>过去用量 {$user->LastusedTraffic()}</span>
-                                </div>
-                                <div class="col-auto d-flex align-items-center px-2">
-                                    <span class="legend me-2 bg-success"></span>
-                                    <span>今日用量 {$user->TodayusedTraffic()}</span>
+                                    {/if}
                                 </div>
-                                <div class="col-auto d-flex align-items-center ps-2">
-                                    <span class="legend me-2"></span>
-                                    <span>剩余流量 {$user->unusedTraffic()}</span>
+                                <div class="row">
+                                    <div class="col-auto d-flex align-items-center pe-2">
+                                        <span class="legend me-2 bg-primary"></span>
+                                        <span>过去用量 {$user->LastusedTraffic()}</span>
+                                    </div>
+                                    <div class="col-auto d-flex align-items-center px-2">
+                                        <span class="legend me-2 bg-success"></span>
+                                        <span>今日用量 {$user->TodayusedTraffic()}</span>
+                                    </div>
+                                    <div class="col-auto d-flex align-items-center ps-2">
+                                        <span class="legend me-2"></span>
+                                        <span>剩余流量 {$user->unusedTraffic()}</span>
+                                    </div>
                                 </div>
-                            </div>
-                            <p class="my-3">
-                                {if $user->class === 0}
+                                <p class="my-3">
+                                    {if $user->class === 0}
                                     前往
                                     <a href="/user/product">商店</a>
                                     购买套餐
-                                {else}
+                                    {else}
                                     你的 LV. {$user->class} 账户会在 {$class_expire_days} 天后到期（{$user->class_expire}）
+                                    {/if}
+                                </p>
+                            </div>
+                        </div>
+                        {if $public_setting['traffic_log']}
+                        <div class="card my-3 mb-0">
+                            <div class="card-body">
+                                <h3 class="card-title">每小时用量</h3>
+                                <div id="traffic-log"></div>
+                            </div>
+                        </div>
+                        {/if}
+                    </div>
+                </div>
+                {if $public_setting['enable_checkin']}
+                <div class="col-lg-6 col-sm-12">
+                    <div class="card">
+                        <div class="card-stamp">
+                            <div class="card-stamp-icon bg-green">
+                                <i class="ti ti-check"></i>
+                            </div>
+                        </div>
+                        <div class="card-body">
+                            <h3 class="card-title">每日签到</h3>
+                            <p>
+                                签到可领取
+                                {if $public_setting['checkin_min'] !== $public_setting['checkin_max']}
+                                &nbsp;
+                                <code>{$public_setting['checkin_min']} MB</code>
+                                至
+                                <code>{$public_setting['checkin_max']} MB</code>
+                                范围内的流量
+                                {else}
+                                <code>{$public_setting['checkin_min']} MB</code>
                                 {/if}
                             </p>
+                            <p>
+                                上次签到时间：<code id="last-checkin-time">{$user->lastCheckInTime()}</code>
+                            </p>
+                        </div>
+                        <div class="card-footer">
+                            <div class="d-flex">
+                                {if ! $user->isAbleToCheckin()}
+                                <button id="check-in" class="btn btn-primary ms-auto" disabled>已签到</button>
+                                {else}
+                                {if $public_setting['enable_checkin_captcha']}
+                                {include file='captcha/div.tpl'}
+                                {/if}
+                                <button id="check-in" class="btn btn-primary ms-auto"
+                                        hx-post="/user/checkin" hx-swap="none" hx-vals='js:{
+                                    {if $public_setting['enable_checkin_captcha']}
+                                    {include file='captcha/ajax.tpl'}
+                                    {/if}
+                                    }'>
+                                    签到
+                                </button>
+                                {/if}
+                            </div>
                         </div>
                     </div>
                 </div>
+                {/if}
                 <div class="col-lg-6 col-sm-12">
                     <div class="card">
                         <div class="ribbon ribbon-top bg-yellow">
@@ -501,67 +559,19 @@
                             <h3 class="card-title">
                                 最新公告
                                 {if $ann !== null}
-                                    <span class="card-subtitle">{$ann->date}</span>
+                                <span class="card-subtitle">{$ann->date}</span>
                                 {/if}
                             </h3>
                             <p class="text-secondary">
                                 {if $ann !== null}
-                                    {$ann->content}
+                                {$ann->content}
                                 {else}
-                                    暂无公告
+                                暂无公告
                                 {/if}
                             </p>
                         </div>
                     </div>
                 </div>
-                {if $public_setting['enable_checkin']}
-                    <div class="col-lg-6 col-sm-12">
-                        <div class="card">
-                            <div class="card-stamp">
-                                <div class="card-stamp-icon bg-green">
-                                    <i class="ti ti-check"></i>
-                                </div>
-                            </div>
-                            <div class="card-body">
-                                <h3 class="card-title">每日签到</h3>
-                                <p>
-                                    签到可领取
-                                    {if $public_setting['checkin_min'] !== $public_setting['checkin_max']}
-                                        &nbsp;
-                                        <code>{$public_setting['checkin_min']} MB</code>
-                                        至
-                                        <code>{$public_setting['checkin_max']} MB</code>
-                                        范围内的流量
-                                    {else}
-                                        <code>{$public_setting['checkin_min']} MB</code>
-                                    {/if}
-                                </p>
-                                <p>
-                                    上次签到时间：<code id="last-checkin-time">{$user->lastCheckInTime()}</code>
-                                </p>
-                            </div>
-                            <div class="card-footer">
-                                <div class="d-flex">
-                                    {if ! $user->isAbleToCheckin()}
-                                        <button id="check-in" class="btn btn-primary ms-auto" disabled>已签到</button>
-                                    {else}
-                                        {if $public_setting['enable_checkin_captcha']}
-                                            {include file='captcha/div.tpl'}
-                                        {/if}
-                                        <button id="check-in" class="btn btn-primary ms-auto"
-                                                hx-post="/user/checkin" hx-swap="none" hx-vals='js:{
-                                                {if $public_setting['enable_checkin_captcha']}
-                                                    {include file='captcha/ajax.tpl'}
-                                                {/if}
-                                                }'>
-                                            签到
-                                        </button>
-                                    {/if}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {/if}
             </div>
         </div>
     </div>
@@ -570,4 +580,105 @@
         {include file='captcha/js.tpl'}
     {/if}
 
+    {if $public_setting['traffic_log']}
+    <script>
+        document.addEventListener("DOMContentLoaded", function () {
+            let chart = window.ApexCharts && new ApexCharts(document.getElementById('traffic-log'), {
+                chart: {
+                    type: "line",
+                    fontFamily: "inherit",
+                    height: '100%',
+                    parentHeightOffset: 0,
+                    toolbar: {
+                        show: false
+                    },
+                    animations: {
+                        enabled: false
+                    }
+                },
+                stroke: {
+                    curve: "smooth"
+                },
+                fill: {
+                    opacity: 1
+                },
+                series: [
+                    {
+                        name: "使用流量（MB）",
+                        data: {$traffic_logs}
+                    }
+                ],
+                tooltip: {
+                    theme: "dark"
+                },
+                grid: {
+                    padding: {
+                        top: -20,
+                        right: 0,
+                        left: 0,
+                        bottom: 0
+                    },
+                    strokeDashArray: 4
+                },
+                xaxis: {
+                    title: {
+                        text: "小时"
+                    },
+                    labels: {
+                        padding: 0
+                    },
+                    tooltip: {
+                        enabled: false
+                    },
+                    axisBorder: {
+                        show: false
+                    },
+                    categories: [
+                        "00",
+                        "01",
+                        "02",
+                        "03",
+                        "04",
+                        "05",
+                        "06",
+                        "07",
+                        "08",
+                        "09",
+                        "10",
+                        "11",
+                        "12",
+                        "13",
+                        "14",
+                        "15",
+                        "16",
+                        "17",
+                        "18",
+                        "19",
+                        "20",
+                        "21",
+                        "22",
+                        "23"
+                    ]
+                },
+                yaxis: {
+                    title: {
+                        text: "使用流量（MB）",
+                        rotate: -90
+                    },
+                    labels: {
+                        padding: 14
+                    }
+                },
+                colors: [tabler.getColor("azure")],
+                legend: {
+                    show: false
+                }
+            });
+            chart.render();
+        });
+    </script>
+
+    <script src="//{$config['jsdelivr_url']}/npm/@tabler/core@latest/dist/libs/apexcharts/dist/apexcharts.min.js"></script>
+    {/if}
+
     {include file='user/footer.tpl'}

resources/views/tabler/user/traffic_log.tpl

@@ -1,132 +0,0 @@
-{include file='user/header.tpl'}
-
-<div class="page-wrapper">
-    <div class="container-xl">
-        <div class="page-header d-print-none text-white">
-            <div class="row align-items-center">
-                <div class="col">
-                    <h2 class="page-title">
-                        <span class="home-title">流量记录</span>
-                    </h2>
-                    <div class="page-pretitle my-3">
-                        <span class="home-subtitle">本日内的流量使用记录</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="page-body">
-        <div class="container-xl">
-            <div class="row row-deck row-cards">
-                <div class="col-sm-12 col-lg-12">
-                    <div class="card">
-                        <div class="card-body">
-                            <div id="traffic-log"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            let chart = window.ApexCharts && new ApexCharts(document.getElementById('traffic-log'), {
-                chart: {
-                    type: "line",
-                    fontFamily: "inherit",
-                    height: '250%',
-                    parentHeightOffset: 0,
-                    toolbar: {
-                        show: false
-                    },
-                    animations: {
-                        enabled: false
-                    }
-                },
-                stroke: {
-                    curve: "smooth"
-                },
-                fill: {
-                    opacity: 1
-                },
-                series: [
-                    {
-                        name: "使用流量（MB）",
-                        data: {$logs}
-                    }
-                ],
-                tooltip: {
-                    theme: "dark"
-                },
-                grid: {
-                    padding: {
-                        top: -20,
-                        right: 0,
-                        left: 0,
-                        bottom: 0
-                    },
-                    strokeDashArray: 4
-                },
-                xaxis: {
-                    title: {
-                        text: "小时"
-                    },
-                    labels: {
-                        padding: 0
-                    },
-                    tooltip: {
-                        enabled: false
-                    },
-                    axisBorder: {
-                        show: false
-                    },
-                    categories: [
-                        "00",
-                        "01",
-                        "02",
-                        "03",
-                        "04",
-                        "05",
-                        "06",
-                        "07",
-                        "08",
-                        "09",
-                        "10",
-                        "11",
-                        "12",
-                        "13",
-                        "14",
-                        "15",
-                        "16",
-                        "17",
-                        "18",
-                        "19",
-                        "20",
-                        "21",
-                        "22",
-                        "23"
-                    ]
-                },
-                yaxis: {
-                    title: {
-                        text: "使用流量（MB）",
-                        rotate: -90
-                    },
-                    labels: {
-                        padding: 14
-                    }
-                },
-                colors: [tabler.getColor("azure")],
-                legend: {
-                    show: false
-                }
-            });
-            chart.render();
-        });
-    </script>
-
-    <script src="//{$config['jsdelivr_url']}/npm/@tabler/core@latest/dist/libs/apexcharts/dist/apexcharts.min.js"></script>
-
-{include file='user/footer.tpl'}

src/Controllers/User/ProfileController.php

@@ -25,20 +25,18 @@ final class ProfileController extends BaseController
      */
     public function index(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
+        $logins = [];
+        $subs = [];
         $ips = (new OnlineLog())->where('user_id', $this->user->id)
             ->where('last_time', '>', time() - 90)->orderByDesc('last_time')->get();
 
         if (Config::obtain('login_log')) {
             $logins = (new LoginIp())->where('userid', $this->user->id)
                 ->where('type', '=', 0)->orderBy('datetime', 'desc')->take(10)->get();
-        } else {
-            $logins = [];
         }
 
         if (Config::obtain('subscribe_log')) {
             $subs = (new SubscribeLog())->where('user_id', $this->user->id)->orderBy('id', 'desc')->take(10)->get();
-        } else {
-            $subs = [];
         }
 
         foreach ($ips as $ip) {

src/Controllers/User/TrafficLogController.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controllers\User;
-
-use App\Controllers\BaseController;
-use App\Models\Config;
-use App\Services\Analytics;
-use App\Utils\Tools;
-use Exception;
-use Psr\Http\Message\ResponseInterface;
-use Slim\Http\Response;
-use Slim\Http\ServerRequest;
-use function json_encode;
-
-final class TrafficLogController extends BaseController
-{
-    /**
-     * 订阅记录
-     *
-     * @throws Exception
-     */
-    public function index(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        if (! Config::obtain('traffic_log')) {
-            return $response->withRedirect('/user');
-        }
-
-        $logs = [];
-        $hourly_usage = Analytics::getUserTodayHourlyUsage($this->user->id);
-
-        foreach ($hourly_usage as $hour => $usage) {
-            $logs[] = Tools::bToMB((int) $usage);
-        }
-
-        return $response->write($this->view()
-            ->assign('logs', json_encode($logs))
-            ->fetch('user/traffic_log.tpl'));
-    }
-}

src/Controllers/UserController.php

@@ -6,6 +6,7 @@ namespace App\Controllers;
 
 use App\Models\Ann;
 use App\Models\Config;
+use App\Services\Analytics;
 use App\Services\Auth;
 use App\Services\Captcha;
 use App\Services\Reward;
@@ -16,6 +17,7 @@ use Exception;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response;
 use Slim\Http\ServerRequest;
+use function json_encode;
 use function strtotime;
 use function time;
 
@@ -27,17 +29,27 @@ final class UserController extends BaseController
     public function index(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $captcha = [];
+        $traffic_logs = [];
         $class_expire_days = $this->user->class > 0 ?
             round((strtotime($this->user->class_expire) - time()) / 86400) : 0;
 
-        if (Config::obtain('enable_checkin_captcha')) {
+        if (Config::obtain('enable_checkin_captcha') && $this->user->isAbleToCheckin()) {
             $captcha = Captcha::generate();
         }
 
+        if (Config::obtain('traffic_log')) {
+            $hourly_usage = Analytics::getUserTodayHourlyUsage($this->user->id);
+
+            foreach ($hourly_usage as $hour => $usage) {
+                $traffic_logs[] = Tools::bToMB((int) $usage);
+            }
+        }
+
         return $response->write(
             $this->view()
                 ->assign('ann', (new Ann())->orderBy('date', 'desc')->first())
                 ->assign('captcha', $captcha)
+                ->assign('traffic_logs', json_encode($traffic_logs))
                 ->assign('class_expire_days', $class_expire_days)
                 ->assign('UniversalSub', Subscribe::getUniversalSubLink($this->user))
                 ->fetch('user/index.tpl')