#4-merge-with-master-conflict-resolve

This commit is contained in:
2026-05-12 11:00:22 +08:00
19 changed files with 819 additions and 79 deletions

View File

@@ -0,0 +1,63 @@
<x-app-layout>
<x-slot name="header">
<div>
<p class="text-sm font-medium uppercase tracking-wider text-indigo-600">{{ __('Categories') }}</p>
<h2 class="text-2xl font-semibold leading-tight text-gray-900">
{{ __('Create Category') }}
</h2>
</div>
</x-slot>
<div class="py-10">
<div class="mx-auto max-w-4xl px-4 sm:px-6 lg:px-8">
<section class="overflow-hidden rounded-xl border border-gray-200 bg-white shadow-sm">
<div class="border-b border-gray-100 bg-gradient-to-r from-indigo-50 via-fuchsia-50 to-amber-50 px-6 py-5">
<h3 class="text-lg font-semibold text-gray-900">{{ __('Category Details') }}</h3>
<p class="mt-1 text-sm text-gray-600">{{ __('Choose a clear name and a color that stands out in lists.') }}</p>
</div>
<form method="POST" action="{{ route('category.store') }}" class="space-y-6 p-6">
@csrf
<div class="grid gap-6 md:grid-cols-2">
<div>
<x-input-label for="name" :value="__('Name')" />
<x-text-input id="name" class="mt-2 block w-full" type="text" name="name" :value="old('name')" required autofocus autocomplete="off" />
<x-input-error class="mt-2" :messages="$errors->get('name')" />
</div>
<div>
<x-input-label for="slug" :value="__('Slug')" />
<x-text-input id="slug" class="mt-2 block w-full" type="text" name="slug" :value="old('slug')" autocomplete="off" placeholder="auto-generated-from-name" />
<x-input-error class="mt-2" :messages="$errors->get('slug')" />
</div>
</div>
<div>
<x-input-label for="description" :value="__('Description')" />
<textarea id="description" name="description" rows="4" class="mt-2 block w-full rounded-lg border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500">{{ old('description') }}</textarea>
<x-input-error class="mt-2" :messages="$errors->get('description')" />
</div>
<div>
<x-input-label for="color" :value="__('Color')" />
<div class="mt-2 flex items-center gap-3">
<input id="color" type="color" name="color" value="{{ old('color', '#4f46e5') }}" class="h-11 w-16 cursor-pointer rounded-lg border border-gray-300 bg-white p-1 shadow-sm">
<span class="text-sm text-gray-500">{{ __('Select a category accent color.') }}</span>
</div>
<x-input-error class="mt-2" :messages="$errors->get('color')" />
</div>
<div class="flex flex-col-reverse gap-3 border-t border-gray-100 pt-6 sm:flex-row sm:items-center sm:justify-end">
<a href="{{ route('category.index') }}" class="inline-flex items-center justify-center rounded-lg border border-gray-300 px-4 py-2 text-sm font-semibold text-gray-700 transition hover:bg-gray-50">
{{ __('Cancel') }}
</a>
<button type="submit" class="inline-flex items-center justify-center rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">
{{ __('Save Category') }}
</button>
</div>
</form>
</section>
</div>
</div>
</x-app-layout>

View File

