From d2c6e18b86365fa6e5d231f345239f3a39bc876c Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 11:40:34 +0100
Subject: [PATCH 1/7] Configured user factory, migration, seeder and
 workexperiences factory, migration, seeder. All migrations works

---
 .../Controllers/WorkExperienceController.php  | 85 +++++++++++++++++++
 app/Models/User.php                           |  6 ++
 app/Models/WorkExperience.php                 | 28 ++++++
 database/factories/UserFactory.php            |  1 +
 database/factories/WorkExperienceFactory.php  | 36 ++++++++
 .../2014_10_12_000000_create_users_table.php  |  1 +
 ...4_102001_create_work_experiences_table.php | 43 ++++++++++
 database/seeders/DatabaseSeeder.php           |  3 +-
 database/seeders/WorkExperienceSeeder.php     | 18 ++++
 tests/Feature/UserTest.php                    | 22 +++++
 tests/Feature/WorkExperienceTest.php          | 22 +++++
 11 files changed, 264 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Controllers/WorkExperienceController.php
 create mode 100644 app/Models/WorkExperience.php
 create mode 100644 database/factories/WorkExperienceFactory.php
 create mode 100644 database/migrations/2021_01_24_102001_create_work_experiences_table.php
 create mode 100644 database/seeders/WorkExperienceSeeder.php
 create mode 100644 tests/Feature/UserTest.php
 create mode 100644 tests/Feature/WorkExperienceTest.php

diff --git a/app/Http/Controllers/WorkExperienceController.php b/app/Http/Controllers/WorkExperienceController.php
new file mode 100644
index 0000000..b882b3c
--- /dev/null
+++ b/app/Http/Controllers/WorkExperienceController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\WorkExperience;
+use Illuminate\Http\Request;
+
+class WorkExperienceController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Models\WorkExperience  $workExperience
+     * @return \Illuminate\Http\Response
+     */
+    public function show(WorkExperience $workExperience)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Models\WorkExperience  $workExperience
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(WorkExperience $workExperience)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Models\WorkExperience  $workExperience
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, WorkExperience $workExperience)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Models\WorkExperience  $workExperience
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(WorkExperience $workExperience)
+    {
+        //
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index 804799b..fceca4d 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -20,6 +20,7 @@ class User extends Authenticatable
         'name',
         'email',
         'password',
+        'isAdmin',
     ];
 
     /**
@@ -40,4 +41,9 @@ class User extends Authenticatable
     protected $casts = [
         'email_verified_at' => 'datetime',
     ];
+
+    public function WorkExperiences()
+    {
+        return $this->hasMany(WorkExperience::class);
+    }
 }
diff --git a/app/Models/WorkExperience.php b/app/Models/WorkExperience.php
new file mode 100644
index 0000000..2de42a5
--- /dev/null
+++ b/app/Models/WorkExperience.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class WorkExperience extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'position',
+        'org_name',
+        'org_activity',
+        'description',
+        'month_start',
+        'year_start',
+        'month_end',
+        'year_end',
+        'user_id',
+    ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index bdea1a3..def0bed 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -25,6 +25,7 @@ public function definition()
         return [
             'name' => $this->faker->name,
             'email' => $this->faker->unique()->safeEmail,
+            'isAdmin' => $this->faker->boolean(false),
             'email_verified_at' => now(),
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'remember_token' => Str::random(10),
diff --git a/database/factories/WorkExperienceFactory.php b/database/factories/WorkExperienceFactory.php
new file mode 100644
index 0000000..741e54b
--- /dev/null
+++ b/database/factories/WorkExperienceFactory.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\WorkExperience;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class WorkExperienceFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = WorkExperience::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'position' => $this->faker->text(50),
+            'org_name' => $this->faker->text(255),
+            'org_activity' => $this->faker->text(255),
+            'description' => $this->faker->paragraph(5),
+            'month_start' => $this->faker->monthName(),
+            'year_start' => $this->faker->year(),
+            'month_end' => $this->faker->monthName(),
+            'year_end' => $this->faker->year(),
+            'user_id' => $this->faker->numberBetween(1,3),
+        ];
+    }
+}
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 621a24e..dee9356 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -17,6 +17,7 @@ public function up()
             $table->id();
             $table->string('name');
             $table->string('email')->unique();
+            $table->boolean('isAdmin')->default(false);
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->rememberToken();
diff --git a/database/migrations/2021_01_24_102001_create_work_experiences_table.php b/database/migrations/2021_01_24_102001_create_work_experiences_table.php
new file mode 100644
index 0000000..55557a1
--- /dev/null
+++ b/database/migrations/2021_01_24_102001_create_work_experiences_table.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateWorkExperiencesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('work_experiences', function (Blueprint $table) {
+            $table->id();
+            $table->string('position');
+            $table->string('org_name');
+            $table->string('org_activity');
+            $table->text('description');
+            $table->string('month_start');
+            $table->integer('year_start');
+            $table->string('month_end')->nullable();
+            $table->integer('year_end')->nullable();
+            $table->unsignedBigInteger('user_id');
+            $table->timestamps();
+
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('work_experiences');
+    }
+}
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 57b73b5..e5d03f5 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -13,6 +13,7 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // \App\Models\User::factory(10)->create();
+        \App\Models\User::factory(10)->create();
+        \App\Models\WorkExperience::factory(20)->create();
     }
 }
diff --git a/database/seeders/WorkExperienceSeeder.php b/database/seeders/WorkExperienceSeeder.php
new file mode 100644
index 0000000..23db60b
--- /dev/null
+++ b/database/seeders/WorkExperienceSeeder.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+
+class WorkExperienceSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+    }
+}
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
new file mode 100644
index 0000000..a1cc96c
--- /dev/null
+++ b/tests/Feature/UserTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class UserTest extends TestCase
+{
+    /**
+     * A basic feature test example.
+     *
+     * @return void
+     */
+    public function test_example()
+    {
+        $response = $this->get('/');
+
+        $response->assertStatus(200);
+    }
+}
diff --git a/tests/Feature/WorkExperienceTest.php b/tests/Feature/WorkExperienceTest.php
new file mode 100644
index 0000000..9c65a42
--- /dev/null
+++ b/tests/Feature/WorkExperienceTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class WorkExperienceTest extends TestCase
+{
+    /**
+     * A basic feature test example.
+     *
+     * @return void
+     */
+    public function test_example()
+    {
+        $response = $this->get('/');
+
+        $response->assertStatus(200);
+    }
+}

