diff options
| author | Zach DeCook <zachdecook@gmail.com> | 2018-12-26 13:23:48 -0500 |
|---|---|---|
| committer | Zach DeCook <zachdecook@gmail.com> | 2018-12-26 13:23:48 -0500 |
| commit | 1f8b8c8f1892a5514f6929561e1fabd23ffc830b (patch) | |
| tree | 63b5274d7d324cd619fcf4cac75f0a43ee2b2bc9 | |
| parent | 0790c781f8a1ae297c800f86bc8da2c5c2818670 (diff) | |
| download | prosongsa-1f8b8c8f1892a5514f6929561e1fabd23ffc830b.tar.gz | |
* Song display: Create view for it
| -rw-r--r-- | laravel/app/Http/Controllers/SongController.php | 4 | ||||
| -rw-r--r-- | laravel/resources/views/main.blade.php | 66 | ||||
| -rw-r--r-- | laravel/resources/views/song.blade.php | 3 | ||||
| -rw-r--r-- | laravel/resources/views/welcome.blade.php | 66 |
4 files changed, 73 insertions, 66 deletions
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 @@ +<!doctype html> +<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <title>Laravel</title> + + <!-- Fonts --> + <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css"> + + <!-- Styles --> + <style> + html, body { + background-color: #fff; + color: #636b6f; + font-family: 'Nunito', sans-serif; + font-weight: 200; + height: 100vh; + margin: 0; + } + + .flex-center { + align-items: center; + display: flex; + justify-content: center; + } + + .position-ref { + position: relative; + } + + .top-right { + position: absolute; + right: 10px; + top: 18px; + } + + .title { + font-size: 84px; + } + </style> + </head> + <body> + <div class="flex-center position-ref full-height"> + @if (Route::has('login')) + <div class="top-right links"> + @auth + <a href="{{ url('/home') }}">Home</a> + @else + <a href="{{ route('login') }}">Login</a> + + @if (Route::has('register')) + <a href="{{ route('register') }}">Register</a> + @endif + @endauth + </div> + @endif + + <div class="content"> + @yield('content') + </div> + </div> + </body> + +</html> 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') +<h2>{{$song['title']}}</h2> 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 @@ -<!doctype html> -<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - - <title>Laravel</title> - - <!-- Fonts --> - <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css"> - - <!-- Styles --> - <style> - html, body { - background-color: #fff; - color: #636b6f; - font-family: 'Nunito', sans-serif; - font-weight: 200; - height: 100vh; - margin: 0; - } - - .flex-center { - align-items: center; - display: flex; - justify-content: center; - } - - .position-ref { - position: relative; - } - - .top-right { - position: absolute; - right: 10px; - top: 18px; - } - - .title { - font-size: 84px; - } - </style> - </head> - <body> - <div class="flex-center position-ref full-height"> - @if (Route::has('login')) - <div class="top-right links"> - @auth - <a href="{{ url('/home') }}">Home</a> - @else - <a href="{{ route('login') }}">Login</a> - - @if (Route::has('register')) - <a href="{{ route('register') }}">Register</a> - @endif - @endauth - </div> - @endif - - <div class="content"> +@extends('main') +@section('content') <div class="title"> Prosongsa Songs </div> @@ -70,7 +12,3 @@ </a> @endforeach </ul> - </div> - </div> - </body> -</html> |