From eeaa837c29c174fe7e07573a23d965d2aa8ffb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Mon, 16 Jul 2018 23:00:45 +0200 Subject: [PATCH] added some icons, small cleaning, create table page stub, table controller --- app/Http/Controllers/HomeController.php | 4 +- app/Http/Controllers/TableController.php | 18 ++++ app/Models/Concerns/Reportable.php | 2 +- app/Models/User.php | 10 +++ public/fonts/fa-dtbl-1.css | 47 ++++++++++ public/fonts/fa-dtbl-1.eot | Bin 0 -> 3772 bytes public/fonts/fa-dtbl-1.svg | 55 ++++++++++++ public/fonts/fa-dtbl-1.ttf | Bin 0 -> 3592 bytes public/fonts/fa-dtbl-1.woff2 | Bin 0 -> 1772 bytes resources/assets/sass/_variables.scss | 9 +- resources/assets/sass/app.scss | 17 +++- resources/views/about/privacy.blade.php | 27 ++++++ resources/views/{ => about}/terms.blade.php | 0 resources/views/auth/login.blade.php | 19 ++-- resources/views/auth/register.blade.php | 7 +- resources/views/home.blade.php | 59 ++++++++---- resources/views/layouts/app.blade.php | 94 ++++---------------- resources/views/layouts/footer.blade.php | 13 +++ resources/views/layouts/main-nav.blade.php | 57 ++++++++++++ resources/views/privacy.blade.php | 37 -------- resources/views/table/create.blade.php | 12 +++ routes/login.php | 67 ++++++++++++++ routes/web.php | 69 +------------- 23 files changed, 410 insertions(+), 213 deletions(-) create mode 100644 app/Http/Controllers/TableController.php create mode 100644 public/fonts/fa-dtbl-1.css create mode 100644 public/fonts/fa-dtbl-1.eot create mode 100644 public/fonts/fa-dtbl-1.svg create mode 100644 public/fonts/fa-dtbl-1.ttf create mode 100644 public/fonts/fa-dtbl-1.woff2 create mode 100644 resources/views/about/privacy.blade.php rename resources/views/{ => about}/terms.blade.php (100%) create mode 100644 resources/views/layouts/footer.blade.php create mode 100644 resources/views/layouts/main-nav.blade.php delete mode 100644 resources/views/privacy.blade.php create mode 100644 resources/views/table/create.blade.php create mode 100644 routes/login.php 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 0000000000000000000000000000000000000000..1aedfbad9f4e1df318d4f345685fe527a444896e GIT binary patch literal 3772 zcmds4YfM|$9si&E@&gP8{6Lh@;}8riu>oUD0)!I6NZXMSEw5Ec2?h*!0ZeQYmrPpS zq^i0{Xq&BzHl=FTY?J6?RidnWs2`$z*wRU*%A~4W6DdKZ=X)2(nlLkZh-y~ z@Siq(19#QgIsd-mj(<~u1!SU+l5e^1_A6v1O`ukD*&v=kftx?G3OX2uBm*`-1qP*n zzAKn`#DX(})`hT(M^S&rUL+O350rlbznSahz4Qe8;Pbfw9=nqcK(>v3b%e6SZ)iCi zG(&9e1GacLG3omvPLQ(`pYy`rTvHcKm=g(abLNRPFvt*os4y;xAqhe1UiVZz^BlIPh5(@gifwEsWI$ah+2zC$d`rrCnDPWp~?9TCBr zNN(kIMAt&W(~KHA&R7)sG;~^1FLj)eC4h8V7GzbB&sa2eyW7Gn)Jeb9vk@t=3O1;nFhntr4%sd#C>bTI&~FSGCp> zZU&@*Ej6&$Sad}7u@z6E>;=)eFW|w8Vy;8H=ENEV9sm*4!`K*Nwo3*g8 zNhvO|7CSqfCC-vIi7QU0nqAOey>LrUY*ouk|B;=U-Fpt$>dMP2DhhbO zc3{u$%+ABxBIVke&360RdS0iXci3GD#m6zN5eW@hke(h1uB!R{08B_tAxK|K^#C+3dw< zb{`w)^=W#abba&2zv*wB69ZTqt6Z3U@4d|7%lc=R4>vx#_Zv0ljz?|~d8rF_xGYQ) z375}0A5t&mwK1e;wV;Llol>(e6hTV*t9@UQf^weZQBIaEUnvXw^{xuPzk;3fhsz|+ zQu7)8oTE%)YO#ZLbq@@5>sOddE79zVNkiuTG%TiK5=YBc_!+P8gTk7Zk=JDog}W;p z1KrZO?g2@$6j%*>K3Akz^Ptwu=vY$|PvmT%KlMn^YzL7yp=)HH^`* zW9Bog%d}UA!hvqaO?%}BIXIXzCL>|$9ZQ$tsIXKDJ=ig$a<8DEpa45j0r3Bfo#??< zlr)9sR-Iu#O8zxm(ImIaTiWd5ts%*&albRdr9ZO?*0(fwbV)y}AJfnNYi@2ynSA-s zf__y$kBm64mu)>}$sKTU*}0c>+msNX$EN z^L@4@n`M`C6Bc0+O8-jMDr%I4*3#F7jY7G{$q?LC2uiijs9I*eY-A$rh<&@LXDAHK zKDU`PooaK)Tg5_=)(8NUHn+Ub)FXAVK}T7cLqA#OK%VF)1;PdmWSRGc8TE|a{_*TF zi>SLfRGKwmi3+9TCM?tA(wio%P^nyH!YXmO!-O@^6SRZIaU|r_ivwX2HJsBX z%7BsrK51}9jiX{3oH(c)hs!t(gEIvzhPuyb2Ji^rB;d3uZ#z9keZc!6S@hzN*@V6h z{50NaYNH0cDacAf;xuR}j1foE3G~96G4ONq>p}TnHs&mgVvMjh=f@BZ#CZ!7pmT6W zjb8XV1%3DX8it-$G;tIjqFH=L;c?HG^o-b8Xg-;{}^5|c4LnwU!Sc#2QNhhtNz z*a)AQ8i^%&8soM<*2nvM`*>5ZiPw#%)6;DY4XNQ|d^(*9rs5O9L~^VF{QBU%5+N)K zvCuIT6#^5Z_>E!=6y>#sgRQ|vJ~YdFq6cGqOLS^vHpsUok})2i8cp!TRNfxQN^_w* z1?56$G-r2kES?^p84AYX(*y1+qtU=fdT1hmtIIw2m^?ARZlV|2A)+5LSE~*1{USMH zEpjh{3sEat$hhv{P9Xe3M8{%01eeyBy0vYJu!pp7o_7 + + + + +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 0000000000000000000000000000000000000000..cf3fd691c866352df20ab3384b419208f4902e0b GIT binary patch literal 3592 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 literal 0 HcmV?d00001 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');