From 8c114198d6eb53d6d46eff3d0a0c7d1322d0a1ca Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Thu, 10 Aug 2017 00:31:13 -0500
Subject: [PATCH] styling, add admin link. point register page to main design.
 wrap nav links

---
 resources/views/admin/app.blade.php           |   2 +-
 resources/views/layouts/default/app.blade.php |  83 +++++++-----
 .../layouts/default/auth/register.blade.php   |   9 +-
 .../layouts/default/dashboard/index.blade.php |  53 --------
 .../views/layouts/default/home.blade.php      | 124 +++++-------------
 5 files changed, 91 insertions(+), 180 deletions(-)

diff --git a/resources/views/admin/app.blade.php b/resources/views/admin/app.blade.php
index 16fb5fc9..ea7d360d 100644
--- a/resources/views/admin/app.blade.php
+++ b/resources/views/admin/app.blade.php
@@ -34,7 +34,7 @@
 
             <!-- Logo -->
             <a href="#" class="logo">
-                <b>phpvms<sup>4</sup></b>
+                <b>phpvms<sup>7</sup></b>
             </a>
 
             <!-- Header Navbar -->
diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php
index f083ce79..8e2f4151 100644
--- a/resources/views/layouts/default/app.blade.php
+++ b/resources/views/layouts/default/app.blade.php
@@ -42,36 +42,59 @@
              data-nav-image="/assets/frontend/img/blurred-image-1.jpg">
             <ul class="navbar-nav">
                 {{--<li class="nav-item active">--}}
-                <li class="nav-item">
-                    <a class="nav-link" href="{!! url('/dashboard') !!}">
-                        <i class="fa fa-tachometer" aria-hidden="true"></i>
-                        <p>Dashboard</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{!! url('/flights') !!}">
-                        <i class="fa fa-plane" aria-hidden="true"></i>
-                        <p>Flights</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{!! url('/pireps') !!}">
-                        <i class="fa fa-cloud-upload" aria-hidden="true"></i>
-                        <p>PIREPs</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{!! url('/profile') !!}">
-                        <i class="fa fa-user-circle-o" aria-hidden="true"></i>
-                        <p>Profile</p>
-                    </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#">
-                        <i class="fa fa-external-link-square" aria-hidden="true"></i>
-                        <p>Log Out</p>
-                    </a>
-                </li>
+                @if(!Auth::user())
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/login') !!}">
+                            <i class="fa fa-sign-in" aria-hidden="true"></i>
+                            <p>Login</p>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/register') !!}">
+                            <i class="fa fa-id-card-o" aria-hidden="true"></i>
+                            <p>Register</p>
+                        </a>
+                    </li>
+                @else
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/dashboard') !!}">
+                            <i class="fa fa-tachometer" aria-hidden="true"></i>
+                            <p>Dashboard</p>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/flights') !!}">
+                            <i class="fa fa-plane" aria-hidden="true"></i>
+                            <p>Flights</p>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/pireps') !!}">
+                            <i class="fa fa-cloud-upload" aria-hidden="true"></i>
+                            <p>PIREPs</p>
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/profile') !!}">
+                            <i class="fa fa-user-circle-o" aria-hidden="true"></i>
+                            <p>Profile</p>
+                        </a>
+                    </li>
+                    @if(Entrust::hasRole('admin'))
+                        <li class="nav-item">
+                            <a class="nav-link" href="{!! url('/admin') !!}">
+                                <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
+                                <p>Admin</p>
+                            </a>
+                        </li>
+                    @endif
+                    <li class="nav-item">
+                        <a class="nav-link" href="{!! url('/logout') !!}">
+                            <i class="fa fa-external-link-square" aria-hidden="true"></i>
+                            <p>Log Out</p>
+                        </a>
+                    </li>
+                @endif
             </ul>
         </div>
     </div>
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index 8bd0eb25..dacbd256 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -1,7 +1,9 @@
-@extends('layouts.default.auth.layout')
+@extends('layouts.default.app')
 
 @section('content')
-
+<div class="row">
+<div class="col-sm-3 push-3"></div>
+<div class="col-sm-6">
 <form class="form-signin" role="form" method="POST" action="{{ url('/register') }}">
     {{ csrf_field() }}
 
@@ -73,4 +75,7 @@
     </div>
 
 </form>
+</div>
+</div>
+</div>
 @endsection
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index a1ba60cb..0013abd4 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -1,59 +1,6 @@
 @extends('layouts.default.app')
 
 @section('content')
