diff --git a/pima/app/Http/Controllers/Formulaire2Controller.php b/pima/app/Http/Controllers/Formulaire2Controller.php
index 79ca420094dc157377f1297be5eb967defb19849..7af296ef4e6888fe4f23bdfb6fb59cccc15c7074 100644
--- a/pima/app/Http/Controllers/Formulaire2Controller.php
+++ b/pima/app/Http/Controllers/Formulaire2Controller.php
@@ -15,7 +15,7 @@ class Formulaire2Controller extends Controller
}
public function store(FormulaireRequest $request){
-
+
if (!isset($request->message)) {
$message = null;
}
@@ -23,6 +23,10 @@ class Formulaire2Controller extends Controller
$message = $request->message;
}
+ if ($request->categorie == 4){
+ $request->objet = $request->objet_autre;
+ }
+
Message::create([
'auteur' => $request->nom,
'type' => $request->off_dem,
diff --git a/pima/app/Http/Controllers/ProfilController.php b/pima/app/Http/Controllers/ProfilController.php
index 25452ad377a3863f0f301aeaa80923406305ad8f..bb343b6b43b0eda95748bf5d28ef23f742becd2b 100644
--- a/pima/app/Http/Controllers/ProfilController.php
+++ b/pima/app/Http/Controllers/ProfilController.php
@@ -10,10 +10,17 @@ use Auth;
class ProfilController extends Controller
{
+ public function create(){
+ if (Auth::check()){
+ return view('profil');
+ }
+ }
+
+/*
public function create($user){
if (Auth::check()){
return view('profil',["pseudo=>$user"]);
}
- }
+ }*/
}
diff --git a/pima/app/Test.php b/pima/app/Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..58f7e879c365e8ed99f9a7a227c710f5b22eab88
--- /dev/null
+++ b/pima/app/Test.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Test extends Model
+{
+ //
+}
diff --git a/pima/app/Tool.php b/pima/app/Tool.php
index 116b6aaf032afa9b4d34820706a468eabb9d5491..6678dde073de21c4ff0857cb293047e49e2df339 100644
--- a/pima/app/Tool.php
+++ b/pima/app/Tool.php
@@ -3,10 +3,29 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
+use App\Categorie;
class Tool extends Model
{
protected $fillable =[
'objet', 'categorie',
];
+
+ public static function tool_list(){
+ $categories = Categorie::categories_names();
+ //dd($categories);
+ $array_cat = array();
+ foreach ($categories as $categorie){
+ $array_cat = array_add($array_cat, $categorie, array());
+ //dd($array_cat);
+ $tools = Tool::where('categorie', Categorie::where('nom', $categorie)->first()->id)->get();
+ //dd($tools);
+ foreach($tools as $tool){
+ //dd($tool);
+ $array_cat[$categorie] = array_add($array_cat[$categorie], $tool->objet, $tool->objet);
+ }
+ }
+ //dd($array_cat);
+ return $array_cat;
+ }
}
diff --git a/pima/database/migrations/2018_11_15_102916_create_test_table.php b/pima/database/migrations/2018_11_15_102916_create_test_table.php
new file mode 100644
index 0000000000000000000000000000000000000000..b44886c577ade68aa9eca6356011f8902b75dc8b
--- /dev/null
+++ b/pima/database/migrations/2018_11_15_102916_create_test_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTestTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('test', function (Blueprint $table) {
+ $table->increments('id');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('test');
+ }
+}
diff --git a/pima/database/seeds/DatabaseSeeder.php b/pima/database/seeds/DatabaseSeeder.php
index d6c260617cb9b76e168a40e9cfb717f9a5fb1620..be8f9b3e3283a528fbbdc6952697b96e58aff80a 100644
--- a/pima/database/seeds/DatabaseSeeder.php
+++ b/pima/database/seeds/DatabaseSeeder.php
@@ -4,6 +4,7 @@ use Illuminate\Database\Seeder;
use App\Message;
use App\User;
use App\Categorie;
+use App\Tool;
class DatabaseSeeder extends Seeder
{
@@ -27,6 +28,10 @@ class DatabaseSeeder extends Seeder
'nom' => 'Jardinage',
]);
+ Categorie::create([
+ 'nom' => 'Autre',
+ ]);
+
Message::create([
'auteur' => 'Michel',
'type' => true,
@@ -38,7 +43,7 @@ class DatabaseSeeder extends Seeder
User::create([
'name' => 'Pierrick',
'email' => 'adresse@adresse.fr',
- 'password' => 'aaa',
+ 'password' => 'aaaaaa',
'adresse' => '69 Rue Jolie 91000 Evry',
'telephone' => '06 69 00 00 00',
]);
@@ -46,7 +51,7 @@ class DatabaseSeeder extends Seeder
User::create([
'name' => 'Dorian',
'email' => 'dorian@dorian.fr',
- 'password' => 'aaa',
+ 'password' => 'aaaaaa',
'adresse' => '69 Rue Jolie 91000 Evry',
'telephone' => '06 69 00 00 00',
]);
@@ -54,7 +59,7 @@ class DatabaseSeeder extends Seeder
User::create([
'name' => 'Guillaume',
'email' => 'guillaume@guillaume.fr',
- 'password' => 'aaa',
+ 'password' => 'aaaaaa',
'adresse' => '69 Rue Jolie 91000 Evry',
'telephone' => '06 69 00 00 00',
]);
@@ -62,7 +67,7 @@ class DatabaseSeeder extends Seeder
User::create([
'name' => 'Quentin',
'email' => 'quentin@quentin.fr',
- 'password' => 'aaa',
+ 'password' => 'aaaaaa',
'adresse' => '69 Rue Jolie 91000 Evry',
'telephone' => '06 69 00 00 00',
]);
@@ -70,7 +75,7 @@ class DatabaseSeeder extends Seeder
User::create([
'name' => 'Emile',
'email' => 'emile@emile.fr',
- 'password' => 'aaa',
+ 'password' => 'aaaaaa',
'adresse' => '69 Rue Jolie 91000 Evry',
'telephone' => '06 69 00 00 00',
]);
@@ -78,11 +83,131 @@ class DatabaseSeeder extends Seeder
User::create([
'name' => 'Thibaut',
'email' => 'thibaut@thibaut.fr',
- 'password' => 'aaa',
+ 'password' => 'aaaaaa',
'adresse' => '69 Rue Jolie 91000 Evry',
'telephone' => '06 69 00 00 00',
]);
+ Tool::create([
+ 'objet'=> "Tournevis",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Marteau",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Scie sauteuse",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Perceuse",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Niveau a bulle",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Grattoir" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Spatule" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Ruban adhésif" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Ponceuse" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Papier de verre" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Rouleau a patisserie" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Plat a tarte" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Moule" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Poche a douille" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Fouet" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Thermometre" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Presse citron" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Pelle" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Pioche" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Beche" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Secateur" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Brouette" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Bache" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Binette" ,
+ 'categorie' => 3,
+ ]);
+
}
}
diff --git a/pima/resources/views/formulaire2.blade.php b/pima/resources/views/formulaire2.blade.php
index b9d978f8973afe5b393ba2493c098ffa5870703e..938ece86fb0959c33135d4e70a24c0c122173031 100644
--- a/pima/resources/views/formulaire2.blade.php
+++ b/pima/resources/views/formulaire2.blade.php
@@ -3,6 +3,7 @@
<?php
use App\Message;
use App\Categorie;
+use App\Tool;
?>
@section('titre')
@@ -18,7 +19,8 @@ Accueil
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
- </a>
+ </a><br>
+ <a href="{{ route('profil') }}">Profil</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
@@ -58,13 +60,26 @@ Accueil
{{ Form::radio('off_dem', false) }} <B>Demande</B> <br>
-->
+
+<!--
<B>Objet</B> {{ Form::text('objet')}} <br>
{{ $errors->first('objet', ':message') }}
<br>
+
+ -->
+
+
+
<B>Catégorie</B> {{ Form::select('categorie', Categorie::categories_names()) }}
{{ $errors->first('categorie', ':message') }}
+ <br>
+ <B>Objet</B> {{Form::select('objet', Tool::tool_list())}}
+ {{ $errors->first('objet', ':message') }}
+
+<br>
+<B>Objet si categorie Autre<B> {{ Form::text('objet_autre')}}
<br><br>
<B>Message</B> {{ Form::text('message')}}
<br><br>
diff --git a/pima/resources/views/profil.blade.php b/pima/resources/views/profil.blade.php
index 814bf95e420a7bf158a27f9b8180622e24cb5a06..047b23b4a1b1e5285ef460383d0bd2e2411b1a12 100644
--- a/pima/resources/views/profil.blade.php
+++ b/pima/resources/views/profil.blade.php
@@ -5,65 +5,46 @@ Profil
@endsection
@section('contenu')
-
-<!--Header des pages-->
- <header>
- <!--Pop le header-->
- <style>
- .column {
- float: left;
- width: 33%;
- background-color: lightblue;
- color: black;
- }
- .column2{
- float: left;
- width: 33%;
- background-color: pink;
- margin-left: .5%;
- margin-right: .5%;
- color:black;
- }
- .row:after {
- content: "";
- display: table;
- clear: both;
- }
-
- .case{
- background-color: lightblue;
- text-align: justify;
- }
-
- @media screen and (max-width: 600px) {
- .column{
- width: 100%;
- }
- .column2{
- width: 100%;
- margin-bottom: 20px;
- margin-top: 20px;
- }
-
- }
- </style>
-
- </header>
-
- <!--Blabla avant découpe -->
- Ici blablabla
- <hr/>
- <!--Navigation-->
- <section>
- <nav class="side">
+<div class="flex-center position-ref full-height">
+ @if (Route::has('login'))
+ <div class="top-right links">
+ @auth
+ <a href="{{ route('logout') }}"
+ onclick="event.preventDefault();
+ document.getElementById('logout-form').submit();">
+ {{ __('Logout') }}
+ </a>
+ <br>
+ <a href="{{ route('home') }}">Home</a>
+
+ <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+ @csrf
+ </form>
+ @else
+ <a href="{{ route('login') }}">Login</a> <br>
+ <a href="{{ route('register') }}">Register</a>
+ @endauth
+ </div>
+ @endif
+ </div>
+
+
+ <!--Navigation-->
+
+ <div class="top">
<ul>
<li><a href="#coordonnees">Coordonnées</a></li>
<li><a href="#liste_outils">Liste d'outils</a></li>
<li><a href="#edit">Édition</a></li>
</ul>
- </nav>
- </section>
-
+ </div>
+ <div class="side">
+ <ul>
+ <li><a href="#coordonnees">Coordonnées</a></li>
+ <li><a href="#liste_outils">Liste d'outils</a></li>
+ <li><a href="#edit">Édition</a></li>
+ </ul>
+ </div>
<article>
<h1 id="coordonnees">Vos coordonnées</h1>
<?php /*Connection avec la BDD.*/
@@ -136,9 +117,26 @@ Profil
</div>
+<<<<<<< HEAD
<!-- Pop les pages à la suite, IL FAUT METTRE DES TITRES STYLES <h1 id=" . "> avec coordonnees, liste_outils et edit -->
- </article>
+=======
+
+ <h1 id="edit">Les edit</h1>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam libero arcu, euismod a scelerisque vel, mattis et nisi. Donec vitae libero faucibus, vehicula sapien id, eleifend ligula. Fusce diam est, gravida non velit non, gravida aliquet ligula. Duis efficitur mi id fringilla facilisis. Quisque in sagittis dolor. Suspendisse rhoncus convallis suscipit. Ut aliquet sodales sapien quis fringilla. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc facilisis sapien ac tellus pharetra, sit amet rhoncus velit fringilla. Vestibulum eget diam nunc. Maecenas eros eros, consectetur id gravida ac, luctus non nunc.
+Pellentesque ullamcorper massa at sapien fringilla, et lobortis ante bibendum. Aenean dui leo, laoreet in nisi nec, sagittis venenatis velit. Nunc suscipit malesuada finibus. Maecenas pharetra congue aliquet. Nullam eu turpis nulla. Nullam laoreet vehicula ipsum ac convallis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam libero arcu, euismod a scelerisque vel, mattis et nisi. Donec vitae libero faucibus, vehicula sapien id, eleifend ligula. Fusce diam est, gravida non velit non, gravida aliquet ligula. Duis efficitur mi id fringilla facilisis. Quisque in sagittis dolor. Suspendisse rhoncus convallis suscipit. Ut aliquet sodales sapien quis fringilla. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc facilisis sapien ac tellus pharetra, sit amet rhoncus velit fringilla. Vestibulum eget diam nunc. Maecenas eros eros, consectetur id gravida ac, luctus non nunc.
+
+Pellentesque ullamcorper massa at sapien fringilla, et lobortis ante bibendum. Aenean dui leo, laoreet in nisi nec, sagittis venenatis velit. Nunc suscipit malesuada finibus. Maecenas pharetra congue aliquet. Nullam eu turpis nulla. Nullam laoreet vehicula ipsum ac convallis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam libero arcu, euismod a scelerisque vel, mattis et nisi. Donec vitae libero faucibus, vehicula sapien id, eleifend ligula. Fusce diam est, gravida non velit non, gravida aliquet ligula. Duis efficitur mi id fringilla facilisis. Quisque in sagittis dolor. Suspendisse rhoncus convallis suscipit. Ut aliquet sodales sapien quis fringilla. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc facilisis sapien ac tellus pharetra, sit amet rhoncus velit fringilla. Vestibulum eget diam nunc. Maecenas eros eros, consectetur id gravida ac, luctus non nunc.
- </section>
+Pellentesque ullamcorper massa at sapien fringilla, et lobortis ante bibendum. Aenean dui leo, laoreet in nisi nec, sagittis venenatis velit. Nunc suscipit malesuada finibus. Maecenas pharetra congue aliquet. Nullam eu turpis nulla. Nullam laoreet vehicula ipsum ac convallis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam libero arcu, euismod a scelerisque vel, mattis et nisi. Donec vitae libero faucibus, vehicula sapien id, eleifend ligula. Fusce diam est, gravida non velit non, gravida aliquet ligula. Duis efficitur mi id fringilla facilisis. Quisque in sagittis dolor. Suspendisse rhoncus convallis suscipit. Ut aliquet sodales sapien quis fringilla. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc facilisis sapien ac tellus pharetra, sit amet rhoncus velit fringilla. Vestibulum eget diam nunc. Maecenas eros eros, consectetur id gravida ac, luctus non nunc.
+
+Pellentesque ullamcorper massa at sapien fringilla, et lobortis ante bibendum. Aenean dui leo, laoreet in nisi nec, sagittis venenatis velit. Nunc suscipit malesuada finibus. Maecenas pharetra congue aliquet. Nullam eu turpis nulla. Nullam laoreet vehicula ipsum ac convallis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam libero arcu, euismod a scelerisque vel, mattis et nisi. Donec vitae libero faucibus, vehicula sapien id, eleifend ligula. Fusce diam est, gravida non velit non, gravida aliquet ligula. Duis efficitur mi id fringilla facilisis. Quisque in sagittis dolor. Suspendisse rhoncus convallis suscipit. Ut aliquet sodales sapien quis fringilla. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nunc facilisis sapien ac tellus pharetra, sit amet rhoncus velit fringilla. Vestibulum eget diam nunc. Maecenas eros eros, consectetur id gravida ac, luctus non nunc.
+
+Pellentesque ullamcorper massa at sapien fringilla, et lobortis ante bibendum. Aenean dui leo, laoreet in nisi nec, sagittis venenatis velit. Nunc suscipit malesuada finibus. Maecenas pharetra congue aliquet. Nullam eu turpis nulla. Nullam laoreet vehicula ipsum ac convallis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.</p>
+>>>>>>> 3109c8babeba5d8c9200c938e5bb4a07447e1e9e
+ </article>
@endsection
diff --git a/pima/resources/views/template.blade.php b/pima/resources/views/template.blade.php
index 632172ef67de76e378a2812b99595fd9c1ed0241..18d29a28104cf729b3f784ca1a51a9c5fd5c62f4 100644
--- a/pima/resources/views/template.blade.php
+++ b/pima/resources/views/template.blade.php
@@ -29,7 +29,7 @@ body {
.form{
background-color: #566573;
- color: #D5D8DC;
+ color: #D5D8DC;
}
.offre {
@@ -39,51 +39,108 @@ body {
padding: 0px 0px 2px 30px;
}
-nav.side{
- font-size: 30px;
- float: left;
- width: 15%;
- padding: 20px;
- height: 100px;
- margin-right: 20px;
+.top ul { /*barre de navigation du haut*/
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ background-color: #212F3D;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ border-bottom: 5px solid grey;
}
-article{
- float: right;
- width: 75%;
- margin-left: 10px;
- padding-left: 15px;
- border-left: 5px solid grey
+.top li {
+ float: right;
}
-nav.side a:link {
- color: white;
- border-radius: 50px 50px 50px 50px;
+.top a,.side a{ /*lien dans barre de navigation*/
+ display: block;
+ color: #f2f2f2;
background-color: #686868;
- padding: 0px 10px 0px 10px;
+ text-align: center;
+ padding: 14px 16px;
text-decoration: none;
+ font-size: 21px;
}
-nav.side a:visited{
- color:white;
- border-radius: 50px 50px 50px 50px;
- background-color: #686868;
+.top a:hover,.side a:hover{
+ display: block;
+ color: white;
+ background-color: #a8a6a6;
+ text-align: center;
+ padding: 14px 16px;
text-decoration: none;
- padding: 0px 10px 0px 10px;
+ font-size: 21px;
}
-nav.side ul{
+.side ul { /*sidebar*/
list-style-type: none;
+ margin: 0;
padding: 0;
+ width: 20%;
+ background-color: #212F3D;
+ position: fixed;
+ height: 100%;
+ overflow: auto;
+ top: 60px;
}
-nav.side a:hover {
- color: white;
- border-radius: 50px 50px 50px 50px;
- background-color: #a8a6a6;
- text-decoration: none;
- padding: 0px 10px 0px 10px;
+/* Le contenu des pages */
+
+article{
+ float: right;
+ width: 75%;
+ margin-left: 10px;
+ margin-top: 60px;
+ padding-left: 15px;
+ border-left: 5px solid grey
}
+
+
+
+
+
+
+
+ .column {
+ float: left;
+ width: 33%;
+ background-color: lightblue;
+ color: black;
+ }
+ .column2{
+ float: left;
+ width: 33%;
+ background-color: pink;
+ margin-left: .5%;
+ margin-right: .5%;
+ color:black;
+ }
+ .row:after {
+ content: "";
+ display: table;
+ clear: both;
+ }
+
+ .case{
+ background-color: lightblue;
+ text-align: justify;
+ }
+
+@media screen and (max-width: 600px) {
+ .column{
+ width: 100%;
+ }
+
+ .column2{
+ width: 100%;
+ margin-bottom: 20px;
+ margin-top: 20px;
+ }
+}
+
</style>
<title>@yield('titre')</title>
</head>
diff --git a/pima/resources/views/welcome.blade.php b/pima/resources/views/welcome.blade.php
index 6f88d8fe676418486e747b52ce109e4768839766..4546ffa6d946b820207ae6ee15b3b14c95501a58 100644
--- a/pima/resources/views/welcome.blade.php
+++ b/pima/resources/views/welcome.blade.php
@@ -93,6 +93,7 @@
<a href="https://github.com/laravel/laravel">GitHub</a>
-->
<a href="{{ url('formulaire2') }}">Main</a>
+ <a href="{{ url('profil') }}">Profil</a>
</div>
</div>
</div>
diff --git a/pima/routes/web.php b/pima/routes/web.php
index 43fcc35cacd7dcd861619d00dc7a6800bc009c79..d2a814ac841e35dd65d87963c721c9e1b8c150f3 100644
--- a/pima/routes/web.php
+++ b/pima/routes/web.php
@@ -26,5 +26,10 @@ Route::post('formulaire', ['as' => 'formulaire', 'uses' => 'FormulaireController
Route::get('formulaire2', [ 'as' => 'formulaire2', 'uses' => 'Formulaire2Controller@create']);
Route::post('formulaire2', ['as' => 'formulaire2', 'uses' => 'Formulaire2Controller@store']);
+<<<<<<< HEAD
Route::get('profil/{user}', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
Route::post('profil/{user}', ['as' => 'profil', 'uses' => 'ProfilController@store']);
+=======
+Route::get('profil', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
+//Route::post('profil', ['as' => 'profil', 'uses' => 'ProfilController@store']);
+>>>>>>> 3109c8babeba5d8c9200c938e5bb4a07447e1e9e