diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a3af7dd..b8df8bc 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -23,6 +23,8 @@ class HomeController extends Controller */ public function index() { - return view('home'); + $tables = \Auth::user()->tables()->paginate(10); + + return view('home')->with(compact('tables')); } } diff --git a/app/Http/Controllers/TableController.php b/app/Http/Controllers/TableController.php new file mode 100644 index 0000000..576478c --- /dev/null +++ b/app/Http/Controllers/TableController.php @@ -0,0 +1,18 @@ +reportsOf()->delete(); diff --git a/app/Models/User.php b/app/Models/User.php index b23188a..1ade1b6 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -7,6 +7,7 @@ use App\Models\Concerns\Reportable; use Illuminate\Database\Eloquent\Collection; use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notification; /** * A user in the application @@ -126,4 +127,13 @@ class User extends Authenticatable { $this->followedDiscussions()->detach($table); } + + public function fakeTables() + { + return [ + (object)['title' => 'Table 1'], + (object)['title' => 'Table 2'], + (object)['title' => 'Table 3'] + ]; + } } diff --git a/public/fonts/fa-dtbl-1.css b/public/fonts/fa-dtbl-1.css new file mode 100644 index 0000000..fe8f918 --- /dev/null +++ b/public/fonts/fa-dtbl-1.css @@ -0,0 +1,47 @@ +/*! + * Based on Fork Awesome 1.1.0, originaly by Dave Gandy - http://forkawesome.github.io/Fork-Awesome/ + * License - http://forkawesome.github.io/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License) + */ +@font-face { + font-family: 'fa-dtbl-1'; + src: url('./fa-dtbl-1.eot?v=1.1.0'); + src: url('./fa-dtbl-1.eot?#iefix&v=1.1.0') format('embedded-opentype'), + url('./fa-dtbl-1.woff2?v=1.1.0') format('woff2'), + url('./fa-dtbl-1.ttf?v=1.1.0') format('truetype'), + url('./fa-dtbl-1.svg?v=1.1.0#fa-dtbl-1') format('svg'); + font-weight: normal; + font-style: normal; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "fa-dtbl-1"; + src: url("./fa-dtbl-1.svg#fa-dtbl-1") format("svg"); + } +} + +[data-icon]::before { content: attr(data-icon); } + +[data-icon]::before, [class^="fa-"]::before, [class*=" fa-"]::before { + display: inline-block; + font-family: "fa-dtbl-1"; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + font-size: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; +} + +.fa-facebook-square::before { content: "\f100"; } +.fa-github::before { content: "\f101"; } +.fa-google::before { content: "\f102"; } +.fa-sign-in::before { content: "\f103"; } +.fa-sign-out::before { content: "\f104"; } +.fa-user-circle-o::before { content: "\f105"; } +.fa-user-plus::before { content: "\f106"; } diff --git a/public/fonts/fa-dtbl-1.eot b/public/fonts/fa-dtbl-1.eot new file mode 100644 index 0000000..1aedfba Binary files /dev/null and b/public/fonts/fa-dtbl-1.eot differ diff --git a/public/fonts/fa-dtbl-1.svg b/public/fonts/fa-dtbl-1.svg new file mode 100644 index 0000000..27b577e --- /dev/null +++ b/public/fonts/fa-dtbl-1.svg @@ -0,0 +1,55 @@ + + + + + +Created by FontForge 20170805 at Mon Jul 16 22:14:13 2018 + By ondra +The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io + + + + + + + + + + + + + + + diff --git a/public/fonts/fa-dtbl-1.ttf b/public/fonts/fa-dtbl-1.ttf new file mode 100644 index 0000000..cf3fd69 Binary files /dev/null and b/public/fonts/fa-dtbl-1.ttf differ diff --git a/public/fonts/fa-dtbl-1.woff2 b/public/fonts/fa-dtbl-1.woff2 new file mode 100644 index 0000000..36240f5 Binary files /dev/null and b/public/fonts/fa-dtbl-1.woff2 differ diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 845f780..45bc727 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -1,6 +1,6 @@ // Body -$body-bg: #f5f8fa; +$body-bg: white;//$gray-300; // Typography $font-family-sans-serif: "IBM Plex Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif; @@ -12,3 +12,10 @@ $link-decoration: none; $link-hover-color: darken($link-color, 15%); $link-hover-decoration: underline; +$card-cap-bg: lighten($primary, 5); +$card-border-color: $primary; +//$card-border-width: 2px; +$card-border-radius: 5px; +$card-inner-border-radius: 2px; + +$list-group-hover-bg: rgba($primary, .1); diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 4580278..82008a1 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,6 +1,6 @@ // Fonts -@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); +//@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); // Variables @import "bst-base"; @@ -9,11 +9,22 @@ .page-navbar { background: white; - border-bottom: 1px solid $gray-400; + border-bottom: 1px solid $primary; + + box-shadow: 0 -3px 8px rgba(black, 1); } .page-footer { font-size: 95%; background: $body-bg; - border-top: 2px solid white; + border-top: 2px dotted $gray-200; +} + +.card-header { + color: white; + font-weight: bold; +} + +.card { + box-shadow: 0 2px 3px rgba(black, .3); } diff --git a/resources/views/about/privacy.blade.php b/resources/views/about/privacy.blade.php new file mode 100644 index 0000000..74da31f --- /dev/null +++ b/resources/views/about/privacy.blade.php @@ -0,0 +1,27 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
Privacy Statement
+ +
+

