From ddb885b4e20820490a93ff469ea3c4a2abe8fa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 22 Jul 2018 20:49:22 +0200
Subject: [PATCH] basic profile edit page, not working yet

---
 app/Http/Controllers/UserController.php       | 19 +++++++-
 app/Models/User.php                           |  1 +
 app/View/Widget.php                           |  2 +-
 app/View/WidgetFactory.php                    | 14 ++++++
 ...83900_create_email_confirmations_table.php |  1 +
 resources/views/auth/register.blade.php       |  3 +-
 resources/views/layouts/main-nav.blade.php    |  7 ++-
 resources/views/table/create.blade.php        | 16 ++-----
 resources/views/table/view.blade.php          |  2 +-
 resources/views/user/edit.blade.php           | 48 +++++++++++++++++++
 routes/web.php                                |  1 +
 11 files changed, 96 insertions(+), 18 deletions(-)
 create mode 100644 resources/views/user/edit.blade.php

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  "<div class=\"row\">".
+                    "<h$hx class=\"col-md-$this->fieldCols offset-md-$this->labelCols\">".e($text)."</h$hx>".
+                "</div>";
+    }
+
+    public function par($text)
+    {
+        return  "<div class=\"row\">".
+            "<p class=\"col-md-$this->fieldCols offset-md-$this->labelCols\">".e($text)."</o>".
+            "</div>";
+    }
+
     private function baseWidget($view, $name, $label)
     {
         return (new Widget($view, $name, $label))->layout($this->labelCols, $this->fieldCols);
diff --git a/database/migrations/2018_07_22_083900_create_email_confirmations_table.php b/database/migrations/2018_07_22_083900_create_email_confirmations_table.php
index 5f64e76..76d1c5b 100644
--- a/database/migrations/2018_07_22_083900_create_email_confirmations_table.php
+++ b/database/migrations/2018_07_22_083900_create_email_confirmations_table.php
@@ -16,6 +16,7 @@ class CreateEmailConfirmationsTable extends Migration
         Schema::create('email_confirmations', function (Blueprint $table) {
             $table->unsignedInteger('user_id')->index();
             $table->timestamp('created_at')->nullable();
+            $table->string('email');
             $table->string('token');
         });
     }
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 6a39af7..d82772b 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -18,7 +18,8 @@
                                 some symbols are allowed. You can always change this later.') !!}
 
                         {!! Widget::email('email', 'E-Mail Address')->required()->autofocus()
-                              ->help('Used to login and for password reset e-mails') !!}
+                              ->help('Used to login and for password resets') !!}
+
                         {!! Widget::password('password', 'Password')->required() !!}
                         {!! Widget::password('password_confirmation', 'Confirm Password')->required() !!}
 
diff --git a/resources/views/layouts/main-nav.blade.php b/resources/views/layouts/main-nav.blade.php
index af29aa3..13724a8 100644
--- a/resources/views/layouts/main-nav.blade.php
+++ b/resources/views/layouts/main-nav.blade.php
@@ -44,8 +44,11 @@
             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
               <a class="dropdown-item" href="{{ route('logout') }}"
                  onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
-                <i class="fa-sign-out fa-pr"></i>{{--
-                --}}{{ __('Logout') }}
+                <i class="fa-sign-out fa-pr"></i>{{ __('Logout') }}
+              </a>
+
+              <a class="dropdown-item" href="{{ route('user.edit') }}">
+                <i class="fa-sliders fa-pr"></i>{{ __('Settings') }}
               </a>
 
               <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
diff --git a/resources/views/table/create.blade.php b/resources/views/table/create.blade.php
index ca291dc..f6ee4db 100644
--- a/resources/views/table/create.blade.php
+++ b/resources/views/table/create.blade.php
@@ -4,20 +4,14 @@
 
 @section('content')
   <div class="container">
-    <div class="row justify-content-center">
-      <div class="col-md-8">
-        <div class="row">
-          <h2 class="col-md-8 offset-md-3">New Table</h2>
-        </div>
-      </div>
-    </div>
-
     <form method="POST" action="{{route('table.storeNew')}}" class="row justify-content-center"
           aria-label="New Table">
 
       @csrf
-      <div class="col-md-8">
-        @php(Widget::setLayout(3, 8))
+      <div class="col-md-10">
+        @php(Widget::setLayout(3, 7))
+
+        {!! Widget::header(1, 'New Table') !!}
 
         {!! Widget::text('title', 'Title')->autoAlias('name', '-')
               ->help('Unique among your tables') !!}
@@ -54,7 +48,7 @@
                 specification you entered above.') !!}
 
         <div class="row form-group">
-          <div class="col-md-8 offset-md-3">
+          <div class="col-md-7 offset-md-3">
             <button type="submit" class="btn btn-primary">
               <i class="fa-save pr-2"></i>Create Table
             </button>
diff --git a/resources/views/table/view.blade.php b/resources/views/table/view.blade.php
index 80e644b..4b8f90d 100644
--- a/resources/views/table/view.blade.php
+++ b/resources/views/table/view.blade.php
@@ -13,7 +13,7 @@
     </div>
     <div class="row justify-content-center">
 
-      <div class="col-md-8">
+      <div class="col-md-10">
         <table class="table table-hover table-sm">
           <thead>
           <tr>
diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php
new file mode 100644
index 0000000..014210f
--- /dev/null
+++ b/resources/views/user/edit.blade.php
@@ -0,0 +1,48 @@
+{{-- Profile edit form --}}
+
+@extends('layouts.app')
+
+@section('content')
+  <div class="container">
+    <form method="POST" action="{{route('user.store')}}" class="row justify-content-center"
+          aria-label="Your Profile">
+      @csrf
+
+      <div class="col-md-10">
+        @php(Widget::setLayout(3, 7))
+
+        {!! Widget::header(1, 'Settings') !!}
+
+        {!! Widget::text('title', 'Display Name')->value($user->title)->required()->autofocus()
+              ->help('Shown on your profile page, tables, comments, etc.') !!}
+
+        {!! Widget::textarea('bio', 'About Me')->value($user->bio)->required()->height('8em')
+              ->help('This is shown in your profile box') !!}
+
+        {!! Widget::text('name', 'Username')->value($user->name)->required()
+              ->prepend('@')
+              ->help('Part of your vanity URL. Caution: changing this will alter URLs of your tables.') !!}
+
+        {!! Widget::email('email', 'E-Mail Address')->value($user->email)->required()
+              ->help('Used to login and for password resets.
+              This field is protected; a change will be applied only after you confirm
+              the new e-mail address via a confirmation link we\'ll send you to it.') !!}
+
+        {!! Widget::header(3, 'Password Change') !!}
+        {!! Widget::par('Leave empty to keep your current password (if any).') !!}
+
+        {!! Widget::password('new_password', 'New Password') !!}
+
+        {!! Widget::password('new_password_confirmation', 'Confirm New Password') !!}
+
+        <div class="row form-group">
+          <div class="col-md-7 offset-md-3">
+            <button type="submit" class="btn btn-primary">
+              <i class="fa-save pr-2"></i>Apply Changes
+            </button>
+          </div>
+        </div>
+      </div>
+    </form>
+  </div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index bc4151f..4f04e3c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -31,6 +31,7 @@ Route::group(['middleware' => 'auth'], function () {
         'prefix' => 'user',
     ], function () {
         Route::get('edit', 'UserController@edit')->name('user.edit');
+        Route::post('edit', 'UserController@store')->name('user.store');
         Route::post('create', 'TableController@storeNew')->name('table.storeNew');
     });
 });