logo, improved listing, some helpers, mail confirms table, confirmed flag, user title column..
This commit is contained in:
@@ -25,7 +25,7 @@ class LoginController extends Controller
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/home';
|
||||
protected $redirectTo = '/';
|
||||
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
|
||||
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Foundation\Auth\RegistersUsers;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class RegisterController extends Controller
|
||||
{
|
||||
@@ -28,7 +29,7 @@ class RegisterController extends Controller
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $redirectTo = '/home';
|
||||
protected $redirectTo = '/';
|
||||
|
||||
/**
|
||||
* Create a new controller instance.
|
||||
@@ -49,9 +50,15 @@ class RegisterController extends Controller
|
||||
protected function validator(array $data)
|
||||
{
|
||||
return Validator::make($data, [
|
||||
'name' => 'required|string|max:255|regex:/^[a-zA-Z0-9_.-]+$/',
|
||||
'name' => [
|
||||
'regex:/^[a-zA-Z0-9_.-]+$/',
|
||||
'required',
|
||||
'string',
|
||||
'max:255',
|
||||
'unique:users'
|
||||
],
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
'password' => 'required|string|min:6|max:1000|confirmed', // max len to foil DOS attempts
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -65,7 +72,7 @@ class RegisterController extends Controller
|
||||
{
|
||||
return User::create([
|
||||
'name' => $data['name'],
|
||||
'title' => $data['name'], // display name - by default, init to name
|
||||
'title' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'password' => Hash::make($data['password']),
|
||||
]);
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class HomeController extends Controller
|
||||
{
|
||||
/**
|
||||
* Show the application dashboard.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$tables = \Auth::user()->tables()->paginate(10);
|
||||
|
||||
return view('home')->with(compact('tables'));
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ use App\Models\Table;
|
||||
use App\Models\User;
|
||||
use App\Utils\Column;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\Rule;
|
||||
use MightyPork\Exceptions\NotApplicableException;
|
||||
|
||||
class TableController extends Controller
|
||||
@@ -16,7 +17,7 @@ class TableController extends Controller
|
||||
{
|
||||
/** @var Table $tableModel */
|
||||
$tableModel = $user->tables()->where('name', $table)->first();
|
||||
$revision = $tableModel->activeRevision;
|
||||
$revision = $tableModel->revision;
|
||||
|
||||
return view('table.view', [
|
||||
'table' => $tableModel,
|
||||
@@ -54,12 +55,12 @@ class TableController extends Controller
|
||||
$u = \Auth::user();
|
||||
|
||||
$this->validate($request, [
|
||||
'name' => 'required',
|
||||
'title' => 'string',
|
||||
'description' => 'string|nullable',
|
||||
'license' => 'string|nullable',
|
||||
'origin' => 'string|nullable',
|
||||
'columns' => 'required',
|
||||
'name' => 'required|string|max:255',
|
||||
'title' => 'string|string|max:255',
|
||||
'description' => 'string|nullable|max:4000',
|
||||
'license' => 'string|nullable|max:4000',
|
||||
'origin' => 'string|nullable|max:4000',
|
||||
'columns' => 'required|string',
|
||||
'data' => 'string|nullable',
|
||||
]);
|
||||
|
||||
@@ -74,16 +75,24 @@ class TableController extends Controller
|
||||
// Parse and validate the columns specification
|
||||
/** @var Column[] $columns */
|
||||
$columns = [];
|
||||
$column_keys = []; // for checking duplicates
|
||||
$colTable = array_map('str_getcsv', explode("\n", $request->get('columns')));
|
||||
|
||||
// prevent griefing via long list of columns
|
||||
if (count($colTable) > 100) return $this->backWithErrors(['columns' => "Too many columns"]);
|
||||
|
||||
foreach ($colTable as $col) {
|
||||
$col = array_map('trim', $col);
|
||||
if (count($col) < 2) {
|
||||
return $this->backWithErrors([
|
||||
'columns' => "All columns must have at least name and type.",
|
||||
]);
|
||||
if (count($col) < 2 || strlen($col[0])==0) {
|
||||
return $this->backWithErrors(['columns' => "All columns must have at least name and type."]);
|
||||
}
|
||||
|
||||
try {
|
||||
if (in_array($col[0], $column_keys)) {
|
||||
return $this->backWithErrors(['columns' => "Duplicate column: $col[0]"]);
|
||||
}
|
||||
$column_keys[] = $col[0];
|
||||
|
||||
$columns[] = new Column([
|
||||
'name' => $col[0],
|
||||
'type' => $col[1],
|
||||
@@ -93,6 +102,7 @@ class TableController extends Controller
|
||||
return $this->backWithErrors(['columns' => $e->getMessage()]);
|
||||
}
|
||||
}
|
||||
if (count($columns) == 0) return $this->backWithErrors(['columns' => "Define at least one column"]);
|
||||
|
||||
$rowTable = array_map('str_getcsv', explode("\n", $request->get('data')));
|
||||
|
||||
@@ -110,38 +120,42 @@ class TableController extends Controller
|
||||
}
|
||||
return [
|
||||
'data' => json_encode($parsed),
|
||||
'refs' => 1,
|
||||
];
|
||||
}, $rowTable);
|
||||
} catch (\Exception $e) {
|
||||
return $this->backWithErrors(['columns' => $e->getMessage()]);
|
||||
}
|
||||
|
||||
$revision = Revision::create([
|
||||
'refs' => 1, // from the new table
|
||||
$revisionFields = [
|
||||
'note' => "Initial revision of table $u->name/$tabName",
|
||||
'columns' => json_encode($columns),
|
||||
]);
|
||||
'row_count' => count($rowsData),
|
||||
];
|
||||
|
||||
$table = Table::create([
|
||||
$tableFields = [
|
||||
'owner_id' => $u->id,
|
||||
'revision_id' => $revision->id,
|
||||
'revision_id' => 0,
|
||||
'name' => $tabName,
|
||||
'title' => $request->get('title'),
|
||||
'description' => $request->get('description'),
|
||||
'license' => $request->get('license'),
|
||||
'origin' => $request->get('origin'),
|
||||
]);
|
||||
];
|
||||
|
||||
// Attach the revision to the table, set as current
|
||||
$table->revisions()->attach($revision);
|
||||
$table->activeRevision()->associate($revision);
|
||||
\DB::transaction(function () use ($revisionFields, $tableFields, $rowsData) {
|
||||
$revision = Revision::create($revisionFields);
|
||||
|
||||
// Spawn the rows, linked to the revision
|
||||
$revision->rows()->createMany($rowsData);
|
||||
$tableFields['revision_id'] = $revision->id; // to meet the not-null constraint
|
||||
$table = Table::create($tableFields);
|
||||
|
||||
// Now we create rows, a revision pointing to them, and the table using it.
|
||||
// Attach the revision to the table, set as current
|
||||
$table->revisions()->attach($revision);
|
||||
$table->revision()->associate($revision);
|
||||
|
||||
return "Ok.";
|
||||
// Spawn rows, linked to the revision
|
||||
$revision->rows()->createMany($rowsData);
|
||||
});
|
||||
|
||||
return redirect(route('table.view', ['user' => $u, 'table' => $tabName]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
class UserController extends Controller
|
||||
{
|
||||
/**
|
||||
* Show the application dashboard.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function view(User $user)
|
||||
{
|
||||
$tables = $user->tables()
|
||||
->with('revision:id,row_count')
|
||||
->paginate(3);
|
||||
|
||||
return view('user.view')->with(compact('tables', 'user'));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user