From 30fd9166460620e1c7de5c8ce518e1a3f3365014 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Tue, 19 Oct 2021 22:21:32 +1100
Subject: [PATCH] Add user alias

---
 app/Http/Controllers/UserController.php       |  3 +-
 .../2021_10_19_105854_add_alias_to_user.php   | 32 +++++++++++++++++
 resources/views/user/addedit.blade.php        | 35 +++++++++++++------
 3 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 database/migrations/2021_10_19_105854_add_alias_to_user.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 524be45..aa1530c 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -30,11 +30,12 @@ class UserController extends Controller
 					'min:64',
 					//function ($attribute,$value,$fail) { return $fail('Not this time'); }
 				],
+				'alias' => 'nullable|min:1',
 				'active' => 'required|boolean',
 				'admin' => 'required|boolean',
 			]);
 
-			foreach (['name','email','pgp_pubkey','active','admin'] as $key)
+			foreach (['name','email','pgp_pubkey','active','admin','alias'] as $key)
 				$o->{$key} = $request->post($key);
 
 			if (! $o->exists)
diff --git a/database/migrations/2021_10_19_105854_add_alias_to_user.php b/database/migrations/2021_10_19_105854_add_alias_to_user.php
new file mode 100644
index 0000000..026e056
--- /dev/null
+++ b/database/migrations/2021_10_19_105854_add_alias_to_user.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAliasToUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('alias')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+			$table->dropColumn('alias');
+        });
+    }
+}
diff --git a/resources/views/user/addedit.blade.php b/resources/views/user/addedit.blade.php
index 0b5ac83..a3f2769 100644
--- a/resources/views/user/addedit.blade.php
+++ b/resources/views/user/addedit.blade.php
@@ -29,16 +29,16 @@
 							</div>
 						</div>
 
-						<div class="col-4">
-							<label for="active" class="form-label">Active</label>
-							<div class="input-group">
-								<div class="btn-group" role="group">
-									<input type="radio" class="btn-check" name="active" id="active_yes" value="1" required @cannot('admin',$o)disabled @endcannot @if(old('active',$o->active))checked @endif>
-									<label class="btn btn-outline-success" for="active_yes">Yes</label>
-
-									<input type="radio" class="btn-check btn-danger" name="active" id="active_no" value="0" required @cannot('admin',$o)disabled @endcannot @if(! old('active',$o->active))checked @endif>
-									<label class="btn btn-outline-danger" for="active_no">No</label>
-								</div>
+						<div class="col-3">
+							<label for="alias" class="form-label">BBS Alias</label>
+							<div class="input-group has-validation">
+								<span class="input-group-text"><i class="bi bi-tag-fill"></i></span>
+								<input type="text" class="form-control @error('alias') is-invalid @enderror" id="alias" placeholder="alias" name="alias" value="{{ old('alias',$o->alias) }}" @cannot('admin',$o)disabled @endcannot>
+								<span class="invalid-feedback" role="alert">
+									@error('alias')
+										{{ $message }}
+									@enderror
+								</span>
 							</div>
 						</div>
 					</div>
@@ -59,7 +59,20 @@
 							</div>
 						</div>
 
-						<div class="col-4">
+						<div class="col-1">
+							<label for="active" class="form-label">Active</label>
+							<div class="input-group">
+								<div class="btn-group" role="group">
+									<input type="radio" class="btn-check" name="active" id="active_yes" value="1" required @cannot('admin',$o)disabled @endcannot @if(old('active',$o->active))checked @endif>
+									<label class="btn btn-outline-success" for="active_yes">Yes</label>
+
+									<input type="radio" class="btn-check btn-danger" name="active" id="active_no" value="0" required @cannot('admin',$o)disabled @endcannot @if(! old('active',$o->active))checked @endif>
+									<label class="btn btn-outline-danger" for="active_no">No</label>
+								</div>
+							</div>
+						</div>
+
+						<div class="offset-1 col-1">
 							<label for="admin" class="form-label">Site Admin</label>
 							<div class="input-group">
 								<div class="btn-group" role="group" @if($user->id == $o->id)data-bs-toggle="tooltip" title="You cannot demote yourself" @endif>