diff --git a/ -i b/ -i
new file mode 100644
index 0000000..e69de29
diff --git a/app/Http/Controllers/MarcaController.php b/app/Http/Controllers/MarcaController.php
index c93a0da..9bafa5b 100644
--- a/app/Http/Controllers/MarcaController.php
+++ b/app/Http/Controllers/MarcaController.php
@@ -14,27 +14,20 @@ class MarcaController extends Controller
     {
         $busqueda = $request->busqueda;
 
-    if($busqueda) {
-        $marcas = Marca::where('nombre', 'LIKE', "%{$busqueda}%")->get();
+        if ($busqueda) {
+            // Busca en la columna 'marca' de la tabla 'marcas'
+            $marcas = Marca::where('marca', 'LIKE', "%{$busqueda}%")->get();
 
-        if($marcas->count() == 0) {
-            return redirect()->route('marca.index')
-                           ->with('error', 'No existe ninguna marca con el nombre "' . $busqueda . '". Por favor, inténtalo de nuevo.');
+            if ($marcas->isEmpty()) {
+                return redirect()->route('marca.index')
+                    ->with('error', 'No existe ninguna marca con el nombre "' . $busqueda . '". Por favor, inténtalo de nuevo.');
+            }
+        } else {
+            // Si no hay búsqueda, mostrar todas las marcas
+            $marcas = Marca::where('eliminado', 0)->get();
         }
 
-        // Si solo hay una marca, mostrar sus detalles
-        if($marcas->count() == 1) {
-            $marca = $marcas->first();
-            return redirect()->route('marca.edit', $marca->id);
-        }
-
-        // Si hay múltiples coincidencias, mostrar la lista filtrada
-        return view('marca', ["marcas" => $marcas]);
-    }
-
-        // Si no hay búsqueda, mostrar todas las marcas
-        $marcas = Marca::all();
-        return view('marcas', ["marcas" => $marcas]);
+        return view('marcas', ['marcas' => $marcas]);
     }
 
     /**
@@ -42,8 +35,7 @@ class MarcaController extends Controller
      */
     public function create()
     {
-        $marcas = Marca::all();
-        return view('marcasCrearEditar',['marcas'=>$marcas]);
+        return view('marcasCrearEditar', ['marca' => null]); // No se necesita pasar marcas
     }
 
     /**
@@ -51,17 +43,13 @@ class MarcaController extends Controller
      */
     public function store(Request $request)
     {
-        $marca = new Marca($request->all());
+        // Crea una nueva marca
+        $marca = new Marca();
+        $marca->marca = $request->marca; // Asigna el nombre ingresado por el usuario
+        $marca->eliminado = 0; // Marca como activa por defecto
         $marca->save();
-        return redirect()->route('marca.index')->with('success', 'Marca creada exitosamente.');
-    }
 
-    /**
-     * Display the specified resource.
-     */
-    public function show(Marca $marca)
-    {
-        //
+        return redirect()->route('marca.index')->with('success', 'Marca creada exitosamente.');
     }
 
     /**
@@ -69,8 +57,8 @@ class MarcaController extends Controller
      */
     public function edit($id)
     {
-        $marca = Marca::find($id);
-        return view('marcasCrearEditar',['marca'=>$marca]);
+        $marca = Marca::findOrFail($id); // Busca la marca por ID
+        return view('marcasCrearEditar', ['marca' => $marca]); // Pasa la marca a la vista
     }
 
     /**
@@ -78,20 +66,23 @@ class MarcaController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $marca = Marca::find($id);
-        $marca->fill($request->all());
-        $marca->save();
-        return redirect()->route('marca.index')->with('success', 'Marca actualizada exitosamente.');
+        $marca = Marca::findOrFail($id); // Encuentra la marca por ID
+        $marca->marca = $request->marca; // Actualiza el nombre de la marca
+        $marca->eliminado = 0; // Cambia el estado a activo si se está editando
+        $marca->save(); // Guarda los cambios
+
+        return redirect()->route('marca.index')->with('success', 'Marca actualizada correctamente.');
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy($id )
+    public function destroy($id)
     {
-        $marca = Marca::find($id);
-        $marca->delete();
-        return redirect()->route('marca.index')->with('success', 'Marca eliminada exitosamente.');
+        $marca = Marca::findOrFail($id); // Encuentra la marca por ID
+        $marca->eliminado = 1; // Cambia el estado a inactivo
+        $marca->save(); // Guarda los cambios
 
+        return redirect()->route('marca.index')->with('success', 'Marca inactivada correctamente.');
     }
 }
diff --git a/app/Http/Controllers/TiposLicenciasController.php b/app/Http/Controllers/TiposLicenciasController.php
new file mode 100644
index 0000000..fd8d379
--- /dev/null
+++ b/app/Http/Controllers/TiposLicenciasController.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\TiposLicencias;
+use Illuminate\Http\Request;
+
+class TiposLicenciasController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request)
+    {
+        $busqueda = $request->busqueda;
+
+    if($busqueda) {
+        $tiposLicencias = TiposLicencias::where('nombre', 'LIKE', "%{$busqueda}%")->get();
+
+        if($tiposLicencias->count() == 0) {
+            return redirect()->route('tiposLicencias.index')
+                           ->with('error', 'No existe ningún tipo de licencia con el nombre "' . $busqueda . '". Por favor, inténtalo de nuevo.');
+        }
+
+        // Si solo hay un tipo de licencia, mostrar sus detalles
+        if($tiposLicencias->count() == 1) {
+            $tipoLicencia = $tiposLicencias->first();
+            return redirect()->route('tiposLicencias.edit', $tipoLicencia->id);
+        }
+
+        // Si hay múltiples coincidencias, mostrar la lista filtrada
+        return view('tiposLicencias', ["tiposLicencias" => $tiposLicencias]);
+    }
+
+        // Si no hay búsqueda, mostrar todos los tipos de licencias
+        $tiposLicencias = TiposLicencias::all();
+        return view('tiposLicencias', ["tiposLicencias" => $tiposLicencias]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        $tiposLicencias = TiposLicencias::all();
+        return view('tiposLicenciasCrearEditar',['tiposLicencias'=>$tiposLicencias]);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        $tipoLicencia = new TiposLicencias($request->all());
+        $tipoLicencia->save();
+        return redirect()->route('tiposLicencias.index')->with('success', 'Tipo de licencia creado exitosamente.');
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(TiposLicencias $tipoLicencia)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        $tipoLicencia = TiposLicencias::find($id);
+        return view('tiposLicenciasCrearEditar',['tipoLicencia'=>$tipoLicencia]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id)
+    {
+        $tipoLicencia = TiposLicencias::find($id);
+        $tipoLicencia->fill($request->all());
+        $tipoLicencia->save();
+        return redirect()->route('tiposLicencias.index')->with('success', 'Tipo de licencia actualizado exitosamente.');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        $tipoLicencia = TiposLicencias::find($id);
+        $tipoLicencia->delete();
+        return redirect()->route('tiposLicencias.index')->with('success', 'Tipo de licencia eliminado exitosamente.');
+    }
+}
diff --git a/app/Models/Capacidad.php b/app/Models/Capacidad.php
index f495253..43eb662 100644
--- a/app/Models/Capacidad.php
+++ b/app/Models/Capacidad.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
+
 class Capacidad extends Model
 {
     use HasFactory;
diff --git a/app/Models/Marca.php b/app/Models/Marca.php
index 91be636..a65769b 100644
--- a/app/Models/Marca.php
+++ b/app/Models/Marca.php
@@ -4,12 +4,17 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class Marca extends Model
 {
     use HasFactory;
 
     protected $table = 'marcas';
-    
-    protected $fillable = ['nombre'];
+
+    protected $fillable = ['marca'];
+    /*public function Marc():HasOne{
+        return $this->hasOne(marc::class, 'id','marcs_id');
+
+    }*/
 }
