From 0604ab45103ac148edefd1e5b11ed62b1660cc8c Mon Sep 17 00:00:00 2001
From: Bahar <rezaeiibahar8080@gmail.com>
Date: Wed, 19 Aug 2026 13:16:19 +0330
Subject: [PATCH] fix:changes viewa and layouts

---
 .../views/account/layouts/sidebar.blade.php   |   4 +-
 resources/views/auth/register.blade.php       | 120 +++++++++++++-----
 resources/views/layouts/header.blade.php      |  68 +++++-----
 resources/views/layouts/navbar.blade.php      |  47 ++++---
 4 files changed, 150 insertions(+), 89 deletions(-)

diff --git a/resources/views/account/layouts/sidebar.blade.php b/resources/views/account/layouts/sidebar.blade.php
index c6885c3..0d85620 100644
--- a/resources/views/account/layouts/sidebar.blade.php
+++ b/resources/views/account/layouts/sidebar.blade.php
@@ -8,8 +8,8 @@
         <h4>{{ getUserFullName()}}</h4>
     </div>
     <ul class="user-profile-sidebar-list">
-        <li><a class="active" href="{{route('account.profile')}}"><i class="far fa-user"></i> نمایه من</a></li>
-        <li><a href="{{ route('account.booking') }}"><i class="far fa-shopping-bag"></i> رزرو من</a></li>
+        <li><a href="{{route('account.profile')}}"><i class="far fa-user"></i> پروفایل من</a></li>
+        <li><a href="{{route('account.booking') }}"><i class="far fa-shopping-bag"></i> رزرو من</a></li>
         <li><a href="{{route('account.comments')}}"><i class="far fa-clipboard-list"></i> نظرات من</a></li>
         <li><a href="{{route('account.wishlist')}}"><i class="far fa-heart"></i> علاقه مندی های من</a></li>
         <li><a href="{{route('account.edit-profile.index')}}"><i class="far fa-cog"></i> تنظیمات</a></li>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index b5dbc00..29dd6c3 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,9 +1,6 @@
 @extends('layouts.app')
 
-@php
-    use App\Enums\UserGender;
-    use App\Enums\UserMaritalStatus;
-@endphp
+
 @section('content')
     <main class="main">
         <div class="site-breadcrumb" style="background: url({{asset('assets/img/breadcrumb/02.jpg')}})">
@@ -27,7 +24,7 @@
                         <form action="{{route('auth.register.post')}}"
                               method="POST"
                               enctype="multipart/form-data"
-                           >
+                        >
                             @csrf
 
                             <div class="form-group">
@@ -55,7 +52,7 @@
                                            name="last_name"
                                            class="form-control"
                                            value="{{old('last_name')}}"
-                                           placeholder="اسم شما">
+                                           placeholder="نام خانوادگی شما">
                                     <i class="far fa-user"></i>
                                 </div>
                                 <!-- ERROR -->
@@ -92,18 +89,18 @@
                                     >
                                         <option value="">جنسیت خود را انتخاب کنید</option>
 
-                                        <option value="{{ UserGender::MALE->value }}"
-                                            {{ old('gender') == UserGender::MALE->value ? 'selected' : '' }}>
+                                        <option value="{{ \App\Enums\UserGender::MALE->value }}"
+                                            @selected(old('gender') == \App\Enums\UserGender::MALE->value  && old('gender') !== null) >
                                             مرد
                                         </option>
 
-                                        <option value="{{ UserGender::FEMALE->value }}"
-                                            {{ old('gender') == UserGender::FEMALE->value ? 'selected' : '' }}>
+                                        <option value="{{ \App\Enums\UserGender::FEMALE->value }}"
+                                            @selected(old('gender') == \App\Enums\UserGender::FEMALE->value && old('gender') !== null)>
                                             زن
                                         </option>
 
-                                        <option value="{{ UserGender::UNKNOWN->value }}"
-                                            {{ old('gender') == UserGender::UNKNOWN->value ? 'selected' : '' }}>
+                                        <option value="{{ \App\Enums\UserGender::UNKNOWN->value }}"
+                                            @selected(old('gender') == \App\Enums\UserGender::UNKNOWN->value && old('gender') !== null)>
                                             نامشخص
                                         </option>
                                     </select>
@@ -129,18 +126,18 @@
                                         >
                                             <option value="">وضعیت تأهل خود را انتخاب کنید</option>
 
-                                            <option value="{{ UserMaritalStatus::SINGLE->value }}"
-                                                {{ old('marital_status') == UserMaritalStatus::SINGLE->value ? 'selected' : '' }}>
+                                            <option value="{{\App\Enums\UserMaritalStatus::SINGLE->value }}"
+                                                @selected(old('marital_status') == \App\Enums\UserMaritalStatus::SINGLE->value  && old('gender') !== null)>
                                                 مجرد
                                             </option>
 