+ datatable.directory does not collect anything beyond what users + themselves enter in the application, plus limited data from OAuth providers + when a social login is used. User IP addresses and other data, such as the + user agent, are briefly stored in the web server log as a byproduct of the + server operation, and serve debugging purposes only. +

+ +

+ We do not share private data with any third parties. +

+
+
+
+
+
+@endsection diff --git a/resources/views/terms.blade.php b/resources/views/about/terms.blade.php similarity index 100% rename from resources/views/terms.blade.php rename to resources/views/about/terms.blade.php diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 5642e51..6f62a57 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -53,10 +53,14 @@
+ {{-- - + --}} {{ __('Forgot Your Password?') }} + {{-- + + --}} + {{ __('Register') }}
@@ -65,29 +69,26 @@
- {{ __('Log in with') }} + {{ __('Login with') }}
@set('services.oauth_providers.github.client_id') + {{ __('GitHub') }} @endset - {{--@set('services.oauth_providers.stack.client_id') - - {{ __('StackOverflow') }} - - @endset--}} - @set('services.oauth_providers.google.client_id') + {{ __('Google') }} @endset @set('services.oauth_providers.facebook.client_id') + {{ __('Facebook') }} @endset diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 84bb51b..abb4241 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -71,12 +71,11 @@
-
- You can also log in with +
+ You can also register by logging in with Google, GitHub, - or Facebook, - without the need to register. + or Facebook.
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 05dfca9..44a504f 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,23 +1,50 @@ @extends('layouts.app') @section('content') -
+
+
-
-
-
Dashboard
- -
- @if (session('status')) - - @endif - - You are logged in! -
-
+ + {{-- Dash card --}} +
+
+
Dashboard
+ +
+ @if (session('status')) + + @endif + +

You are logged in!

+ +

blabla dashboard things ...

+
+
+
+ + {{-- Table list card --}} +
+
+
+ Your Tables + New +
+ +
+ @if(count($tables) == 0) + No tables yet. + @else + @foreach($tables as $table) + {{ $table->title }} + @endforeach + {{ $tables->links() }} + @endif +
+
-
+
@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index fd6225b..1b5b46e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,89 +1,31 @@ - - - + + + - - + + - {{ config('app.name', 'Laravel') }} + {{ config('app.name', 'Laravel') }} - - + + - - + + + -
- - -
- @yield('content') -
- - -
+ @include('layouts.footer') +
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php new file mode 100644 index 0000000..b77674b --- /dev/null +++ b/resources/views/layouts/footer.blade.php @@ -0,0 +1,13 @@ + diff --git a/resources/views/layouts/main-nav.blade.php b/resources/views/layouts/main-nav.blade.php new file mode 100644 index 0000000..f1412a1 --- /dev/null +++ b/resources/views/layouts/main-nav.blade.php @@ -0,0 +1,57 @@ + diff --git a/resources/views/privacy.blade.php b/resources/views/privacy.blade.php deleted file mode 100644 index 387ebec..0000000 --- a/resources/views/privacy.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -@extends('layouts.app') - -@section('content') -
-
-
-
-
Privacy Statement
- -
-

- datatable.directory collects visit counts the purpose of submission - popularity ranking and internal statistics. User IP addresses and other - data, such as the user agent string, is briefly stored in the web server - log. This data is the byproduct of the server operation and serves debugging - purposes only. -

