From af5002c2da050cd775391a0ff16b1932723fde01 Mon Sep 17 00:00:00 2001
From: myqnrrhmn <romanovthewriter@gmail.com>
Date: Wed, 14 May 2025 08:40:00 +0700
Subject: [PATCH] chore: refactor dashboard UI batch 1

---
 app/Http/Requests/UserRequest.php             |   7 +-
 app/Models/AiringProofTheme.php               |   4 +
 .../airing-proof-themes/create.blade.php      |   4 +-
 .../airing-proof-themes/edit.blade.php        |   4 +-
 .../airing-proof-themes/show.blade.php        | 118 +++++++++++-------
 .../dashboard/announcements/create.blade.php  |   4 +-
 .../dashboard/announcements/edit.blade.php    |   8 +-
 .../dashboard/announcements/show.blade.php    |  27 ++--
 .../classifications/show.blade.php            |   2 +-
 .../media-cooperations/create.blade.php       |   2 +-
 .../views/dashboard/news/create.blade.php     |   6 +-
 resources/views/dashboard/news/edit.blade.php |   6 +-
 resources/views/dashboard/news/show.blade.php |   3 +
 .../views/dashboard/setting/index.blade.php   |  26 ++--
 .../views/dashboard/users/create.blade.php    |  20 ++-
 .../views/dashboard/users/edit.blade.php      |  15 ++-
 .../dashboard/users/reset-password.blade.php  |   2 +-
 routes/web.php                                |   2 -
 18 files changed, 165 insertions(+), 95 deletions(-)