-                                            <option value="{{ UserMaritalStatus::MARRIED->value }}"
-                                                {{ old('marital_status') == UserMaritalStatus::MARRIED->value ? 'selected' : '' }}>
+                                            <option value="{{\App\Enums\UserMaritalStatus::MARRIED->value }}"
+                                                @selected(old('marital_status') == \App\Enums\UserMaritalStatus::SINGLE->value  && old('gender') !== null)>
                                                 متأهل
                                             </option>
 
-                                            <option value="{{ UserMaritalStatus::SEPARATED->value }}"
-                                                {{ old('marital_status') == UserMaritalStatus::SEPARATED->value ? 'selected' : '' }}>
+                                            <option value="{{ \App\Enums\UserMaritalStatus::SEPARATED->value }}"
+                                                @selected(old('marital_status') == \App\Enums\UserMaritalStatus::SINGLE->value  && old('gender') !== null)>
                                                 متارکه
                                             </option>
                                         </select>
@@ -186,8 +183,6 @@
                                     <span style="color: red">{{ $message }}</span>
                                     @enderror
                                 </div>
-
-
                                 <div class="form-group">
                                     <label>آدرس ایمیل</label>
                                     <div class="form-group-icon">
@@ -203,7 +198,6 @@
                                     <span style="color: red">{{ $message }}</span>
                                     @enderror
                                 </div>
-
                                 <div class="form-group">
                                     <label>تصویر پروفایل
                                         (اختیاری)
@@ -274,8 +268,6 @@
                                     <span style="color: red">{{ $message }}</span>
                                     @enderror
                                 </div>
-
-                                {{-- استان --}}
                                 <div class="form-group">
                                     <label>
                                         استان
@@ -285,13 +277,8 @@
                                         <select name="province_id"
                                                 id="province_id"
                                                 class="form-control">
-
                                             <option value="">استان خود را انتخاب کنید</option>
-
-                                            {{-- بعداً استان‌ها را از دیتابیس می‌آوریم --}}
-
                                         </select>
-                                        <i class="far fa-map-marker"></i>
                                     </div>
 
                                     @error('province_id')
@@ -299,8 +286,6 @@
                                     @enderror
                                 </div>
 
-
-                                {{-- شهرستان --}}
                                 <div class="form-group">
                                     <label>
                                         شهرستان
@@ -339,3 +324,78 @@
 
     </main>
 @endsection
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+
+        const provinceSelect = document.getElementById('province_id');
+        const citySelect = document.getElementById('city_id');
+
+        fetch('{{ asset('assets/data/iran-cities.json') }}')
+            .then(response => response.json())
+            .then(data => {
+
+                const provinces = [];
+
+                data.forEach(item => {
+
+                    const exists = provinces.some(
+                        province => province.id === item.provinceId
+                    );
+
+                    if (!exists) {
+                        provinces.push({
+                            id: item.provinceId,
+                            name: item.provinceName
+                        });
+                    }
+                });
+
+                provinces.forEach(province => {
+
+                    provinceSelect.innerHTML += `
+                        <option value="${province.id}">
+                            ${province.name}
+                        </option>
+                    `;
+
+                });
+
+
+                provinceSelect.addEventListener('change', function () {
+
+                    citySelect.innerHTML = `
+                        <option value="">
+                            شهر خود را انتخاب کنید
+                        </option>
+                    `;
+
+                    const provinceId = this.value;
+
+                    if (!provinceId) {
+                        return;
+                    }
+
+                    const cities = data.filter(
+                        item => item.provinceId === provinceId
+                    );
+
+                    cities.forEach(city => {
+
+                        citySelect.innerHTML += `
+                            <option value="${city.cityId}">
+                                ${city.cityName}
+                            </option>
+                        `;
+
+                    });
+
+                });
+
+            })
+            .catch(error => {
+                console.error('Error loading cities:', error);
+            });
+
+    });
+</script>
diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php
index 05cfed2..3bb0be0 100644
--- a/resources/views/layouts/header.blade.php
+++ b/resources/views/layouts/header.blade.php
@@ -4,48 +4,38 @@
         <div class="container">
             <div class="row align-items-center">
                 <div class="col-md-7">