- -

- We store users' e-mail addresses for the purpose of login authentication, - together with other profile information entered by the user. Passwords - are securely hashed in the database; nonetheless users are encouraged to - use a unique password generated by a password manager, or use one of the - social login options, which removes the use of a password altogether. -

- -

- We do not share any data with any third parties, and do not use advertising - that would compromise user privacy. The website is supported entirely by - donations. -

-
-
-
-
-
-@endsection diff --git a/resources/views/table/create.blade.php b/resources/views/table/create.blade.php new file mode 100644 index 0000000..905decf --- /dev/null +++ b/resources/views/table/create.blade.php @@ -0,0 +1,12 @@ +@extends('layouts.app') + +@section('content') +
+
+ {{-- Dash card --}} +
+ asdf +
+
+
+@endsection diff --git a/routes/login.php b/routes/login.php new file mode 100644 index 0000000..b4b315d --- /dev/null +++ b/routes/login.php @@ -0,0 +1,67 @@ +exists) { + $user->name = $details->nickname ?: ($details->full_name ?: $details->email); + } + + // set e-mail from provider data, only if user e-mail is empty + if ("$user->email" === "") { + $user->email = $details->email; + } + }); + } catch (ApplicationRejectedException $e) { + abort(401, $e->getMessage()); + } catch (InvalidAuthorizationCodeException $e) { + abort(401, $e->getMessage()); + } + return Redirect::intended(); +}; + + +Route::get('/auth/github/authorize', function() { + return SocialAuth::authorize('github'); +})->name('oauth-github-authorize'); + +Route::get('/auth/github/callback', function() { + return _loginVia('github'); +})->name('oauth-github-callback'); + + +Route::get('/auth/google/authorize', function() { + return SocialAuth::authorize('google'); +})->name('oauth-google-authorize'); + +Route::get('/auth/google/callback', function() { + return _loginVia('google'); +})->name('oauth-google-callback'); + + +Route::get('/auth/facebook/authorize', function() { + return SocialAuth::authorize('facebook'); +})->name('oauth-facebook-authorize'); + +Route::get('/auth/facebook/callback', function() { + return _loginVia('facebook'); +})->name('oauth-facebook-callback'); + +/* +Route::get('/auth/stack/authorize', function() { + return SocialAuth::authorize('stack'); +})->name('oauth-stack-authorize'); + +Route::get('/auth/stack/callback', function() { + return _loginVia('stack'); +})->name('oauth-stack-callback'); +*/ diff --git a/routes/web.php b/routes/web.php index 7f3292a..73db1ef 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,4 @@ name('home'); -// ----------------- SOCIAL LOGIN -------------------- - -function _loginVia($method) { - try { - SocialAuth::login($method, function (\App\Models\User $user, ProviderUser $details) { - // update user name first time user logs in - if (!$user->exists) { - $user->name = $details->nickname ?: ($details->full_name ?: $details->email); - } - - // set e-mail from provider data, only if user e-mail is empty - if ("$user->email" === "") { - $user->email = $details->email; - } - }); - } catch (ApplicationRejectedException $e) { - abort(401, $e->getMessage()); - } catch (InvalidAuthorizationCodeException $e) { - abort(401, $e->getMessage()); - } - return Redirect::intended(); -}; - - -Route::get('/auth/github/authorize', function() { - return SocialAuth::authorize('github'); -})->name('oauth-github-authorize'); - -Route::get('/auth/github/callback', function() { - return _loginVia('github'); -})->name('oauth-github-callback'); - - -Route::get('/auth/google/authorize', function() { - return SocialAuth::authorize('google'); -})->name('oauth-google-authorize'); - -Route::get('/auth/google/callback', function() { - return _loginVia('google'); -})->name('oauth-google-callback'); - - -Route::get('/auth/facebook/authorize', function() { - return SocialAuth::authorize('facebook'); -})->name('oauth-facebook-authorize'); - -Route::get('/auth/facebook/callback', function() { - return _loginVia('facebook'); -})->name('oauth-facebook-callback'); - -/* -Route::get('/auth/stack/authorize', function() { - return SocialAuth::authorize('stack'); -})->name('oauth-stack-authorize'); - -Route::get('/auth/stack/callback', function() { - return _loginVia('stack'); -})->name('oauth-stack-callback'); -*/ +Route::get('/table/create', 'TableController@create')->name('table.create');