diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 3391630..b22aabe 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -12,7 +12,8 @@ class TrustProxies extends Middleware * * @var array|string|null */ - protected $proxies; + // Trust all proxies (Traefik handles TLS and forwards client info) + protected $proxies = '*'; /** * The headers that should be used to detect proxies. diff --git a/package-lock.json b/package-lock.json index a7cd623..130093d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1064,7 +1064,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -1767,7 +1766,6 @@ "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", "dev": true, "license": "MIT", - "peer": true, "bin": { "jiti": "bin/jiti.js" } @@ -2091,7 +2089,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -2576,7 +2573,6 @@ "integrity": "sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -2696,7 +2692,6 @@ "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", diff --git a/public/images/usher-logo-long.png b/public/images/usher-logo-long.png new file mode 100644 index 0000000..2a45482 Binary files /dev/null and b/public/images/usher-logo-long.png differ diff --git a/public/images/usher-logo.png b/public/images/usher-logo.png new file mode 100644 index 0000000..bc64869 Binary files /dev/null and b/public/images/usher-logo.png differ diff --git a/resources/views/components/application-logo.blade.php b/resources/views/components/application-logo.blade.php index 46579cf..a9a64ba 100644 --- a/resources/views/components/application-logo.blade.php +++ b/resources/views/components/application-logo.blade.php @@ -1,3 +1,8 @@ - - - +@props(['alt' => '台灣尤塞氏症暨視聽弱協會']) + +{{ $alt }}merge(['class' => 'h-10 w-auto']) }} +> diff --git a/resources/views/components/nav-link.blade.php b/resources/views/components/nav-link.blade.php index 5c101a2..5cc2d27 100644 --- a/resources/views/components/nav-link.blade.php +++ b/resources/views/components/nav-link.blade.php @@ -6,6 +6,6 @@ $classes = ($active ?? false) : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition duration-150 ease-in-out'; @endphp -merge(['class' => $classes]) }}> +merge(['class' => $classes]) }} @if($active) aria-current="page" @endif> {{ $slot }} diff --git a/resources/views/components/responsive-nav-link.blade.php b/resources/views/components/responsive-nav-link.blade.php index 43b91e7..a98e0b1 100644 --- a/resources/views/components/responsive-nav-link.blade.php +++ b/resources/views/components/responsive-nav-link.blade.php @@ -6,6 +6,6 @@ $classes = ($active ?? false) : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-gray-600 hover:text-gray-800 hover:bg-gray-50 hover:border-gray-300 focus:outline-none focus:text-gray-800 focus:bg-gray-50 focus:border-gray-300 transition duration-150 ease-in-out'; @endphp -merge(['class' => $classes]) }}> +merge(['class' => $classes]) }} @if($active) aria-current="page" @endif> {{ $slot }} diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 909b85c..f373518 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,65 +1,195 @@ -

- {{ __('Dashboard') }} -

+
+
+

+ 台灣尤塞氏症暨視聽弱協會｜工作桌面 +

+

會員服務、財務簽核、文件與公告都在這裡。

+
+ +
-
+
- -
-
-

歡迎回來，{{ Auth::user()->name }}！

-

這是您的個人儀表板

+ +
+
+
+
+
會員狀態
+

查看會籍期限、繳費紀錄、下載收據

+
+ 🎫 +
+
+ + 前往會員專區 + + + 自助繳費 + +
+
+ +
+
+
+
財務申請/審核
+

申請、審核、付款、對帳全流程

+
+ 💼 +
+
+ + 新增申請 + + + 查看案件列表 + +
+
+ +
+
+
+
管理/維運
+

會員匯入、角色權限、審計與問題追蹤

+
+ 🛡️ +
+
+ + 會員管理 + + + 角色與權限 + + + 審計日誌 + +
- - @if($recentDocuments->isNotEmpty()) -
-
-
-

最新文件

- - 查看全部 → - -
-
-
- @foreach($recentDocuments as $document) -
-
-
- {{ $document->currentVersion?->getFileIcon() ?? '📄' }} -
-
-

- - {{ $document->title }} - -

- @if($document->description) -

{{ $document->description }}

- @endif -
- {{ $document->category->icon }} {{ $document->category->name }} - 📅 {{ $document->created_at->format('Y-m-d') }} - 📏 {{ $document->currentVersion?->getFileSizeHuman() }} -
-
-
- - 下載 - -
-
-
- @endforeach + +
+
+
+

待辦總覽（所有角色可見）

+

依職責挑選你需要處理的事項。

- @endif +
+
+
+

申請人 / 會員

📝 +
+ +
+
+
+

出納

💰 +
+ +
+
+
+

會計

📊 +
+ +
+
+
+

理事長/理事

✅ +
+ +
+
+
+ + +
+
+
+

問題追蹤

+ 建立問題 +
+

回報系統/流程問題，追蹤討論、附件與狀態。

+
+ 查看全部 + 統計報表 +
+
+ + @if($recentDocuments->isNotEmpty()) +
+
+
+

最新文件/公告

+

協會文件、公告與外部發佈。

+
+ 查看全部 → +
+
+ @foreach($recentDocuments as $document) +
+
+
+ {{ $document->currentVersion?->getFileIcon() ?? '📄' }} +
+
+

+ + {{ $document->title }} + +

+ @if($document->description) +

{{ $document->description }}

+ @endif +
+ {{ $document->category->icon }} {{ $document->category->name }} + 📅 {{ $document->created_at->format('Y-m-d') }} + 📏 {{ $document->currentVersion?->getFileSizeHuman() }} +
+
+
+ + 下載 + +
+
+
+ @endforeach +
+
+ @endif +
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 83275aa..16a2e60 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -15,6 +15,9 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) + + {{ __('Skip to main content') }} +
@include('layouts.navigation') @@ -28,7 +31,7 @@ @endif -
+
{{ $slot }}
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 11feb47..06f336c 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -15,6 +15,9 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) + + {{ __('Skip to main content') }} +
-
+
{{ $slot }}
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 15c5da7..8659f59 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -24,7 +24,7 @@ {{ __('Documents') }} - @if(Auth::user() && (Auth::user()->is_admin || Auth::user()->hasRole('admin'))) + @if(Auth::user()) {{ __('Admin: Members') }} @@ -113,7 +113,7 @@
-