gbanyan/usher-manage-stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix audit logs and issue reports pages, rename Issues to Tasks

Browse Source 
修復稽核日誌與任務報表頁面，並將「問題」改名為「任務」

## Changes 變更內容

### Bug Fixes 錯誤修復
1. Fixed audit logs page 500 error
   - Added missing $auditableTypes variable to controller
   - Changed $events to $actions in view
   - Added description and ip_address columns to audit_logs table
   - Updated AuditLog model fillable array

2. Fixed issue reports page SQLite compatibility errors
   - Replaced MySQL NOW() function with Laravel now() helper
   - Replaced TIMESTAMPDIFF() with PHP-based date calculation
   - Fixed request->date() default value handling

### Feature Changes 功能變更
3. Renamed "Issues" terminology to "Tasks" throughout the system
   - Updated navigation menus (Admin: Issues → Admin: Tasks)
   - Updated all issue-related views to use task terminology
   - Changed Chinese labels from "問題" to "任務"
   - Updated dashboard, issue tracker, and reports pages

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Gbanyan
2025-11-30 10:47:04 +08:00
parent bf6179c457
commit bcff65cf67
10 changed files with 324 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AdminAuditLogController.php
View File

@@ -46,6 +46,7 @@ class AdminAuditLogController extends Controller
$users = AuditLog::with('user')->whereNotNull('user_id')->select('user_id')->distinct()->get()->map(function ($log) { $users = AuditLog::with('user')->whereNotNull('user_id')->select('user_id')->distinct()->get()->map(function ($log) {
return $log->user; return $log->user;
})->filter(); })->filter();
$auditableTypes = AuditLog::select('auditable_type')->distinct()->whereNotNull('auditable_type')->orderBy('auditable_type')->pluck('auditable_type');
return view('admin.audit.index', [ return view('admin.audit.index', [
'logs' => $logs, 'logs' => $logs,
@@ -56,6 +57,7 @@ class AdminAuditLogController extends Controller
'endDate' => $end, 'endDate' => $end,
'actions' => $actions, 'actions' => $actions,
'users' => $users, 'users' => $users,
'auditableTypes' => $auditableTypes,
]); ]);
} }

19
app/Http/Controllers/IssueReportsController.php
View File