@@ -0,0 +1,92 @@
<x-app-layout>
<x-slot name="header">
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
<div>
<p class="text-sm font-medium uppercase tracking-wider text-indigo-600">{{ __('Categories') }}</p>
<h2 class="text-2xl font-semibold leading-tight text-gray-900">
{{ __('Edit Category') }}
</h2>
</div>
<a href="{{ route('category.index') }}" class="inline-flex items-center justify-center rounded-lg border border-gray-300 px-4 py-2 text-sm font-semibold text-gray-700 transition hover:bg-white">
{{ __('Back to Categories') }}
</a>
</div>
</x-slot>
<div class="py-10">
<div class="mx-auto max-w-4xl px-4 sm:px-6 lg:px-8">
@if (session('status') === 'category-updated')
<div class="mb-6 rounded-lg border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm font-medium text-emerald-800">
{{ __('Category updated successfully.') }}
</div>
@endif
<section class="overflow-hidden rounded-xl border border-gray-200 bg-white shadow-sm">
<div class="border-b border-gray-100 px-6 py-5" style="background: linear-gradient(90deg, {{ $category->color }}20, #ffffff)">
<div class="flex items-center gap-4">
<span class="h-12 w-12 rounded-xl shadow-sm ring-1 ring-black/5" style="background-color: {{ $category->color }}"></span>
<div>
<h3 class="text-lg font-semibold text-gray-900">{{ $category->name }}</h3>
<p class="mt-1 font-mono text-sm text-gray-600">{{ $category->slug }}</p>
</div>
</div>
</div>
<form id="delete-category-form" method="POST" action="{{ route('category.destroy', $category) }}" onsubmit="return confirm('{{ __('Delete this category?') }}')">
@csrf
@method('DELETE')
</form>
<form method="POST" action="{{ route('category.update', $category) }}" class="space-y-6 p-6">
@csrf
@method('PATCH')
<div class="grid gap-6 md:grid-cols-2">
<div>
<x-input-label for="name" :value="__('Name')" />
<x-text-input id="name" class="mt-2 block w-full" type="text" name="name" :value="old('name', $category->name)" required autofocus autocomplete="off" />
<x-input-error class="mt-2" :messages="$errors->get('name')" />
</div>
<div>
<x-input-label for="slug" :value="__('Slug')" />
<x-text-input id="slug" class="mt-2 block w-full" type="text" name="slug" :value="old('slug', $category->slug)" required autocomplete="off" />
<x-input-error class="mt-2" :messages="$errors->get('slug')" />
</div>
</div>
<div>
<x-input-label for="description" :value="__('Description')" />
<textarea id="description" name="description" rows="4" class="mt-2 block w-full rounded-lg border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500">{{ old('description', $category->description) }}</textarea>
<x-input-error class="mt-2" :messages="$errors->get('description')" />
</div>
<div>
<x-input-label for="color" :value="__('Color')" />
<div class="mt-2 flex items-center gap-3">
<input id="color" type="color" name="color" value="{{ old('color', $category->color) }}" class="h-11 w-16 cursor-pointer rounded-lg border border-gray-300 bg-white p-1 shadow-sm">
<span class="text-sm text-gray-500">{{ __('Adjust the accent used across category lists.') }}</span>
</div>
<x-input-error class="mt-2" :messages="$errors->get('color')" />
</div>
<div class="flex flex-col gap-3 border-t border-gray-100 pt-6 sm:flex-row sm:items-center sm:justify-between">
<button type="submit" form="delete-category-form" class="inline-flex items-center justify-center rounded-lg border border-rose-200 px-4 py-2 text-sm font-semibold text-rose-700 transition hover:bg-rose-50">
{{ __('Delete Category') }}
</button>
<div class="flex flex-col-reverse gap-3 sm:flex-row sm:items-center">
<a href="{{ route('category.index') }}" class="inline-flex items-center justify-center rounded-lg border border-gray-300 px-4 py-2 text-sm font-semibold text-gray-700 transition hover:bg-gray-50">
{{ __('Cancel') }}
</a>
<button type="submit" class="inline-flex items-center justify-center rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">
{{ __('Update Category') }}
</button>
</div>
</div>
</form>
</section>
</div>
</div>
</x-app-layout>

View File

