some fixes and removed the laravel ad-esque home view

6 years ago · fd296e2d8f
parent 6e2040249b
commit fd296e2d8f
5 changed files with 79 additions and 151 deletions
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@ -65,10 +65,15 @@

 				<div class="card-body">
 					<a type="submit" href="{{route('oauth-github-authorize')}}" class="btn btn-dark">
-						{{ __('Register with GitHub') }}
+						{{ __('Login with GitHub') }}
 					</a>
-					<a type="submit" href="{{route('oauth-github-login')}}" class="btn btn-dark">
-						{{ __('Log in with GitHub') }}
+
+					<a type="submit" href="{{route('oauth-google-authorize')}}" class="btn btn-dark">
+						{{ __('Login with Google') }}
+					</a>
+
+					<a type="submit" href="{{route('oauth-facebook-authorize')}}" class="btn btn-dark">
+						{{ __('Login with Facebook') }}
 					</a>
 				</div>
            </div>
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@ -13,10 +13,6 @@
    <!-- Scripts -->
    <script src="{{ asset('js/app.js') }}" defer></script>

-    <!-- Fonts -->
-    <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600" rel="stylesheet" type="text/css">
-
    <!-- Styles -->
    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@ -1,95 +1,17 @@
-<!doctype html>
-<html lang="{{ app()->getLocale() }}">
-    <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.app')

-        <title>Laravel</title>
+@section('content')
+	<div class="container">
+		<div class="row justify-content-center">
+			<div class="col-md-8">
+				<div class="card">
+					<div class="card-header">Dashboard</div>

-        <!-- 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', sans-serif;
-                font-weight: 100;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .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">
-                    @auth
-                        <a href="{{ url('/home') }}">Home</a>
-                    @else
-                        <a href="{{ route('login') }}">Login</a>
-                        <a href="{{ route('register') }}">Register</a>
-                    @endauth
+					<div class="card-body">
+						<h1>Welcome to the public landing page.</h1>
 					</div>
-            @endif
-
-            <div class="content">
-                <div class="title m-b-md">
-                    Laravel
 				</div>
-
-                <div class="links">
-                    <a href="https://laravel.com/docs">Documentation</a>
-                    <a href="https://laracasts.com">Laracasts</a>
-                    <a href="https://laravel-news.com">News</a>
-                    <a href="https://forge.laravel.com">Forge</a>
-                    <a href="https://github.com/laravel/laravel">GitHub</a>
 			</div>
 		</div>
 	</div>
-    </body>
-</html>
+@endsection
--- a/routes/web.php
+++ b/routes/web.php
@ -17,6 +17,9 @@ Auth::routes();


 Route::get('/', function () {
+	if (!Auth::guest()) {
+		return redirect('/home');
+	}
    return view('welcome');
 });

--- a/sideload/socialnorm/socialnorm/src/SocialNorm.php
+++ b/sideload/socialnorm/socialnorm/src/SocialNorm.php
@ -1,7 +1,6 @@
 <?php namespace SocialNorm;

 use SocialNorm\Exceptions\InvalidAuthorizationCodeException;
-use SocialNorm\State\StateManager;

 class SocialNorm
 {
@ -31,7 +30,11 @@ class SocialNorm
 	public function authorize($providerAlias)
 	{
 		$state = $this->stateGenerator->generate();
-        $this->session->put('oauth.state', $state);
+
+		// this is for some reason needed, plain put doesn't work across the redirect
+		\Session::put('oauth.state', $state);
+		\Session::save();
+
 		return $this->getProvider($providerAlias)->authorizeUrl($state);
 	}

@ -48,9 +51,8 @@ class SocialNorm

 	protected function verifyState()
 	{
-    	// FIXME this is broken, can't find why
-//        if ($this->session->get('oauth.state') !== $this->request->state()) {
-//            throw new InvalidAuthorizationCodeException;
-//        }
+        if (\Session::get('oauth.state') !== $this->request->state()) {
+            throw new InvalidAuthorizationCodeException;
+        }
 	}
 }