@@ -12,8 +12,8 @@ class IssueReportsController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
// Date range filter (default: last 30 days) // Date range filter (default: last 30 days)
$startDate = $request->date('start_date', now()->subDays(30)); $startDate = $request->date('start_date') ?? now()->subDays(30);
$endDate = $request->date('end_date', now()); $endDate = $request->date('end_date') ?? now();
// Overview Statistics // Overview Statistics
$stats = [ $stats = [
@@ -63,11 +63,12 @@ class IssueReportsController extends Controller
->get(); ->get();
// Assignee Performance // Assignee Performance
$now = now();
$assigneePerformance = User::select('users.id', 'users.name') $assigneePerformance = User::select('users.id', 'users.name')
->leftJoin('issues', 'users.id', '=', 'issues.assigned_to_user_id') ->leftJoin('issues', 'users.id', '=', 'issues.assigned_to_user_id')
->selectRaw('count(issues.id) as total_assigned') ->selectRaw('count(issues.id) as total_assigned')
->selectRaw('sum(case when issues.status = ? then 1 else 0 end) as completed', [Issue::STATUS_CLOSED]) ->selectRaw('sum(case when issues.status = ? then 1 else 0 end) as completed', [Issue::STATUS_CLOSED])
->selectRaw('sum(case when issues.due_date < NOW() and issues.status != ? then 1 else 0 end) as overdue', [Issue::STATUS_CLOSED]) ->selectRaw('sum(case when issues.due_date < ? and issues.status != ? then 1 else 0 end) as overdue', [$now, Issue::STATUS_CLOSED])
->groupBy('users.id', 'users.name') ->groupBy('users.id', 'users.name')
->having('total_assigned', '>', 0) ->having('total_assigned', '>', 0)
->orderByDesc('total_assigned') ->orderByDesc('total_assigned')
@@ -101,9 +102,15 @@ class IssueReportsController extends Controller
->get(); ->get();
// Average Resolution Time (days) // Average Resolution Time (days)
$avgResolutionTime = Issue::whereNotNull('closed_at') $closedIssues = Issue::whereNotNull('closed_at')
->selectRaw('avg(TIMESTAMPDIFF(DAY, created_at, closed_at)) as avg_days') ->select('created_at', 'closed_at')
->value('avg_days'); ->get();
$avgResolutionTime = $closedIssues->isNotEmpty()
? $closedIssues->avg(function ($issue) {
return $issue->created_at->diffInDays($issue->closed_at);
})
: null;
// Recent Activity (last 10 issues) // Recent Activity (last 10 issues)
$recentIssues = Issue::with(['creator', 'assignee']) $recentIssues = Issue::with(['creator', 'assignee'])

2
app/Models/AuditLog.php
View File

@@ -12,9 +12,11 @@ class AuditLog extends Model
protected $fillable = [ protected $fillable = [
'user_id', 'user_id',
'action', 'action',
'description',
'auditable_type', 'auditable_type',
'auditable_id', 'auditable_id',
'metadata', 'metadata',
'ip_address',
]; ];
protected $casts = [ protected $casts = [

29
database/migrations/2025_11_29_010220_add_description_and_ip_address_to_audit_logs_table.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('audit_logs', function (Blueprint $table) {
$table->text('description')->nullable()->after('action');
$table->string('ip_address', 45)->nullable()->after('metadata');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('audit_logs', function (Blueprint $table) {
$table->dropColumn(['description', 'ip_address']);
});
}
};

196
resources/views/admin/audit/index.blade.php
View File

@@ -1,136 +1,142 @@
<x-app-layout> <x-app-layout>
<x-slot name="header"> <x-slot name="header">
<h2 class="text-xl font-semibold leading-tight text-gray-800"> <h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200">
{{ __('Audit Logs') }} {{ __('Audit Logs') }}
</h2> </h2>
</x-slot> </x-slot>
<div class="py-12"> <div class="py-12">
<div class="mx-auto max-w-7xl sm:px-6 lg:px-8"> <div class="mx-auto max-w-7xl sm:px-6 lg:px-8">
<div class="bg-white shadow sm:rounded-lg"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg">
<div class="px-4 py-5 sm:p-6 space-y-6"> <div class="px-4 py-5 sm:p-6">
<form method="GET" action="{{ route('admin.audit.index') }}" class="space-y-4" role="search" aria-label="{{ __('Filter audit logs') }}"> <form method="GET" action="{{ route('admin.audit.index') }}" class="space-y-4" role="search" aria-label="{{ __('Filter audit logs') }}">
<div class="grid gap-4 sm:grid-cols-2"> <div class="grid grid-cols-1 gap-4 md:grid-cols-4">
<div> <div>
<label for="search" class="block text-sm font-medium text-gray-700"> <label for="user_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
{{ __('Search actions or metadata') }}
</label>
<input
type="text"
id="search"
name="search"
value="{{ $search }}"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
>
</div>
<div>
<label for="action" class="block text-sm font-medium text-gray-700">
{{ __('Action') }}
</label>
<select
id="action"
name="action"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
>
<option value="">{{ __('All') }}</option>
@foreach ($actions as $actionOption)
<option value="{{ $actionOption }}" @selected($actionFilter === $actionOption)>{{ $actionOption }}</option>
@endforeach
</select>
</div>
<div>
<label for="user_id" class="block text-sm font-medium text-gray-700">
{{ __('User') }} {{ __('User') }}
</label> </label>
<select <select
id="user_id"
name="user_id" name="user_id"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" id="user_id"
class="mt-1 block w-full rounded-md border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 sm:text-sm dark:bg-gray-700 dark:text-gray-100"
> >
<option value="">{{ __('All') }}</option> <option value="">{{ __('All Users') }}</option>
@foreach ($users as $user) @foreach ($users as $user)
<option value="{{ $user->id }}" @selected($userFilter == $user->id)>{{ $user->name }} ({{ $user->email }})</option> <option value="{{ $user->id }}" @selected(request('user_id') == $user->id)>
{{ $user->name }}
</option>
@endforeach @endforeach
</select> </select>
</div> </div>
<div class="grid sm:grid-cols-2 gap-4"> <div>
<div> <label for="event" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
<label for="start_date" class="block text-sm font-medium text-gray-700"> {{ __('Event') }}
{{ __('Start date') }} </label>
</label> <select
<input name="event"
type="date" id="event"
id="start_date" class="mt-1 block w-full rounded-md border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 sm:text-sm dark:bg-gray-700 dark:text-gray-100"
name="start_date" >
value="{{ $startDate }}" <option value="">{{ __('All Events') }}</option>
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm" @foreach ($actions as $action)
> <option value="{{ $action }}" @selected(request('action') == $action)>
</div> {{ ucfirst($action) }}
<div> </option>
<label for="end_date" class="block text-sm font-medium text-gray-700"> @endforeach
{{ __('End date') }} </select>
</label>
<input
type="date"
id="end_date"
name="end_date"
value="{{ $endDate }}"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
>
</div>
</div> </div>
</div>
<div class="flex flex-wrap gap-2"> <div>
<button type="submit" class="inline-flex items-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"> <label for="auditable_type" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
{{ __('Apply filters') }} {{ __('Model Type') }}
</button> </label>
<a href="{{ route('admin.audit.export', request()->only('search','action','user_id','start_date','end_date')) }}" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"> <select
{{ __('Export CSV') }} name="auditable_type"
</a> id="auditable_type"
class="mt-1 block w-full rounded-md border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 sm:text-sm dark:bg-gray-700 dark:text-gray-100"
>
<option value="">{{ __('All Types') }}</option>
@foreach ($auditableTypes as $type)
<option value="{{ $type }}" @selected(request('auditable_type') == $type)>
{{ class_basename($type) }}
</option>
@endforeach
</select>
</div>
<div class="flex items-end">
<button type="submit" class="inline-flex w-full justify-center rounded-md border border-transparent bg-indigo-600 dark:bg-indigo-500 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 dark:hover:bg-indigo-600 focus:outline-none focus:ring-2 focus:ring-indigo-500 dark:focus:ring-indigo-600 focus:ring-offset-2 dark:focus:ring-offset-gray-800">
{{ __('Filter') }}
</button>
</div>
</div> </div>
</form> </form>
<div class="overflow-x-auto"> <div class="mt-8 overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg dark:ring-gray-700">
<table class="min-w-full divide-y divide-gray-200" role="table"> <table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600">
<thead class="bg-gray-50"> <thead class="bg-gray-50 dark:bg-gray-900">
<tr> <tr>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"> <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-100 sm:pl-6">
{{ __('Time') }}
</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500">
{{ __('User') }} {{ __('User') }}
</th> </th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">
{{ __('Action') }} {{ __('Event') }}
</th> </th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium uppercase tracking-wider text-gray-500"> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">
{{ __('Metadata') }} {{ __('Model') }}
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">
{{ __('Details') }}
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">
{{ __('IP Address') }}
</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">
{{ __('Date') }}
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody class="divide-y divide-gray-200 bg-white"> <tbody class="divide-y divide-gray-200 bg-white dark:divide-gray-700 dark:bg-gray-800">
@forelse ($logs as $log) @forelse ($logs as $log)
<tr> <tr class="hover:bg-gray-50 dark:hover:bg-gray-700">
<td class="whitespace-nowrap px-4 py-3 text-sm text-gray-900"> <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-gray-100 sm:pl-6">
{{ $log->created_at->toDateTimeString() }} {{ $log->user->name ?? __('System') }}
</td> </td>
<td class="whitespace-nowrap px-4 py-3 text-sm text-gray-900"> <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{{ $log->user?->name ?? __('System') }} <span class="inline-flex rounded-full px-2 text-xs font-semibold leading-5
@if(str_contains($log->action, 'created')) bg-green-100 dark:bg-green-900 text-green-800 dark:text-green-200
@elseif(str_contains($log->action, 'updated')) bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200
@elseif(str_contains($log->action, 'deleted')) bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-200
@else bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-200
@endif">
{{ $log->action }}
</span>
</td> </td>
<td class="whitespace-nowrap px-4 py-3 text-sm text-gray-900"> <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{{ $log->action }} {{ class_basename($log->auditable_type) }} #{{ $log->auditable_id }}
</td> </td>
<td class="px-4 py-3 text-sm text-gray-900"> <td class="px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
<pre class="whitespace-pre-wrap break-all text-xs bg-gray-50 p-2 rounded">{{ json_encode($log->metadata, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) }}</pre> <div>{{ $log->description ?: '—' }}</div>
@if(!empty($log->metadata))
<details class="cursor-pointer group mt-1">
<summary class="text-xs text-indigo-600 dark:text-indigo-400 hover:text-indigo-900 dark:hover:text-indigo-300">{{ __('Metadata') }}</summary>
<div class="mt-2 p-2 bg-gray-50 dark:bg-gray-900 rounded text-xs font-mono overflow-x-auto">
<pre class="whitespace-pre-wrap text-gray-800 dark:text-gray-200">{{ json_encode($log->metadata, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) }}</pre>
</div>
</details>
@endif
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{{ $log->ip_address }}
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500 dark:text-gray-400">
{{ $log->created_at->format('Y-m-d H:i:s') }}
</td> </td>
</tr> </tr>
@empty @empty
<tr> <tr>
<td colspan="4" class="px-4 py-4 text-sm text-gray-500"> <td colspan="6" class="px-3 py-4 text-sm text-gray-500 dark:text-gray-400 text-center">
{{ __('No audit logs found.') }} {{ __('No audit logs found.') }}
</td> </td>
</tr> </tr>
@@ -139,8 +145,8 @@
</table> </table>
</div> </div>
<div> <div class="mt-4">
{{ $logs->links() }} {{ $logs->withQueryString()->links() }}
</div> </div>
</div> </div>
</div> </div>

56
resources/views/admin/issue-reports/index.blade.php
View File

@@ -1,7 +1,7 @@
<x-app-layout> <x-app-layout>
<x-slot name="header"> <x-slot name="header">
<h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200"> <h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200">
{{ __('Issue Reports & Analytics') }} {{ __('Task Reports & Analytics') }}
</h2> </h2>
</x-slot> </x-slot>
@@ -9,7 +9,7 @@
<div class="mx-auto max-w-7xl sm:px-6 lg:px-8 space-y-6"> <div class="mx-auto max-w-7xl sm:px-6 lg:px-8 space-y-6">
{{-- Date Range Filter --}} {{-- Date Range Filter --}}
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<form method="GET" action="{{ route('admin.issue-reports.index') }}" class="flex flex-wrap gap-4 items-end"> <form method="GET" action="{{ route('admin.issue-reports.index') }}" class="flex flex-wrap gap-4 items-end">
<div class="flex-1 min-w-[200px]"> <div class="flex-1 min-w-[200px]">
<label for="start_date" class="block text-sm font-medium text-gray-700 dark:text-gray-300"> <label for="start_date" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
@@ -34,35 +34,35 @@
{{-- Summary Statistics --}} {{-- Summary Statistics --}}
<div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4"> <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
<div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-blue-400"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-blue-400">
<dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Total Issues') }}</dt> <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Total Tasks') }}</dt>
<dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['total_issues']) }}</dd> <dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['total_issues']) }}</dd>
</div> </div>
<div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-green-400"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-green-400">
<dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Open Issues') }}</dt> <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Open Tasks') }}</dt>
<dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['open_issues']) }}</dd> <dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['open_issues']) }}</dd>
</div> </div>
<div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-gray-400"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-gray-400">
<dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Closed Issues') }}</dt> <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Closed Tasks') }}</dt>
<dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['closed_issues']) }}</dd> <dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['closed_issues']) }}</dd>
</div> </div>
<div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-red-400"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 border-l-4 border-red-400">
<dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Overdue Issues') }}</dt> <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">{{ __('Overdue Tasks') }}</dt>
<dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['overdue_issues']) }}</dd> <dd class="mt-1 text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($stats['overdue_issues']) }}</dd>
</div> </div>
</div> </div>
{{-- Charts Section --}} {{-- Charts Section --}}
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6"> <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
{{-- Issues by Status --}} {{-- Tasks by Status --}}
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Issues by Status') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Tasks by Status') }}</h3>
<div class="space-y-2"> <div class="space-y-2">
@foreach(['new', 'assigned', 'in_progress', 'review', 'closed'] as $status) @foreach(['new', 'assigned', 'in_progress', 'review', 'closed'] as $status)
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<span class="text-sm text-gray-600 dark:text-gray-400">{{ ucfirst(str_replace('_', ' ', $status)) }}</span> <span class="text-sm text-gray-600 dark:text-gray-400">{{ ucfirst(str_replace('_', ' ', $status)) }}</span>
<span class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{ $issuesByStatus[$status] ?? 0 }}</span> <span class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{ $issuesByStatus[$status] ?? 0 }}</span>
</div> </div>
<div class="w-full bg-gray-200 rounded-full h-2 dark:bg-gray-700"> <div class="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-2">
@php @php
$percentage = $stats['total_issues'] > 0 ? (($issuesByStatus[$status] ?? 0) / $stats['total_issues']) * 100 : 0; $percentage = $stats['total_issues'] > 0 ? (($issuesByStatus[$status] ?? 0) / $stats['total_issues']) * 100 : 0;
@endphp @endphp
@@ -72,9 +72,9 @@
</div> </div>
</div> </div>
{{-- Issues by Priority --}} {{-- Tasks by Priority --}}
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Issues by Priority') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Tasks by Priority') }}</h3>
<div class="space-y-2"> <div class="space-y-2">
@foreach(['low', 'medium', 'high', 'urgent'] as $priority) @foreach(['low', 'medium', 'high', 'urgent'] as $priority)
@php @php
@@ -84,7 +84,7 @@
<span class="text-sm text-gray-600 dark:text-gray-400">{{ ucfirst($priority) }}</span> <span class="text-sm text-gray-600 dark:text-gray-400">{{ ucfirst($priority) }}</span>
<span class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{ $issuesByPriority[$priority] ?? 0 }}</span> <span class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{ $issuesByPriority[$priority] ?? 0 }}</span>
</div> </div>
<div class="w-full bg-gray-200 rounded-full h-2 dark:bg-gray-700"> <div class="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-2">
@php @php
$percentage = $stats['total_issues'] > 0 ? (($issuesByPriority[$priority] ?? 0) / $stats['total_issues']) * 100 : 0; $percentage = $stats['total_issues'] > 0 ? (($issuesByPriority[$priority] ?? 0) / $stats['total_issues']) * 100 : 0;
@endphp @endphp
@@ -94,16 +94,16 @@
</div> </div>
</div> </div>
{{-- Issues by Type --}} {{-- Tasks by Type --}}
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Issues by Type') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Tasks by Type') }}</h3>
<div class="space-y-2"> <div class="space-y-2">
@foreach(['work_item', 'project_task', 'maintenance', 'member_request'] as $type) @foreach(['work_item', 'project_task', 'maintenance', 'member_request'] as $type)
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<span class="text-sm text-gray-600 dark:text-gray-400">{{ ucfirst(str_replace('_', ' ', $type)) }}</span> <span class="text-sm text-gray-600 dark:text-gray-400">{{ ucfirst(str_replace('_', ' ', $type)) }}</span>
<span class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{ $issuesByType[$type] ?? 0 }}</span> <span class="text-sm font-semibold text-gray-900 dark:text-gray-100">{{ $issuesByType[$type] ?? 0 }}</span>
</div> </div>
<div class="w-full bg-gray-200 rounded-full h-2 dark:bg-gray-700"> <div class="w-full bg-gray-200 dark:bg-gray-700 rounded-full h-2">
@php @php
$percentage = $stats['total_issues'] > 0 ? (($issuesByType[$type] ?? 0) / $stats['total_issues']) * 100 : 0; $percentage = $stats['total_issues'] > 0 ? (($issuesByType[$type] ?? 0) / $stats['total_issues']) * 100 : 0;
@endphp @endphp
@@ -116,7 +116,7 @@
{{-- Time Tracking Metrics --}} {{-- Time Tracking Metrics --}}
@if($timeTrackingMetrics && $timeTrackingMetrics->total_estimated > 0) @if($timeTrackingMetrics && $timeTrackingMetrics->total_estimated > 0)
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Time Tracking Metrics') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Time Tracking Metrics') }}</h3>
<div class="grid grid-cols-1 sm:grid-cols-4 gap-4"> <div class="grid grid-cols-1 sm:grid-cols-4 gap-4">
<div> <div>
@@ -153,7 +153,7 @@
{{-- Average Resolution Time --}} {{-- Average Resolution Time --}}
@if($avgResolutionTime) @if($avgResolutionTime)
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">{{ __('Average Resolution Time') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-2">{{ __('Average Resolution Time') }}</h3>
<p class="text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($avgResolutionTime, 1) }} {{ __('days') }}</p> <p class="text-3xl font-semibold text-gray-900 dark:text-gray-100">{{ number_format($avgResolutionTime, 1) }} {{ __('days') }}</p>
</div> </div>
@@ -161,9 +161,9 @@
{{-- Assignee Performance --}} {{-- Assignee Performance --}}
@if($assigneePerformance->isNotEmpty()) @if($assigneePerformance->isNotEmpty())
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Assignee Performance (Top 10)') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Assignee Performance (Top 10)') }}</h3>
<div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg dark:ring-gray-700"> <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg">
<table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600"> <table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600">
<thead class="bg-gray-50 dark:bg-gray-900"> <thead class="bg-gray-50 dark:bg-gray-900">
<tr> <tr>
@@ -174,7 +174,7 @@
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Completion Rate') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Completion Rate') }}</th>
</tr> </tr>
</thead> </thead>
<tbody class="divide-y divide-gray-200 bg-white dark:divide-gray-700 dark:bg-gray-800"> <tbody class="divide-y divide-gray-200 dark:divide-gray-700 bg-white dark:bg-gray-800">
@foreach($assigneePerformance as $user) @foreach($assigneePerformance as $user)
<tr> <tr>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-gray-100"> <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 dark:text-gray-100">
@@ -209,7 +209,7 @@
{{-- Top Labels Used --}} {{-- Top Labels Used --}}
@if($topLabels->isNotEmpty()) @if($topLabels->isNotEmpty())
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Top Labels Used') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Top Labels Used') }}</h3>
<div class="space-y-3"> <div class="space-y-3">
@foreach($topLabels as $label) @foreach($topLabels as $label)
@@ -234,14 +234,14 @@
</div> </div>
@endif @endif
{{-- Recent Issues --}} {{-- Recent Tasks --}}
<div class="bg-white shadow sm:rounded-lg dark:bg-gray-800 px-4 py-5 sm:p-6"> <div class="bg-white dark:bg-gray-800 shadow sm:rounded-lg px-4 py-5 sm:p-6">
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Recent Issues') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100 mb-4">{{ __('Recent Tasks') }}</h3>
<div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg dark:ring-gray-700"> <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg dark:ring-gray-700">
<table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600"> <table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600">
<thead class="bg-gray-50 dark:bg-gray-900"> <thead class="bg-gray-50 dark:bg-gray-900">
<tr> <tr>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Issue') }}</th> <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Task') }}</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Status') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Status') }}</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Priority') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Priority') }}</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Assignee') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Assignee') }}</th>

