From e3dc5a6a514e44fa4d675ca82edf62e06c95be27 Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Fri, 17 Feb 2023 20:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E6=AC=A2=E8=BF=8E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Web/AuthController.php |   6 +-
 resources/views/index.blade.php             | 177 +++++++++-----------
 resources/views/welcome.blade.php           |  11 ++
 3 files changed, 96 insertions(+), 98 deletions(-)
 create mode 100644 resources/views/welcome.blade.php

diff --git a/app/Http/Controllers/Web/AuthController.php b/app/Http/Controllers/Web/AuthController.php
index 6c05a02..d9ea0dc 100644
--- a/app/Http/Controllers/Web/AuthController.php
+++ b/app/Http/Controllers/Web/AuthController.php
@@ -28,12 +28,12 @@ public function index(Request $request): View|RedirectResponse
 
             session(['callback' => $callback]);
 
-            if (Auth::guard('web')->check()) {
+            if ($request->user('web')) {
                 $callbackHost = parse_url($callback, PHP_URL_HOST);
                 $dashboardHost = parse_url(config('settings.dashboard.base_url'), PHP_URL_HOST);
 
                 if ($callbackHost === $dashboardHost) {
-                    if (! Auth::guard('web')->user()->isRealNamed()) {
+                    if (! $request->user('web')->isRealNamed()) {
                         return redirect()->route('real_name.create')->with('status', '重定向已被打断，需要先实人认证。');
                     }
 
@@ -51,7 +51,7 @@ public function index(Request $request): View|RedirectResponse
             }
         }
 
-        return view('index');
+        return $request->user('web') ? view('index') : view('welcome');
     }
 
     public function confirm_redirect(Request $request): View
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 52f3741..ac6c329 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -2,108 +2,95 @@
 
 @section('content')
 
-    @guest
-        <h3>欢迎使用 {{ config('app.display_name') }}</h3>
-        <p>您需要先 登录 / 注册，才能继续使用 {{ config('app.display_name') }}。</p>
-
-        <p>如果您继续，则代表您已经阅读并同意 <a href="https://www.laecloud.com/tos/" target="_blank"
-                                                class="text-decoration-underline">服务条款</a></p>
-        <a href="{{ route('login') }}" class="btn btn-primary">登录</a>
-        <a href="{{ route('register') }}" class="btn btn-primary">注册</a>
-    @endguest
-
-    @auth
-        @if(!auth('web')->user()->isRealNamed())
-            <x-alert-danger>
-                <div>
-                    您还没有<a href="{{ route('real_name.create') }}">实人认证</a>，<a
-                        href="{{ route('real_name.create') }}">实人认证</a>后才能使用所有功能。
-                </div>
-            </x-alert-danger>
-        @endif
-
-        @if (session('token'))
-            <x-alert-warning>
-                <div>
-                    像密码一样保管好您的 API Token。
-                    <br/>
-                    {{ session('token') }}
-                </div>
-            </x-alert-warning>
-        @endif
-
-
-        <h3>嗨, <span class="link" data-bs-toggle="modal" data-bs-target="#userInfo"
-                      style="cursor: pointer">{{ auth('web')->user()->name }}</span></h3>
-        @php($user = auth('web')->user())
-        <form method="POST" action="{{ route('users.update') }}">
-            @csrf
-            @method('PATCH')
-            <div class="form-floating mb-2">
-                <input type="text" class="form-control" placeholder="用户名"
-                       aria-label="用户名" name="name" required maxlength="25"
-                       value="{{ $user->name }}">
-                <label>用户名</label>
+    @if(!auth('web')->user()->isRealNamed())
+        <x-alert-danger>
+            <div>
+                您还没有<a href="{{ route('real_name.create') }}">实人认证</a>，<a
+                    href="{{ route('real_name.create') }}">实人认证</a>后才能使用所有功能。
             </div>
+        </x-alert-danger>
+    @endif
 
-            <button type="submit" class="btn btn-primary visually-hidden">
-                更新
-            </button>
-        </form>
-
-        <h3 class="mt-3">访问密钥</h3>
-        <p>在这里，你可以获取新的 Token 来对接其他应用程序或者访问 控制面板。</p>
-
-        <form action="{{ route('token.new') }}" name="newToken" method="POST">
-            @csrf
-            <div class="form-floating mb-2">
-                <input type="text" class="form-control" placeholder="Token 名称"
-                       aria-label="密钥名称" name="name" required maxlength="25">
-                <label>Token 名称</label>
+    @if (session('token'))
+        <x-alert-warning>
+            <div>
+                像密码一样保管好您的 API Token。
+                <br/>
+                {{ session('token') }}
             </div>
-
-            <button type="submit" class="btn btn-primary visually-hidden">
-                创建
-            </button>
-        </form>
-
-        <h3 class="mt-3">撤销密钥</h3>
-        <p>如果你需要撤销对所有应用程序的授权，你可以在这里吊销所有 Token</p>
-        <form action="{{ route('token.delete_all') }}" method="post">
-            @csrf
-            @method('DELETE')
-            <button class="btn btn-danger" type="submit">撤销所有</button>
-        </form>
+        </x-alert-warning>
+    @endif
 
 
-        <div class="modal fade" id="userInfo" tabindex="-1" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">{{ $user->name }}</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>ID: {{ $user->id }}</p>
-                        <p>Email: {{ $user->email }}</p>
-                        @if ($user->birthday_at)
-                            <p>年龄: {{ $user->birthday_at->age . ' 岁' }}</p>
-                        @endif
-                        <p>注册时间: {{ $user->created_at }}</p>
-                        <p>验证时间: {{ $user->email_verified_at }}</p>
-                        @if ($user->real_name_verified_at)
-                            <p>实人认证时间: {{ $user->real_name_verified_at }}</p>
-                        @endif
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary"
-                                data-bs-dismiss="modal">好
-                        </button>
-                    </div>
+    <h3>嗨, <span class="link" data-bs-toggle="modal" data-bs-target="#userInfo"
+                  style="cursor: pointer">{{ auth('web')->user()->name }}</span></h3>
+    @php($user = auth('web')->user())
+    <form method="POST" action="{{ route('users.update') }}">
+        @csrf
+        @method('PATCH')
+        <div class="form-floating mb-2">
+            <input type="text" class="form-control" placeholder="用户名"
+                   aria-label="用户名" name="name" required maxlength="25"
+                   value="{{ $user->name }}">
+            <label>用户名</label>
+        </div>
+
+        <button type="submit" class="btn btn-primary visually-hidden">
+            更新
+        </button>
+    </form>
+
+    <h3 class="mt-3">访问密钥</h3>
+    <p>在这里，你可以获取新的 Token 来对接其他应用程序或者访问 控制面板。</p>
+
+    <form action="{{ route('token.new') }}" name="newToken" method="POST">
+        @csrf
+        <div class="form-floating mb-2">
+            <input type="text" class="form-control" placeholder="Token 名称"
+                   aria-label="密钥名称" name="name" required maxlength="25">
+            <label>Token 名称</label>
+        </div>
+
+        <button type="submit" class="btn btn-primary visually-hidden">
+            创建
+        </button>
+    </form>
+
+    <h3 class="mt-3">撤销密钥</h3>
+    <p>如果你需要撤销对所有应用程序的授权，你可以在这里吊销所有 Token</p>
+    <form action="{{ route('token.delete_all') }}" method="post">
+        @csrf
+        @method('DELETE')
+        <button class="btn btn-danger" type="submit">撤销所有</button>
+    </form>
+
+
+    <div class="modal fade" id="userInfo" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">{{ $user->name }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <p>ID: {{ $user->id }}</p>
+                    <p>Email: {{ $user->email }}</p>
+                    @if ($user->birthday_at)
+                        <p>年龄: {{ $user->birthday_at->age . ' 岁' }}</p>
+                    @endif
+                    <p>注册时间: {{ $user->created_at }}</p>
+                    <p>验证时间: {{ $user->email_verified_at }}</p>
+                    @if ($user->real_name_verified_at)
+                        <p>实人认证时间: {{ $user->real_name_verified_at }}</p>
+                    @endif
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary"
+                            data-bs-dismiss="modal">好
+                    </button>
                 </div>
             </div>
         </div>
-
-    @endauth
+    </div>
 
 @endsection
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
new file mode 100644
index 0000000..8d44685
--- /dev/null
+++ b/resources/views/welcome.blade.php
@@ -0,0 +1,11 @@
+@extends('layouts.app')
+
+@section('content')
+    <h3>欢迎使用 {{ config('app.display_name') }}</h3>
+    <p>您需要先 登录 / 注册，才能继续使用 {{ config('app.display_name') }}。</p>
+
+    <p>如果您继续，则代表您已经阅读并同意 <a href="https://www.laecloud.com/tos/" target="_blank"
+                                            class="text-decoration-underline">服务条款</a></p>
+    <a href="{{ route('login') }}" class="btn btn-primary">登录</a>
+    <a href="{{ route('register') }}" class="btn btn-primary">注册</a>
+@endsection