MightyPork/datatable.directory
1
0
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

some fixes and removed the laravel ad-esque home view

Browse Source
This commit is contained in:
MightyPork
2018-07-09 00:17:07 +02:00
parent 6e2040249b
commit fd296e2d8f
5 changed files with 71 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/auth/login.blade.php
+8 -3
View File
@@ -65,11 +65,16 @@
<div class="card-body">
<a type="submit" href="{{route('oauth-github-authorize')}}" class="btn btn-dark">
{{ __('Register with GitHub') }}
</a>
<a type="submit" href="{{route('oauth-github-login')}}" class="btn btn-dark">
{{ __('Login with GitHub') }}
</a>
<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>
</div>
resources/views/layouts/app.blade.php
-4
View File
@@ -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>
resources/views/welcome.blade.php
+12 -90
View File
@@ -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>
@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 class="card-body">
<h1>Welcome to the public landing page.</h1>
</div>
</div>
</div>
</body>
</html>
</div>
</div>
@endsection
routes/web.php
+3
View File
@@ -17,6 +17,9 @@ Auth::routes();
Route::get('/', function () {
if (!Auth::guest()) {
return redirect('/home');
}
return view('welcome');
});
sideload/socialnorm/socialnorm/src/SocialNorm.php
+8 -6
View File
@@ -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;
}
}
}