30
resources/views/admin/issues/create.blade.php
View File

@@ -1,7 +1,7 @@
<x-app-layout> <x-app-layout>
<x-slot name="header"> <x-slot name="header">
<h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200"> <h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200">
{{ __('Create Issue') }} (建立問題) {{ __('Create Task') }} (建立任務)
</h2> </h2>
</x-slot> </x-slot>
@@ -18,7 +18,7 @@
</label> </label>
<input type="text" name="title" id="title" value="{{ old('title') }}" required maxlength="255" <input type="text" name="title" id="title" value="{{ old('title') }}" required maxlength="255"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('title') border-red-300 @enderror" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('title') border-red-300 @enderror"
placeholder="{{ __('Brief summary of the issue') }}"> placeholder="{{ __('Brief summary of the task') }}">
@error('title')<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>@enderror @error('title')<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>@enderror
</div> </div>
@@ -29,15 +29,15 @@
</label> </label>
<textarea name="description" id="description" rows="5" <textarea name="description" id="description" rows="5"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"
placeholder="{{ __('Detailed description of the issue...') }}">{{ old('description') }}</textarea> placeholder="{{ __('Detailed description of the task...') }}">{{ old('description') }}</textarea>
@error('description')<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>@enderror @error('description')<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>@enderror
</div> </div>
<!-- Issue Type and Priority --> <!-- Task Type and Priority -->
<div class="grid grid-cols-1 gap-6 sm:grid-cols-2"> <div class="grid grid-cols-1 gap-6 sm:grid-cols-2">
<div> <div>
<label for="issue_type" class="block text-sm font-medium text-gray-700 dark:text-gray-300"> <label for="issue_type" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
{{ __('Issue Type') }} <span class="text-red-500">*</span> {{ __('Task Type') }} <span class="text-red-500">*</span>
</label> </label>
<select name="issue_type" id="issue_type" required <select name="issue_type" id="issue_type" required
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('issue_type') border-red-300 @enderror"> class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('issue_type') border-red-300 @enderror">
@@ -100,7 +100,7 @@
<input type="number" name="estimated_hours" id="estimated_hours" value="{{ old('estimated_hours') }}" step="0.5" min="0" <input type="number" name="estimated_hours" id="estimated_hours" value="{{ old('estimated_hours') }}" step="0.5" min="0"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"
placeholder="0.0"> placeholder="0.0">
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Estimated time to complete this issue') }}</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Estimated time to complete this task') }}</p>
</div> </div>
<!-- Member (for member requests) --> <!-- Member (for member requests) -->
@@ -118,21 +118,21 @@
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Link to a member for member requests') }}</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Link to a member for member requests') }}</p>
</div> </div>
<!-- Parent Issue (for sub-tasks) --> <!-- Parent Task (for sub-tasks) -->
<div> <div>
<label for="parent_issue_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300"> <label for="parent_issue_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
{{ __('Parent Issue') }} {{ __('Parent Task') }}
</label> </label>
<select name="parent_issue_id" id="parent_issue_id" <select name="parent_issue_id" id="parent_issue_id"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"> class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100">
<option value="">{{ __('None (top-level issue)') }}</option> <option value="">{{ __('None (top-level task)') }}</option>
@foreach($openIssues as $parentIssue) @foreach($openIssues as $parentIssue)
<option value="{{ $parentIssue->id }}" @selected(old('parent_issue_id') == $parentIssue->id)> <option value="{{ $parentIssue->id }}" @selected(old('parent_issue_id') == $parentIssue->id)>
{{ $parentIssue->issue_number }} - {{ $parentIssue->title }} {{ $parentIssue->issue_number }} - {{ $parentIssue->title }}
</option> </option>
@endforeach @endforeach
</select> </select>
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Make this a sub-task of another issue') }}</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Make this a sub-task of another task') }}</p>
</div> </div>
<!-- Labels --> <!-- Labels -->
@@ -153,7 +153,7 @@
</label> </label>
@endforeach @endforeach
</div> </div>
<p class="mt-2 text-sm text-gray-500 dark:text-gray-400">{{ __('Select one or more labels to categorize this issue') }}</p> <p class="mt-2 text-sm text-gray-500 dark:text-gray-400">{{ __('Select one or more labels to categorize this task') }}</p>
</div> </div>
<!-- Actions --> <!-- Actions -->
@@ -164,7 +164,7 @@
</a> </a>
<button type="submit" <button type="submit"
class="inline-flex justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:focus:ring-offset-gray-800"> class="inline-flex justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:focus:ring-offset-gray-800">
{{ __('Create Issue') }} {{ __('Create Task') }}
</button> </button>
</div> </div>
</form> </form>
@@ -179,14 +179,14 @@
</svg> </svg>
</div> </div>
<div class="ml-3"> <div class="ml-3">
<h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">{{ __('Creating Issues') }}</h3> <h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">{{ __('Creating Tasks') }}</h3>
<div class="mt-2 text-sm text-blue-700 dark:text-blue-300"> <div class="mt-2 text-sm text-blue-700 dark:text-blue-300">
<ul class="list-disc pl-5 space-y-1"> <ul class="list-disc pl-5 space-y-1">
<li>{{ __('Use work items for general tasks and todos') }}</li> <li>{{ __('Use work items for general tasks and todos') }}</li>
<li>{{ __('Project tasks are for specific project milestones') }}</li> <li>{{ __('Project tasks are for specific project milestones') }}</li>
<li>{{ __('Member requests track inquiries or requests from members') }}</li> <li>{{ __('Member requests track inquiries or requests from members') }}</li>
<li>{{ __('Assign issues to team members to track responsibility') }}</li> <li>{{ __('Assign tasks to team members to track responsibility') }}</li>
<li>{{ __('Use labels to categorize and filter issues easily') }}</li> <li>{{ __('Use labels to categorize and filter tasks easily') }}</li>
</ul> </ul>
</div> </div>
</div> </div>