From 942008b3e088d232cc9dc4bed10b965a8f1654aa Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 12:09:34 +0100
Subject: [PATCH 2/7] pasted testing database user and workexperiences

---
 tests/Feature/ExampleTest.php        | 21 ---------------------
 tests/Feature/UserTest.php           |  9 ++++++---
 tests/Feature/WorkExperienceTest.php | 13 ++++++++++---
 tests/Unit/ExampleTest.php           | 18 ------------------
 4 files changed, 16 insertions(+), 45 deletions(-)
 delete mode 100644 tests/Feature/ExampleTest.php
 delete mode 100644 tests/Unit/ExampleTest.php

diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
deleted file mode 100644
index cdb5111..0000000
--- a/tests/Feature/ExampleTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic test example.
-     *
-     * @return void
-     */
-    public function testBasicTest()
-    {
-        $response = $this->get('/');
-
-        $response->assertStatus(200);
-    }
-}
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index a1cc96c..3b7959c 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -5,18 +5,21 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
+use App\Models\User;
 
 class UserTest extends TestCase
 {
+    use RefreshDatabase;
     /**
      * A basic feature test example.
      *
      * @return void
      */
-    public function test_example()
+    public function test_I_can_add_user_in_db()
     {
-        $response = $this->get('/');
+        $user = User::factory()->create();
 
-        $response->assertStatus(200);
+        $this->assertDatabaseCount('users', 1);
+        $this->assertDatabaseHas('users', ['name' => $user->name]);
     }
 }
diff --git a/tests/Feature/WorkExperienceTest.php b/tests/Feature/WorkExperienceTest.php
index 9c65a42..b48eca4 100644
--- a/tests/Feature/WorkExperienceTest.php
+++ b/tests/Feature/WorkExperienceTest.php
@@ -2,21 +2,28 @@
 
 namespace Tests\Feature;
 
