Skip to content
Extraits de code Groupes Projets
Valider 82c48b1c rédigé par Guillaume AICHHORN's avatar Guillaume AICHHORN
Parcourir les fichiers
	modified:   composer.lock
	modified:   public/css/style.css
	modified:   resources/views/template.blade.php
	modified:   resources/views/welcome.blade.php
	modified:   routes/web.php
parents 3b7ee145 f829f46a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "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" "This file is @generated automatically"
], ],
"content-hash": "b5ae90e1a0e375625b272b46d1cc7b8e", "content-hash": "b5ae90e1a0e375625b272b46d1cc7b8e",
...@@ -891,16 +891,16 @@ ...@@ -891,16 +891,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "1.34.0", "version": "1.34.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33" "reference": "19201b87f7dba2a7cbf1cccdf0e1da13c04ee9c9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/19201b87f7dba2a7cbf1cccdf0e1da13c04ee9c9",
"reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33", "reference": "19201b87f7dba2a7cbf1cccdf0e1da13c04ee9c9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -942,7 +942,7 @@ ...@@ -942,7 +942,7 @@
"datetime", "datetime",
"time" "time"
], ],
"time": "2018-09-20T19:36:25+00:00" "time": "2018-11-08T13:33:47+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
......
body { body {
background-color : #212F3D; background-color : #212F3D;
color: #D5D8DC; color: #D5D8DC;
font-family: 'Nunito', sans-serif;
} }
.demande { .demande {
...@@ -32,3 +33,48 @@ body { ...@@ -32,3 +33,48 @@ body {
background-color: rgba(153,0,51,0.3); background-color: rgba(153,0,51,0.3);
padding: 0px 0px 2px 30px; 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
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
body { body {
background-color : #212F3D; background-color : #212F3D;
color: #D5D8DC; color: #D5D8DC;
font-family: 'Nunito', sans-serif;
} }
.demande { .demande {
...@@ -37,6 +38,52 @@ ...@@ -37,6 +38,52 @@
background-color: rgba(153,0,51,0.3); background-color: rgba(153,0,51,0.3);
padding: 0px 0px 2px 30px; 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> </style>
<title>@yield('titre')</title> <title>@yield('titre')</title>
</head> </head>
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
@auth @auth
<a href="{{ url('/home') }}">Home</a> <a href="{{ url('/home') }}">Home</a>
@else @else
<a href="{{ url('profil') }}">Profil</a>
<a href="{{ route('login') }}">Login</a> <a href="{{ route('login') }}">Login</a>
<a href="{{ route('register') }}">Register</a> <a href="{{ route('register') }}">Register</a>
@endauth @endauth
......
...@@ -25,3 +25,6 @@ Route::post('formulaire', ['as' => 'formulaire', 'uses' => 'FormulaireController ...@@ -25,3 +25,6 @@ Route::post('formulaire', ['as' => 'formulaire', 'uses' => 'FormulaireController
Route::get('formulaire2', [ 'as' => 'formulaire2', 'uses' => 'Formulaire2Controller@create']); Route::get('formulaire2', [ 'as' => 'formulaire2', 'uses' => 'Formulaire2Controller@create']);
Route::post('formulaire2', ['as' => 'formulaire2', 'uses' => 'Formulaire2Controller@store']); 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
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter