about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZach DeCook <zachdecook@gmail.com>2018-12-26 14:50:13 -0500
committerZach DeCook <zachdecook@gmail.com>2018-12-26 14:50:13 -0500
commit67436667e7f240e0df06fafc7fff187b72038945 (patch)
tree7b092c7177277091aa2d574f662336dda621effc
parentb2459a5f593ed143403b26dd722be7bf006a2516 (diff)
downloadprosongsa-67436667e7f240e0df06fafc7fff187b72038945.tar.gz
* Pages: Show title on each page
-rw-r--r--laravel/resources/views/home.blade.php1
-rw-r--r--laravel/resources/views/layouts/app.blade.php2
-rw-r--r--laravel/resources/views/main.blade.php51
-rw-r--r--laravel/resources/views/song.blade.php1
-rw-r--r--laravel/resources/views/welcome.blade.php1
5 files changed, 4 insertions, 52 deletions
diff --git a/laravel/resources/views/home.blade.php b/laravel/resources/views/home.blade.php
index 05dfca9..6b29ce1 100644
--- a/laravel/resources/views/home.blade.php
+++ b/laravel/resources/views/home.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title', 'Dashboard')
 
 @section('content')
 <div class="container">
diff --git a/laravel/resources/views/layouts/app.blade.php b/laravel/resources/views/layouts/app.blade.php
index ee7767c..a020e18 100644
--- a/laravel/resources/views/layouts/app.blade.php
+++ b/laravel/resources/views/layouts/app.blade.php
@@ -7,7 +7,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ config('app.name', 'Laravel') }}</title>
+    <title> @yield('title') </title>
 
     <!-- Scripts -->
     <script src="{{ asset('js/app.js') }}" defer></script>
diff --git a/laravel/resources/views/main.blade.php b/laravel/resources/views/main.blade.php
deleted file mode 100644
index 303327c..0000000
--- a/laravel/resources/views/main.blade.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<!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;
-                margin: 8px;
-            }
-
-            .top-right {
-                position: absolute;
-                right: 10px;
-                top: 18px;
-            }
-        </style>
-    </head>
-    <body>
-        <div>
-            @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
index daf2dd2..c166862 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title', $song['title'])
 @section('content')
 <div class='container'>
     <h2>{{$song['title']}}</h2>
diff --git a/laravel/resources/views/welcome.blade.php b/laravel/resources/views/welcome.blade.php
index 4ed5f3f..4e57621 100644
--- a/laravel/resources/views/welcome.blade.php
+++ b/laravel/resources/views/welcome.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.app')
+@section('title', "All songs")
 @section('content')
 <div class='container'>
                 <h1>