+use App\Models\WorkExperience;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
 class WorkExperienceTest extends TestCase
 {
+    use RefreshDatabase;
     /**
      * A basic feature test example.
      *
      * @return void
      */
-    public function test_example()
+    public function test_I_can_add_work_experiences_in_db()
     {
-        $response = $this->get('/');
+        $user = User::factory()->create();
+        WorkExperience::factory()->create(['user_id' => $user->id]);
+        
+        $result = $user->WorkExperiences()->get('position');
 
-        $response->assertStatus(200);
+        $this->assertDatabaseCount('work_experiences', 1);
+        $this->assertDatabaseHas('work_experiences', ['position' => $result[0]->position]);
     }
 }
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
deleted file mode 100644
index 358cfc8..0000000
--- a/tests/Unit/ExampleTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Tests\Unit;
-
-use PHPUnit\Framework\TestCase;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic test example.
-     *
-     * @return void
-     */
-    public function testBasicTest()
-    {
-        $this->assertTrue(true);
-    }
-}

From 5963aadbb6cc02b45b408d84ccd325df946cfc58 Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 13:13:39 +0100
Subject: [PATCH 3/7] added view admin and middleware

---
 app/Http/Controllers/AdminController.php      | 18 +++++++++++++
 app/Http/Controllers/Auth/LoginController.php |  2 ++
 app/Http/Controllers/UserController.php       | 10 +++++++
 app/Http/Kernel.php                           |  1 +
 app/Http/Middleware/AdminMiddleware.php       | 26 +++++++++++++++++++
 resources/views/admin-dashboard.blade.php     | 23 ++++++++++++++++
 routes/web.php                                |  5 +++-
 tests/Feature/AdminTest.php                   | 26 +++++++++++++++++++
 8 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Controllers/AdminController.php
 create mode 100644 app/Http/Controllers/UserController.php
 create mode 100644 app/Http/Middleware/AdminMiddleware.php
 create mode 100644 resources/views/admin-dashboard.blade.php
 create mode 100644 tests/Feature/AdminTest.php

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
new file mode 100644
index 0000000..0755a64
--- /dev/null
+++ b/app/Http/Controllers/AdminController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class AdminController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('admin');
+    }
+
+    public function index()
+    {
+        return view('admin-dashboard');
+    }
+}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 18a0d08..f325b95 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
@@ -26,6 +27,7 @@ class LoginController extends Controller
      *
      * @var string
      */
+    
     protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
new file mode 100644
index 0000000..4fbc685
--- /dev/null
+++ b/app/Http/Controllers/UserController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class UserController extends Controller
+{
+    
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 30020a5..7db6a06 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -62,5 +62,6 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'admin' => \App\Http\Middleware\AdminMiddleware::class,
     ];
 }
diff --git a/app/Http/Middleware/AdminMiddleware.php b/app/Http/Middleware/AdminMiddleware.php
new file mode 100644
index 0000000..f41df78
--- /dev/null
+++ b/app/Http/Middleware/AdminMiddleware.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class AdminMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        if(Auth::check() && Auth::user()->isAdmin==true) {
+            return $next($request);
+        }
+
+        return redirect('login');
+    }
+}
diff --git a/resources/views/admin-dashboard.blade.php b/resources/views/admin-dashboard.blade.php
new file mode 100644
index 0000000..2262341
--- /dev/null
+++ b/resources/views/admin-dashboard.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    {{ __('You are logged in admin dashboard!') }}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index bf53cd0..887e66d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Http\Controllers\AdminController;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -18,5 +20,6 @@
 });
 
 Auth::routes();
-
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
+
+Route::resource('admin', AdminController::class)->middleware('admin');
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
new file mode 100644
index 0000000..a18a291
--- /dev/null
+++ b/tests/Feature/AdminTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class AdminTest extends TestCase
+{
+    /**
+     * A basic feature test example.
+     *
+     * @return void
+     */
+    public function test_admin_can_access_to_his_dashboard()
+    {
+        $adminUser = User::factory()->create(['isAdmin' => true]);
+
+        $response = $this->actingAs($adminUser)
+            ->get('/admin');
+
+        $response->assertStatus(200);
+    }
+}

From a2f571bf4420f0bf6da99fe9230e47b4b7439149 Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:22:23 +0100
Subject: [PATCH 4/7] admin can view list of users in dash and access to edit
 view to modify user profile