18
resources/views/admin/issues/index.blade.php
View File

@@ -1,7 +1,7 @@
<x-app-layout> <x-app-layout>
<x-slot name="header"> <x-slot name="header">
<h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200"> <h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200">
{{ __('Issues') }} (問題追蹤) {{ __('Tasks') }} (任務追蹤)
</h2> </h2>
</x-slot> </x-slot>
@@ -23,13 +23,13 @@
<!-- Header --> <!-- Header -->
<div class="sm:flex sm:items-center sm:justify-between mb-6"> <div class="sm:flex sm:items-center sm:justify-between mb-6">
<div> <div>
<h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">{{ __('Issue Tracker') }}</h3> <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">{{ __('Task Tracker') }}</h3>
<p class="mt-1 text-sm text-gray-600 dark:text-gray-400">{{ __('Manage work items, tasks, and member requests') }}</p> <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">{{ __('Manage work items, tasks, and member requests') }}</p>
</div> </div>
<div class="mt-4 sm:mt-0"> <div class="mt-4 sm:mt-0">
<a href="{{ route('admin.issues.create') }}" class="inline-flex items-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:focus:ring-offset-gray-800"> <a href="{{ route('admin.issues.create') }}" class="inline-flex items-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:focus:ring-offset-gray-800">
<svg class="-ml-0.5 mr-1.5 h-5 w-5" fill="currentColor" viewBox="0 0 20 20"><path d="M10.75 4.75a.75.75 0 00-1.5 0v4.5h-4.5a.75.75 0 000 1.5h4.5v4.5a.75.75 0 001.5 0v-4.5h4.5a.75.75 0 000-1.5h-4.5v-4.5z"/></svg> <svg class="-ml-0.5 mr-1.5 h-5 w-5" fill="currentColor" viewBox="0 0 20 20"><path d="M10.75 4.75a.75.75 0 00-1.5 0v4.5h-4.5a.75.75 0 000 1.5h4.5v4.5a.75.75 0 001.5 0v-4.5h4.5a.75.75 0 000-1.5h-4.5v-4.5z"/></svg>
{{ __('Create Issue') }} {{ __('Create Task') }}
</a> </a>
</div> </div>
</div> </div>
@@ -101,7 +101,7 @@
<div class="flex gap-4"> <div class="flex gap-4">
<div class="flex-1"> <div class="flex-1">
<label for="search" class="block text-sm font-medium text-gray-700 dark:text-gray-300">{{ __('Search') }}</label> <label for="search" class="block text-sm font-medium text-gray-700 dark:text-gray-300">{{ __('Search') }}</label>
<input type="text" name="search" id="search" value="{{ request('search') }}" placeholder="{{ __('Issue number, title, or description...') }}" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"> <input type="text" name="search" id="search" value="{{ request('search') }}" placeholder="{{ __('Task number, title, or description...') }}" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100">
</div> </div>
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<button type="submit" class="inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-100 dark:ring-gray-600 dark:hover:bg-gray-600">{{ __('Filter') }}</button> <button type="submit" class="inline-flex justify-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-100 dark:ring-gray-600 dark:hover:bg-gray-600">{{ __('Filter') }}</button>
@@ -116,10 +116,10 @@
<!-- Issues Table --> <!-- Issues Table -->
<div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg dark:ring-gray-700"> <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg dark:ring-gray-700">
<table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600"> <table class="min-w-full divide-y divide-gray-300 dark:divide-gray-600">
<caption class="sr-only">{{ __('List of issues with their current status and assignment') }}</caption> <caption class="sr-only">{{ __('List of tasks with their current status and assignment') }}</caption>
<thead class="bg-gray-50 dark:bg-gray-900"> <thead class="bg-gray-50 dark:bg-gray-700">
<tr> <tr>
<th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Issue') }}</th> <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Task') }}</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Type') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Type') }}</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Status') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Status') }}</th>
<th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Priority') }}</th> <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-100">{{ __('Priority') }}</th>
@@ -177,10 +177,10 @@
@empty @empty
<tr> <tr>
<td colspan="7" class="px-3 py-8 text-center text-sm text-gray-500 dark:text-gray-400"> <td colspan="7" class="px-3 py-8 text-center text-sm text-gray-500 dark:text-gray-400">
<p>{{ __('No issues found') }}</p> <p>{{ __('No tasks found') }}</p>
<div class="mt-4"> <div class="mt-4">
<a href="{{ route('admin.issues.create') }}" class="inline-flex items-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400"> <a href="{{ route('admin.issues.create') }}" class="inline-flex items-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400">
+ {{ __('Create First Issue') }} + {{ __('Create First Task') }}
</a> </a>
</div> </div>
</td> </td>