diff --git a/app/Http/Requests/UserRequest.php b/app/Http/Requests/UserRequest.php
index 6902765..821417c 100644
--- a/app/Http/Requests/UserRequest.php
+++ b/app/Http/Requests/UserRequest.php
@@ -26,17 +26,18 @@ public function rules(): array
     {
         $rules = [
             'name' => ['required', 'max:100'],
-            'email' => ['required', 'email', 'max:100', 'unique:users,email'],
-            'role_id' => ['required', 'in:1,2,3,4'],
-            'status' => ['required', 'in:1,2'],
+            'role_id' => ['required', 'in:1,2,3,4', 'not_in:select'],
+            'status' => ['required', 'in:1,2', 'not_in:select'],
         ];
 
         if($this->isMethod('post')){
+            $roles['email'] = ['required', 'email', 'max:100', 'unique:users,email'];
             $rules['password'] = ['required', 'confirmed', Password::min(8)
             ->mixedCase()
             ->numbers()
             ->symbols()];
         }else if($this->isMethod('put')){
+            $roles['email'] = ['required', 'email', 'max:100'];
             $rules['password'] = ['nullable', 'confirmed', Password::min(8)
             ->mixedCase()
             ->numbers()
diff --git a/app/Models/AiringProofTheme.php b/app/Models/AiringProofTheme.php
index 9f41a38..c55aca2 100644
--- a/app/Models/AiringProofTheme.php
+++ b/app/Models/AiringProofTheme.php
@@ -17,4 +17,8 @@ class AiringProofTheme extends Model
         'description',
         'enhancer_id'
     ];
+
+    public function enhancer(){
+        return $this->belongsTo(User::class, 'enhancer_id', 'id');
+    }
 }
diff --git a/resources/views/dashboard/airing-proof-themes/create.blade.php b/resources/views/dashboard/airing-proof-themes/create.blade.php
index e41556b..c596bf2 100644
--- a/resources/views/dashboard/airing-proof-themes/create.blade.php
+++ b/resources/views/dashboard/airing-proof-themes/create.blade.php
@@ -30,7 +30,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama tema" value="{{old('name')}}">
+                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Contoh: Pendidikan" value="{{old('name')}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -41,7 +41,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="year">Tahun<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('year') border-danger  @enderror" id="year" name="year" placeholder="Masukan tahun" value="{{old('year')}}">
+                                                                <input type="text" class="form-control @error('year') border-danger  @enderror" id="year" name="year" placeholder="Contoh: 2025" value="{{old('year')}}">
                                                             </div>
                                                             @error('year')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/airing-proof-themes/edit.blade.php b/resources/views/dashboard/airing-proof-themes/edit.blade.php
index 61c8672..7df5035 100644
--- a/resources/views/dashboard/airing-proof-themes/edit.blade.php
+++ b/resources/views/dashboard/airing-proof-themes/edit.blade.php
@@ -20,7 +20,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama tema" value="{{$airingProofTheme->name}}">
+                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Contoh: Pendidikan" value="{{$airingProofTheme->name}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -31,7 +31,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="year">Tahun<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('year') border-danger  @enderror" id="year" name="year" placeholder="Masukan tahun" value="{{$airingProofTheme->year}}">
+                                                                <input type="text" class="form-control @error('year') border-danger  @enderror" id="year" name="year" placeholder="Contoh: 2025" value="{{$airingProofTheme->year}}">
                                                             </div>
                                                             @error('year')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/airing-proof-themes/show.blade.php b/resources/views/dashboard/airing-proof-themes/show.blade.php
index 7b1d012..0e34ec7 100644
--- a/resources/views/dashboard/airing-proof-themes/show.blade.php
+++ b/resources/views/dashboard/airing-proof-themes/show.blade.php
@@ -6,49 +6,83 @@
                     <div class="container-fluid">
                         <div class="nk-content-inner">
                             <div class="nk-content-body">
-                                <div class="nk-block nk-block-lg">
-                                    <div class="card card-bordered card-preview">
-                                        <div class="card-inner">
-                                            <div class="card-head">
-                                                <h5 class="card-title">{{$title}}</h5>
+                                <div class="nk-block-head nk-block-head-sm">
+                                    <div class="nk-block-between g-3">
+                                        <div class="nk-block-head-content">
+                                            <h3 class="nk-block-title page-title">Detail Tema Bukti Tayang</h3>
+                                            <div class="nk-block-des text-soft">
+                                                <ul class="list-inline">
+                                                    <li>Detail tema bukti tayang dapat dilihat di sini.</li>
+                                                </ul>
                                             </div>
-                                            <form action="#" method="post">
-                                                @csrf
-                                                <div class="row g-4">
-                                                    <div class="col-lg-6">
-                                                        <div class="form-group">
-                                                            <label class="form-label" for="name">Nama</label>
-                                                            <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama tema" value="{{$airingProofTheme->name}}" readonly>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-lg-6">
-                                                        <div class="form-group">
-                                                            <label class="form-label" for="year">Tahun</label>
-                                                            <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('year') border-danger  @enderror" id="year" name="year" placeholder="Masukan tahun" value="{{$airingProofTheme->year}}" readonly>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-lg-12">
-                                                        <div class="form-group">
-                                                            <label class="form-label" for="phone-no-1">Deskripsi</label>
-                                                            <div class="form-control-wrap">
-                                                                <div class="description-content">{!! filled($airingProofTheme->description) ? $airingProofTheme->description : '<i>Tidak ada deskripsi</i>'  !!}</div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-12">
-                                                        <hr>
-                                                        <div class="form-group d-flex justify-content-end">
-                                                            <a href="{{route('dashboard.airing.proof.themes.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
-                                                            <a href="{{route('dashboard.airing.proof.themes.edit', ['id' => encrypt_id($airingProofTheme->id)])}}" class="btn btn-warning"><span>Ubah</span></a>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </form>
                                         </div>
+                                        <div class="nk-block-head-content">
+                                            <a href="{{route('dashboard.airing.proof.themes.index')}}" class="btn btn-icon btn-outline-light bg-white d-inline-flex d-sm-none"><em class="icon ni ni-arrow-left"></em></a>
+                                            <a href="{{route('dashboard.airing.proof.themes.index')}}" class="btn btn-outline-light bg-white d-none d-sm-inline-flex"><em class="icon ni ni-arrow-left"></em><span>Kembali</span></a>
+                                        </div>
+                                    </div>
+                                </div><!-- .nk-block-head -->
+                                <div class="nk-block nk-block-lg">
+                                    <div class="card">
+                                        <div class="card-aside-wrap">
+                                            <div class="card-content">
+                                                <ul class="nav nav-tabs nav-tabs-mb-icon nav-tabs-card">
+                                                    <li class="nav-item">
+                                                        <a class="nav-link text-primary" href="javascript:void(0);"><em class="icon ni ni-info"></em><span>Detail Informasi</span></a>
+                                                    </li>
+                                                    <li class="nav-item nav-item-trigger d-xxl-none">
+                                                        <a href="{{route('dashboard.airing.proof.themes.edit', ['id' => encrypt_id($airingProofTheme->id), 'show' => true])}}" class="btn btn-icon btn-trigger"><em class="icon ni ni-edit"></em></a>
+                                                    </li>
+                                                </ul><!-- .nav-tabs -->
+                                                <div class="card-inner">
+                                                    <div class="nk-block">
+                                                        {{-- <div class="nk-block-head">
+                                                            <h5 class="title">Personal Information</h5>
+                                                            <p>Basic info, like your name and address, that you use on Nio Platform.</p>
+                                                        </div> --}}
+                                                        <div class="profile-ud-list">
+                                                            <div class="profile-ud-item">
+                                                                <div class="profile-ud wider">
+                                                                    <span class="profile-ud-label">Nama</span>
+                                                                    <span class="profile-ud-value">{{$airingProofTheme->name}}</span>
+                                                                </div>
+                                                            </div>
+                                                            <div class="profile-ud-item">
+                                                                <div class="profile-ud wider">
+                                                                    <span class="profile-ud-label">Tahun</span>
+                                                                    <span class="profile-ud-value">{{$airingProofTheme->year}}</span>
+                                                                </div>
+                                                            </div>
+                                                            <div class="profile-ud-item">
+                                                                <div class="profile-ud wider">
+                                                                    <span class="profile-ud-label">Dibuat Pada</span>
+                                                                    <span class="profile-ud-value">{{idn_date($airingProofTheme->created_at, 'l, d F Y')}}</span>
+                                                                </div>
+                                                            </div>
+                                                            <div class="profile-ud-item">
+                                                                <div class="profile-ud wider">
+                                                                    <span class="profile-ud-label">Dibuat Oleh</span>
+                                                                    <span class="profile-ud-value">{{$airingProofTheme->enhancer->name}}</span>
+                                                                </div>
+                                                            </div>
+                                                        </div><!-- .profile-ud-list -->
+                                                    </div><!-- .nk-block -->
+                                                    {{-- <div class="nk-divider divider md"></div> --}}
+                                                    <div class="nk-block">
+                                                        <div class="nk-block-head nk-block-head-sm nk-block-between">
+                                                            <span class="profile-ud-label">Deskripsi</span>
+                                                        </div><!-- .nk-block-head -->
+                                                        <div class="bq-note">
+                                                            <div class="bq-note-item">
+                                                                <div class="bq-note-text">
+                                                                    {!! filled($airingProofTheme->description) ? $airingProofTheme->description : '<i>Tidak ada deskripsi</i>' !!}
+                                                                </div>
+                                                            </div><!-- .bq-note-item -->
+                                                        </div><!-- .bq-note -->
+                                                    </div><!-- .nk-block -->
+                                                </div><!-- .card-inner -->
+                                            </div><!-- .card-content -->
+                                        </div><!-- .card-aside-wrap -->
                                     </div>
                                 </div>
                             </div>
@@ -56,4 +90,4 @@
                     </div>
                 </div>
                 <!-- content @e -->
-@include('partials.dashboard.footer', ['rich_editor' => true])
+@include('partials.dashboard.footer', ['rich_editor' => false])
diff --git a/resources/views/dashboard/announcements/create.blade.php b/resources/views/dashboard/announcements/create.blade.php
index 44c997d..a2e2210 100644
--- a/resources/views/dashboard/announcements/create.blade.php
+++ b/resources/views/dashboard/announcements/create.blade.php
@@ -19,7 +19,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="headline">Headline<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('headline') border-danger  @enderror" id="headline" name="headline" placeholder="Masukan headline" value="{{old('headline')}}">
+                                                                <input type="text" class="form-control @error('headline') border-danger  @enderror" id="headline" name="headline" placeholder="Contoh: Pemberitahuan kerjasama ..." value="{{old('headline')}}">
                                                             </div>
                                                             @error('headline')
                                                             <span class="validation-error">{{$message}}</span>
@@ -56,7 +56,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="link">Link</label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="link" name="link" placeholder="Masukan link" value="{{old('link')}}">
+                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="link" name="link" placeholder="Contoh: https://sample.com" value="{{old('link')}}">
                                                             </div>
                                                             @error('link')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/announcements/edit.blade.php b/resources/views/dashboard/announcements/edit.blade.php
index c90817b..a11d1bf 100644
--- a/resources/views/dashboard/announcements/edit.blade.php
+++ b/resources/views/dashboard/announcements/edit.blade.php
@@ -20,7 +20,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="headline">Headline<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('headline') border-danger  @enderror" id="headline" name="headline" placeholder="Masukan headline" value="{{$announcement->headline}}">
+                                                                <input type="text" class="form-control @error('headline') border-danger  @enderror" id="headline" name="headline" placeholder="Contoh: Pemberitahuan kerjasama ..." value="{{$announcement->headline}}">
                                                             </div>
                                                             @error('headline')
                                                             <span class="validation-error">{{$message}}</span>
@@ -57,7 +57,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="link">Link</label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="link" name="link" placeholder="Masukan link" value="{{$announcement->link}}">
+                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="link" name="link" placeholder="Contoh: https://sample.com" value="{{$announcement->link}}">
                                                             </div>
                                                             @error('link')
                                                             <span class="validation-error">{{$message}}</span>
@@ -78,7 +78,11 @@
                                                     <div class="col-12">
                                                         <hr>
                                                         <div class="form-group d-flex justify-content-end">
+                                                            @if (request()->query('show'))
+                                                            <a href="{{route('dashboard.announcements.show', ['id' => encrypt_id($announcement->id)])}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
+                                                            @else
                                                             <a href="{{route('dashboard.announcements.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
+                                                            @endif
                                                             <button type="button" class="btn btn-md btn-primary" id="submitButton">Simpan</button>
                                                         </div>
                                                     </div>
diff --git a/resources/views/dashboard/announcements/show.blade.php b/resources/views/dashboard/announcements/show.blade.php
index 8d20fd0..0fd3760 100644
--- a/resources/views/dashboard/announcements/show.blade.php
+++ b/resources/views/dashboard/announcements/show.blade.php
@@ -6,13 +6,32 @@
                     <div class="container-fluid">
                         <div class="nk-content-inner">
                             <div class="nk-content-body">
+                                <div class="nk-block-head nk-block-head-sm">
+                                    <div class="nk-block-between g-3">
+                                        <div class="nk-block-head-content">
+                                            <h3 class="nk-block-title page-title">Detail Pengumuman</h3>
+                                            <div class="nk-block-des text-soft">
+                                                <ul class="list-inline">
+                                                    <li>Detail pengumuman dapat dilihat di sini.</li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                        <div class="nk-block-head-content">
+                                            <a href="{{route('dashboard.announcements.index')}}" class="btn btn-outline-light bg-white d-none d-sm-inline-flex"><em class="icon ni ni-arrow-left"></em><span>Kembali</span></a>
+                                            <a href="{{route('dashboard.announcements.index')}}" class="btn btn-icon btn-outline-light bg-white d-inline-flex d-sm-none"><em class="icon ni ni-arrow-left"></em></a>
+                                        </div>
+                                    </div>
+                                </div><!-- .nk-block-head -->
                                 <div class="nk-block nk-block-lg">
                                     <div class="card">
                                         <div class="card-aside-wrap">
                                             <div class="card-content">
                                                 <ul class="nav nav-tabs nav-tabs-mb-icon nav-tabs-card">
                                                     <li class="nav-item">
-                                                        <a class="nav-link text-primary" href="#"><em class="icon ni ni-info"></em><span>Detail Pengumuman</span></a>
+                                                        <a class="nav-link text-primary" href="#"><em class="icon ni ni-info"></em><span>Detail Informasi</span></a>
+                                                    </li>
+                                                    <li class="nav-item nav-item-trigger d-xxl-none">
+                                                        <a href="{{route('dashboard.announcements.edit', ['id' => encrypt_id($announcement->id), 'show' => true])}}" class="btn btn-icon btn-trigger"><em class="icon ni ni-edit"></em></a>
                                                     </li>
                                                 </ul><!-- .nav-tabs -->
                                                 <div class="card-inner">
@@ -105,12 +124,6 @@
                                                         </div>
                                                     </div>
                                                     @endif
-                                                    <div class="nk-block d-flex justify-content-end">
-                                                        <a href="{{route('dashboard.announcements.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
-                                                        @if ($announcement->users[0]->pivot->category !== 'system')
-                                                        <a href="{{route('dashboard.announcements.edit', ['id' => encrypt_id($announcement->id)])}}" class="btn btn-warning"><span>Ubah</span></a>
-                                                        @endif
-                                                    </div><!-- .nk-block -->
                                                 </div><!-- .card-inner -->
                                             </div><!-- .card-content -->
                                         </div><!-- .card-aside-wrap -->
diff --git a/resources/views/dashboard/content-recaps/classifications/show.blade.php b/resources/views/dashboard/content-recaps/classifications/show.blade.php
index d79109d..e3ca063 100644
--- a/resources/views/dashboard/content-recaps/classifications/show.blade.php
+++ b/resources/views/dashboard/content-recaps/classifications/show.blade.php
@@ -87,7 +87,7 @@
                                                         <div class="bq-note">
                                                             <div class="bq-note-item">
                                                                 <div class="bq-note-text">
-                                                                    {!!$contentRecapClassification->description ?? '-' !!}
+                                                                    {!! filled($contentRecapClassification->description) ? $contentRecapClassification->description : '<i>Tidak ada deskripsi</i>' !!}
                                                                 </div>
                                                             </div><!-- .bq-note-item -->
                                                         </div><!-- .bq-note -->
diff --git a/resources/views/dashboard/media-cooperations/create.blade.php b/resources/views/dashboard/media-cooperations/create.blade.php
index 0cf47aa..cc55fe4 100644
--- a/resources/views/dashboard/media-cooperations/create.blade.php
+++ b/resources/views/dashboard/media-cooperations/create.blade.php
@@ -19,7 +19,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="name">Nama Kegiatan<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama kegiatan" value="{{old('name')}}">
+                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Contoh: Publikasi Pembangunan Daerah" value="{{old('name')}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/news/create.blade.php b/resources/views/dashboard/news/create.blade.php
index a5cb511..c187973 100644
--- a/resources/views/dashboard/news/create.blade.php
+++ b/resources/views/dashboard/news/create.blade.php
@@ -22,7 +22,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="title">Judul<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('title') border-danger  @enderror" id="title" name="title" placeholder="Masukan judul" value="{{old('title')}}">
+                                                                <input type="text" class="form-control @error('title') border-danger  @enderror" id="title" name="title" placeholder="Contoh: Hari Pendidikan, Pemkab Purwakarta Resmi..." value="{{old('title')}}">
                                                             </div>
                                                             @error('title')
                                                             <span class="validation-error">{{$message}}</span>
@@ -33,7 +33,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="link">Link</label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="newsLink" name="link" placeholder="Masukan link" value="{{old('link')}}">
+                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="newsLink" name="link" placeholder="Contoh: https://purwakartakab.go.id/read/2684" value="{{old('link')}}">
                                                                 <small id="newsLinkFeedback" class="d-none"></small>
                                                             </div>
                                                             @error('link')
@@ -59,7 +59,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="tag">Tag</label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('tag') border-danger  @enderror" id="tag" name="tag" placeholder="Masukan tag" value="{{old('tag')}}">
+                                                                <input type="text" class="form-control @error('tag') border-danger  @enderror" id="tag" name="tag" placeholder="Contoh: #PemkabPurwakarta" value="{{old('tag')}}">
                                                             </div>
                                                             @error('tag')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/news/edit.blade.php b/resources/views/dashboard/news/edit.blade.php
index a35a821..79358ce 100644
--- a/resources/views/dashboard/news/edit.blade.php
+++ b/resources/views/dashboard/news/edit.blade.php
@@ -23,7 +23,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="title">Judul<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('title') border-danger  @enderror" id="title" name="title" placeholder="Masukan judul" value="{{$news->title}}">
+                                                                <input type="text" class="form-control @error('title') border-danger  @enderror" id="title" name="title" placeholder="Contoh: Hari Pendidikan, Pemkab Purwakarta Resmi..." value="{{$news->title}}">
                                                             </div>
                                                             @error('title')
                                                             <span class="validation-error">{{$message}}</span>
@@ -34,7 +34,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="link">Link</label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="link" name="link" placeholder="Masukan link" value="{{$news->link}}">
+                                                                <input type="text" class="form-control @error('link') border-danger  @enderror" id="link" name="link" placeholder="Contoh: https://purwakartakab.go.id/read/2684" value="{{$news->link}}">
                                                             </div>
                                                             @error('link')
                                                             <span class="validation-error">{{$message}}</span>
@@ -59,7 +59,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="tag">Tag</label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('tag') border-danger  @enderror" id="tag" name="tag" placeholder="Masukan tag" value="{{$news->tag}}">
+                                                                <input type="text" class="form-control @error('tag') border-danger  @enderror" id="tag" name="tag" placeholder="#PemkabPurwakarta" value="{{$news->tag}}">
                                                             </div>
                                                             @error('tag')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/news/show.blade.php b/resources/views/dashboard/news/show.blade.php
index 46d18ae..35ddd9a 100644
--- a/resources/views/dashboard/news/show.blade.php
+++ b/resources/views/dashboard/news/show.blade.php
@@ -30,6 +30,9 @@
                                                     <li class="nav-item">
                                                         <a class="nav-link text-primary" href="javascript:void(0);"><em class="icon ni ni-info"></em><span>Detail Informasi</span></a>
                                                     </li>
+                                                    <li class="nav-item nav-item-trigger d-xxl-none">
+                                                        <a href="{{route('dashboard.news.edit', ['id' => encrypt_id($news->id), 'show' => true])}}" class="btn btn-icon btn-trigger"><em class="icon ni ni-edit"></em></a>
+                                                    </li>
                                                 </ul><!-- .nav-tabs -->
                                                 <div class="card-inner">
                                                     <div class="nk-block">
diff --git a/resources/views/dashboard/setting/index.blade.php b/resources/views/dashboard/setting/index.blade.php
index 3941059..ec8837e 100644
--- a/resources/views/dashboard/setting/index.blade.php
+++ b/resources/views/dashboard/setting/index.blade.php
@@ -23,7 +23,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="app_name">Nama Aplikasi<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('app_name') border-danger  @enderror" id="app_name" name="app_name" placeholder="Masukan nama aplikasi" value="{{$app->app_name}}">
+                                                                <input type="text" class="form-control @error('app_name') border-danger  @enderror" id="app_name" name="app_name" placeholder="Contoh: Sistem Media Komunikasi Kabupaten Purwakarta" value="{{$app->app_name}}">
                                                             </div>
                                                             @error('app_name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -34,7 +34,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="app_title">Title Tab Aplikasi<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('app_title') border-danger  @enderror" id="app_title" name="app_title" placeholder="Masukan title untuk tab aplikasi" value="{{$app->app_title}}">
+                                                                <input type="text" class="form-control @error('app_title') border-danger  @enderror" id="app_title" name="app_title" placeholder="Contoh: Simedkom Kab. Purwakarta" value="{{$app->app_title}}">
                                                             </div>
                                                             @error('app_title')
                                                             <span class="validation-error">{{$message}}</span>
@@ -45,7 +45,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="app_description">Deskripsi Aplikasi<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('app_description') border-danger  @enderror" id="app_description" name="app_description" placeholder="Masukan deskripsi aplikasi" value="{{$app->app_description}}">
+                                                                <input type="text" class="form-control @error('app_description') border-danger  @enderror" id="app_description" name="app_description" placeholder="Contoh: Aplikasi Sistem Media Komunikasi Kabupaten Purwakarta" value="{{$app->app_description}}">
                                                             </div>
                                                             @error('app_description')
                                                             <span class="validation-error">{{$message}}</span>
@@ -56,7 +56,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="app_keywords">Keyword Aplikasi<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('app_keywords') border-danger  @enderror" id="app_keywords" name="app_keywords" placeholder="Masukan kata kunci aplikasi" value="{{$app->app_keywords}}">
+                                                                <input type="text" class="form-control @error('app_keywords') border-danger  @enderror" id="app_keywords" name="app_keywords" placeholder="Contoh: diskominfo, simedkom, komunikasi, media" value="{{$app->app_keywords}}">
                                                             </div>
                                                             @error('app_keywords')
                                                             <span class="validation-error">{{$message}}</span>
@@ -89,7 +89,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_address">Alamat<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_address') border-danger  @enderror" id="contact_address"  name="contact_address" placeholder="Masukan alamat" value="{{$app->contact_address}}">
+                                                                <input type="text" class="form-control @error('contact_address') border-danger  @enderror" id="contact_address"  name="contact_address" placeholder="Contoh: Jl. Ganda Negara No.25, Nagri Kidul, Kec. Purwakarta, Kabupaten" value="{{$app->contact_address}}">
                                                             </div>
                                                             @error('contact_address')
                                                             <span class="validation-error">{{$message}}</span>
@@ -100,7 +100,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_phone">Nomor Telepon<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_phone') border-danger  @enderror" id="contact_phone" name="contact_phone" placeholder="Masukan nomor telepon" value="{{$app->contact_phone}}">
+                                                                <input type="text" class="form-control @error('contact_phone') border-danger  @enderror" id="contact_phone" name="contact_phone" placeholder="Contoh: 0851-7513-8912" value="{{$app->contact_phone}}">
                                                             </div>
                                                             @error('contact_phone')
                                                             <span class="validation-error">{{$message}}</span>
@@ -111,7 +111,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_email">Email<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_email') border-danger  @enderror" id="contact_email" name="contact_email" placeholder="Masukan email" value="{{$app->contact_email}}">
+                                                                <input type="text" class="form-control @error('contact_email') border-danger  @enderror" id="contact_email" name="contact_email" placeholder="Contoh: simedkom.purwakarta@gmail.com" value="{{$app->contact_email}}">
                                                             </div>
                                                             @error('contact_email')
                                                             <span class="validation-error">{{$message}}</span>
@@ -122,7 +122,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_facebook">Facebook<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_facebook') border-danger  @enderror" id="contact_facebook" name="contact_facebook" placeholder="Masukan link akun Facebook" value="{{$app->contact_facebook}}">
+                                                                <input type="text" class="form-control @error('contact_facebook') border-danger  @enderror" id="contact_facebook" name="contact_facebook" placeholder="Contoh: https://www.facebook.com/Simedkom" value="{{$app->contact_facebook}}">
                                                             </div>
                                                             @error('contact_facebook')
                                                             <span class="validation-error">{{$message}}</span>
@@ -133,7 +133,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_twitter">Twitter<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_twitter') border-danger  @enderror" id="contact_twitter" name="contact_twitter" placeholder="Masukan link akun Twitter" value="{{$app->contact_twitter}}">
+                                                                <input type="text" class="form-control @error('contact_twitter') border-danger  @enderror" id="contact_twitter" name="contact_twitter" placeholder="Contoh: https://twitter.com/Simedkom" value="{{$app->contact_twitter}}">
                                                             </div>
                                                             @error('contact_twitter')
                                                             <span class="validation-error">{{$message}}</span>
@@ -144,7 +144,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_instagram">Instagram<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_instagram') border-danger  @enderror" id="contact_instagram" name="contact_instagram" placeholder="Masukan link akun Instagram" value="{{$app->contact_instagram}}">
+                                                                <input type="text" class="form-control @error('contact_instagram') border-danger  @enderror" id="contact_instagram" name="contact_instagram" placeholder="Contoh: https://www.instagram.com/Simedkom" value="{{$app->contact_instagram}}">
                                                             </div>
                                                             @error('contact_instagram')
                                                             <span class="validation-error">{{$message}}</span>
@@ -155,7 +155,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_youtube">YouTube<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_youtube') border-danger  @enderror" id="contact_youtube" name="contact_youtube" placeholder="Masukan link akun YouTube" value="{{$app->contact_youtube}}">
+                                                                <input type="text" class="form-control @error('contact_youtube') border-danger  @enderror" id="contact_youtube" name="contact_youtube" placeholder="Contoh: https://www.youtube.com/@Simedkom" value="{{$app->contact_youtube}}">
                                                             </div>
                                                             @error('contact_youtube')
                                                             <span class="validation-error">{{$message}}</span>
@@ -166,7 +166,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_whatsapp">WhatsApp<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_whatsapp') border-danger  @enderror" id="contact_whatsapp" name="contact_whatsapp" placeholder="Masukan link WhatsApp" value="{{$app->contact_whatsapp}}">
+                                                                <input type="text" class="form-control @error('contact_whatsapp') border-danger  @enderror" id="contact_whatsapp" name="contact_whatsapp" placeholder="Contoh: https://wa.me/628xxxxxxxxxx" value="{{$app->contact_whatsapp}}">
                                                             </div>
                                                             @error('contact_whatsapp')
                                                             <span class="validation-error">{{$message}}</span>
@@ -177,7 +177,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="contact_telegram">Telegram<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('contact_telegram') border-danger  @enderror" id="contact_telegram" name="contact_telegram" placeholder="Masukan link akun Telegram" value="{{$app->contact_telegram}}">
+                                                                <input type="text" class="form-control @error('contact_telegram') border-danger  @enderror" id="contact_telegram" name="contact_telegram" placeholder="Contoh: https://t.me/Simedkom" value="{{$app->contact_telegram}}">
                                                             </div>
                                                             @error('contact_telegram')
                                                             <span class="validation-error">{{$message}}</span>
diff --git a/resources/views/dashboard/users/create.blade.php b/resources/views/dashboard/users/create.blade.php
index e9f9535..833e3c2 100644
--- a/resources/views/dashboard/users/create.blade.php
+++ b/resources/views/dashboard/users/create.blade.php
@@ -12,14 +12,14 @@
                                             <div class="card-head">
                                                 <h5 class="card-title">{{$title}}</h5>
                                             </div>
-                                            <form action="{{route('dashboard.users.store')}}" method="post">
+                                            <form action="{{route('dashboard.users.store')}}" method="post" id="myForm">
                                                 @csrf
                                                 <div class="row g-4">
                                                     <div class="col-lg-6">
                                                         <div class="form-group">
                                                             <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama" value="{{old('name')}}">
+                                                                <input type="text" class="form-control" id="name" name="name" placeholder="Masukan nama lengkap" value="{{old('name')}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -30,7 +30,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="email">Email<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="email" class="form-control @error('email') border-danger  @enderror" id="email" name="email" placeholder="Masukan email" value="{{old('email')}}">
+                                                                <input type="email" class="form-control" id="email" name="email" placeholder="Masukan email aktif" value="{{old('email')}}">
                                                             </div>
                                                             @error('email')
                                                             <span class="validation-error">{{$message}}</span>
@@ -42,6 +42,7 @@
                                                             <label class="form-label">Role<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
                                                                 <select class="form-select js-select2" name="role_id">
+                                                                    <option value="select" selected disabled>Pilih Role</option>
                                                                     @foreach ($roles as $role)
                                                                     @if ($role->id != '3')
                                                                     <option value="{{$role->id}}" {{old('role_id') == $role->id ? 'selected' : ''}}>{{$role->name}}</option>
@@ -49,6 +50,9 @@
                                                                     @endforeach
                                                                 </select>
                                                             </div>
+                                                            @error('role_id')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                     <div class="col-lg-6">
@@ -56,10 +60,14 @@
                                                             <label class="form-label">Status<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
                                                                 <select class="form-select js-select2" name="status">
+                                                                    <option value="select" selected disabled>Pilih Status</option>
                                                                     <option value="1" {{old('status') === '1' ? 'selected' : ''}}>Aktif</option>
                                                                     <option value="2" {{old('status') === '2' ? 'selected' : ''}}>Nonaktif</option>
                                                                 </select>
                                                             </div>
+                                                            @error('status')
+                                                            <span class="validation-error">{{$message}}</span>
+                                                            @enderror
                                                         </div>
                                                     </div>
                                                 </div>
@@ -68,7 +76,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="password">Password<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="password" class="form-control @error('password') border-danger  @enderror" id="password" name="password" placeholder="Masukan password" value="{{old('password')}}">
+                                                                <input type="password" class="form-control" id="password" name="password" placeholder="Masukan password" value="{{old('password')}}">
                                                             </div>
                                                             @error('password')
                                                             <span class="validation-error">{{$message}}</span>
@@ -79,7 +87,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="password_confirmation">Ulangi Password<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="password" class="form-control @error('password_confirmation') border-danger  @enderror" id="password_confirmation" name="password_confirmation" placeholder="Ulangi Password" value="{{old('password_confirmation')}}">
+                                                                <input type="password" class="form-control" id="password_confirmation" name="password_confirmation" placeholder="Ulangi Password" value="{{old('password_confirmation')}}">
                                                             </div>
                                                             @error('password_confirmation')
                                                             <span class="validation-error">{{$message}}</span>
@@ -90,7 +98,7 @@
                                                         <hr>
                                                         <div class="form-group d-flex justify-content-end">
                                                             <a href="{{route('dashboard.users.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
-                                                            <button type="submit" class="btn btn-md btn-primary">Tambahkan</button>
+                                                            <button type="button" class="btn btn-md btn-primary" id="submitButton">Tambahkan</button>
                                                         </div>
                                                     </div>
                                                 </div>
diff --git a/resources/views/dashboard/users/edit.blade.php b/resources/views/dashboard/users/edit.blade.php
index 2a4b9df..2e101eb 100644
--- a/resources/views/dashboard/users/edit.blade.php
+++ b/resources/views/dashboard/users/edit.blade.php
@@ -10,9 +10,12 @@
                                     <div class="card card-bordered card-preview">
                                         <div class="card-inner">
                                             <div class="card-head">
-                                                <h5 class="card-title">{{$title}}</h5>
+                                                <div class="nk-block-head">
+                                                    <h5 class="title">Ubah Pengguna</h5>
+                                                    <p>Perbarui informasi pengguna ini.</p>
+                                                </div>
                                             </div>
-                                            <form action="{{route('dashboard.users.update', ['id' => encrypt_id($user->id)])}}" method="post">
+                                            <form action="{{route('dashboard.users.update', ['id' => encrypt_id($user->id)])}}" method="post" id="myForm">
                                                 @csrf
                                                 @method('put')
                                                 <div class="row g-4">
@@ -20,7 +23,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="name">Nama<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama" value="{{$user->name}}">
+                                                                <input type="text" class="form-control @error('name') border-danger  @enderror" id="name" name="name" placeholder="Masukan nama lengkap" value="{{$user->name}}">
                                                             </div>
                                                             @error('name')
                                                             <span class="validation-error">{{$message}}</span>
@@ -31,7 +34,7 @@
                                                         <div class="form-group">
                                                             <label class="form-label" for="email">Email<span class="required-input">*</span></label>
                                                             <div class="form-control-wrap">
-                                                                <input type="email" class="form-control @error('email') border-danger  @enderror" id="email" name="email" placeholder="Masukan email" value="{{$user->email}}">
+                                                                <input type="email" class="form-control @error('email') border-danger  @enderror" id="email" name="email" placeholder="Masukan email aktif" value="{{$user->email}}">
                                                             </div>
                                                             @error('email')
                                                             <span class="validation-error">{{$message}}</span>
@@ -45,7 +48,9 @@
                                                             <div class="form-control-wrap">
                                                                 <select class="form-select js-select2" name="role_id">
                                                                     @foreach ($roles as $role)
+                                                                    @if ($role->id != '3')
                                                                     <option value="{{$role->id}}" {{$user->role_id == $role->id ? 'selected' : ''}}>{{$role->name}}</option>
+                                                                    @endif
                                                                     @endforeach
                                                                 </select>
                                                             </div>
@@ -67,7 +72,7 @@
                                                         <hr>
                                                         <div class="form-group d-flex justify-content-end">
                                                             <a href="{{route('dashboard.users.index')}}" class="btn btn-white btn-dim btn-outline-light mx-2"><span>Kembali</span></a>
-                                                            <button type="submit" class="btn btn-md btn-primary">Simpan</button>
+                                                            <button type="button" class="btn btn-md btn-primary" id="submitButton">Simpan</button>
                                                         </div>
                                                     </div>
                                                 </div>
diff --git a/resources/views/dashboard/users/reset-password.blade.php b/resources/views/dashboard/users/reset-password.blade.php
index 3951dc0..58b786e 100644
--- a/resources/views/dashboard/users/reset-password.blade.php
+++ b/resources/views/dashboard/users/reset-password.blade.php
@@ -54,7 +54,7 @@
                                                         <label class="form-label" for="your-password">Kata Sandi Anda ({{$page === 'reset' ? Auth::user()->name : 'Saat Ini'}})</label>
                                                     </div>
                                                     <div class="form-control-wrap">
-                                                        <input type="password" class="form-control form-control-lg" id="your-password" placeholder="Kata sandi Anda" name="my_password">
+                                                        <input type="password" class="form-control form-control-lg" id="your-password" placeholder="Kata sandi Anda saat ini" name="my_password">
                                                     </div>
                                                     @error('my_password')
                                                     <span class="validation-error">{{$message}}</span>
diff --git a/routes/web.php b/routes/web.php
index 77c29a0..8c0d536 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -601,7 +601,5 @@
                 Route::get('/data', [DatatableController::class, 'loginHistory'])->name('data');
             });
         });
-
-
     });
 });