@@ -0,0 +1,126 @@
<x-app-layout>
<x-slot name="header">
<div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
<div>
<p class="text-sm font-medium uppercase tracking-wider text-indigo-600">{{ __('Content Library') }}</p>
<h2 class="text-2xl font-semibold leading-tight text-gray-900">
{{ __('Categories') }}
</h2>
</div>
<a href="{{ route('category.create') }}" class="inline-flex items-center justify-center rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">
{{ __('New Category') }}
</a>
</div>
</x-slot>
<div class="py-10">
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
@if (session('status'))
<div class="mb-6 rounded-lg border border-emerald-200 bg-emerald-50 px-4 py-3 text-sm font-medium text-emerald-800">
@if (session('status') === 'category-created')
{{ __('Category created successfully.') }}
@elseif (session('status') === 'category-updated')
{{ __('Category updated successfully.') }}
@elseif (session('status') === 'category-deleted')
{{ __('Category deleted successfully.') }}
@endif
</div>
@endif
<div class="grid gap-6 lg:grid-cols-[1fr_18rem]">
<section class="overflow-hidden rounded-xl border border-gray-200 bg-white shadow-sm">
<div class="border-b border-gray-100 bg-gradient-to-r from-indigo-50 via-sky-50 to-emerald-50 px-6 py-5">
<div class="flex flex-col gap-2 sm:flex-row sm:items-end sm:justify-between">
<div>
<h3 class="text-lg font-semibold text-gray-900">{{ __('Manage Categories') }}</h3>
<p class="mt-1 text-sm text-gray-600">{{ __('Organize records with clear names, slugs, and color labels.') }}</p>
</div>
<span class="inline-flex w-fit items-center rounded-full bg-white px-3 py-1 text-sm font-medium text-gray-700 shadow-sm ring-1 ring-gray-200">
{{ trans_choice(':count category|:count categories', $categories->total(), ['count' => $categories->total()]) }}
</span>
</div>
</div>
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-white">
<tr>
<th scope="col" class="px-6 py-4 text-left text-xs font-semibold uppercase tracking-wider text-gray-500">{{ __('Category') }}</th>
<th scope="col" class="px-6 py-4 text-left text-xs font-semibold uppercase tracking-wider text-gray-500">{{ __('Slug') }}</th>
<th scope="col" class="px-6 py-4 text-left text-xs font-semibold uppercase tracking-wider text-gray-500">{{ __('Created') }}</th>
<th scope="col" class="px-6 py-4 text-right text-xs font-semibold uppercase tracking-wider text-gray-500">{{ __('Actions') }}</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-100 bg-white">
@forelse ($categories as $category)
<tr class="transition hover:bg-gray-50">
<td class="px-6 py-4">
<div class="flex items-center gap-3">
<span class="h-11 w-11 rounded-xl shadow-sm ring-1 ring-black/5" style="background-color: {{ $category->color }}"></span>
<div>
<p class="font-semibold text-gray-900">{{ $category->name }}</p>
<p class="mt-1 max-w-md truncate text-sm text-gray-500">
{{ $category->description ?: __('No description added.') }}
</p>
</div>
</div>
</td>
<td class="px-6 py-4 text-sm text-gray-600">
<span class="rounded-full bg-gray-100 px-3 py-1 font-mono text-xs text-gray-700">{{ $category->slug }}</span>
</td>
<td class="px-6 py-4 text-sm text-gray-600">{{ $category->created_at?->format('Y-m-d H:i') }}</td>
<td class="px-6 py-4 text-right text-sm">
<div class="flex justify-end gap-2">
<a href="{{ route('category.edit', $category) }}" class="rounded-lg border border-indigo-200 px-3 py-2 font-medium text-indigo-700 transition hover:bg-indigo-50">
{{ __('Edit') }}
</a>
<form method="POST" action="{{ route('category.destroy', $category) }}" onsubmit="return confirm('{{ __('Delete this category?') }}')">
@csrf
@method('DELETE')
<button type="submit" class="rounded-lg border border-rose-200 px-3 py-2 font-medium text-rose-700 transition hover:bg-rose-50">
{{ __('Delete') }}
</button>
</form>
</div>
</td>
</tr>
@empty
<tr>
<td colspan="4" class="px-6 py-12 text-center">
<div class="mx-auto max-w-sm">
<div class="mx-auto h-12 w-12 rounded-2xl bg-indigo-100"></div>
<h3 class="mt-4 text-base font-semibold text-gray-900">{{ __('No categories yet') }}</h3>
<p class="mt-1 text-sm text-gray-500">{{ __('Create your first category to start organizing the system.') }}</p>
<a href="{{ route('category.create') }}" class="mt-5 inline-flex items-center justify-center rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-indigo-500">
{{ __('Create Category') }}
</a>
</div>
</td>
</tr>
@endforelse
</tbody>
</table>
</div>
@if ($categories->hasPages())
<div class="border-t border-gray-100 px-6 py-4">
{{ $categories->links() }}
</div>
@endif
</section>
<aside class="rounded-xl border border-gray-200 bg-white p-6 shadow-sm">
<p class="text-sm font-medium uppercase tracking-wider text-gray-500">{{ __('Palette') }}</p>
<div class="mt-4 grid grid-cols-4 gap-3">
@foreach ($categories->take(8) as $category)
<span class="h-12 rounded-xl shadow-sm ring-1 ring-black/5" style="background-color: {{ $category->color }}" title="{{ $category->name }}"></span>
@endforeach
</div>
<p class="mt-5 text-sm leading-6 text-gray-600">{{ __('Use color to make category scanning faster while keeping names and slugs predictable.') }}</p>
</aside>
</div>
</div>
</div>
</x-app-layout>

