diff --git a/app/Http/Controllers/CityController.php b/app/Http/Controllers/CityController.php index 034efbf..67d37b5 100644 --- a/app/Http/Controllers/CityController.php +++ b/app/Http/Controllers/CityController.php @@ -6,12 +6,8 @@ use App\Models\City; class CityController extends Controller { - public function byProvince(int $province) + public function byProvince($province) { - $cities = City::where('provinces_id', $province) - ->orderBy('name') - ->get(); - - return response()->json($cities); + return City::where('province_id', $province)->get(); } } diff --git a/app/Http/Controllers/TourController.php b/app/Http/Controllers/TourController.php index b62971f..4bafb9f 100644 --- a/app/Http/Controllers/TourController.php +++ b/app/Http/Controllers/TourController.php @@ -16,8 +16,8 @@ class TourController extends Controller ->latest() ->paginate(2); - return view('tours.index', compact('newestTour', 'tours')); - } + return view('tours.index', compact('tours')) + ->with('withoutHero', true); } public function show(Tour $tour) diff --git a/public/assets/css/account-sidebar.css b/public/assets/css/account-sidebar.css new file mode 100644 index 0000000..f0da049 --- /dev/null +++ b/public/assets/css/account-sidebar.css @@ -0,0 +1,69 @@ +.account-sidebar { + background: #fff; + border-radius: 20px; + padding: 25px; + box-shadow: 0 10px 35px rgba(0,0,0,.08); +} + +.account-user { + text-align: center; + border-bottom: 1px solid #eee; + padding-bottom: 20px; +} + +.avatar { + width: 80px; + height: 80px; + margin: auto; + border-radius: 50%; + background: #09203f; + color: white; + display: flex; + align-items: center; + justify-content: center; +} + +.avatar i { + font-size: 35px; +} + +.account-user h4 { + margin-top: 15px; + color: #09203f; +} + +.account-user span { + color: #777; + font-size: 13px; +} + +.account-sidebar ul { + list-style: none; + padding: 0; + margin-top: 20px; +} + +.account-sidebar li { + margin-bottom: 10px; +} + +.account-sidebar a { + display: flex; + align-items: center; + gap: 12px; + padding: 14px; + border-radius: 12px; + color: #555; + text-decoration: none; + transition: .3s; +} + +.account-sidebar a:hover { + background: #09203f; + color: white; + transform: translateX(-5px); +} + +.account-sidebar i { + width: 20px; +} diff --git a/public/assets/css/account.css b/public/assets/css/account.css new file mode 100644 index 0000000..601f0f5 --- /dev/null +++ b/public/assets/css/account.css @@ -0,0 +1,100 @@ +.account-content { + + background: #fff; + padding: 35px; + border-radius: 25px; + box-shadow: 0 15px 40px rgba(0,0,0,.08); + +} + + +.account-title { + + color:#09203f; + font-weight:900; + margin-bottom:30px; + +} + + + +.comment-card { + + background:#fafcff; + border:1px solid #edf1f7; + border-radius:20px; + padding:25px; + margin-bottom:20px; + transition:.3s; + +} + + +.comment-card:hover { + + transform:translateY(-5px); + box-shadow:0 10px 30px rgba(0,0,0,.08); + +} + + + +.comment-header { + + display:flex; + justify-content:space-between; + align-items:center; + margin-bottom:20px; + +} + + +.comment-header h4 { + + color:#09203f; + font-weight:800; + +} + + +.comment-header span { + + color:#999; + font-size:13px; + +} + + + +.comment-body { + + background:white; + padding:18px; + border-radius:15px; + color:#555; + line-height:2; + +} + + + +.approved { + + background:#198754; + color:white; + padding:7px 15px; + border-radius:20px; + font-size:12px; + +} + + +.pending { + + background:#ffc107; + color:#333; + padding:7px 15px; + border-radius:20px; + font-size:12px; + +} diff --git a/public/assets/css/profile.css b/public/assets/css/profile.css new file mode 100644 index 0000000..8a49734 --- /dev/null +++ b/public/assets/css/profile.css @@ -0,0 +1,110 @@ +.account-content{ + background:#fff; + border-radius:25px; + padding:30px; + box-shadow:0 15px 40px rgba(0,0,0,.08); +} + + +.account-header{ + display:flex; + justify-content:space-between; + align-items:center; + margin-bottom:30px; +} + + +.account-title{ + color:#09203f; + font-size:26px; + font-weight:700; +} + + +.account-header p{ + color:#777; + margin-top:8px; +} + + +.profile-badge{ + width:60px; + height:60px; + border-radius:18px; + background:#09203f; + color:white; + display:flex; + align-items:center; + justify-content:center; + font-size:25px; +} + + + +.profile-box{ + + background:#fafafa; + border-radius:20px; + padding:25px; + margin-bottom:25px; + +} + + + +.profile-box-title{ + + font-size:18px; + font-weight:bold; + color:#09203f; + margin-bottom:20px; + +} + + +.profile-box-title i{ + + margin-left:8px; + +} + + + +.form-control{ + + border-radius:12px; + height:45px; + border:1px solid #ddd; + +} + + +.form-control:focus{ + + border-color:#09203f; + box-shadow:0 0 0 3px rgba(9,32,63,.1); + +} + + + +.btn-save-profile{ + + background:#09203f; + color:white; + border:none; + border-radius:15px; + padding:14px 35px; + font-size:16px; + transition:.3s; + +} + + +.btn-save-profile:hover{ + + transform:translateY(-3px); + background:#123b70; + +} + diff --git a/public/assets/css/profile1.css b/public/assets/css/profile1.css new file mode 100644 index 0000000..e83e9f5 --- /dev/null +++ b/public/assets/css/profile1.css @@ -0,0 +1,131 @@ +.account-content{ + background:#fff; + padding:30px; + border-radius:20px; + box-shadow:0 10px 35px rgba(0,0,0,.08); +} + + +.account-header{ + margin-bottom:30px; +} + + +.account-title{ + color:#09203f; + font-size:26px; + font-weight:700; +} + + +.account-subtitle{ + color:#777; +} + + +.profile-box{ + + background:#fff; + + border-radius:18px; + + margin-bottom:25px; + + border:1px solid #eee; + + overflow:hidden; + +} + + +.profile-box-header{ + + background:#f8fafc; + + padding:18px 25px; + + border-bottom:1px solid #eee; + +} + + +.profile-box-header h3{ + + margin:0; + + color:#09203f; + + font-size:18px; + +} + + +.profile-box-body{ + + padding:25px; + +} + + + +.profile-box .form-control{ + + height:48px; + + border-radius:12px; + + border:1px solid #ddd; + +} + + + +.profile-box label{ + + color:#444; + + font-weight:600; + + margin-bottom:8px; + +} + + + +.profile-box .form-control:focus{ + + border-color:#09203f; + + box-shadow:0 0 0 .2rem rgba(9,32,63,.1); + +} + + + +.save-profile-btn{ + + background:#09203f; + + color:white; + + border:none; + + padding:14px 40px; + + border-radius:14px; + + font-size:16px; + + transition:.3s; + +} + + + +.save-profile-btn:hover{ + + transform:translateY(-3px); + + background:#123b6d; + +} diff --git a/public/assets/js/custom.js b/public/assets/js/custom.js index aaf3999..36294cf 100644 --- a/public/assets/js/custom.js +++ b/public/assets/js/custom.js @@ -15,7 +15,6 @@ $(document).ready(function () { $.ajax({ url: '/users/cities/' + provinceId, - type: 'GET', success:function (cities) { diff --git a/resources/views/account/layout/app.blade.php b/resources/views/account/layout/app.blade.php index 3b64911..6ebf07d 100644 --- a/resources/views/account/layout/app.blade.php +++ b/resources/views/account/layout/app.blade.php @@ -1,3 +1,64 @@ -
- + + + + + + + Document + + + + + + +
+ + + + + +
+ + + diff --git a/resources/views/account/users/comments/index.blade.php b/resources/views/account/users/comments/index.blade.php index b2b128f..ae7d7d6 100644 --- a/resources/views/account/users/comments/index.blade.php +++ b/resources/views/account/users/comments/index.blade.php @@ -3,197 +3,126 @@ @section('content')
+
- {{-- Sidebar --}} +
- + @include('account.layout.app')
- {{-- Content --}} +
-