User login updates

composer.json

@@ -11,6 +11,8 @@
     ],
     "require": {
       "igaster/laravel-theme": "^2.0",
+      "acacha/user": "^0.2.2",
+      "creativeorange/gravatar": "^1.0",
       "orchestra/asset": "^3.6"
     },
     "require-dev": {

resources/themes/adminlte/lang/en/message.php

@@ -30,9 +30,10 @@ return [
     'signFacebook'            => 'Sign in using Facebook',
     'signTwitter'             => 'Sign in using Twitter',
     'signGoogle+'             => 'Sign in using Google+',
-    'signLinkedin'             => 'Sign in using Linkedin',
+    'signLinkedin'            => 'Sign in using Linkedin',
     'signW3id'                => 'Sign in using W3id',
     'signIBMid'               => 'Sign in using IBMid',
+	'signMeetup'              => 'Sign in using Meetup',
     'sendpassword'            => 'Send Password Reset Link',
     'passwordreset'           => 'Reset password',
     'pagenotfound'            => 'Page not found',

resources/themes/adminlte/views/layouts/partials/contentheader.blade.php

@@ -14,7 +14,7 @@
 							<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
 						@endforeach
 					@endisset
-					<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li>
+					<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
 				</ol>
 			</div><!-- /.col -->
 		</div><!-- /.row -->

resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php

@@ -16,8 +16,14 @@
 	<link rel="stylesheet" href="/css/adminlte.min.css">
 	<!-- Google Font: Source Sans Pro -->
 	<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
-	<!-- Printing Modifications -->
-	<link rel="stylesheet" href="/css/print.css">
+	@if(file_exists('css/social.css'))
+		<!-- Social Logins -->
+		<link rel="stylesheet" href="/css/social.css">
+	@endif
+	@if(file_exists('css/print.css'))
+		<!-- Printing Modifications -->
+		<link rel="stylesheet" href="/css/print.css">
+	@endif
 
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -45,4 +51,9 @@
 
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
+
+	@if(file_exists('css/fixes.css'))
+	<!-- CSS Fixes -->
+		<link rel="stylesheet" href="/css/fixes.css">
+	@endif
 </head>

resources/themes/adminlte/views/layouts/partials/mainheader.blade.php

@@ -46,6 +46,8 @@
 					</a>
 				</div>
 			</li>
+		@else
+			<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
 		@endif
 
 		<!-- Control Side Bar -->

resources/themes/adminlte/views/layouts/partials/scripts.blade.php

@@ -5,51 +5,51 @@
 <!-- AdminLTE -->
 <script src="/js/adminlte.min.js"></script>
 
-<!-- Our our CSRF token to each interaction -->
-{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
 <script type="text/javascript">
-    $.ajaxSetup({
-        headers: {
-            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-        }
-    });
+	// Our CSRF token to each interaction
+	$.ajaxSetup({
+		headers: {
+			'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+		}
+	});
 
-    $.AdminLTESidebarTweak = {};
+	$.AdminLTESidebarTweak = {};
 
-    $.AdminLTESidebarTweak.options = {
-        EnableRemember: true,
-        //Removes the transition after page reload.
-        NoTransitionAfterReload: false
-    };
+	$.AdminLTESidebarTweak.options = {
+		EnableRemember: true,
+		//Removes the transition after page reload.
+		NoTransitionAfterReload: false
+	};
 
-    $(function () {
-        "use strict";
+	$(function () {
+		"use strict";
 
-        $("body").on("collapsed.lte.pushmenu", function(){
-            if($.AdminLTESidebarTweak.options.EnableRemember){
-                document.cookie = "toggleState=closed";
-            }
-        });
+		$("body").on("collapsed.lte.pushmenu", function(){
+			if($.AdminLTESidebarTweak.options.EnableRemember){
+				document.cookie = "toggleState=closed";
+			}
+		});
 
-        $("body").on("expanded.lte.pushmenu", function(){
-            if($.AdminLTESidebarTweak.options.EnableRemember){
-                document.cookie = "toggleState=opened";
-            }
-        });
+		// @todo this is not firing.
+		$("body").on("expanded.lte.pushmenu", function(){
+			if($.AdminLTESidebarTweak.options.EnableRemember){
+				document.cookie = "toggleState=opened";
+			}
+		});
 
-        if($.AdminLTESidebarTweak.options.EnableRemember){
-            var re = new RegExp('toggleState' + "=([^;]+)");
-            var value = re.exec(document.cookie);
-            var toggleState = (value != null) ? unescape(value[1]) : null;
-            if(toggleState == 'closed'){
-                if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){
-                    $("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
-                        $(this).removeClass('hold-transition');
-                    });
-                }else{
-                    $("body").addClass('sidebar-collapse');
-                }
-            }
-        }
-    });
+		if($.AdminLTESidebarTweak.options.EnableRemember){
+			var re = new RegExp('toggleState' + "=([^;]+)");
+			var value = re.exec(document.cookie);
+			var toggleState = (value != null) ? unescape(value[1]) : null;
+			if(toggleState == 'closed'){
+				if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){
+					$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
+						$(this).removeClass('hold-transition');
+					});
+				}else{
+					$("body").addClass('sidebar-collapse');
+				}
+			}
+		}
+	});
 </script>

resources/themes/adminlte/views/layouts/partials/sidebar.blade.php

@@ -11,10 +11,10 @@
 		<!-- Sidebar user panel (optional) -->
 		<div class="user-panel mt-3 pb-3 mb-3 d-flex">
 			<div class="image">
-				<img src="{{ Gravatar::get($user->exists ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
+				<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
 			</div>
 			<div class="info">
-				<a class="d-block">{{ $user->name ?: 'Nobody' }}</a>
+				<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
 			</div>
 		</div>