View File

@@ -0,0 +1,126 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Neighborhood News Portal</title>
@vite(['resources/css/app.css', 'resources/js/app.js'])
</head>
<body class="min-h-screen bg-gradient-to-b from-emerald-50 via-white to-sky-50 text-slate-800 antialiased">
<div class="mx-auto w-full max-w-6xl px-4 py-8 sm:px-6 lg:px-8">
@if (\Illuminate\Support\Facades\Route::has('login'))
<div class="mb-4 flex justify-end">
<nav class="flex items-center gap-2 text-sm">
@auth
<a
href="{{ url('/dashboard') }}"
class="rounded-xl border border-emerald-300 bg-emerald-50 px-4 py-2 font-medium text-emerald-800 transition hover:bg-emerald-100"
>
Dashboard
</a>
@else
<a
href="{{ route('login') }}"
class="rounded-xl border border-slate-300 bg-white px-4 py-2 font-medium text-slate-700 transition hover:bg-slate-50"
>
Login
</a>
@if (\Illuminate\Support\Facades\Route::has('register'))
<a
href="{{ route('register') }}"
class="rounded-xl border border-emerald-300 bg-emerald-50 px-4 py-2 font-medium text-emerald-800 transition hover:bg-emerald-100"
>
Register
</a>
@endif
@endauth
</nav>
</div>
@endif
<header class="relative overflow-hidden rounded-3xl border border-emerald-100 bg-white/80 p-6 shadow-sm backdrop-blur sm:p-8">
<img
src="https://images.pexels.com/photos/10768840/pexels-photo-10768840.jpeg?auto=compress&cs=tinysrgb&w=1600"
alt="Forested hills in the distance"
class="absolute inset-0 h-full w-full object-cover"
>
<div class="absolute inset-0 bg-gradient-to-r from-white via-white/88 to-emerald-100/55"></div>
<div class="absolute inset-x-0 bottom-0 h-32 bg-gradient-to-t from-white/90 to-transparent"></div>
<div class="relative">
<p class="text-xs font-semibold uppercase tracking-wider text-emerald-700">Local Neighborhood Portal</p>
<div class="mt-3 flex flex-col gap-4 md:flex-row md:items-end md:justify-between">
<div>
<h1 class="text-3xl font-bold tracking-tight text-slate-900 sm:text-4xl">Taman Melawati News</h1>
<p class="mt-2 max-w-2xl text-sm text-slate-700 sm:text-base">
Friendly updates from around the block. Stories are placeholders for now, but the spirit is real.
</p>
<p class="mt-4 text-xs uppercase tracking-[0.24em] text-slate-500">Inspired by the hills and forest edges around our neighborhood</p>
</div>
<div class="rounded-2xl border border-white/70 bg-white/75 px-4 py-3 text-sm text-emerald-950 shadow-sm backdrop-blur">
<p class="font-semibold">Good morning, Neighbor</p>
<p class="text-emerald-800">Tuesday community digest</p>
</div>
</div>
</div>
</header>
<main class="mt-8 grid gap-6 lg:grid-cols-3">
<section class="space-y-6 lg:col-span-2">
<article class="relative overflow-hidden rounded-3xl border border-slate-200 bg-white p-6 shadow-sm sm:p-7">
<img
src="https://images.pexels.com/photos/9651398/pexels-photo-9651398.jpeg?auto=compress&cs=tinysrgb&w=1200"
alt="Misty forested mountain backdrop"
class="absolute inset-x-0 top-0 h-40 w-full object-cover"
>
<div class="absolute inset-x-0 top-0 h-40 bg-gradient-to-b from-emerald-950/35 via-emerald-900/25 to-white"></div>
<div class="relative pt-24">
<p class="text-xs font-semibold uppercase tracking-wide text-amber-700">Top Story</p>
<h2 class="mt-2 text-2xl font-semibold text-slate-900">Community Garden Harvest Day Set for Saturday</h2>
<p class="mt-3 text-sm leading-6 text-slate-600">
Volunteers from Cedar Lane and Oak Street are gathering at 8:00 AM to pick tomatoes, herbs, and okra.
Bring a reusable bag and a smile. Extra produce will be shared with nearby families.
</p>
<div class="mt-4 flex flex-wrap items-center gap-2 text-xs text-slate-500">
<span class="rounded-full bg-emerald-50 px-3 py-1 font-medium text-emerald-700">By Hana, local editor</span>
<span>2 hours ago</span>
</div>
</div>
</article>
<div class="grid gap-4 sm:grid-cols-2">
<article class="rounded-2xl border border-slate-200 bg-white p-5 shadow-sm">
<p class="text-xs font-semibold uppercase tracking-wide text-sky-700">Street Update</p>
<h3 class="mt-2 text-lg font-semibold text-slate-900">Pine Street Lighting Repaired</h3>
<p class="mt-2 text-sm text-slate-600">Evening walks are brighter again after three new lamps were installed this week.</p>
</article>
<article class="rounded-2xl border border-slate-200 bg-white p-5 shadow-sm">
<p class="text-xs font-semibold uppercase tracking-wide text-rose-700">School Corner</p>
<h3 class="mt-2 text-lg font-semibold text-slate-900">Book Drive Reaches 500 Donations</h3>
<p class="mt-2 text-sm text-slate-600">Taman Melawati Elementary thanks neighbors for donating books to the weekend reading club.</p>
</article>
</div>
</section>
<aside class="space-y-6">
<section class="rounded-2xl border border-slate-200 bg-white p-5 shadow-sm">
<h3 class="text-sm font-semibold uppercase tracking-wide text-slate-700">Community Board</h3>
<ul class="mt-4 space-y-3 text-sm text-slate-600">
<li class="rounded-xl bg-slate-50 px-3 py-2">Thursday 7 PM: Town Hall mini-meet at River Cafe.</li>
<li class="rounded-xl bg-slate-50 px-3 py-2">Friday 5 PM: Youth futsal practice at West Court.</li>
<li class="rounded-xl bg-slate-50 px-3 py-2">Sunday 9 AM: Riverside clean-up, all ages welcome.</li>
</ul>
</section>
<section class="rounded-2xl border border-slate-200 bg-white p-5 shadow-sm">
<h3 class="text-sm font-semibold uppercase tracking-wide text-slate-700">Weather Snapshot</h3>
<p class="mt-3 text-3xl font-bold text-slate-900">29°C</p>
<p class="text-sm text-slate-600">Warm with light breeze. Great evening for a neighborhood stroll.</p>
</section>
</aside>
</main>
</div>
</body>
</html>

View File

@@ -21,6 +21,9 @@
<x-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }}
</x-nav-link>
<x-nav-link :href="route('category.index')" :active="request()->routeIs('category.*')">
{{ __('Categories') }}
</x-nav-link>
</div>
</div>
@@ -82,6 +85,9 @@
<x-responsive-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }}
</x-responsive-nav-link>
<x-responsive-nav-link :href="route('category.index')" :active="request()->routeIs('category.*')">
{{ __('Categories') }}
</x-responsive-nav-link>
</div>
<!-- Responsive Settings Options -->