diff --git a/app/Models/marc.php b/app/Models/marc.php
new file mode 100644
index 0000000..d19eace
--- /dev/null
+++ b/app/Models/marc.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class marc extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/tiposLicencias.php b/app/Models/tiposLicencias.php
new file mode 100644
index 0000000..285f5d9
--- /dev/null
+++ b/app/Models/tiposLicencias.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class tiposLicencias extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tiposLicencias';
+
+    protected $fillable = ['nombre'];
+}
diff --git a/database/factories/TiposLicenciasFactory.php b/database/factories/TiposLicenciasFactory.php
new file mode 100644
index 0000000..16bdd26
--- /dev/null
+++ b/database/factories/TiposLicenciasFactory.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\tiposLicencias>
+ */
+class TiposLicenciasFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 444fafb..8bf368e 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -20,6 +20,11 @@ return new class extends Migration
             $table->rememberToken();
             $table->timestamps();
         });
+        DB::table('users')->insert([
+            'name'=> 'Administrador',
+            'email'=> 'admin@admin.com',
+            'password'=> bcrypt('12345678')
+        ]);
     }
 
     /**
diff --git a/database/migrations/2025_01_18_230913_create_marcs_table.php b/database/migrations/2025_01_18_230913_create_marcs_table.php
new file mode 100644
index 0000000..55461fe
--- /dev/null
+++ b/database/migrations/2025_01_18_230913_create_marcs_table.php
@@ -0,0 +1,62 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('marcs', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->timestamps();
+        });
+        DB::table('marcs')->insert([
+            ['name' => 'chevrolet'],
+            ['name' => 'nissan'],
+            ['name' => 'ford'],
+            ['name' => 'toyota'],
+            ['name' => 'honda'],
+            ['name' => 'bmw'],
+            ['name' => 'audi'],
+            ['name' => 'mercedes-benz'],
+            ['name' => 'volkswagen'],
+            ['name' => 'hyundai'],
+            ['name' => 'kia'],
+            ['name' => 'subaru'],
+            ['name' => 'mazda'],
+            ['name' => 'peugeot'],
+            ['name' => 'renault'],
+            ['name' => 'fiat'],
+            ['name' => 'land rover'],
+            ['name' => 'jaguar'],
+            ['name' => 'tesla'],
+            ['name' => 'porsche'],
+            ['name' => 'volvo'],
+            ['name' => 'mitsubishi'],
+            ['name' => 'chrysler'],
+            ['name' => 'dodge'],
+            ['name' => 'jeep'],
+            ['name' => 'buick'],
+            ['name' => 'gmc'],
+            ['name' => 'infiniti'],
+            ['name' => 'lexus'],
+            ['name' => 'acura'],
+            ['name' => 'alfa romeo'],
+            // Agrega más marcas según sea necesario
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('marcs');
+    }
+};
diff --git a/database/migrations/2025_02_28_192615_create_marcas_table.php b/database/migrations/2025_02_28_192615_create_marcas_table.php
index cb30b5f..d1fc322 100644
--- a/database/migrations/2025_02_28_192615_create_marcas_table.php
+++ b/database/migrations/2025_02_28_192615_create_marcas_table.php
@@ -13,8 +13,9 @@ return new class extends Migration
     {
         Schema::create('marcas', function (Blueprint $table) {
             $table->id();
-            $table->string('nombre');
+            $table->string('marca');
             $table->timestamps();
+           //  funciona como enlace de una tabla a otra par agregar valores ya definidos $table->foreign('marcs_id')->references('id')->on('marcs');
         });
     }
 
diff --git a/database/migrations/2025_03_13_133629_create_capacidads_table.php b/database/migrations/2025_03_13_133629_create_capacidads_table.php
index 87eb55b..59d6557 100644
--- a/database/migrations/2025_03_13_133629_create_capacidads_table.php
+++ b/database/migrations/2025_03_13_133629_create_capacidads_table.php
@@ -13,7 +13,7 @@ return new class extends Migration
     {
         Schema::create('capacidades', function (Blueprint $table) {
             $table->id();
-            $table->integer('capacidad')->unique();
+            $table->integer('capacidad');
             $table->timestamps();
         });
     }
diff --git a/database/migrations/2025_03_13_143153_create_tipos_licencias_table.php b/database/migrations/2025_03_13_143153_create_tipos_licencias_table.php
new file mode 100644
index 0000000..2e600ce
--- /dev/null
+++ b/database/migrations/2025_03_13_143153_create_tipos_licencias_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('tiposLicencias', function (Blueprint $table) {
+            $table->id();
+            $table->string('tipoLicencia');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('tiposLicencias');
+    }
+};
diff --git a/database/migrations/2025_03_13_050724_add_tipo_combustible_to_tipos_veiculos_table.php b/database/migrations/2025_03_19_030418_add_columneliminado_tomarcas.php
similarity index 58%
rename from database/migrations/2025_03_13_050724_add_tipo_combustible_to_tipos_veiculos_table.php
rename to database/migrations/2025_03_19_030418_add_columneliminado_tomarcas.php
index 07722dc..bca0bba 100644
--- a/database/migrations/2025_03_13_050724_add_tipo_combustible_to_tipos_veiculos_table.php
+++ b/database/migrations/2025_03_19_030418_add_columneliminado_tomarcas.php
@@ -11,8 +11,9 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::table('tipos_veiculos', function (Blueprint $table) {
-            $table->string('tipo_combustible')->after('nombre')->nullable();
+
+        Schema::table('marcas', function (Blueprint $table) {
+            $table->boolean('eliminado')->default(false);
         });
     }
 
@@ -21,8 +22,8 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::table('tipos_veiculos', function (Blueprint $table) {
-            $table->dropColumn('tipo_combustible');
+        Schema::table('marcas', function (Blueprint $table) {
+            $table->dropColumn('eliminado');
         });
     }
 };
diff --git a/database/seeders/TiposLicenciasSeeder.php b/database/seeders/TiposLicenciasSeeder.php
new file mode 100644
index 0000000..bd22eb7
--- /dev/null
+++ b/database/seeders/TiposLicenciasSeeder.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class TiposLicenciasSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}
diff --git a/resources/views/docentesCrearEditar.blade.php b/resources/views/docentesCrearEditar.blade.php
index 277c60c..f5d33f3 100644
--- a/resources/views/docentesCrearEditar.blade.php
+++ b/resources/views/docentesCrearEditar.blade.php
@@ -31,7 +31,14 @@
                     </div>
                     <div>
                         <label for="materia" class="block text-sm font-medium text-gray-700">Materia</label>
-                        <input type="text" name="materia" id="materia" value="{{ old('materia', $docente->materia ?? '') }}" class="mt-1 block w-full border border-gray-300 rounded-lg shadow-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                        <select name="materia" id="materia" class="mt-1 block w-full border border-gray-300 rounded-lg shadow-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                            <option value="">Seleccione una materia</option>
+                            <option value="Matemáticas" {{ old('materia', $docente->materia ?? '') == 'Matemáticas' ? 'selected' : '' }}>Matemáticas</option>
+                            <option value="Programación" {{ old('materia', $docente->materia ?? '') == 'Programación' ? 'selected' : '' }}>Programación</option>
+                            <option value="Base de datos" {{ old('materia', $docente->materia ?? '') == 'Base de datos' ? 'selected' : '' }}>Base de datos</option>
+                            <option value="Sistemas Operativos" {{ old('materia', $docente->materia ?? '') == 'Sistemas Operativos' ? 'selected' : '' }}>Sistemas Operativos</option>
+                            <option value="Redes" {{ old('materia', $docente->materia ?? '') == 'Redes' ? 'selected' : '' }}>Redes</option>
+                        </select>
                     </div>
                 </div>
                 <div class="mt-6 flex justify-end">
diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php
index 9ea01e9..dff585b 100644
--- a/resources/views/layouts/dashboard.blade.php
+++ b/resources/views/layouts/dashboard.blade.php
@@ -186,10 +186,10 @@
                         <div class="relative" x-data="{ open: false }">
                             <button @click="open = !open"
                                     class="flex items-center space-x-3 text-gray-700 hover:text-gray-900 px-4 py-2 rounded-full hover:bg-gray-100 transition-all duration-200">
-                                <img src="https://ui-avatars.com/api/?name={{ Auth::user()->name }}"
+                                <img src="https://ui-avatars.com/api/?name={{ Auth::check() ? Auth::user()->name : 'Usuario' }}"
                                      alt="Profile"
                                      class="w-8 h-8 rounded-full ring-2 ring-blue-500/20">
-                                <span class="font-medium">{{ Auth::user()->name }}</span>
+                                <span class="font-medium">{{ Auth::check() ? Auth::user()->name : 'Usuario' }}</span>
                                 <i class="fas fa-chevron-down text-sm transition-transform duration-200"
                                    :class="{ 'transform rotate-180': open }"></i>
                             </button>
diff --git a/resources/views/marcas.blade.php b/resources/views/marcas.blade.php
index 999332e..3564c4a 100644
--- a/resources/views/marcas.blade.php
+++ b/resources/views/marcas.blade.php
@@ -2,7 +2,9 @@
 
 @section('content')
 <div class="container mx-auto px-4 py-6">
-    <!-- Encabezado -->
+
+
+    <!-- Mensajes de éxito y error -->
     @if(session('success'))
         <div id="success-message" class="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative mb-4" role="alert">
             <span class="block sm:inline">{{ session('success') }}</span>
@@ -18,15 +20,13 @@
     <div class="bg-white rounded-lg shadow-lg">
         <div class="p-4 border-b border-gray-200 flex justify-between items-center">
             <h2 class="text-2xl font-bold">Gestión de Marcas</h2>
-            <a href="{{ route('marca.create') }}"
-               class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 flex items-center gap-2">
+            <a href="{{ route('marca.create') }}" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 flex items-center gap-2">
                 <i class="fas fa-plus"></i>
                 Agregar
             </a>
         </div>
-
-        <!-- Barra de búsqueda -->
-        <div class="p-4 border-b border-gray-200 bg-gray-50">
+         <!-- Barra de búsqueda -->
+         <div class="p-4 border-b border-gray-200 bg-gray-50">
             <form action="{{ route('marca.index') }}" method="GET" class="flex gap-2">
                 <div class="relative w-full sm:w-64">
                     <input type="text"
@@ -39,7 +39,7 @@
                     </div>
                 </div>
                 <button type="submit" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600">
-                    Buscar/Actualizar
+                    Buscar
                 </button>
                 @if(request('busqueda'))
                     <a href="{{ route('marca.index') }}" class="px-4 py-2 bg-gray-500 text-white rounded-lg hover:bg-gray-600">
@@ -50,12 +50,12 @@
         </div>
 
         <div class="overflow-x-auto">
-
             <table class="min-w-full divide-y divide-gray-200">
                 <thead class="bg-gray-50">
                     <tr>
                         <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">ID</th>
                         <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Marca</th>
+
                         <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Acciones</th>
                     </tr>
                 </thead>
@@ -65,28 +65,42 @@
                         <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">{{ $marca->id }}</td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
                             <i class="fas fa-car text-blue-500 mr-2"></i>
-                            {{ $marca->nombre }}
+                            {{ $marca->marca }}
                         </td>
-                        <td class="px-6 py-4 whitespace-nowrap text-sm">
-                            <div class="flex gap-2">
-                                <a href="#"
-                                   onclick="confirmarEdicion('{{ route('marca.edit', $marca->id) }}')"
-                                   class="text-blue-600 hover:text-blue-900">
-                                    <i class="fas fa-edit"></i>
+                       {{-- todo esto funciona para mostrar el estatus de tiempo real dela actividad
+                       <td class="px-6 py-4 whitespace-nowrap text-sm">
+                            @if($marca->eliminado == 0)
+                                <span class="flex items-center">
+                                    <span class="h-2 w-2 bg-green-500 rounded-full mr-2"></span> Activo
+                                </span>
+                            @else
+                                <span class="flex items-center">
+                                    <span class="h-2 w-2 bg-red-500 rounded-full mr-2"></span> Inactivo
+                                </span>
+                            @endif
+                        </td>--}}
+                        <td class="flex space-x-2 px-6 py-4 whitespace-nowrap text-sm">
+                            @if($marca->eliminado == 1)
+                                <form action="{{ route('marca.update', $marca->id) }}" method="POST" class="d-inline">
+                                    @csrf
+                                    @method('PUT')
+                                    <input type="hidden" name="recuperar" value="1">
+                                    <a href="#" onclick="event.preventDefault(); this.closest('form').submit();" class="text-success">
+                                        <i class="fas fa-undo" style="color: green;"></i>
+                                    </a>
+                                </form>
+                            @else
+                                <a href="{{ route('marca.edit', $marca->id) }}" class="text-warning">
+                                    <i class="fas fa-edit" style="color: orange;"></i>
                                 </a>
-                                <form action="{{ route('marca.destroy', $marca->id) }}"
-                                      method="POST"
-                                      class="inline"
-                                      onsubmit="return false;">
+                                <form action="{{ route('marca.destroy', $marca->id) }}" method="POST" class="d-inline">
                                     @csrf
                                     @method('DELETE')
-                                    <button type="button"
-                                            onclick="confirmarEliminacion(this)"
-                                            class="text-red-600 hover:text-red-900">
-                                        <i class="fas fa-trash"></i>
-                                    </button>
+                                    <a href="#" onclick="event.preventDefault(); this.closest('form').submit();" class="text-danger">
+                                        <i class="fas fa-trash" style="color: red;"></i>
+                                    </a>
                                 </form>
-                            </div>
+                            @endif
                         </td>
                     </tr>
                     @endforeach
@@ -97,50 +111,26 @@
 </div>
 
 <script>
-function confirmarEdicion(url) {
-    Swal.fire({
-        title: '¿Editar marca?',
-        text: "¿Estás seguro de que deseas editar esta marca?",
-        icon: 'question',
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        cancelButtonColor: '#d33',
-        confirmButtonText: 'Sí, editar',
-        cancelButtonText: 'Cancelar'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            window.location.href = url;
+    // Desaparecer el mensaje después de 3 segundos
+    setTimeout(function() {
+        var message = document.getElementById('success-message');
+        if (message) {
+            message.style.transition = 'opacity 0.5s ease';
+            message.style.opacity = '0';
+            setTimeout(function() {
+                message.remove();
+            }, 500); // Tiempo para remover el elemento después de la transición
         }
-    });
-}
-function confirmarEliminacion(button) {
-    Swal.fire({
-        title: '¿Estás seguro?',
-        text: "Esta acción no se puede deshacer",
-        icon: 'warning',
-        showCancelButton: true,
-        confirmButtonColor: '#3085d6',
-        cancelButtonColor: '#d33',
-        confirmButtonText: 'Sí, eliminar',
-        cancelButtonText: 'Cancelar'
-    }).then((result) => {
-        if (result.isConfirmed) {
-            button.closest('form').onsubmit = null;
-            button.closest('form').submit();
+    }, 3000); // Tiempo en milisegundos antes de comenzar a desaparecer
+    setTimeout(function() {
+        var noResultsMessage = document.getElementById('no-results-message');
+        if (noResultsMessage) {
+            noResultsMessage.style.transition = 'opacity 0.5s ease';
+            noResultsMessage.style.opacity = '0';
+            setTimeout(function() {
+                noResultsMessage.remove();
+            }, 500); // Tiempo para remover el elemento después de la transición
         }
-    });
-}
-
-// Desaparecer el mensaje después de 3 segundos
-setTimeout(function() {
-    var message = document.getElementById('success-message');
-    if (message) {
-        message.style.transition = 'opacity 0.5s ease';
-        message.style.opacity = '0';
-        setTimeout(function() {
-            message.remove();
-        }, 500); // Tiempo para remover el elemento después de la transición
-    }
-}, 3000); // Tiempo en milisegundos antes de comenzar a desaparecer
+    }, 3000); // Tiempo en milisegundos antes de comenzar a desaparecer
 </script>
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/marcasCrearEditar.blade.php b/resources/views/marcasCrearEditar.blade.php
index f48795c..b47354e 100644
--- a/resources/views/marcasCrearEditar.blade.php
+++ b/resources/views/marcasCrearEditar.blade.php
@@ -30,7 +30,6 @@
                     </div>
                 </div>
                 @endif
-
                 <!-- Formulario -->
                 <form id="marcaForm"
                       action="{{ isset($marca) ? route('marca.update', $marca->id) : route('marca.store') }}"
@@ -43,7 +42,7 @@
                     <div class="space-y-6">
                         <!-- Campo Nombre -->
                         <div>
-                            <label for="nombre" class="block text-sm font-medium text-gray-700 mb-2">
+                            <label for="marca" class="block text-sm font-medium text-gray-700 mb-2">
                                 Nombre de la Marca
                             </label>
                             <div class="relative rounded-md shadow-sm">
@@ -51,14 +50,14 @@
                                     <i class="fas fa-tag text-gray-400"></i>
                                 </div>
                                 <input type="text"
-                                       name="nombre"
-                                       id="nombre"
+                                       name="marca"
+                                       id="marca"
                                        class="block w-full pl-10 pr-3 py-2 border border-gray-300 rounded-md focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
-                                       value="{{ isset($marca) ? $marca->nombre : old('nombre') }}"
-                                       placeholder="Ingrese el nombre de la marca"
-                                       required>
+                                       required
+                                       placeholder="Ingresa el nombre de la marca"
+                                       value="{{ isset($marca) ? $marca->marca : old('marca') }}">
                             </div>
-                            @error('nombre')
+                            @error('marca')
                                 <p class="mt-1 text-sm text-red-600">{{ $message }}</p>
                             @enderror
                         </div>
@@ -66,7 +65,7 @@
                         <!-- Botones de acción -->
                         <div class="flex justify-end space-x-2 pt-4 border-t border-gray-200">
                             <a href="{{ route('marca.index') }}"
-                               class="px-4 py-2 border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                            class="px-4 py-2 border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
                                 Cancelar
                             </a>
                             <button type="submit"
@@ -80,4 +79,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/tiposLicencia.blade.php b/resources/views/tiposLicencia.blade.php
new file mode 100644
index 0000000..184c7d2
--- /dev/null
+++ b/resources/views/tiposLicencia.blade.php
@@ -0,0 +1,145 @@
+@extends('layouts.dashboard')
+
+@section('content')
+<div class="container mx-auto px-4 py-6">
+    <!-- Encabezado -->
+    @if(session('success'))
+        <div id="success-message" class="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative mb-4" role="alert">
+            <span class="block sm:inline">{{ session('success') }}</span>
+        </div>
+    @endif
+
+    @if(session('error'))
+        <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative mb-4" role="alert">
+            <span class="block sm:inline">{{ session('error') }}</span>
+        </div>
+    @endif
+
+    <div class="bg-white rounded-lg shadow-lg">
+        <div class="p-4 border-b border-gray-200 flex justify-between items-center">
+            <h2 class="text-2xl font-bold">Gestión de Tipos de Licencias</h2>
+            <a href="{{ route('tiposLicencias.create') }}"
+               class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 flex items-center gap-2">
+                <i class="fas fa-plus"></i>
+                Agregar
+            </a>
+        </div>
+
+        <!-- Barra de búsqueda -->
+        <div class="p-4 border-b border-gray-200 bg-gray-50">
+            <form action="{{ route('tiposLicencias.index') }}" method="GET" class="flex gap-2">
+                <div class="relative w-full sm:w-64">
+                    <input type="text"
+                           name="busqueda"
+                           placeholder="Buscar tipo de licencia..."
+                           value="{{ request('busqueda') }}"
+                           class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500">
+                    <div class="absolute left-3 top-2.5 text-gray-400">
+                        <i class="fas fa-search"></i>
+                    </div>
+                </div>
+                <button type="submit" class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600">
+                    Buscar/Actualizar
+                </button>
+                @if(request('busqueda'))
+                    <a href="{{ route('tiposLicencias.index') }}" class="px-4 py-2 bg-gray-500 text-white rounded-lg hover:bg-gray-600">
+                        Limpiar
+                    </a>
+                @endif
+            </form>
+        </div>
+
+        <div class="overflow-x-auto">
+            <table class="min-w-full divide-y divide-gray-200">
+                <thead class="bg-gray-50">
+                    <tr>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">ID</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Tipo de Licencia</th>
+                        <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Acciones</th>
+                    </tr>
+                </thead>
+                <tbody class="bg-white divide-y divide-gray-200">
+                    @foreach($tiposLicencias as $tipoLicencia)
+                    <tr class="hover:bg-gray-50">
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">{{ $tipoLicencia->id }}</td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
+                            <i class="fas fa-car text-blue-500 mr-2"></i>
+                            {{ $tipoLicencia->nombre }}
+                        </td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm">
+                            <div class="flex gap-2">
+                                <a href="#"
+                                   onclick="confirmarEdicion('{{ route('tiposLicencias.edit', $tipoLicencia->id) }}')"
+                                   class="text-blue-600 hover:text-blue-900">
+                                    <i class="fas fa-edit"></i>
+                                </a>
+                                <form action="{{ route('tiposLicencias.destroy', $tipoLicencia->id) }}"
+                                      method="POST"
+                                      class="inline"
+                                      onsubmit="return false;">
+                                    @csrf
+                                    @method('DELETE')
+                                    <button type="button"
+                                            onclick="confirmarEliminacion(this)"
+                                            class="text-red-600 hover:text-red-900">
+                                        <i class="fas fa-trash"></i>
+                                    </button>
+                                </form>
+                            </div>
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+<script>
+function confirmarEdicion(url) {
+    Swal.fire({
+        title: '¿Editar tipo de licencia?',
+        text: "¿Estás seguro de que deseas editar este tipo de licencia?",
+        icon: 'question',
+        showCancelButton: true,
+        confirmButtonColor: '#3085d6',
+        cancelButtonColor: '#d33',
+        confirmButtonText: 'Sí, editar',
+        cancelButtonText: 'Cancelar'
+    }).then((result) => {
+        if (result.isConfirmed) {
+            window.location.href = url;
+        }
+    });
+}
+function confirmarEliminacion(button) {
+    Swal.fire({
+        title: '¿Estás seguro?',
+        text: "Esta acción no se puede deshacer",
+        icon: 'warning',
+        showCancelButton: true,
+        confirmButtonColor: '#3085d6',
+        cancelButtonColor: '#d33',
+        confirmButtonText: 'Sí, eliminar',
+        cancelButtonText: 'Cancelar'
+    }).then((result) => {
+        if (result.isConfirmed) {
+            button.closest('form').onsubmit = null;
+            button.closest('form').submit();
+        }
+    });
+}
+
+// Desaparecer el mensaje después de 3 segundos
+setTimeout(function() {
+    var message = document.getElementById('success-message');
+    if (message) {
+        message.style.transition = 'opacity 0.5s ease';
+        message.style.opacity = '0';
+        setTimeout(function() {
+            message.remove();
+        }, 500); // Tiempo para remover el elemento después de la transición
+    }
+}, 3000); // Tiempo en milisegundos antes de comenzar a desaparecer
+</script>
+@endsection
diff --git a/resources/views/tiposLicenciaCreaeEditar.blade.php b/resources/views/tiposLicenciaCreaeEditar.blade.php
new file mode 100644
index 0000000..fd3e6f3
--- /dev/null
+++ b/resources/views/tiposLicenciaCreaeEditar.blade.php
@@ -0,0 +1,83 @@
+@extends('layouts.dashboard')
+
+@section('content')
+<div class="container mx-auto px-4 py-6">
+    <div class="max-w-lg mx-auto">
+        <div class="bg-white rounded-lg shadow-lg overflow-hidden">
+            <div class="p-6">
+                <!-- Encabezado del formulario -->
+                <div class="flex items-center justify-between mb-6">
+                    <h2 class="text-2xl font-bold text-gray-800">
+                        {{ isset($tipoLicencia) ? 'Editar Tipo de Licencia' : 'Nuevo Tipo de Licencia' }}
+                    </h2>
+                    <div class="h-10 w-10 bg-blue-100 rounded-full flex items-center justify-center">
+                        <i class="fas fa-car text-blue-600"></i>
+                    </div>
+                </div>
+
+                <!-- Mensajes de error -->
+                @if($errors->any())
+                <div class="mb-6 bg-red-50 border-l-4 border-red-500 p-4 rounded-r-lg">
+                    <div class="flex items-center">
+                        <i class="fas fa-exclamation-circle text-red-500 mr-3"></i>
+                        <div class="text-red-700">
+                            <ul>
+                                @foreach($errors->all() as $error)
+                                    <li>{{ $error }}</li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                @endif
+
+                <!-- Formulario -->
+                <form id="tipoLicenciaForm"
+                      action="{{ isset($tipoLicencia) ? route('tiposLicencias.update', $tipoLicencia->id) : route('tiposLicencias.store') }}"
+                      method="POST">
+                    @csrf
+                    @if(isset($tipoLicencia))
+                        @method('PUT')
+                    @endif
+
+                    <div class="space-y-6">
+                        <!-- Campo Nombre -->
+                        <div>
+                            <label for="nombre" class="block text-sm font-medium text-gray-700 mb-2">
+                                Nombre del Tipo de Licencia
+                            </label>
+                            <div class="relative rounded-md shadow-sm">
+                                <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
+                                    <i class="fas fa-tag text-gray-400"></i>
+                                </div>
+                                <input type="text"
+                                       name="nombre"
+                                       id="nombre"
+                                       class="block w-full pl-10 pr-3 py-2 border border-gray-300 rounded-md focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+                                       value="{{ isset($tipoLicencia) ? $tipoLicencia->nombre : old('nombre') }}"
+                                       placeholder="Ingrese el nombre del tipo de licencia"
+                                       required>
+                            </div>
+                            @error('nombre')
+                                <p class="mt-1 text-sm text-red-600">{{ $message }}</p>
+                            @enderror
+                        </div>
+
+                        <!-- Botones de acción -->
+                        <div class="flex justify-end space-x-2 pt-4 border-t border-gray-200">
+                            <a href="{{ route('tiposLicencias.index') }}"
+                               class="px-4 py-2 border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                                Cancelar
+                            </a>
+                            <button type="submit"
+                                    class="px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
+                                {{ isset($tipoLicencia) ? 'Actualizar' : 'Guardar' }}
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 6810a08..ee8a9ee 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,7 +6,11 @@ use App\Http\Controllers\HomeController;
 use App\Http\Controllers\MarcaController;
 use App\Http\Controllers\DocentesController;
 use App\Http\Controllers\TiposVeiculosController;
+
+use App\Http\Controllers\TiposLicenciasController;
+
 use App\Http\Controllers\CapacidadController;
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -27,9 +31,14 @@ Auth::routes(['register'=>true,'reset'=>false]);
 Route::resource('marca', MarcaController::class);
 Route::resource('docentes', DocentesController::class);
 Route::resource('vehiculos', TiposVeiculosController::class);
+
+
+Route::resource('tiposLicencias', TiposLicenciasController::class);
+
 Route::resource('capacidades', CapacidadController::class);
 
 
+
 // Rutas protegidas que requieren autenticación
 Route::middleware(['auth'])->group(function () {
     Route::get('/dashboard', [HomeController::class, 'index'])->name('dashboard');