---
 app/Http/Controllers/AdminController.php  | 12 +++++++-
 resources/views/admin-dashboard.blade.php | 13 +++++++++
 resources/views/edit-user.blade.php       | 29 +++++++++++++++++++
 tests/Feature/AdminTest.php               | 35 +++++++++++++++++++++++
 4 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/edit-user.blade.php

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 0755a64..ec6b592 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class AdminController extends Controller
@@ -13,6 +14,15 @@ public function __construct()
 
     public function index()
     {
-        return view('admin-dashboard');
+        $users = User::all();
+
+        return view('admin-dashboard', ['users' => $users]);
     }
+
+    public function edit($id)
+    {
+        $user = User::find($id);
+        return view('edit-user', ['user' => $user]);
+    }
+
 }
diff --git a/resources/views/admin-dashboard.blade.php b/resources/views/admin-dashboard.blade.php
index 2262341..2ab78b5 100644
--- a/resources/views/admin-dashboard.blade.php
+++ b/resources/views/admin-dashboard.blade.php
@@ -17,6 +17,19 @@
                     {{ __('You are logged in admin dashboard!') }}
                 </div>
             </div>
+
+            <div>
+                <ul>
+                @foreach ($users as $user)
+                    @if($user->isAdmin == false)
+                        <li>
+                            <span>{{ $user->name }}</span>
+                            <a href="{{ route('admin.edit', $user->id) }} " class="btn btn-primary" type="submit">Edit</a>
+                        </li>
+                    @endif
+                @endforeach
+                </ul>
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/edit-user.blade.php b/resources/views/edit-user.blade.php
new file mode 100644
index 0000000..6b33067
--- /dev/null
+++ b/resources/views/edit-user.blade.php
@@ -0,0 +1,29 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    {{ __('You are logged in admin dashboard!') }}
+                </div>
+            </div>
+
+            <div>
+                <ul>
+                    <li>{{ $user->name }}</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index a18a291..c4ee51e 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -9,6 +9,7 @@
 
 class AdminTest extends TestCase
 {
+    use RefreshDatabase;
     /**
      * A basic feature test example.
      *
@@ -23,4 +24,38 @@ public function test_admin_can_access_to_his_dashboard()
 
         $response->assertStatus(200);
     }
+
+    public function test_admin_can_view_user_list()
+    {
+        $adminUser = User::factory()->create(['isAdmin' => true]);
+
+        $user = User::factory()->create();
+        $userName = $user->name;
+
+        $this->actingAs($adminUser)
+            ->get('/admin')
+            ->assertViewIs('admin-dashboard')
+            ->assertSee($userName);
+    }
+
+    /** @test */
+    public function test_admin_can_go_view_form_to_edit_user()
+    {
+        $userAdmin = User::factory()->create(['isAdmin' => true]);
+        $user = User::factory()->create(['isAdmin' => false]);
+
+        $response = $this->actingAs($userAdmin)
+            ->get(route('admin.edit', $user->id))
+            ->assertViewIs('edit-user');
+            
+        $response->assertSee($user->name);   
+    }
+
+    /** @test */
+    public function test_admin_can_edit_user_profile()
+    {
+        // assertions
+    }
+    
+    
 }

From 6f1fb99811c4059bd1264425b2859cdccd280248 Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 15:50:19 +0100
Subject: [PATCH 5/7] section user finished, need design

---
 app/Http/Controllers/AdminController.php  | 18 +++++++++++++
 app/Http/Controllers/UserController.php   | 10 ++++++-
 resources/views/admin-dashboard.blade.php |  2 +-
 resources/views/edit-user.blade.php       | 12 ++++++++-
 resources/views/show-user.blade.php       | 32 +++++++++++++++++++++++
 routes/web.php                            |  2 ++
 tests/Feature/AdminTest.php               | 12 ++++++---
 7 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 resources/views/show-user.blade.php

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index ec6b592..f5062de 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -25,4 +25,22 @@ public function edit($id)
         return view('edit-user', ['user' => $user]);
     }
 
+    public function show($id)
+    {
+        $user = User::find($id);
+        return view('show-user', ['user' => $user]);
+    }
+
+    public function update(Request $request, $id)
+    {
+        $user = User::find($id);
+
+        $user->name = $request->name;
+        $user->isAdmin = $request->isAdmin;
+
+        $user->save();
+
+        return view('show-user', ['user' => $user]);
+    }
+
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 4fbc685..ae76130 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -2,9 +2,17 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
-    
+    public function index()
+    {
+        $user = User::find(auth()->id);
+        $works = $user->WorkExperiences()->get();
+
+        return view('home', ['works' => $works]);
+
+    }
 }
diff --git a/resources/views/admin-dashboard.blade.php b/resources/views/admin-dashboard.blade.php
index 2ab78b5..dbc822d 100644
--- a/resources/views/admin-dashboard.blade.php
+++ b/resources/views/admin-dashboard.blade.php
@@ -23,7 +23,7 @@
                 @foreach ($users as $user)
                     @if($user->isAdmin == false)
                         <li>
-                            <span>{{ $user->name }}</span>
+                            <a href="{{ route('admin.show', $user->id) }}">{{ $user->name }}</a>
                             <a href="{{ route('admin.edit', $user->id) }} " class="btn btn-primary" type="submit">Edit</a>
                         </li>
                     @endif
diff --git a/resources/views/edit-user.blade.php b/resources/views/edit-user.blade.php
index 6b33067..daf7c83 100644
--- a/resources/views/edit-user.blade.php
+++ b/resources/views/edit-user.blade.php
@@ -20,7 +20,17 @@
 
             <div>
                 <ul>
-                    <li>{{ $user->name }}</li>
+                    
+                    <form action="{{ route('admin.update', $user->id) }}" method="POST">
+                        @csrf
+                        @method('put')
+                        <input type="text" name="name" value="{{ $user->name }}">
+                        <select name="isAdmin" id="isAdmin">
+                            <option value="0">Simple User</option>
+                            <option value="1">Administrador</option>
+                        </select>
+                        <button class="btn btn-primary" type="submit">Update</button>
+                    </form>
                 </ul>
             </div>
         </div>
diff --git a/resources/views/show-user.blade.php b/resources/views/show-user.blade.php
new file mode 100644
index 0000000..06909d6
--- /dev/null
+++ b/resources/views/show-user.blade.php
@@ -0,0 +1,32 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    {{ __('You are logged in admin dashboard!') }}
+                </div>
+            </div>
+
+            <div>
+                <ul>
+                    <li>
+                        <span>{{ $user->name }}</span>
+                        <a href="{{ route('admin.edit', $user->id) }} " class="btn btn-primary" type="submit">Edit</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 887e66d..a842477 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\AdminController;
+use App\Http\Controllers\UserController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 
@@ -22,4 +23,5 @@
 Auth::routes();
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
 
+Route::resource('user', UserController::class)->middleware('auth');
 Route::resource('admin', AdminController::class)->middleware('admin');
diff --git a/tests/Feature/AdminTest.php b/tests/Feature/AdminTest.php
index c4ee51e..73815df 100644
--- a/tests/Feature/AdminTest.php
+++ b/tests/Feature/AdminTest.php
@@ -52,10 +52,16 @@ public function test_admin_can_go_view_form_to_edit_user()
     }
 
     /** @test */
-    public function test_admin_can_edit_user_profile()
+    public function test_admin_can_update_user_profile()
     {
-        // assertions
+        $userAdmin = User::factory()->create(['isAdmin' => true]);
+        $user = User::factory()->create(['isAdmin' => false]);
+        $user->name = 'helena';
+        
+        $this->actingAs($userAdmin)
+            ->put(route('admin.update', $user->id), $user->toArray());
+
+        $this->assertDatabaseHas('users', ['id' => $user->id, 'name' => 'helena']);
     }
     
-    
 }

From 6d6140324f219eb3377ccd1a1d402a37bf7df3b6 Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 17:03:30 +0100
Subject: [PATCH 6/7] user can create work experience, view work experiences

