From ae835c4c2fd9e1c4f96ddc78e80375c40807ed4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Cmit=20Tun=C3=A7?= <umitreva@gmail.com>
Date: Tue, 28 Apr 2026 21:41:20 +0300
Subject: [PATCH] feat: implement admin user management interface and
 registration command

---
 app/Console/Commands/CreateAdmin.php         | 59 ++++++++++++++++++++
 app/Functions/datagrid-scripts.php           |  2 +-
 app/Models/User.php                          |  1 +
 resources/views/admin/users.blade.php        | 21 -------
 resources/views/admin/users/detail.blade.php | 15 -----
 5 files changed, 61 insertions(+), 37 deletions(-)
 create mode 100644 app/Console/Commands/CreateAdmin.php

diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php
new file mode 100644
index 0000000..2eba22d
--- /dev/null
+++ b/app/Console/Commands/CreateAdmin.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\User;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+class CreateAdmin extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'admin:create';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create or reset admin user admin@citrus.com with a random password';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $email = 'admin@citrus.com';
+        $password = Str::random(12);
+        
+        $user = User::where('email', $email)->first();
+
+        if ($user) {
+            $user->password = Hash::make($password);
+            $user->level = 'Admin';
+            $user->save();
+            $status = 'updated';
+        } else {
+            $user = new User();
+            $user->name = 'Admin';
+            $user->email = $email;
+            $user->password = Hash::make($password);
+            $user->level = 'Admin';
+            $user->save();
+            $status = 'created';
+        }
+
+        $this->info("Admin user has been {$status}.");
+        $this->line("--------------------------------");
+        $this->info("Email:    {$email}");
+        $this->info("Password: {$password}");
+        $this->line("--------------------------------");
+        
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Functions/datagrid-scripts.php b/app/Functions/datagrid-scripts.php
index 018b938..8ad5d56 100644
--- a/app/Functions/datagrid-scripts.php
+++ b/app/Functions/datagrid-scripts.php
@@ -9,7 +9,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/exceljs/4.1.1/exceljs.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2.0.2/FileSaver.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/2.0.0/jspdf.umd.min.js"></script>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/devextreme-dist/23.1.5/css/<?php echo setting("DevExpress_Theme", false,"dx.light.compact") ?>">
+<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/23.1.5/css/<?php echo setting("DevExpress_Theme", false,"dx.light.compact") ?>.css">
 <!-- Quill CSS -->
 <link rel="stylesheet" href="https://cdn.quilljs.com/1.3.7/quill.snow.css">
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 8996368..c33bbd9 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -21,6 +21,7 @@ class User extends Authenticatable
         'name',
         'email',
         'password',
+        'level',
     ];
 
     /**
diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index 300a34a..1d498ea 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -10,7 +10,6 @@
 	use App\Fields;
 	use App\User;
 
-	$teams = db("subcontractors")->get()->pluck("company_name_en")->toArray();
 	try{
 		$seviye = Contents::where("slug","user-level")->first();
 		$seviye = strip_tags($seviye->html);
@@ -214,12 +213,6 @@ columns : [
 	'name',
     'name_ru',
     'level',
-	{
-            dataField: 'subcontructer', // provides column values
-            lookup: {
-                dataSource: <?php echo json_encode_tr(db("subcontractors")->select("company_name_en")->get()->pluck("company_name_en")) ?>
-            }
-        },
    'email',
     'recover',
 	{
@@ -360,7 +353,6 @@ window.setTimeout(function() {
 					<tr>
 						<td>{{e2("ID")}}</td>
 						<td>{{e2("Name")}}</td>
-						<td>{{e2("Team")}}</td>
 						<td>{{e2("Level")}}</td>
 						<td>{{e2("E-Mail")}}</td>
 						<td>{{e2("Phone")}}</td>
@@ -379,19 +371,6 @@ window.setTimeout(function() {
 						<td>
 							<input type="text" name="name" value="{{$u->name}}" table="users" data-id="{{$u->id}}" class="name{{$u->id}} form-control edit" />
 						</td>
-						<td>
-							<select name="subcontructer" data-id="{{$u->id}}" class="form-control edit" table="users">
-								<option value="">{{e2("Select")}}</option>
-								<?php 
-								foreach($teams AS $s)  {
-									?>
-									<option value="{{$s}}" <?php if($u->subcontructer == $s) echo "selected"; ?>>{{$s}}</option>
-
-									<?php 
-								}
-								?>
-							</select>
-						</td>
 						<td>
 							<select name="level"data-id="{{$u->id}}" table="users" class="form-control edit">
 						@if($seviye!=null)
diff --git a/resources/views/admin/users/detail.blade.php b/resources/views/admin/users/detail.blade.php
index dec10c9..3d5dd1b 100644
--- a/resources/views/admin/users/detail.blade.php
+++ b/resources/views/admin/users/detail.blade.php
@@ -1,7 +1,6 @@
  {{col("col-12 detail","User Detail")}} 
  <?php 
 if(isAdmin())  { 
-    $teams = db("subcontractors")->get()->pluck("company_name_en")->toArray();
   if(getisset("update")) {
     $post = $_POST;
     $pic = upload("pic","profile_pic/");
@@ -78,20 +77,6 @@ if(isAdmin())  {
             <label for="">{{e2("Name Ru")}}: </label><input  type="text" value="" name="name_ru"
             class="form-control">
         </div>
-        <div class="col-md-6">
-            <label for="">{{e2("Team/Subconstructer")}}: </label>
-            <select name="subcontructer" id="" class="form-control">
-                <option value="">{{e2("Select")}}</option>
-                <?php 
-                foreach($teams AS $s)  {
-                     ?>
-                     <option value="{{$s}}">{{$s}}</option>
-
-                     <?php 
-                }
-                ?>
-            </select>
-        </div>
         <div class="col-md-6">
             <label for="">{{e2("Date of Birth")}}: </label><input  type="date" value="" name="date_of_birth"
             class="form-control">