From 1f8b8c8f1892a5514f6929561e1fabd23ffc830b Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Wed, 26 Dec 2018 13:23:48 -0500 Subject: * Song display: Create view for it --- laravel/app/Http/Controllers/SongController.php | 4 +- laravel/resources/views/main.blade.php | 66 +++++++++++++++++++++++++ laravel/resources/views/song.blade.php | 3 ++ laravel/resources/views/welcome.blade.php | 66 +------------------------ 4 files changed, 73 insertions(+), 66 deletions(-) create mode 100644 laravel/resources/views/main.blade.php create mode 100644 laravel/resources/views/song.blade.php diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php index fb471af..44c766d 100644 --- a/laravel/app/Http/Controllers/SongController.php +++ b/laravel/app/Http/Controllers/SongController.php @@ -10,7 +10,7 @@ class SongController extends Controller public function show( $songNumber ) { - $song = Song::where('number', $songNumber )->get(); - return $song; + $song = Song::where('number', $songNumber )->first(); + return view('song', ['song' => $song ] ); } } diff --git a/laravel/resources/views/main.blade.php b/laravel/resources/views/main.blade.php new file mode 100644 index 0000000..59cfcf6 --- /dev/null +++ b/laravel/resources/views/main.blade.php @@ -0,0 +1,66 @@ + + + + + + + Laravel + + + + + + + + +
+ @if (Route::has('login')) +
+ @auth + Home + @else + Login + + @if (Route::has('register')) + Register + @endif + @endauth +
+ @endif + +
+ @yield('content') +
+
+ + + diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php new file mode 100644 index 0000000..c63477b --- /dev/null +++ b/laravel/resources/views/song.blade.php @@ -0,0 +1,3 @@ +@extends('main') +@section('content') +

{{$song['title']}}

diff --git a/laravel/resources/views/welcome.blade.php b/laravel/resources/views/welcome.blade.php index 5652f49..10c2615 100644 --- a/laravel/resources/views/welcome.blade.php +++ b/laravel/resources/views/welcome.blade.php @@ -1,63 +1,5 @@ - - - - - - - Laravel - - - - - - - - -
- @if (Route::has('login')) -
- @auth - Home - @else - Login - - @if (Route::has('register')) - Register - @endif - @endauth -
- @endif - -
+@extends('main') +@section('content')
Prosongsa Songs
@@ -70,7 +12,3 @@ @endforeach -
-
- - -- cgit 1.4.1