Merge branch 'issue-1' into 'develop'
Issue 1 Closes #1 See merge request ldc-web/projets/support-web!11
This commit is contained in:
commit
5fc956f45e
5 changed files with 383 additions and 420 deletions
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Parsedown;
|
||||
|
||||
class HomeController extends Controller
|
||||
{
|
||||
/**
|
||||
|
|
@ -14,8 +11,6 @@ class HomeController extends Controller
|
|||
*/
|
||||
public function home()
|
||||
{
|
||||
$Parsedown = new Parsedown();
|
||||
$changelog = $Parsedown->text(File::get(\app_path('../CHANGELOG.md')));
|
||||
return view('home', ['changelog' => $changelog]);
|
||||
return view('home');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
"php": "^7.3|^8.0",
|
||||
"carlos-meneses/laravel-mpdf": "^2.1",
|
||||
"doctrine/dbal": "^3.1",
|
||||
"erusev/parsedown": "^1.7",
|
||||
"fideloper/proxy": "^4.4",
|
||||
"fruitcake/laravel-cors": "^2.0",
|
||||
"guzzlehttp/guzzle": "^7.0.1",
|
||||
|
|
@ -41,8 +40,12 @@
|
|||
"sort-packages": true,
|
||||
"allow-plugins": {
|
||||
"dealerdirect/phpcodesniffer-composer-installer": true,
|
||||
"composer/package-versions-deprecated": true
|
||||
}
|
||||
"composer/package-versions-deprecated": true,
|
||||
"php-http/discovery": true
|
||||
},
|
||||
"gitlab-domains": [
|
||||
"lab.s-web.fr"
|
||||
]
|
||||
},
|
||||
"extra": {
|
||||
"laravel": {
|
||||
|
|
@ -75,10 +78,10 @@
|
|||
"@php artisan key:generate --ansi"
|
||||
]
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
"repositories": {
|
||||
"lab.s-web.fr": {
|
||||
"type": "composer",
|
||||
"url": "https://gitlab.com/api/v4/group/16669037/-/packages/composer/packages.json"
|
||||
"url": "https://lab.s-web.fr/api/v4/group/23/-/packages/composer/packages.json"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
767
composer.lock
generated
767
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -5,15 +5,13 @@
|
|||
<div class="row">
|
||||
<div class="col">
|
||||
<h1>Bienvenue sur le support LDC WEB.</h1>
|
||||
<p>Pour consulter vos tickets, merci de vous connecter : <a href="{{ route('login') }}">Connexion</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-4">
|
||||
<h3>Changements</h3>
|
||||
</div>
|
||||
<div class="row mt-3">
|
||||
<div class="col">
|
||||
{!! $changelog !!}
|
||||
<a href="{{ route('ticket.create') }}" class="btn btn-primary">
|
||||
{{ __('Créer un ticket') }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@ use Illuminate\Support\Facades\Route;
|
|||
|
|
||||
*/
|
||||
|
||||
Route::get('/', [HomeController::class, 'home'])->middleware('guest')->name('home');
|
||||
|
||||
Route::middleware(['throttle:credentials'])->group(function () {
|
||||
// * guest:web middleware specified in AuthController
|
||||
Auth::routes([
|
||||
|
|
@ -58,6 +56,8 @@ Route::get('/ping', function () {
|
|||
})->withoutMiddleware('auth');
|
||||
|
||||
Route::middleware('auth:web')->group(function () {
|
||||
// * Home
|
||||
Route::get('/', [HomeController::class, 'home'])->name('home');
|
||||
|
||||
// * Macro planning
|
||||
Route::get('/macroplanning', [ScheduleMacroController::class, 'show'])->name('macroplanning.show');
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue