form improvements
This commit is contained in:
@@ -49,7 +49,7 @@ class RegisterController extends Controller
|
||||
protected function validator(array $data)
|
||||
{
|
||||
return Validator::make($data, [
|
||||
'name' => 'required|string|max:255',
|
||||
'name' => 'required|string|max:255|regex:/^[a-zA-Z0-9_.-]+$/',
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
]);
|
||||
@@ -65,6 +65,7 @@ class RegisterController extends Controller
|
||||
{
|
||||
return User::create([
|
||||
'name' => $data['name'],
|
||||
'title' => $data['name'], // display name - by default, init to name
|
||||
'email' => $data['email'],
|
||||
'password' => Hash::make($data['password']),
|
||||
]);
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Table;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class TableController extends Controller
|
||||
@@ -13,7 +14,7 @@ class TableController extends Controller
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
$exampleColSpec =
|
||||
$exampleColumns =
|
||||
"latin, string, Latin Name\n".
|
||||
"common, string, Common Name\n".
|
||||
"lifespan, int, Lifespan (years)";
|
||||
@@ -24,21 +25,32 @@ class TableController extends Controller
|
||||
"Patella vulgata, common limpet, 20";
|
||||
|
||||
return view('table.create',
|
||||
compact('exampleColSpec', 'exampleData')
|
||||
compact('exampleColumns', 'exampleData')
|
||||
);
|
||||
}
|
||||
|
||||
public function storeNew(Request $request)
|
||||
{
|
||||
$u = \Auth::user();
|
||||
|
||||
$this->validate($request, [
|
||||
'table-name' => 'required',
|
||||
'table-descr' => 'string|nullable',
|
||||
'name' => 'required',
|
||||
'title' => 'string|nullable',
|
||||
'description' => 'string|nullable',
|
||||
'license' => 'string|nullable',
|
||||
'upstream' => 'string|nullable',
|
||||
'col-spec' => 'required',
|
||||
'row-data' => 'string|nullable',
|
||||
'columns' => 'required',
|
||||
'data' => 'string|nullable',
|
||||
]);
|
||||
|
||||
// Check if table name is unique for user
|
||||
$name = $request->get('name');
|
||||
if ($u->tables()->where('name', $name)->exists()) {
|
||||
return back()->withErrors([
|
||||
'title' => "A table called \"$name\" already exists in your account.",
|
||||
]);
|
||||
}
|
||||
|
||||
return "Ok.";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user