Skip to content

Commit 93b9067

Browse files
committed
Merge branch 'feature/Add_a_propos_page' into develop
2 parents 904fb4a + 8911c56 commit 93b9067

File tree

4 files changed

+35
-10
lines changed

4 files changed

+35
-10
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace App\Http\Controllers;
4+
5+
use Illuminate\Http\Request;
6+
use Illuminate\Support\Facades\View;
7+
8+
class AproposController extends Controller
9+
{
10+
public function index() {
11+
return View('apropos.index');
12+
}
13+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@extends('layouts.app')
2+
3+
@section('content')
4+
<div class="jumbotron jumbotron-fluid">
5+
<div class="container">
6+
<h1 class="display-4">Your todolist with Laravel !</h1>
7+
<p class="lead">A very simple todolist application to learn Laravel.</p>
8+
<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Expedita eos provident mollitia.
9+
Nesciunt praesentium doloribus aliquam voluptatem aperiam nisi molestias culpa voluptate soluta?
10+
Nemo incidunt exercitationem similique sequi id temporibus?</p>
11+
<p class="bg-warning p-4"><span class="badge badge-primary mx-2">New</span>Lorem ipsum dolor sit
12+
amet
13+
consectetur, adipisicing elit. Optio, laudantium
14+
culpa facilis alias nihil ad autem. Libero cupiditate tempore, ipsa consectetur maxime quae quis
15+
rem dignissimos nihil nisi necessitatibus voluptas.</p>
16+
</div>
17+
</div>
18+
@endsection()

resources/views/layouts/app.blade.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,10 @@
7979
</div>
8080
</nav>
8181

82-
<main class="py-4">
82+
<main class="py-4 container">
8383
@yield('content')
8484
</main>
8585
</div>
86-
{{-- <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
87-
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous">
88-
</script> --}}
89-
{{-- <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
90-
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous">
91-
</script>
92-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
93-
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous">
94-
</script> --}}
9586
</body>
9687

9788
</html>

routes/web.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
return view('welcome');
1616
});
1717

18+
1819
Auth::routes();
1920

2021
Route::get('/home', 'HomeController@index')->name('home');
22+
23+
Route::get('/a-propos', 'AproposController@index')->name('apropos');

0 commit comments

Comments
 (0)