From e5332fa07ce04a8cafc98783c7e8ce9f0ea95a94 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Mon, 25 Jan 2021 19:24:08 +0100 Subject: [PATCH 1/6] Bump project edition --- app/Http/Controllers/ProjectController.php | 12 +- resources/views/projects/edit.blade.php | 116 ++++++++++++++++++ .../views/projects/edit_success.blade.php | 25 ++++ routes/web.php | 2 +- 4 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 resources/views/projects/edit.blade.php create mode 100644 resources/views/projects/edit_success.blade.php diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 4c13b83..c2dcda3 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -73,7 +73,9 @@ class ProjectController extends Controller $project->tags()->sync($validatedData['tags']); - return $project; + return redirect()->route('projects.edit.success', $project)->with([ + 'authorization' => 'success' + ]); } catch (\Exception $e) { throw new \Exception("Impossible de modifier le projet " . $e->getMessage(), 500); } @@ -92,6 +94,14 @@ class ProjectController extends Controller ]); } + public function edit_success(Project $project) + { + abort_if(!session()->has('authorization'), 403); + + return view('projects.edit_success', [ + 'project_id' => $project->id + ]); + } public function destroy(Project $project, string $token) { try { diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php new file mode 100644 index 0000000..1522d9a --- /dev/null +++ b/resources/views/projects/edit.blade.php @@ -0,0 +1,116 @@ +@extends('layouts.app') + +@section('title', 'Ajouter un projet') + +@section('content') +
+

Votre demande de contribution

+

+ Vous pouvez éditer ou supprimer votre demande de contribution. +

+
+ @csrf + @method('PATCH') +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+

Le type de contribution souhaitée

+

Choisissez ce dont vous avez besoin dans une seule catégorie (2 compétences maximum)

+
+ @foreach ($categories as $category) +
+
+
+

+ {{ $category->name }} +

+
+ +
+
+ +
+ @foreach ($category->tags as $tag) + + tags as $exists_tags) + @if ($exists_tags->id == $tag->id) + checked + @endif + @endforeach + > + + @endforeach +
+
+
+ @endforeach +
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+ +
+ Retour + +
+
+
+@endsection diff --git a/resources/views/projects/edit_success.blade.php b/resources/views/projects/edit_success.blade.php new file mode 100644 index 0000000..6c2573d --- /dev/null +++ b/resources/views/projects/edit_success.blade.php @@ -0,0 +1,25 @@ +@extends('layouts.app') + +@section('title', 'Confirmation') + +@section('content') +
+

Félicitations, votre demande de contribution a été modifiée !

+
+
+

Que souhaitez-vous faire maintenant ?

+
+
+ +

Voir mon annonce

+
+
+
+ +

Retourner à l'accueil

+
+
+
+ +
+@endsection diff --git a/routes/web.php b/routes/web.php index 84d830d..fb63972 100644 --- a/routes/web.php +++ b/routes/web.php @@ -20,7 +20,7 @@ Route::view('/projects-list', 'projects-list'); Route::view('/about', 'about'); Route::resource('projects', ProjectController::class)->except(['edit', 'update', 'destroy']); Route::get('/projects/{project}/success', [ProjectController::class, 'success'])->name('projects.success'); - +Route::get('/projects/{project}/edit/success', [ProjectController::class, 'edit_success'])->name('projects.edit.success'); Route::group(['middleware' => ['can:manage,project,token']], function () { Route::get('/projects/{project}/edit/{token}', [ProjectController::class, 'edit'])->name('projects.edit'); Route::patch('/projects/{project}/{token}', [ProjectController::class, 'update'])->name('projects.update'); -- GitLab From efe7b1539032899c2eea25664496782c13623249 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Mon, 25 Jan 2021 19:24:27 +0100 Subject: [PATCH 2/6] On affiche le bon titre sur la vue show --- resources/views/projects/show.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php index 3e8a76d..3452f5a 100644 --- a/resources/views/projects/show.blade.php +++ b/resources/views/projects/show.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title', 'Nom du projet') +@section('title', $project->name) @section('content')
@@ -53,11 +53,11 @@
- +
-@endsection \ No newline at end of file +@endsection -- GitLab From 0e379403c80de38d385b1408f3e23509de487e49 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 29 Jan 2021 14:36:20 +0100 Subject: [PATCH 3/6] Ajout de la suppression, changement affichage des projets --- app/Http/Controllers/ProjectController.php | 5 ++++- resources/sass/_base.scss | 12 +----------- resources/views/projects/edit.blade.php | 8 ++------ resources/views/welcome.blade.php | 8 ++++++++ routes/web.php | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index c2dcda3..dd5bb88 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -13,7 +13,7 @@ class ProjectController extends Controller public function index() { return view('projects.index', [ - 'projects' => Project::all(), + 'projects' => Project::all()->sortByDesc('id'), 'contributions' => json_decode(Http::get('https://framagit.org/participalibre/participalibre/-/snippets/6135/raw/main/contributions.json'), true) ]); } @@ -106,6 +106,9 @@ class ProjectController extends Controller { try { $project->delete(); + return redirect()->route('home')->with([ + 'delete' => 'success' + ]); } catch (\Exception $e) { throw new \Exception("Impossible de supprimer le projet " . $e->getMessage(), 500); diff --git a/resources/sass/_base.scss b/resources/sass/_base.scss index d47c0dc..d83ed55 100644 --- a/resources/sass/_base.scss +++ b/resources/sass/_base.scss @@ -89,10 +89,6 @@ footer { justify-content: space-around; } - &.flex-wrap { - flex-wrap: wrap; - } - &.flex-left { justify-content: start; } @@ -204,17 +200,11 @@ h2 { color: $h-color; } -.icon-danger { - &::before { - @include icon-danger - } -} - .button-danger { @extend .button-primary; background-color: $red !important; @extend .padding-small; - @extend .icon-danger; + text-decoration: none; } .background-accent { diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php index 1522d9a..dfbe7df 100644 --- a/resources/views/projects/edit.blade.php +++ b/resources/views/projects/edit.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title', 'Ajouter un projet') +@section('title', 'Editer un projet') @section('content')
@@ -94,9 +94,6 @@ -
Retour diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index c4abf0b..7a7bbef 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -3,6 +3,14 @@ @section('title', 'Bienvenue') @section('content') + +@if (session('delete')) +
+

+ Votre projet a bien été supprimé +

+
+@endif
diff --git a/routes/web.php b/routes/web.php index fb63972..35e2d8a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -24,5 +24,5 @@ Route::get('/projects/{project}/edit/success', [ProjectController::class, 'edit_ Route::group(['middleware' => ['can:manage,project,token']], function () { Route::get('/projects/{project}/edit/{token}', [ProjectController::class, 'edit'])->name('projects.edit'); Route::patch('/projects/{project}/{token}', [ProjectController::class, 'update'])->name('projects.update'); - Route::delete('/projects/{project}/{token}', [ProjectController::class, 'destroy'])->name('projects.destroy'); + Route::get('/projects/{project}/{token}', [ProjectController::class, 'destroy'])->name('projects.destroy'); }); -- GitLab From 55037b2c9189be4c02b682aedd13d2dfbaa4955f Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Fri, 29 Jan 2021 14:36:37 +0100 Subject: [PATCH 4/6] Ajout du token d'administration dans le seeder des projets. --- database/seeders/ProjectTableSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeders/ProjectTableSeeder.php b/database/seeders/ProjectTableSeeder.php index 2ba9f87..dc43f90 100644 --- a/database/seeders/ProjectTableSeeder.php +++ b/database/seeders/ProjectTableSeeder.php @@ -15,6 +15,6 @@ class ProjectTableSeeder extends Seeder public function run() { // Seed projects - Project::factory()->count(30)->create(); + Project::factory()->count(30)->withAdminToken()->create(); } } -- GitLab From b737dc03e3b4056b86242815539e7789396653f9 Mon Sep 17 00:00:00 2001 From: da-max Date: Fri, 29 Jan 2021 18:04:34 +0100 Subject: [PATCH 5/6] =?UTF-8?q?Correction=20d=E2=80=99une=20erreur=20de=20?= =?UTF-8?q?marge=20dans=20la=20page=20d=E2=80=99=C3=A9dition=20de=20projet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/projects/edit.blade.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php index dfbe7df..0518041 100644 --- a/resources/views/projects/edit.blade.php +++ b/resources/views/projects/edit.blade.php @@ -95,13 +95,15 @@ id="email" required>
-

+

Suppression

-

+

Pour supprimer définitivement votre annonce, c’est ici que ça se passe !

- Supprimer définitivement +
Retour -- GitLab From 20bb303a07a660f5520b45ef3c6e5cc7feb92297 Mon Sep 17 00:00:00 2001 From: Le Libre Au Quotidien Date: Sat, 30 Jan 2021 15:31:11 +0100 Subject: [PATCH 6/6] Add edit link on projet edit success vue --- app/Http/Controllers/ProjectController.php | 2 +- resources/views/projects/edit_success.blade.php | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index dd5bb88..431bb57 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -99,7 +99,7 @@ class ProjectController extends Controller abort_if(!session()->has('authorization'), 403); return view('projects.edit_success', [ - 'project_id' => $project->id + 'project' => $project ]); } public function destroy(Project $project, string $token) diff --git a/resources/views/projects/edit_success.blade.php b/resources/views/projects/edit_success.blade.php index 6c2573d..777a626 100644 --- a/resources/views/projects/edit_success.blade.php +++ b/resources/views/projects/edit_success.blade.php @@ -10,16 +10,18 @@

Que souhaitez-vous faire maintenant ?

- +
@endsection -- GitLab