---
 app/Http/Controllers/HomeController.php      | 36 ++++++++-
 app/Http/Controllers/UserController.php      |  5 +-
 database/factories/WorkExperienceFactory.php |  8 +-
 resources/views/create-work.blade.php        | 81 ++++++++++++++++++++
 resources/views/home.blade.php               |  7 ++
 resources/views/work-experiences.blade.php   | 48 ++++++++++++
 routes/web.php                               |  3 +-
 7 files changed, 178 insertions(+), 10 deletions(-)
 create mode 100644 resources/views/create-work.blade.php
 create mode 100644 resources/views/work-experiences.blade.php

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 7cbc2c3..e02bf48 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -3,6 +3,8 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Models\User;
+use App\Models\WorkExperience;
 
 class HomeController extends Controller
 {
@@ -23,6 +25,38 @@ public function __construct()
      */
     public function index()
     {
-        return view('home');
+        $user = User::find(auth()->id());
+
+        return view('home', ['user' => $user]);
+    }
+
+    public function show(User $user)
+    {
+        $works = $user->WorkExperiences()->get();
+        
+        return view('work-experiences', ['works' => $works]);
+
+    }
+
+    public function create()
+    {
+        return view('create-work');
+    }
+
+    public function store(Request $request)
+    {
+        WorkExperience::create([
+            'position' => $request->position,
+            'org_name' => $request->org_name,
+            'org_activity' => $request->org_activity,
+            'description' => $request->description,
+            'month_start' => $request->month_start,
+            'year_start' => $request->year_start,
+            'month_end' => $request->month_end,
+            'year_end' => $request->year_end,
+            'user_id' => auth()->id(),
+        ]);
+
+        return redirect()->route('home');
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index ae76130..4a11c3b 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -9,10 +9,7 @@ class UserController extends Controller
 {
     public function index()
     {
-        $user = User::find(auth()->id);
-        $works = $user->WorkExperiences()->get();
-
-        return view('home', ['works' => $works]);
 
     }
+
 }
diff --git a/database/factories/WorkExperienceFactory.php b/database/factories/WorkExperienceFactory.php
index 741e54b..2379548 100644
--- a/database/factories/WorkExperienceFactory.php
+++ b/database/factories/WorkExperienceFactory.php
@@ -22,15 +22,15 @@ class WorkExperienceFactory extends Factory
     public function definition()
     {
         return [
-            'position' => $this->faker->text(50),
-            'org_name' => $this->faker->text(255),
-            'org_activity' => $this->faker->text(255),
+            'position' => $this->faker->text(25),
+            'org_name' => $this->faker->text(50),
+            'org_activity' => $this->faker->text(50),
             'description' => $this->faker->paragraph(5),
             'month_start' => $this->faker->monthName(),
             'year_start' => $this->faker->year(),
             'month_end' => $this->faker->monthName(),
             'year_end' => $this->faker->year(),
-            'user_id' => $this->faker->numberBetween(1,3),
+            'user_id' => $this->faker->numberBetween(1,10),
         ];
     }
 }
diff --git a/resources/views/create-work.blade.php b/resources/views/create-work.blade.php
new file mode 100644
index 0000000..fb30c1d
--- /dev/null
+++ b/resources/views/create-work.blade.php
@@ -0,0 +1,81 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    {{ __('You are logged in!') }}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row mt-4 justify-content-center">
+        <a href=" {{ route('user.index') }} " class="btn btn-primary">Cancel</a>
+    </div>
+
+    <div class="row mb-3 justify-content-center">
+        <form action="{{ route('user.store') }}" method="POST">
+            @csrf
+            <div class="mb-3">
+                <label for="position" class="form-label">Position</label>
+                <input type="text" class="form-control" id="position" name="position" placeholder="position">
+            </div>
+
+            <div class="mb-3">
+                <label for="org_name" class="form-label">Organization Name</label>
+                <input type="text" class="form-control" id="org_name" name="org_name" placeholder="org_name">
+            </div>
+
+            <div class="mb-3">
+                <label for="org_activity" class="form-label">Organization Activity</label>
+                <input type="text" class="form-control" id="org_activity" name="org_activity" placeholder="org_activity">
+            </div>
+
+            <div class="mb-3">
+                <label for="description" class="form-label">Description</label>
+                <textarea class="form-control" id="description" name="description" rows="3"></textarea>
+            </div>
+
+            <div class="row">
+                <label for="month_start" class="form-label">Description</label>
+                <select name="month_start" id="month_start" class="col-4 mx-2">
+                    <option value="Janary">Janary</option>
+                    <option value="Febrery">Febrery</option>
+                </select>
+                <label for="year_start" class="form-label">Description</label>
+                <select name="year_start" id="year_start" class="col-2">
+                    <option value="2021">2021</option>
+                    <option value="2020">2020</option>
+                </select>
+            </div>
+
+            <div class="row">
+                <label for="month_end" class="form-label">Description</label>
+                <select name="month_end" id="month_end" class="col-auto mx-2">
+                    <option value="Janary">Janary</option>
+                    <option value="Febrery">Febrery</option>
+                </select>
+                <label for="year_end" class="form-label">Description</label>
+                <select name="year_end" id="year_end" class="col-auto">
+                    <option value="2021">2021</option>
+                    <option value="2020">2020</option>
+                </select>
+            </div>
+
+            <button type="submit" class="btn btn-primary">Add</button>
+            
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 1f34466..822505f 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -19,5 +19,12 @@
             </div>
         </div>
     </div>
+
+    <div class="mt-4">
+        <a href=" {{ route('user.show', $user) }} " class="btn btn-primary">See your works</a>
+    </div>
+    <div class="mt-4">
+        <a href=" {{ route('user.create') }} " class="btn btn-primary">Create Work Experience</a>
+    </div>
 </div>
 @endsection
diff --git a/resources/views/work-experiences.blade.php b/resources/views/work-experiences.blade.php
new file mode 100644
index 0000000..4c5fb91
--- /dev/null
+++ b/resources/views/work-experiences.blade.php
@@ -0,0 +1,48 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    {{ __('You are logged in!') }}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row mt-4">
+        <a href=" {{ route('user.create') }} " class="btn btn-primary">Add work experience</a>
+    </div>
+
+    <div class="row">
+        <table class="table">
+            <thead>
+              <tr>
+                <th scope="col">Position</th>
+                <th scope="col">Organization</th>
+                <th scope="col">Org Activity</th>
+              </tr>
+            </thead>
+            <tbody>
+                @foreach ($works as $work)
+                    <tr>
+                        <td>{{ $work->position }}</td>
+                        <td>{{ $work->org_name }}</td>
+                        <td>{{ $work->org_activity }}</td>
+                    </tr>      
+                @endforeach
+            </tbody>
+          </table>
+    </div>
+</div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index a842477..cc3be2b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,7 @@
 
 use App\Http\Controllers\AdminController;
 use App\Http\Controllers\UserController;
+use App\Http\Controllers\HomeController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 
@@ -23,5 +24,5 @@
 Auth::routes();
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
 
-Route::resource('user', UserController::class)->middleware('auth');
+Route::resource('user', HomeController::class)->middleware('auth');
 Route::resource('admin', AdminController::class)->middleware('admin');

From 15f2bc3ec518eebf2a0433eda4f40c23b4f6d2aa Mon Sep 17 00:00:00 2001
From: pilpod <67429595+pilpod@users.noreply.github.com>
Date: Sun, 24 Jan 2021 17:26:21 +0100
Subject: [PATCH 7/7] added select in form register, working

---
 app/Http/Controllers/Auth/RegisterController.php           | 2 ++
 database/factories/UserFactory.php                         | 2 +-
 .../migrations/2014_10_12_000000_create_users_table.php    | 2 +-
 resources/views/auth/register.blade.php                    | 7 +++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index ed1a5e0..0cc1ac1 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -53,6 +53,7 @@ protected function validator(array $data)
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
             'password' => ['required', 'string', 'min:8', 'confirmed'],
+            'isAdmin' => ['required', 'string', 'max:255'],
         ]);
     }
 