-                    <div class="header-top-left">
-                        {{--                        <div class="top-social">--}}
-                        {{--                            <a href="#"><i class="fab fa-facebook-f"></i></a>--}}
-                        {{--                            <a href="#"><i class="fab fa-twitter"></i></a>--}}
-                        {{--                            <a href="#"><i class="fab fa-instagram"></i></a>--}}
-                        {{--                            <a href="#"><i class="fab fa-linkedin-in"></i></a>--}}
-                        {{--                        </div>--}}
-                        <div class="top-contact-info">
-                            {{--                            <ul>--}}
-                            {{--                                <li><a href="tel:+21234567897"><i class="far fa-phone-arrow-down-left"></i>0912345678</a></li>--}}
-                            {{--                                <li><a href="/cdn-cgi/l/email-protection#7b12151d143b1e031a160b171e55181416"><i class="far fa-envelopes"></i><span class="__cf_email__" data-cfemail="e0898e868fa08598818d908c85ce838f8d">[ایمیل&#160;محفوظ]</span></a></li>--}}
-                            {{--                            </ul>--}}
-                        </div>
-                    </div>
                 </div>
                 <div class="col-md-5">
-                    <div class="header-top-right">
-                        <div class="lang">
-                            <select name="lang" class="select">
-                                <option value="1">انگلیس</option>
-                                <option value="2">روس</option>
-                                <option value="3">روم</option>
-                                <option value="4">فرانس</option>
-                                <option value="5">اسپین</option>
-                                <option value="6">پرتقال</option>
-                            </select>
-                        </div>
-                        <div class="currency">
-                            <select name="currency" class="select">
-                                <option value="1">دلار</option>
-                                <option value="2">یورو</option>
-                                <option value="3">ریال</option>
-                                <option value="4">ین</option>
-                                <option value="5">پوند</option>
-                                <option value="6">فرانک</option>
-                            </select>
-                        </div>
+                    <div class="header-top-right d-flex align-items-center justify-content-end gap-3">
                         @auth
+                            <div class="header-nav-right">
+                                <div class="header-btn">
+                                    <a href="{{ route('auth.logout.index') }}"
+                                       class="theme-btn mt-2">
+                                        خروج از حساب کاربری
+                                    </a>
+                                </div>
+                            </div>
                         @else
-                            <div class="account">
-                                <a href="{{route('auth.login.index')}}"><i class="far fa-sign-in"></i>وارد شدن</a>
-                                <a href="{{route('auth.register.index')}}"><i class="far fa-user-tie"></i>ثبت نام</a>
+                            <div class="header-nav-right">
+                                <div class="header-btn">
+                                    <a href="{{ route('auth.login.index') }}"
+                                       class="theme-btn mt-2">
+                                        ورود به حساب کاربری
+                                    </a>
+                                </div>
+                            </div>
+                            <div class="account d-flex align-items-center gap-3">
+                                <a href="{{ route('auth.login.index') }}"
+                                   class="text-decoration-none">
+                                    <i class="far fa-sign-in me-1"></i>
+                                    وارد شدن
+                                </a>
+                                <a href="{{ route('auth.register.index') }}"
+                                   class="text-decoration-none">
+                                    <i class="far fa-user-tie me-1"></i>
+                                    ثبت نام
+                                </a>
                             </div>
                         @endauth
                     </div>
@@ -53,7 +43,9 @@
             </div>
         </div>
     </div>
+
     <div class="main-navigation">
         @include('layouts.navbar')
     </div>
+
 </header>
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index 8b626b9..f7189ff 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -1,16 +1,28 @@
 <nav class="navbar navbar-expand-lg">
     <div class="container">
-        <a class="navbar-brand" href="{{route('index')}}">
-            <img src="{{asset('assets/img/logo/logo.png')}}" class="logo-display" alt="logo">
-            <img src="{{asset('assets/img/logo/logo-dark.png')}}" class="logo-scrolled" alt="logo">
+        <a class="navbar-brand" href="{{ route('index') }}">
+            <img src="{{ asset('assets/img/logo/logo.png') }}"
+                 class="logo-display"
+                 alt="logo">
+
+            <img src="{{ asset('assets/img/logo/logo-dark.png') }}"
+                 class="logo-scrolled"
+                 alt="logo">
         </a>
         <div class="mobile-menu-right">
-            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main_nav" aria-expanded="false" aria-label="Toggle navigation">
-                <span class="navbar-toggler-btn-icon"><i class="far fa-bars"></i></span>
+            <button class="navbar-toggler"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#main_nav"
+                    aria-expanded="false"
+                    aria-label="Toggle navigation">
+                <span class="navbar-toggler-btn-icon">
+                    <i class="far fa-bars"></i>
+                </span>
             </button>
         </div>
         <div class="collapse navbar-collapse" id="main_nav">
-            <ul class="navbar-nav">
+            <ul class="navbar-nav me-auto">
                 <li class="nav-item">
                     <a class="nav-link" href="{{ route('index') }}">
                         صفحه اصلی
@@ -21,24 +33,21 @@
                         پرواز
                     </a>
                 </li>
-                <li class="nav-item dropdown">
+                <li class="nav-item">
                     <a class="nav-link" href="{{ route('tours.index') }}">
                         تور
                     </a>
                 </li>
-                <li class="nav-item"><a class="nav-link" href="contact.html">تماس باما</a></li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{{route('account.profile')}}">
+                        پروفایل من
+                    </a>
+                </li>    <li class="nav-item">
+                    <a class="nav-link" href="#">
+                        تماس با ما
+                    </a>
+                </li>
             </ul>
-            <div class="header-nav-right">
-                @auth
-                <div class="header-btn">
-                    <a href="{{ route('auth.logout.index') }}" class="theme-btn mt-2">خروج از حساب کاربری</a>
-                </div>
-                @else
-                    <div class="header-btn">
-                        <a href="{{ route('auth.logout.index') }}" class="theme-btn mt-2">ورود به حساب کاربری</a>
-                    </div>
-                @endauth
-            </div>
         </div>
     </div>
 </nav>