171
resources/views/dashboard.blade.php
View File

@@ -2,17 +2,17 @@
<x-slot name="header"> <x-slot name="header">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div> <div>
<h2 class="font-semibold text-xl text-gray-800 leading-tight"> <h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
台灣尤塞氏症暨視聽弱協會｜工作桌面 台灣尤塞氏症暨視聽弱協會｜工作桌面
</h2> </h2>
<p class="text-sm text-gray-500 mt-1">會員服務、財務簽核、文件與公告都在這裡。</p> <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">會員服務、財務簽核、文件與公告都在這裡。</p>
</div> </div>
<div class="hidden sm:flex items-center gap-3"> <div class="hidden sm:flex items-center gap-3">
<a href="{{ route('member.dashboard') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md bg-blue-50 text-blue-700 hover:bg-blue-100 border border-blue-200"> <a href="{{ route('member.dashboard') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md bg-blue-50 dark:bg-blue-900 text-blue-700 dark:text-blue-200 hover:bg-blue-100 dark:hover:bg-blue-800 border border-blue-200 dark:border-blue-700">
我的會籍/繳費 我的會籍/繳費
</a> </a>
@can('create_finance_documents') @can('create_finance_documents')
<a href="{{ route('admin.finance.create') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md bg-emerald-50 text-emerald-700 hover:bg-emerald-100 border border-emerald-200"> <a href="{{ route('admin.finance.create') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md bg-emerald-50 dark:bg-emerald-900 text-emerald-700 dark:text-emerald-200 hover:bg-emerald-100 dark:hover:bg-emerald-800 border border-emerald-200 dark:border-emerald-700">
建立財務申請 建立財務申請
</a> </a>
@endcan @endcan
@@ -24,11 +24,11 @@
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8 space-y-6"> <div class="max-w-7xl mx-auto sm:px-6 lg:px-8 space-y-6">
<!-- Primary cards --> <!-- Primary cards -->
<div class="grid grid-cols-1 md:grid-cols-3 gap-4"> <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
<div class="bg-white shadow-sm sm:rounded-lg border border-gray-100 p-5"> <div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700 p-5">
<div class="flex items-start justify-between"> <div class="flex items-start justify-between">
<div> <div>
<div class="text-sm font-semibold text-gray-700">會員狀態</div> <div class="text-sm font-semibold text-gray-700 dark:text-gray-300">會員狀態</div>
<p class="mt-1 text-sm text-gray-500">查看會籍期限、繳費紀錄、下載收據</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">查看會籍期限、繳費紀錄、下載收據</p>
</div> </div>
<span class="text-2xl">🎫</span> <span class="text-2xl">🎫</span>
</div> </div>
@@ -36,18 +36,18 @@
<a href="{{ route('member.dashboard') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md bg-blue-600 text-white hover:bg-blue-700"> <a href="{{ route('member.dashboard') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md bg-blue-600 text-white hover:bg-blue-700">
前往會員專區 前往會員專區
</a> </a>
<a href="{{ route('member.payments.create') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50"> <a href="{{ route('member.payments.create') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
自助繳費 自助繳費
</a> </a>
</div> </div>
</div> </div>
@if(Auth::user()->can('create_finance_documents') || Auth::user()->can('view_finance_documents')) @if(Auth::user()->can('create_finance_documents') || Auth::user()->can('view_finance_documents'))
<div class="bg-white shadow-sm sm:rounded-lg border border-gray-100 p-5"> <div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700 p-5">
<div class="flex items-start justify-between"> <div class="flex items-start justify-between">
<div> <div>
<div class="text-sm font-semibold text-gray-700">財務申請/審核</div> <div class="text-sm font-semibold text-gray-700 dark:text-gray-300">財務申請/審核</div>
<p class="mt-1 text-sm text-gray-500">申請、審核、付款、對帳全流程</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">申請、審核、付款、對帳全流程</p>
</div> </div>
<span class="text-2xl">💼</span> <span class="text-2xl">💼</span>
</div> </div>
@@ -58,7 +58,7 @@
</a> </a>
@endcan @endcan
@can('view_finance_documents') @can('view_finance_documents')
<a href="{{ route('admin.finance.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50"> <a href="{{ route('admin.finance.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
查看案件列表 查看案件列表
</a> </a>
@endcan @endcan
@@ -67,25 +67,25 @@
@endif @endif
@if(Auth::user()->hasRole(['admin', 'membership_manager']) || Auth::user()->can('view_audit_logs')) @if(Auth::user()->hasRole(['admin', 'membership_manager']) || Auth::user()->can('view_audit_logs'))
<div class="bg-white shadow-sm sm:rounded-lg border border-gray-100 p-5"> <div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700 p-5">
<div class="flex items-start justify-between"> <div class="flex items-start justify-between">
<div> <div>
<div class="text-sm font-semibold text-gray-700">管理/維運</div> <div class="text-sm font-semibold text-gray-700 dark:text-gray-300">管理/維運</div>
<p class="mt-1 text-sm text-gray-500">會員匯入、角色權限、審計與問題追蹤</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">會員匯入、角色權限、審計與任務追蹤</p>
</div> </div>
<span class="text-2xl">🛡️</span> <span class="text-2xl">🛡️</span>
</div> </div>
<div class="mt-4 flex gap-3 flex-wrap"> <div class="mt-4 flex gap-3 flex-wrap">
@hasrole('admin|membership_manager') @hasrole('admin|membership_manager')
<a href="{{ route('admin.members.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50"> <a href="{{ route('admin.members.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
會員管理 會員管理
</a> </a>
@endhasrole @endhasrole
@role('admin') @role('admin')
<a href="{{ route('admin.roles.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50"> <a href="{{ route('admin.roles.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
角色與權限 角色與權限
</a> </a>
<a href="{{ route('admin.audit.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50"> <a href="{{ route('admin.audit.index') }}" class="inline-flex items-center px-3 py-2 text-sm font-medium rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">
審計日誌 審計日誌
</a> </a>
@endrole @endrole
@@ -95,60 +95,60 @@
</div> </div>
<!-- To-do by role (all roles see the buckets) --> <!-- To-do by role (all roles see the buckets) -->
@if(Auth::user()->hasRole(['admin', 'finance_cashier', 'payment_cashier', 'finance_accountant', 'payment_accountant', 'finance_chair', 'payment_chair']) || Auth::user()->can('create_finance_documents')) @if(Auth::user()->hasRole(['admin', 'finance_cashier', 'finance_accountant', 'finance_chair']) || Auth::user()->can('create_finance_documents'))
<div class="bg-white shadow-sm sm:rounded-lg border border-gray-100 p-6"> <div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700 p-6">
<div class="flex items-center justify-between mb-4"> <div class="flex items-center justify-between mb-4">
<div> <div>
<h3 class="text-lg font-semibold text-gray-900">待辦總覽</h3> <h3 class="text-lg font-semibold text-gray-900 dark:text-gray-100">待辦總覽</h3>
<p class="text-sm text-gray-500">依職責挑選你需要處理的事項。</p> <p class="text-sm text-gray-500 dark:text-gray-400">依職責挑選你需要處理的事項。</p>
</div> </div>
</div> </div>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4"> <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
@can('create_finance_documents') @can('create_finance_documents')
<div class="p-4 rounded-lg border border-gray-100 bg-slate-50"> <div class="p-4 rounded-lg border border-gray-100 dark:border-gray-700 bg-slate-50 dark:bg-gray-700">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<h4 class="text-sm font-semibold text-gray-800">申請人 / 會員</h4><span>📝</span> <h4 class="text-sm font-semibold text-gray-800 dark:text-gray-200">申請人 / 會員</h4><span>📝</span>
</div> </div>
<ul class="mt-3 space-y-2 text-sm text-gray-700"> <ul class="mt-3 space-y-2 text-sm text-gray-700 dark:text-gray-300">
<li><a class="hover:text-blue-600" href="{{ route('admin.finance.create') }}">建立財務申請</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.finance.create') }}">建立財務申請</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.finance.index') }}">查看我的申請進度</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.finance.index') }}">查看我的申請進度</a></li>
<li><a class="hover:text-blue-600" href="{{ route('member.dashboard') }}">查看會籍與繳費紀錄</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('member.dashboard') }}">查看會籍與繳費紀錄</a></li>
</ul> </ul>
</div> </div>
@endcan @endcan
@hasrole('finance_cashier|payment_cashier|admin') @hasrole('finance_cashier|admin')
<div class="p-4 rounded-lg border border-gray-100 bg-slate-50"> <div class="p-4 rounded-lg border border-gray-100 dark:border-gray-700 bg-slate-50 dark:bg-gray-700">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<h4 class="text-sm font-semibold text-gray-800">出納</h4><span>💰</span> <h4 class="text-sm font-semibold text-gray-800 dark:text-gray-200">出納</h4><span>💰</span>
</div> </div>
<ul class="mt-3 space-y-2 text-sm text-gray-700"> <ul class="mt-3 space-y-2 text-sm text-gray-700 dark:text-gray-300">
<li><a class="hover:text-blue-600" href="{{ route('admin.finance.index') }}">待出納審核的申請</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.finance.index') }}">待出納審核的申請</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.payment-orders.index') }}">待覆核/執行的付款單</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.payment-orders.index') }}">待覆核/執行的付款單</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.cashier-ledger.index') }}">填寫現金簿/匯出報表</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.cashier-ledger.index') }}">填寫現金簿/匯出報表</a></li>
</ul> </ul>
</div> </div>
@endhasrole @endhasrole
@hasrole('finance_accountant|payment_accountant|admin') @hasrole('finance_accountant|admin')
<div class="p-4 rounded-lg border border-gray-100 bg-slate-50"> <div class="p-4 rounded-lg border border-gray-100 dark:border-gray-700 bg-slate-50 dark:bg-gray-700">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<h4 class="text-sm font-semibold text-gray-800">會計</h4><span>📊</span> <h4 class="text-sm font-semibold text-gray-800 dark:text-gray-200">會計</h4><span>📊</span>
</div> </div>
<ul class="mt-3 space-y-2 text-sm text-gray-700"> <ul class="mt-3 space-y-2 text-sm text-gray-700 dark:text-gray-300">
<li><a class="hover:text-blue-600" href="{{ route('admin.finance.index') }}">待會計審核的申請</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.finance.index') }}">待會計審核的申請</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.payment-orders.index') }}">製作/更新付款單</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.payment-orders.index') }}">製作/更新付款單</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.transactions.index') }}">建立交易分錄</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.transactions.index') }}">建立交易分錄</a></li>
</ul> </ul>
</div> </div>
@endhasrole @endhasrole
@hasrole('finance_chair|payment_chair|admin') @hasrole('finance_chair|admin')
<div class="p-4 rounded-lg border border-gray-100 bg-slate-50"> <div class="p-4 rounded-lg border border-gray-100 dark:border-gray-700 bg-slate-50 dark:bg-gray-700">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<h4 class="text-sm font-semibold text-gray-800">理事長/理事</h4><span>✅</span> <h4 class="text-sm font-semibold text-gray-800 dark:text-gray-200">理事長/理事</h4><span>✅</span>
</div> </div>
<ul class="mt-3 space-y-2 text-sm text-gray-700"> <ul class="mt-3 space-y-2 text-sm text-gray-700 dark:text-gray-300">
<li><a class="hover:text-blue-600" href="{{ route('admin.finance.index') }}">待核准的中額/大額申請</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.finance.index') }}">待核准的中額/大額申請</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.bank-reconciliations.index') }}">待核准的銀行調節表</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.bank-reconciliations.index') }}">待核准的銀行調節表</a></li>
<li><a class="hover:text-blue-600" href="{{ route('admin.roles.index') }}">角色/權限檢視</a></li> <li><a class="hover:text-blue-600 dark:hover:text-blue-400" href="{{ route('admin.roles.index') }}">角色/權限檢視</a></li>
</ul> </ul>
</div> </div>
@endhasrole @endhasrole
@@ -158,44 +158,46 @@
<!-- Issues / Documents --> <!-- Issues / Documents -->
<div class="grid grid-cols-1 lg:grid-cols-2 gap-4"> <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
<div class="bg-white shadow-sm sm:rounded-lg border border-gray-100 p-6"> @if(Auth::user() && (Auth::user()->hasRole(['admin', 'membership_manager', 'finance_accountant', 'staff']) || Auth::user()->canAny(['view_finance_documents', 'view_accounting_transactions', 'manage_system_settings'])))
<div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700 p-6">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<h3 class="text-lg font-semibold text-gray-900">問題追蹤</h3> <h3 class="text-lg font-semibold text-gray-900 dark:text-gray-100">任務追蹤</h3>
<a href="{{ route('admin.issues.create') }}" class="text-sm text-blue-600 hover:text-blue-700">建立問題</a> <a href="{{ route('admin.issues.create') }}" class="text-sm text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">建立任務</a>
</div> </div>
<p class="mt-2 text-sm text-gray-600">回報系統/流程問題，追蹤討論、附件與狀態。</p> <p class="mt-2 text-sm text-gray-600 dark:text-gray-400">內部項目管理、工作追蹤與協作工具。</p>
<div class="mt-3 flex gap-3 text-sm"> <div class="mt-3 flex gap-3 text-sm">
<a href="{{ route('admin.issues.index') }}" class="inline-flex items-center px-3 py-2 rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50">查看全部</a> <a href="{{ route('admin.issues.index') }}" class="inline-flex items-center px-3 py-2 rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">查看全部</a>
<a href="{{ route('admin.issue-reports.index') }}" class="inline-flex items-center px-3 py-2 rounded-md border border-gray-200 text-gray-700 hover:bg-gray-50">統計報表</a> <a href="{{ route('admin.issue-reports.index') }}" class="inline-flex items-center px-3 py-2 rounded-md border border-gray-200 dark:border-gray-600 text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700">統計報表</a>
</div> </div>
</div> </div>
@endif
@if($recentDocuments->isNotEmpty()) @if($recentDocuments->isNotEmpty())
<div class="bg-white shadow-sm sm:rounded-lg border border-gray-100"> <div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700">
<div class="px-6 py-5 border-b border-gray-200 flex items-center justify-between"> <div class="px-6 py-5 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between">
<div> <div>
<h3 class="text-lg font-semibold text-gray-900">最新文件/公告</h3> <h3 class="text-lg font-semibold text-gray-900 dark:text-gray-100">最新文件/公告</h3>
<p class="text-sm text-gray-500">協會文件、公告與外部發佈。</p> <p class="text-sm text-gray-500 dark:text-gray-400">協會文件、公告與外部發佈。</p>
</div> </div>
<a href="{{ route('documents.index') }}" class="text-sm text-blue-600 hover:text-blue-700">查看全部 →</a> <a href="{{ route('documents.index') }}" class="text-sm text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300">查看全部 →</a>
</div> </div>
<div class="divide-y divide-gray-200"> <div class="divide-y divide-gray-200 dark:divide-gray-700">
@foreach($recentDocuments as $document) @foreach($recentDocuments as $document)
<div class="px-6 py-4 hover:bg-gray-50 transition"> <div class="px-6 py-4 hover:bg-gray-50 dark:hover:bg-gray-700 transition">
<div class="flex items-start"> <div class="flex items-start">
<div class="flex-shrink-0 text-3xl mr-4"> <div class="flex-shrink-0 text-3xl mr-4">
{{ $document->currentVersion?->getFileIcon() ?? '📄' }} {{ $document->currentVersion?->getFileIcon() ?? '📄' }}
</div> </div>
<div class="flex-1 min-w-0"> <div class="flex-1 min-w-0">
<h4 class="text-sm font-medium text-gray-900"> <h4 class="text-sm font-medium text-gray-900 dark:text-gray-100">
<a href="{{ route('documents.public.show', $document->public_uuid) }}" class="hover:text-blue-600"> <a href="{{ route('documents.public.show', $document->public_uuid) }}" class="hover:text-blue-600 dark:hover:text-blue-400">
{{ $document->title }} {{ $document->title }}
</a> </a>
</h4> </h4>
@if($document->description) @if($document->description)
<p class="mt-1 text-sm text-gray-500 line-clamp-1">{{ $document->description }}</p> <p class="mt-1 text-sm text-gray-500 dark:text-gray-400 line-clamp-1">{{ $document->description }}</p>
@endif @endif
<div class="mt-2 flex items-center space-x-4 text-xs text-gray-500"> <div class="mt-2 flex items-center space-x-4 text-xs text-gray-500 dark:text-gray-400">
<span>{{ $document->category->icon }} {{ $document->category->name }}</span> <span>{{ $document->category->icon }} {{ $document->category->name }}</span>
<span>📅 {{ $document->created_at->format('Y-m-d') }}</span> <span>📅 {{ $document->created_at->format('Y-m-d') }}</span>
<span>📏 {{ $document->currentVersion?->getFileSizeHuman() }}</span> <span>📏 {{ $document->currentVersion?->getFileSizeHuman() }}</span>
@@ -203,7 +205,7 @@
</div> </div>
<div class="ml-4 flex-shrink-0"> <div class="ml-4 flex-shrink-0">
<a href="{{ route('documents.public.download', $document->public_uuid) }}" <a href="{{ route('documents.public.download', $document->public_uuid) }}"
class="inline-flex items-center px-3 py-1.5 border border-gray-300 rounded-md text-xs font-medium text-gray-700 bg-white hover:bg-gray-50"> class="inline-flex items-center px-3 py-1.5 border border-gray-300 dark:border-gray-600 rounded-md text-xs font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600">
下載 下載
</a> </a>
</div> </div>
@@ -213,6 +215,41 @@
</div> </div>
</div> </div>
@endif @endif
<!-- Recent Announcements -->
@if(isset($recentAnnouncements) && $recentAnnouncements->isNotEmpty())
<div class="bg-white dark:bg-gray-800 shadow-sm sm:rounded-lg border border-gray-100 dark:border-gray-700">
<div class="border-b border-gray-100 dark:border-gray-700 px-6 py-4">
<h3 class="text-lg font-semibold text-gray-900 dark:text-gray-100">📢 最新公告</h3>
</div>
<div class="divide-y divide-gray-100 dark:divide-gray-700">
@foreach($recentAnnouncements as $announcement)
<div class="px-6 py-4 hover:bg-gray-50 dark:hover:bg-gray-700/50 transition-colors">
<div class="flex items-start">
@if($announcement->is_pinned)
<span class="mr-2 text-blue-500 flex-shrink-0" title="置頂公告">📌</span>
@endif
<div class="flex-1 min-w-0">
<h4 class="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-1">
{{ $announcement->title }}
</h4>
<p class="text-sm text-gray-600 dark:text-gray-400 line-clamp-2 mb-2">
{{ $announcement->getExcerpt(120) }}
</p>
<div class="flex items-center space-x-3 text-xs text-gray-500 dark:text-gray-400">
<span>{{ $announcement->published_at?->diffForHumans() ?? $announcement->created_at->diffForHumans() }}</span>
@if($announcement->view_count > 0)
<span>•</span>
<span>👁 {{ $announcement->view_count }} 次</span>
@endif
</div>
</div>
</div>
</div>
@endforeach
</div>
</div>
@endif
</div> </div>
</div> </div>
</div> </div>