@@ -68,6 +69,7 @@ protected function create(array $data)
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => Hash::make($data['password']),
+            'isAdmin' => $data['isAdmin'],
         ]);
     }
 }
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index def0bed..1e7cf85 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -25,7 +25,7 @@ public function definition()
         return [
             'name' => $this->faker->name,
             'email' => $this->faker->unique()->safeEmail,
-            'isAdmin' => $this->faker->boolean(false),
+            'isAdmin' => 'simple_user',
             'email_verified_at' => now(),
             'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'remember_token' => Str::random(10),
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index dee9356..180ddb4 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -17,7 +17,7 @@ public function up()
             $table->id();
             $table->string('name');
             $table->string('email')->unique();
-            $table->boolean('isAdmin')->default(false);
+            $table->string('isAdmin')->default('simple_user');
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->rememberToken();
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index d236a48..1488531 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -61,6 +61,13 @@
                             </div>
                         </div>
 
+                        <div class="form-group row mb-3 justify-content-center">
+                            <select name="isAdmin" id="isAdmin" required>
+                                <option value="simple_user">Simple user</option>
+                                <option value="admin">Admin</option>
+                            </select>
+                        </div>
+
                         <div class="form-group row mb-0">
                             <div class="col-md-6 offset-md-4">
                                 <button type="submit" class="btn btn-primary">