feat: new waifu2x uim logo

.gitignore

@@ -26,7 +26,6 @@ config/.config.php.bak
 config/appprofile.php
 
 public/clients/
-public/images/*.*
 
 storage/framework/smarty/cache/*
 storage/framework/smarty/compile/*

README.md

@@ -1,4 +1,4 @@
-<img src="https://raw.githubusercontent.com/Anankke/SSPanel-Uim/dev/public/images/uim-logo-round.png" alt="logo" width="130" height="130" align="left" />
+<img src="https://raw.githubusercontent.com/Anankke/SSPanel-Uim/dev/public/images/uim-logo-round_192x192.png" alt="logo" width="130" height="130" align="left" />
 
 <h1>SSPanel UIM</h1>
 

resources/views/tabler/admin/tabler_header.tpl

@@ -40,7 +40,7 @@
                     <span class="navbar-toggler-icon"></span>
                 </button>
                 <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3" style="filter: none;">
-                    <img src="/images/uim-logo-round.png" height="32" alt="SSPanel-UIM" class="navbar-brand-image">
+                    <img src="/images/uim-logo-round_48x48.png" height="32" alt="SSPanel-UIM" class="navbar-brand-image">
                 </h1>
                 <div class="navbar-nav flex-row order-md-last">
                     <div class="nav-item dropdown">

resources/views/tabler/auth/login.tpl

@@ -5,7 +5,7 @@
         <div class="container-tight py-4">
             <div class="text-center mb-4">
                 <a href="#" class="navbar-brand navbar-brand-autodark">
-                    <img src="/images/uim-logo-round.png" height="64" alt="">
+                    <img src="/images/uim-logo-round_96x96.png" height="64" alt="">
                 </a>
             </div>
             <div class="card card-md">

resources/views/tabler/auth/register.tpl

@@ -5,7 +5,7 @@
         <div class="container-tight py-4">
             <div class="text-center mb-4">
                 <a href="#" class="navbar-brand navbar-brand-autodark">
-                    <img src="/images/uim-logo-round.png" height="64" alt="">
+                    <img src="/images/uim-logo-round_96x96.png" height="64" alt="">
                 </a>
             </div>
             <div class="card card-md">

resources/views/tabler/gateway/epay.tpl

@@ -9,21 +9,21 @@
         <br />
         {if $config['epay_alipay'] == true}
         <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="alipay">
-            <img src="/images/alipay.jpg" height="50px" />
+            <img src="/images/alipay.png" height="50px" />
         </button>
         {/if}
         {if $config['epay_wechat'] == true}
         <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="wxpay">
-            <img src="/images/weixin.jpg" height="50px" />
+            <img src="/images/wechat.png" height="50px" />
         </button>
         {/if}
         {if $config['epay_qq'] == true}
         <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="qqpay">
-            <img src="/images/qqpay.jpg" height="50px" />
+            <img src="/images/qqpay.png" height="50px" />
         </button>
         {/if}
         {if $config['epay_usdt'] == true}
-        <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value=usdt">
+        <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="usdt">
             <img src="/images/usdt.png" height="50px" />
         </button>
         {/if}

resources/views/tabler/password/reset.tpl

@@ -5,7 +5,7 @@
         <div class="container-tight py-4">
             <div class="text-center mb-4">
                 <a href="#" class="navbar-brand navbar-brand-autodark">
-                    <img src="/images/uim-logo-round.png" height="64" alt="">
+                    <img src="/images/uim-logo-round_96x96.png" height="64" alt="">
                 </a>
             </div>
             <div class="card card-md">

resources/views/tabler/password/token.tpl

@@ -5,7 +5,7 @@
         <div class="container-tight py-4">
             <div class="text-center mb-4">
                 <a href="#" class="navbar-brand navbar-brand-autodark">
-                    <img src="/images/uim-logo-round.png" height="64" alt="">
+                    <img src="/images/uim-logo-round_96x96.png" height="64" alt="">
                 </a>
             </div>
             <div class="card card-md">

resources/views/tabler/user/tabler_header.tpl

@@ -39,7 +39,7 @@
                     <span class="navbar-toggler-icon"></span>
                 </button>
                 <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3" style="filter: none;">
-                    <img src="/images/uim-logo-round.png" height="32" alt="SSPanel-UIM" class="navbar-brand-image">
+                    <img src="/images/uim-logo-round_48x48.png" height="32" alt="SSPanel-UIM" class="navbar-brand-image">
                 </h1>
                 <div class="navbar-nav flex-row order-md-last">
                     <div class="nav-item dropdown">

src/Controllers/LinkController.php

@@ -96,7 +96,7 @@ final class LinkController extends BaseController
         //篩選出用戶能連接的節點
         $nodes_raw = Node::where('type', 1)
             ->where('node_class', '<=', $user->class)
-            ->whereIn('node_group', [0, $user->group])
+            ->whereIn('node_group', [0, $user->node_group])
             ->where(static function ($query): void {
                 $query->where('node_bandwidth_limit', '=', 0)->orWhereRaw('node_bandwidth < node_bandwidth_limit');
             })
@@ -132,7 +132,7 @@ final class LinkController extends BaseController
         //篩選出用戶能連接的節點
         $nodes_raw = Node::where('type', 1)
             ->where('node_class', '<=', $user->class)
-            ->whereIn('node_group', [0, $user->group])
+            ->whereIn('node_group', [0, $user->node_group])
             ->where(static function ($query): void {
                 $query->where('node_bandwidth_limit', '=', 0)->orWhereRaw('node_bandwidth < node_bandwidth_limit');
             })
@@ -191,7 +191,7 @@ final class LinkController extends BaseController
         //篩選出用戶能連接的節點
         $nodes_raw = Node::where('type', 1)
             ->where('node_class', '<=', $user->class)
-            ->whereIn('node_group', [0, $user->group])
+            ->whereIn('node_group', [0, $user->node_group])
             ->where(static function ($query): void {
                 $query->where('node_bandwidth_limit', '=', 0)->orWhereRaw('node_bandwidth < node_bandwidth_limit');
             })

src/Controllers/SubController.php

@@ -89,7 +89,7 @@ final class SubController extends BaseController
         //篩選出用戶能連接的節點
         $nodes_raw = Node::where('type', 1)
             ->where('node_class', '<=', $user->class)
-            ->whereIn('node_group', [0, $user->group])
+            ->whereIn('node_group', [0, $user->node_group])
             ->where(static function ($query): void {
                 $query->where('node_bandwidth_limit', '=', 0)->orWhereRaw('node_bandwidth < node_bandwidth_limit');
             })
@@ -216,7 +216,7 @@ final class SubController extends BaseController
         //篩選出用戶能連接的節點
         $nodes_raw = Node::where('type', 1)
             ->where('node_class', '<=', $user->class)
-            ->whereIn('node_group', [0, $user->group])
+            ->whereIn('node_group', [0, $user->node_group])
             ->where(static function ($query): void {
                 $query->where('node_bandwidth_limit', '=', 0)->orWhereRaw('node_bandwidth < node_bandwidth_limit');
             })

src/Services/Gateway/Vmqpay.php

@@ -90,8 +90,8 @@ final class Vmqpay extends AbstractPayment
             <form class="vmqpay" name="vmqpay" action="/user/payment/purchase/vmqpay" method="get">
                 <input class="form-control maxwidth-edit" id="price" name="price" placeholder="输入充值金额后，点击你要付款的应用图标即可" autofocus="autofocus" type="number" min="0.01" max="1000" step="0.01" required="required">
                 <br>
-                <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="2" ><img src="/images/alipay.jpg" width="50px" height="50px" /></button>
-                <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="1" ><img src="/images/weixin.jpg" width="50px" height="50px" /></button>
+                <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="2" ><img src="/images/alipay.png" width="50px" height="50px" /></button>
+                <button class="btn btn-flat waves-attach" id="btnSubmit" type="submit" name="type" value="1" ><img src="/images/wechat.png" width="50px" height="50px" /></button>
             </form>
             </div>
         ';