From 928727c1499f6d6cd6a3100bc01e1f7cf4dc99eb Mon Sep 17 00:00:00 2001
From: Wisp X <1591788658@qq.com>
Date: Mon, 14 Mar 2022 10:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E9=97=AD=E6=B8=B8?=
 =?UTF-8?q?=E5=AE=A2=E4=B8=8A=E4=BC=A0=E5=90=8E=E5=85=AC=E5=91=8A=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=BC=B9=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/common/notice.blade.php | 16 ++++++++++++++++
 resources/views/layouts/app.blade.php   |  1 +
 resources/views/welcome.blade.php       | 17 +----------------
 3 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 resources/views/common/notice.blade.php

diff --git a/resources/views/common/notice.blade.php b/resources/views/common/notice.blade.php
new file mode 100644
index 00000000..c57cb2ef
--- /dev/null
+++ b/resources/views/common/notice.blade.php
@@ -0,0 +1,16 @@
+@if(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice))
+    <x-modal>
+        <div class="markdown-body">
+            {!! (new Parsedown())->parse(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice)) !!}
+        </div>
+    </x-modal>
+
+    @push('scripts')
+        <script>
+            if (! sessionStorage.getItem('noticed')) {
+                Alpine.store('modal').open = true;
+                sessionStorage.setItem('noticed', '1');
+            }
+        </script>
+    @endpush
+@endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index b2c3f4c4..63ce0618 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -46,6 +46,7 @@
     </x-container>
 </div>
 </body>
+@include('common.notice')
 <script>
     // 开关组件默认值
     let setSwitch = function (e) {
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 96723a10..2cce9f43 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -35,21 +35,6 @@
         </footer>
     </div>
 
-    @if(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice))
-        <x-modal>
-            <div class="markdown-body">
-                {!! (new Parsedown())->parse(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice)) !!}
-            </div>
-        </x-modal>
-
-        @push('scripts')
-            <script>
-                if (! sessionStorage.getItem('noticed')) {
-                    Alpine.store('modal').open = true;
-                    sessionStorage.setItem('noticed', '1');
-                }
-            </script>
-        @endpush
-    @endif
+    @include('common.notice')
 
 </x-guest-layout>