44
resources/views/layouts/navigation.blade.php
View File

@@ -28,7 +28,7 @@
<div class="hidden sm:flex sm:items-center"> <div class="hidden sm:flex sm:items-center">
<x-dropdown align="right" width="48"> <x-dropdown align="right" width="48">
<x-slot name="trigger"> <x-slot name="trigger">
<button class="@if(request()->routeIs('admin.*')) inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out @else 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 @endif"> <button class="@if(request()->routeIs('admin.*')) inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-slate-100 focus:outline-none focus:border-indigo-700 dark:focus:border-indigo-300 transition duration-150 ease-in-out @else inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-slate-400 hover:text-gray-700 dark:hover:text-slate-300 hover:border-gray-300 dark:hover:border-slate-600 focus:outline-none focus:text-gray-700 dark:focus:text-slate-300 focus:border-gray-300 dark:focus:border-slate-600 transition duration-150 ease-in-out @endif">
<div>{{ __('Management') }}</div> <div>{{ __('Management') }}</div>
<div class="ms-1"> <div class="ms-1">
@@ -40,6 +40,11 @@
</x-slot> </x-slot>
<x-slot name="content"> <x-slot name="content">
@can('view_announcements')
<x-dropdown-link :href="route('admin.announcements.index')">
{{ __('Admin: Announcements') }}
</x-dropdown-link>
@endcan
@hasrole('admin|membership_manager') @hasrole('admin|membership_manager')
<x-dropdown-link :href="route('admin.members.index')"> <x-dropdown-link :href="route('admin.members.index')">
{{ __('Admin: Members') }} {{ __('Admin: Members') }}
@@ -66,7 +71,7 @@
</x-dropdown-link> </x-dropdown-link>
@endcan @endcan
<x-dropdown-link :href="route('admin.issues.index')"> <x-dropdown-link :href="route('admin.issues.index')">
{{ __('Admin: Issues') }} {{ __('Admin: Tasks') }}
</x-dropdown-link> </x-dropdown-link>
@role('admin') @role('admin')
<x-dropdown-link :href="route('admin.audit.index')"> <x-dropdown-link :href="route('admin.audit.index')">
@@ -94,23 +99,7 @@
</div> </div>
<!-- Settings Dropdown --> <!-- Settings Dropdown -->
<div class="hidden sm:flex sm:items-center sm:ms-6 space-x-3"> <div class="hidden sm:flex sm:items-center sm:ms-6">
<button
type="button"
@click="$root.toggle()"
class="inline-flex items-center px-3 py-2 rounded-md text-sm font-medium border border-transparent bg-gray-100 text-gray-600 hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-indigo-500 dark:bg-slate-800 dark:text-slate-100 dark:hover:bg-slate-700"
aria-label="Toggle theme"
>
<span x-show="$root.isDark" class="flex items-center space-x-2">
<svg class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path d="M17.293 13.293a1 1 0 00-1.414 0l-.586.586a6 6 0 01-8.486-8.486l.586-.586A1 1 0 006.172 3H6a1 1 0 00-.707.293l-.586.586a8 8 0 1011.314 11.314l.586-.586a1 1 0 000-1.414l-.314-.314z"/></svg>
<span class="sr-only">Switch to light</span>
</span>
<span x-show="!$root.isDark" class="flex items-center space-x-2">
<svg class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path d="M10 3a1 1 0 011 1v1a1 1 0 11-2 0V4a1 1 0 011-1zm0 8a3 3 0 100-6 3 3 0 000 6zm5.657-6.657a1 1 0 010 1.414l-.707.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 9a1 1 0 110 2h-1a1 1 0 110-2h1zM5 9a1 1 0 100 2H4a1 1 0 100-2h1zm10.657 6.657a1 1 0 00-1.414 0l-.707.707a1 1 0 001.414 1.414l.707-.707a1 1 0 000-1.414zM10 16a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zm-5.657-.343a1 1 0 010-1.414l.707-.707a1 1 0 011.414 1.414l-.707.707a1 1 0 01-1.414 0z"/></svg>
<span class="sr-only">Switch to dark</span>
</span>
</button>
<x-dropdown align="right" width="48"> <x-dropdown align="right" width="48">
<x-slot name="trigger"> <x-slot name="trigger">
<button class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none transition ease-in-out duration-150 dark:bg-slate-800 dark:text-slate-100 dark:hover:text-white"> <button class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none transition ease-in-out duration-150 dark:bg-slate-800 dark:text-slate-100 dark:hover:text-white">
@@ -145,7 +134,7 @@
<!-- Hamburger --> <!-- Hamburger -->
<div class="-me-2 flex items-center sm:hidden"> <div class="-me-2 flex items-center sm:hidden">
<button @click="open = ! open" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out" aria-label="{{ __('Main menu') }}"> <button @click="open = ! open" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out dark:text-slate-500 dark:hover:text-slate-400 dark:hover:bg-slate-800 dark:focus:bg-slate-800 dark:focus:text-slate-400" aria-label="{{ __('Main menu') }}">
<svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24"> <svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24">
<path :class="{'hidden': open, 'inline-flex': ! open }" class="inline-flex" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" /> <path :class="{'hidden': open, 'inline-flex': ! open }" class="inline-flex" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
<path :class="{'hidden': ! open, 'inline-flex': open }" class="hidden" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" /> <path :class="{'hidden': ! open, 'inline-flex': open }" class="hidden" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
@@ -172,10 +161,15 @@
@if(Auth::user() && (Auth::user()->hasRole(['admin', 'membership_manager', 'finance_accountant', 'staff']) || Auth::user()->canAny(['view_finance_documents', 'view_accounting_transactions', 'manage_system_settings']))) @if(Auth::user() && (Auth::user()->hasRole(['admin', 'membership_manager', 'finance_accountant', 'staff']) || Auth::user()->canAny(['view_finance_documents', 'view_accounting_transactions', 'manage_system_settings'])))
<div class="pt-2 pb-1 border-t border-gray-200 dark:border-gray-700 mt-2"> <div class="pt-2 pb-1 border-t border-gray-200 dark:border-gray-700 mt-2">
<div class="px-4 text-xs font-semibold text-gray-500 uppercase tracking-wider"> <div class="px-4 text-xs font-semibold text-gray-500 dark:text-gray-400 uppercase tracking-wider">
{{ __('Management') }} {{ __('Management') }}
</div> </div>
</div> </div>
@can('view_announcements')
<x-responsive-nav-link :href="route('admin.announcements.index')" :active="request()->routeIs('admin.announcements.*')">
{{ __('Admin: Announcements') }}
</x-responsive-nav-link>
@endcan
@hasrole('admin|membership_manager') @hasrole('admin|membership_manager')
<x-responsive-nav-link :href="route('admin.members.index')" :active="request()->routeIs('admin.members.*')"> <x-responsive-nav-link :href="route('admin.members.index')" :active="request()->routeIs('admin.members.*')">
{{ __('Admin: Members') }} {{ __('Admin: Members') }}
@@ -202,7 +196,7 @@
</x-responsive-nav-link> </x-responsive-nav-link>
@endcan @endcan
<x-responsive-nav-link :href="route('admin.issues.index')" :active="request()->routeIs('admin.issues.*')"> <x-responsive-nav-link :href="route('admin.issues.index')" :active="request()->routeIs('admin.issues.*')">
{{ __('Admin: Issues') }} {{ __('Admin: Tasks') }}
</x-responsive-nav-link> </x-responsive-nav-link>
@role('admin') @role('admin')
<x-responsive-nav-link :href="route('admin.audit.index')" :active="request()->routeIs('admin.audit.*')"> <x-responsive-nav-link :href="route('admin.audit.index')" :active="request()->routeIs('admin.audit.*')">
@@ -226,10 +220,10 @@
</div> </div>
<!-- Responsive Settings Options --> <!-- Responsive Settings Options -->
<div class="pt-4 pb-1 border-t border-gray-200"> <div class="pt-4 pb-1 border-t border-gray-200 dark:border-gray-700">
<div class="px-4"> <div class="px-4">
<div class="font-medium text-base text-gray-800">{{ Auth::user()->name }}</div> <div class="font-medium text-base text-gray-800 dark:text-slate-200">{{ Auth::user()->name }}</div>
<div class="font-medium text-sm text-gray-500">{{ Auth::user()->email }}</div> <div class="font-medium text-sm text-gray-500 dark:text-slate-400">{{ Auth::user()->email }}</div>
</div> </div>
<div class="mt-3 space-y-1"> <div class="mt-3 space-y-1">