-<!--
-<div class="row">
-    <div class="col-sm-2">
-        <div class="card card-primary text-white">
-            <div class="card-block text-center">
-                <h4 class="">{!! $user->flights !!}</h4>
-                <h5 class="description" style="color: white;">flights</h5>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-2">
-        <div class="card card-primary text-white">
-            <div class="card-block text-center">
-                <h4 class="">{!! \App\Facades\Utils::secondsToTime($user->flight_time, false)!!}</h4>
-                <h5 class="description" style="color: white;">hours</h5>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-2">
-        <div class="card card-primary text-white">
-            <div class="card-block text-center">
-                <h4 class="">{!! $user->current_airport->icao !!}</h4>
-                <h5 class="description" style="color: white;">current airport</h5>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-2">
-        <div class="card card-primary text-white">
-            <div class="card-block text-center">
-                <h4 class="">{!! $user->current_airport->icao !!}</h4>
-                <h5 class="description" style="color: white;">current airport</h5>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-2">
-        <div class="card card-primary text-white">
-            <div class="card-block text-center">
-                <h4 class="">{!! $user->current_airport->icao !!}</h4>
-                <h5 class="description" style="color: white;">current airport</h5>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-2">
-        <div class="card card-primary text-white">
-            <div class="card-block text-center">
-                <h4 class="">{!! $user->current_airport->icao !!}</h4>
-                <h5 class="description" style="color: white;">current airport</h5>
-            </div>
-        </div>
-    </div>
-</div>
--->
-{{--<h3 class="description">welcome back, {!! $user->name !!}</h3>--}}
 <div class="row">
     <div class="col-sm-8">
         <div class="row">
diff --git a/resources/views/layouts/default/home.blade.php b/resources/views/layouts/default/home.blade.php
index a28c1e35..4694f140 100644
--- a/resources/views/layouts/default/home.blade.php
+++ b/resources/views/layouts/default/home.blade.php
@@ -1,97 +1,33 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+@extends('layouts.default.app')
 
-    <title>phpvms4</title>
-
-    <!-- Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
-
-    <!-- Styles -->
-    <style>
-        html, body {
-            background-color: #fff;
-            color: #636b6f;
-            font-family: 'Raleway';
-            font-weight: 100;
-            height: 100vh;
-            margin: 0;
-            background: url(img/bg2.jpg) no-repeat center center fixed;
-            -webkit-background-size: cover;
-            -moz-background-size: cover;
-            -o-background-size: cover;
-            background-size: cover;
-        }
-
-        .full-height {
-            height: 100vh;
-        }
-
-        .flex-center {
-            align-items: center;
-            display: flex;
-            justify-content: center;
-        }
-
-        .position-ref {
-            position: relative;
-        }
-
-        .top-right {
-            position: absolute;
-            right: 10px;
-            top: 18px;
-        }
-
-        .content {
-            text-align: center;
-        }
-
-        .title {
-            font-size: 84px;
-        }
-
-        .links > a {
-            color: #636b6f;
-            padding: 0 25px;
-            font-size: 12px;
-            font-weight: 600;
-            letter-spacing: .1rem;
-            text-decoration: none;
-            text-transform: uppercase;
-        }
-
-        .m-b-md {
-            margin-bottom: 30px;
-        }
-    </style>
-</head>
-<body>
-<div class="flex-center position-ref full-height">
-    @if (Route::has('login'))
-    <div class="top-right links">
-        @if(!Auth::user())
-            <a href="{{ url('/login') }}">Login</a>
-            <a href="{{ url('/register') }}">Register</a>
-        @else
-            @if(Entrust::hasRole('admin'))
-                <a href="{{ url('/admin') }}">Admin</a>
-            @endif
-            <a href="{{ url('/dashboard') }}">Dashboard</a>
-            <a href="{{ url('/logout') }}">Logout</a>
-        @endif
-    </div>
-    @endif
-
-    <div class="content">
-        <div class="title m-b-md">
-            phpVMS<sup style="">4</sup>
+@section('content')
+    <div class="row">
+        <div class="col-sm-3 push-3"></div>
+        <div class="col-sm-6 text-center">
+            <h1 class="description">phpVMS<sup>7</sup></h1>
+            <br />
+            <blockquote>
+                <p class="blockquote blockquote-primary">
+                    Oh! I have slipped the surly bonds of earth,<br />
+                    And danced the skies on laughter-silvered wings;<br />
+                    Sunward I've climbed, and joined the tumbling mirth<br />
+                    Of sun-split clouds, --and done a hundred things<br />
+                    You have not dreamed of --Wheeled and soared and swung<br />
+                    High in the sunlit silence. Hov'ring there<br />
+                    I've chased the shouting wind along, and flung<br />
+                    My eager craft through footless halls of air...<br />
+                    Up, up the long, delirious, burning blue<br />
+                    I've topped the wind-swept heights with easy grace<br />
+                    Where never lark or even eagle flew --<br />
+                    And, while with silent lifting mind I've trod<br />
+                    The high untrespassed sanctity of space,<br />
+                    Put out my hand, and touched the face of God.<br />
+                    <br>
+                    <small>
+                        - John Gillespie Magee, Jr
+                    </small>
+                </p>
+            </blockquote>
         </div>
-
     </div>
-</div>
-</body>
-</html>
+@endsection