diff --git a/pima/composer.lock b/pima/composer.lock
index 5dc554bc365d9c110bd974d20fa5f62393ba57bc..0074e587886ac4cf24a490601c02f51c29678642 100644
--- a/pima/composer.lock
+++ b/pima/composer.lock
@@ -1,7 +1,7 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "b5ae90e1a0e375625b272b46d1cc7b8e",
@@ -891,16 +891,16 @@
},
{
"name": "nesbot/carbon",
- "version": "1.34.0",
+ "version": "1.34.1",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33"
+ "reference": "19201b87f7dba2a7cbf1cccdf0e1da13c04ee9c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
- "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/19201b87f7dba2a7cbf1cccdf0e1da13c04ee9c9",
+ "reference": "19201b87f7dba2a7cbf1cccdf0e1da13c04ee9c9",
"shasum": ""
},
"require": {
@@ -942,7 +942,7 @@
"datetime",
"time"
],
- "time": "2018-09-20T19:36:25+00:00"
+ "time": "2018-11-08T13:33:47+00:00"
},
{
"name": "nikic/php-parser",
diff --git a/pima/public/css/style.css b/pima/public/css/style.css
index 8763ec9996108a427d18a4a43a583fcba53e20a5..91da77694a5dcaae693be97e7d3f75d65338981d 100644
--- a/pima/public/css/style.css
+++ b/pima/public/css/style.css
@@ -1,6 +1,7 @@
body {
background-color : #212F3D;
color: #D5D8DC;
+ font-family: 'Nunito', sans-serif;
}
.demande {
@@ -31,4 +32,49 @@ body {
border-radius: 50px 5px 5px 50px;
background-color: rgba(153,0,51,0.3);
padding: 0px 0px 2px 30px;
+}
+
+nav.side{
+ font-size: 30px;
+ float: left;
+ width: 15%;
+ padding: 20px;
+ height: 100px;
+ margin-right: 20px;
+}
+
+article{
+ float: right;
+ width: 50%;
+ margin-left: 10px;
+ border-left: 5px solid grey
+}
+
+nav.side a:link {
+ color: white;
+ border-radius: 50px 50px 50px 50px;
+ background-color: #686868;
+ padding: 0px 10px 0px 10px;
+ text-decoration: none;
+}
+
+nav.side a:visited{
+ color:white;
+ border-radius: 50px 50px 50px 50px;
+ background-color: #686868;
+ text-decoration: none;
+ padding: 0px 10px 0px 10px;
+}
+
+nav.side ul{
+ list-style-type: none;
+ padding: 0;
+}
+
+nav.side a:hover {
+ color: white;
+ border-radius: 50px 50px 50px 50px;
+ background-color: #a8a6a6;
+ text-decoration: none;
+ padding: 0px 10px 0px 10px;
}
\ No newline at end of file
diff --git a/pima/resources/views/template.blade.php b/pima/resources/views/template.blade.php
index 030018fdbe3f57c2e7bc790acd60a4a06fcbb951..632172ef67de76e378a2812b99595fd9c1ed0241 100644
--- a/pima/resources/views/template.blade.php
+++ b/pima/resources/views/template.blade.php
@@ -2,42 +2,89 @@
<html lang="fr">
<head>
<meta charset="UTF-8">
- <style>
- body {
- background-color : #212F3D;
- color: #D5D8DC;
- }
-
- .demande {
- border-radius: 5px 50px 50px 5px; /*arrondi pour les bordures top right bot left */
- margin: 25px 50% 25px 25px; /* taille du bloc => pas collé et moitié de la page */
- background-color: rgba(102,102,255,0.3); /* couleur style rvb opacity */
- padding: 0px 30px 2px 0px; /* top right bot left => écart à droite pour pas sortir de l'arrondi */
- }
-
- .author { /*pour le champ auteur */
- font-size: 30px; /*grossissement du nom */
- margin: 0px; /* coller le titre au reste */
- }
-
- .date{ /*pour le champ date*/
- color: #ABB2B9;
- margin-left: 10px; /* écarter du nom */
- font-size: 15px;
- }
-
- .form{
- background-color: #566573;
- color: #D5D8DC;
- }
-
- .offre {
- margin: 25px 25px 25px 50%;
- border-radius: 50px 5px 5px 50px;
- background-color: rgba(153,0,51,0.3);
- padding: 0px 0px 2px 30px;
- }
- </style>
+<style>
+body {
+ background-color : #212F3D;
+ color: #D5D8DC;
+ font-family: 'Nunito', sans-serif;
+}
+
+.demande {
+ border-radius: 5px 50px 50px 5px; /*arrondi pour les bordures top right bot left */
+ margin: 25px 50% 25px 25px; /* taille du bloc => pas collé et moitié de la page */
+ background-color: rgba(102,102,255,0.3); /* couleur style rvb opacity */
+ padding: 0px 30px 2px 0px; /* top right bot left => écart à droite pour pas sortir de l'arrondi */
+}
+
+.author { /*pour le champ auteur */
+ font-size: 30px; /*grossissement du nom */
+ margin: 0px; /* coller le titre au reste */
+}
+
+.date{ /*pour le champ date*/
+ color: #ABB2B9;
+ margin-left: 10px; /* écarter du nom */
+ font-size: 15px;
+}
+
+.form{
+ background-color: #566573;
+ color: #D5D8DC;
+}
+
+.offre {
+ margin: 25px 25px 25px 50%;
+ border-radius: 50px 5px 5px 50px;
+ background-color: rgba(153,0,51,0.3);
+ padding: 0px 0px 2px 30px;
+}
+
+nav.side{
+ font-size: 30px;
+ float: left;
+ width: 15%;
+ padding: 20px;
+ height: 100px;
+ margin-right: 20px;
+}
+
+article{
+ float: right;
+ width: 75%;
+ margin-left: 10px;
+ padding-left: 15px;
+ border-left: 5px solid grey
+}
+
+nav.side a:link {
+ color: white;
+ border-radius: 50px 50px 50px 50px;
+ background-color: #686868;
+ padding: 0px 10px 0px 10px;
+ text-decoration: none;
+}
+
+nav.side a:visited{
+ color:white;
+ border-radius: 50px 50px 50px 50px;
+ background-color: #686868;
+ text-decoration: none;
+ padding: 0px 10px 0px 10px;
+}
+
+nav.side ul{
+ list-style-type: none;
+ padding: 0;
+}
+
+nav.side a:hover {
+ color: white;
+ border-radius: 50px 50px 50px 50px;
+ background-color: #a8a6a6;
+ text-decoration: none;
+ padding: 0px 10px 0px 10px;
+}
+</style>
<title>@yield('titre')</title>
</head>
<body>
diff --git a/pima/resources/views/welcome.blade.php b/pima/resources/views/welcome.blade.php
index 445facb2f288ca0ea555bf0cead0f2fb0773ac85..6f88d8fe676418486e747b52ce109e4768839766 100644
--- a/pima/resources/views/welcome.blade.php
+++ b/pima/resources/views/welcome.blade.php
@@ -71,6 +71,7 @@
@auth
<a href="{{ url('/home') }}">Home</a>
@else
+ <a href="{{ url('profil') }}">Profil</a>
<a href="{{ route('login') }}">Login</a>
<a href="{{ route('register') }}">Register</a>
@endauth
diff --git a/pima/routes/web.php b/pima/routes/web.php
index fc2846b81c4529e521f7ae234cb35d7bc8f54b51..b0f5308ad3ee2b684315359f3c704e7baabcaf5f 100644
--- a/pima/routes/web.php
+++ b/pima/routes/web.php
@@ -25,3 +25,6 @@ Route::post('formulaire', ['as' => 'formulaire', 'uses' => 'FormulaireController
Route::get('formulaire2', [ 'as' => 'formulaire2', 'uses' => 'Formulaire2Controller@create']);
Route::post('formulaire2', ['as' => 'formulaire2', 'uses' => 'Formulaire2Controller@store']);
+
+Route::get('profil', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
+//Route::post('profil', ['as' => 'profil', 'uses' => 'ProfilController@store']);
\ No newline at end of file