diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index c4a7e6e..0fa0d3d 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; - use App\Models\User; class UserController extends Controller @@ -11,7 +10,7 @@ class UserController extends Controller /** * Show the application dashboard. * - * @return \Illuminate\Http\Response + * @return \Illuminate\View\View */ public function view(User $user) { @@ -21,4 +20,20 @@ class UserController extends Controller return view('user.view')->with(compact('tables', 'user')); } + + /** + * Edit user profile + * + * @param User $user + * @return \Illuminate\View\View + */ + public function edit() + { + return view('user.edit')->with('user', \Auth::user()); + } + + public function store() + { + echo "Not impl"; + } } diff --git a/app/Models/User.php b/app/Models/User.php index bc5e622..67c85b7 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -20,6 +20,7 @@ use MightyPork\Exceptions\NotExistException; * @property \Carbon\Carbon $updated_at * @property string $name - unique, for vanity URL * @property string $title - for display + * @property string $bio - user bio * @property string $email - unique, for login and social auth chaining * @property string $password - hashed pw * @property bool $confirmed - user e-mail is confirmed diff --git a/app/View/Widget.php b/app/View/Widget.php index 4041400..67b2406 100644 --- a/app/View/Widget.php +++ b/app/View/Widget.php @@ -119,7 +119,7 @@ class Widget // add a compiled list of styles if (!empty($this->styleArray)) { - $attribs_s .= 'style="'.trim(e(array_reduce(array_keys($this->styleArray), function ($carry, $key) { + $attribs_s .= ' style="'.trim(e(array_reduce(array_keys($this->styleArray), function ($carry, $key) { return $carry . $key . ': ' . $this->styleArray[$key] . '; '; }, ''))).'"'; } diff --git a/app/View/WidgetFactory.php b/app/View/WidgetFactory.php index 77a244f..c2e8c84 100644 --- a/app/View/WidgetFactory.php +++ b/app/View/WidgetFactory.php @@ -14,6 +14,20 @@ class WidgetFactory $this->fieldCols = $fieldCols; } + public function header($hx, $text) + { + return "
fieldCols offset-md-$this->labelCols\">".e($text)."". + "