From 4c1ec1ba2fce41bf54d4b357d635cc9fc90e5bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sat, 28 Jul 2018 19:04:37 +0200 Subject: [PATCH] mix up the navbar a bit --- app/Models/User.php | 7 + public/fonts/fa-dtbl-1-preview.html | 125 ++++--- public/fonts/fa-dtbl-1.css | 55 +-- public/fonts/fa-dtbl-1.eot | Bin 13164 -> 13356 bytes public/fonts/fa-dtbl-1.svg | 63 ++-- public/fonts/fa-dtbl-1.ttf | Bin 12984 -> 13176 bytes public/fonts/fa-dtbl-1.woff2 | Bin 6364 -> 6452 bytes resources/assets/sass/_helpers.scss | 4 + resources/views/layouts/nav-buttons.blade.php | 8 +- .../views/profile/edit-account.blade.php | 12 +- .../views/profile/edit-profile.blade.php | 4 +- resources/views/table/view.blade.php | 348 +++++++++--------- routes/web.php | 3 - 13 files changed, 331 insertions(+), 298 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index ad09db3..aef3348 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -182,4 +182,11 @@ class User extends Authenticatable { return $table->owner_id == $this->id; } + + public function favouritesTable(Table $table) + { + return \DB::table('table_favourites') + ->where('user_id', $this->id) + ->where('table_id', $table->id)->exists(); + } } diff --git a/public/fonts/fa-dtbl-1-preview.html b/public/fonts/fa-dtbl-1-preview.html index e950de0..6353ee4 100644 --- a/public/fonts/fa-dtbl-1-preview.html +++ b/public/fonts/fa-dtbl-1-preview.html @@ -183,6 +183,7 @@ .fa-globe:before, .fa-google:before, .fa-history:before, +.fa-home:before, .fa-inbox:before, .fa-key-modern:before, .fa-link:before, @@ -246,33 +247,34 @@ .fa-globe:before { content: "\f113"; } .fa-google:before { content: "\f114"; } .fa-history:before { content: "\f115"; } -.fa-inbox:before { content: "\f116"; } -.fa-key-modern:before { content: "\f117"; } -.fa-link:before { content: "\f118"; } -.fa-pencil:before { content: "\f119"; } -.fa-pencil-square-o:before { content: "\f11a"; } -.fa-question-circle:before { content: "\f11b"; } -.fa-quote-left:before { content: "\f11c"; } -.fa-reply:before { content: "\f11d"; } -.fa-rss:before { content: "\f11e"; } -.fa-search:before { content: "\f11f"; } -.fa-share-alt:before { content: "\f120"; } -.fa-sign-in:before { content: "\f121"; } -.fa-sign-out:before { content: "\f122"; } -.fa-sliders:before { content: "\f123"; } -.fa-sort:before { content: "\f124"; } -.fa-sort-asc:before { content: "\f125"; } -.fa-sort-desc:before { content: "\f126"; } -.fa-star:before { content: "\f127"; } -.fa-star-o:before { content: "\f128"; } -.fa-table:before { content: "\f129"; } -.fa-th-list:before { content: "\f12a"; } -.fa-times:before { content: "\f12b"; } -.fa-trash:before { content: "\f12c"; } -.fa-trash-o:before { content: "\f12d"; } -.fa-user-circle-o:before { content: "\f12e"; } -.fa-user-plus:before { content: "\f12f"; } -.fa-wrench:before { content: "\f130"; } +.fa-home:before { content: "\f116"; } +.fa-inbox:before { content: "\f117"; } +.fa-key-modern:before { content: "\f118"; } +.fa-link:before { content: "\f119"; } +.fa-pencil:before { content: "\f11a"; } +.fa-pencil-square-o:before { content: "\f11b"; } +.fa-question-circle:before { content: "\f11c"; } +.fa-quote-left:before { content: "\f11d"; } +.fa-reply:before { content: "\f11e"; } +.fa-rss:before { content: "\f11f"; } +.fa-search:before { content: "\f120"; } +.fa-share-alt:before { content: "\f121"; } +.fa-sign-in:before { content: "\f122"; } +.fa-sign-out:before { content: "\f123"; } +.fa-sliders:before { content: "\f124"; } +.fa-sort:before { content: "\f125"; } +.fa-sort-asc:before { content: "\f126"; } +.fa-sort-desc:before { content: "\f127"; } +.fa-star:before { content: "\f128"; } +.fa-star-o:before { content: "\f129"; } +.fa-table:before { content: "\f12a"; } +.fa-th-list:before { content: "\f12b"; } +.fa-times:before { content: "\f12c"; } +.fa-trash:before { content: "\f12d"; } +.fa-trash-o:before { content: "\f12e"; } +.fa-user-circle-o:before { content: "\f12f"; } +.fa-user-plus:before { content: "\f130"; } +.fa-wrench:before { content: "\f131"; } @@ -288,7 +290,7 @@
-

fa-dtbl-1 contains 49 glyphs:

+

fa-dtbl-1 contains 50 glyphs:

Toggle Preview Characters
@@ -582,6 +584,19 @@
+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -591,7 +606,7 @@
- +
@@ -604,7 +619,7 @@
- +
@@ -617,7 +632,7 @@
- +
@@ -630,7 +645,7 @@
- +
@@ -644,7 +659,7 @@
- +
@@ -657,7 +672,7 @@
- +
@@ -670,7 +685,7 @@
- +
@@ -683,7 +698,7 @@
- +
@@ -696,7 +711,7 @@
- +
@@ -709,7 +724,7 @@
- +
@@ -722,7 +737,7 @@
- +
@@ -735,7 +750,7 @@
- +
@@ -748,7 +763,7 @@
- +
@@ -761,7 +776,7 @@
- +
@@ -774,7 +789,7 @@
- +
@@ -787,7 +802,7 @@
- +
@@ -800,7 +815,7 @@
- +
@@ -813,7 +828,7 @@
- +
@@ -826,7 +841,7 @@
- +
@@ -839,7 +854,7 @@
- +
@@ -852,7 +867,7 @@
- +
@@ -866,7 +881,7 @@
- +
@@ -879,7 +894,7 @@
- +
@@ -892,7 +907,7 @@
- +
@@ -905,7 +920,7 @@
- +
@@ -918,7 +933,7 @@
- +
@@ -931,7 +946,7 @@
- +
diff --git a/public/fonts/fa-dtbl-1.css b/public/fonts/fa-dtbl-1.css index 70017fb..1c1581d 100644 --- a/public/fonts/fa-dtbl-1.css +++ b/public/fonts/fa-dtbl-1.css @@ -60,30 +60,31 @@ .fa-globe::before { content: "\f113"; } .fa-google::before { content: "\f114"; } .fa-history::before { content: "\f115"; } -.fa-inbox::before { content: "\f116"; } -.fa-key-modern::before { content: "\f117"; } -.fa-link::before { content: "\f118"; } -.fa-pencil::before { content: "\f119"; } -.fa-pencil-square-o::before, .fa-edit::before { content: "\f11a"; } -.fa-question-circle::before { content: "\f11b"; } -.fa-quote-left::before { content: "\f11c"; } -.fa-reply::before { content: "\f11d"; } -.fa-rss::before { content: "\f11e"; } -.fa-search::before { content: "\f11f"; } -.fa-share-alt::before { content: "\f120"; } -.fa-sign-in::before { content: "\f121"; } -.fa-sign-out::before { content: "\f122"; } -.fa-sliders::before { content: "\f123"; } -.fa-sort::before { content: "\f124"; } -.fa-sort-asc::before { content: "\f125"; } -.fa-sort-desc::before { content: "\f126"; } -.fa-star::before { content: "\f127"; } -.fa-star-o::before { content: "\f128"; } -.fa-table::before { content: "\f129"; } -.fa-th-list::before { content: "\f12a"; } -.fa-times::before, .fa-close::before { content: "\f12b"; } -.fa-trash::before { content: "\f12c"; } -.fa-trash-o::before { content: "\f12d"; } -.fa-user-circle-o::before { content: "\f12e"; } -.fa-user-plus::before { content: "\f12f"; } -.fa-wrench::before { content: "\f130"; } +.fa-home::before { content: "\f116"; } +.fa-inbox::before { content: "\f117"; } +.fa-key-modern::before { content: "\f118"; } +.fa-link::before { content: "\f119"; } +.fa-pencil::before { content: "\f11a"; } +.fa-pencil-square-o::before, .fa-edit::before { content: "\f11b"; } +.fa-question-circle::before { content: "\f11c"; } +.fa-quote-left::before { content: "\f11d"; } +.fa-reply::before { content: "\f11e"; } +.fa-rss::before { content: "\f11f"; } +.fa-search::before { content: "\f120"; } +.fa-share-alt::before { content: "\f121"; } +.fa-sign-in::before { content: "\f122"; } +.fa-sign-out::before { content: "\f123"; } +.fa-sliders::before { content: "\f124"; } +.fa-sort::before { content: "\f125"; } +.fa-sort-asc::before { content: "\f126"; } +.fa-sort-desc::before { content: "\f127"; } +.fa-star::before { content: "\f128"; } +.fa-star-o::before { content: "\f129"; } +.fa-table::before { content: "\f12a"; } +.fa-th-list::before { content: "\f12b"; } +.fa-times::before, .fa-close::before { content: "\f12c"; } +.fa-trash::before { content: "\f12d"; } +.fa-trash-o::before { content: "\f12e"; } +.fa-user-circle-o::before { content: "\f12f"; } +.fa-user-plus::before { content: "\f130"; } +.fa-wrench::before { content: "\f131"; } diff --git a/public/fonts/fa-dtbl-1.eot b/public/fonts/fa-dtbl-1.eot index 601d96391b43b898ca53ca838a18654113260f62..177974abd916c1d89326d288fdd5b288d302c167 100644 GIT binary patch delta 646 zcmY*VO=uHA6n<~A-E97L^Vby9qA@X>9!hJr%~o4!Q}9%34JsH#Frl^y+HHa@rFuz_ zsyAufBIGK1k%B@&a#PTwP!X*f1&fFW(H*G3YgFYhZX<`-Fl071?qGH{)_No$ zbBsGX1$HtVe)dH4`$ePpQ0Uy4-___qRi8|rXQ=4)3E44o|Fc?$- z9Vx@W2vh~c_a-~k#`D{JW#DE93NSESZ}RSg(f{B6`^Uk+22#nvz{J2X`3R%Bswr5f zDWfn0KS&)&94G=(kBKjVZy&!7e*%9U{~Z2X0y=^mf_;J)go1=#2wMrS68^QBg|$j# ov!2v-aYob0Y(`m=i;UJ!Rx^I0$OsHih~+>#udZPPIRVA_0J2DMBme*a diff --git a/public/fonts/fa-dtbl-1.svg b/public/fonts/fa-dtbl-1.svg index 15de0cf..858fb1b 100644 --- a/public/fonts/fa-dtbl-1.svg +++ b/public/fonts/fa-dtbl-1.svg @@ -5,7 +5,7 @@ --> -Created by FontForge 20170805 at Sat Jul 28 18:34:22 2018 +Created by FontForge 20170805 at Sat Jul 28 18:55:50 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 @@ -19,10 +19,10 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ panose-1="2 0 5 3 0 0 0 0 0 0" ascent="1536" descent="-256" - bbox="-0.0376684 -256.168 2048 1536.01" + bbox="-0.14014 -256.168 2048 1536.01" underline-thickness="89.6" underline-position="-179.2" - unicode-range="U+0020-F130" + unicode-range="U+0020-F131" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/fonts/fa-dtbl-1.ttf b/public/fonts/fa-dtbl-1.ttf index 3df7d2dce8d3e487fa537995ef8e40b956b89235..d6fb097d778f7ef2f45d9896238384a4a0e2399e 100644 GIT binary patch delta 606 zcmYLHOK1~O6utLlnoK@3`8Jib>e$$67Sc9pGtoxU7NkgNHE6*o1vA8?L6aufP^y~* ziMW&6DS?VB(TxZe0utO*a4RT+Rij`LapA&+L~)bE+qjUoxSVtDyZ4>Lt0n)Wihuwh zKnZjZot~bbD{tK&0vKH&w(s=W;XwTLm4^TrBOFg;)%=%%?lu5hBW@sQk0WKk9G7=kp+Ma1EB zwy-+>0eT772*1zd5~_2+sL+C4!b@3oH4nG&1nEZ!OG|1txp{Ss131#4CE+xS;HqbSIcQ>Myf0acm>liX9olZrI;C^&!3pjy(?H=CL z&9>W`#5U1iea6n?u?^E3bDw$3+^}RUJ3>HM5$a-}ctNaL-PW?TX5FziYyn%@9=CsU z_#BU%lg@P)bDaUGp5(5(ij)oL=el&@ggwi4m)?8GPN!cE+Q*cj5#1q!-r(&YG@^b` z9!6OSp%OTV!7(L_0e82(=Kyx4WKXNqhE~ZVBb#6o_&LH0I)QJ_HfJpsfsgRa#9m1; zso@Zxi;j;b#-x@+&84AMN%r6_a)|Yo%%*0H%)q9a+dMMkjH#Dr=RBU5FGPn!Y^9&_ wz18h~^&V8TyCatw1~kt9q>D@EvPrG#|Jn~oW*B9-_kG~)W9-!bxkf900S^|GPyhe` delta 413 zcmey7wj;HkfsuiMftR6yftew|%`L>YWy1_P1_q-!Kv5b0V11*63)zbq7#Jgf{DkD( z#DYgEqW>8fn0kO>Udd%83JlgP`3wxqH-Pdi>50V!|NjF`VlbKl+sPvEcPpTmDk zKu3^6uut%UP>|3IVJqQP!oM~LuvCd`u9Cbi&S*M0$S`a2KEw5si;SKqG6KVi3Frh+ Q=rdeh!w9Ak&hqX900Ek6xc~qF diff --git a/public/fonts/fa-dtbl-1.woff2 b/public/fonts/fa-dtbl-1.woff2 index 3a7eeca3a6087c4f50ffa821c8fe63dc4b6b7b07..f95ba30eae6bf7cda52fab95e9f332d724b7936f 100644 GIT binary patch literal 6452 zcmV-48O!E(Pew8T0RR9102wp@4FCWD05f<102tf=0RR9100000000000000000000 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 diff --git a/resources/assets/sass/_helpers.scss b/resources/assets/sass/_helpers.scss index 5fe8052..b737b47 100644 --- a/resources/assets/sass/_helpers.scss +++ b/resources/assets/sass/_helpers.scss @@ -54,3 +54,7 @@ a.link-no-color { color: unset; } + +.btn-square { + min-width: 2.5em; +} diff --git a/resources/views/layouts/nav-buttons.blade.php b/resources/views/layouts/nav-buttons.blade.php index 5f8da21..9253d59 100644 --- a/resources/views/layouts/nav-buttons.blade.php +++ b/resources/views/layouts/nav-buttons.blade.php @@ -6,13 +6,13 @@ $aclass = $dropdown ? 'dropdown-item' : 'nav-link'; @endphp {!! $li !!} - - {{ __('Profile') }} - + + {{ __('Your Profile') }} + {!! $li !!} - {{ __('Account') }} + {{ __('Settings') }} {!! $li !!} diff --git a/resources/views/profile/edit-account.blade.php b/resources/views/profile/edit-account.blade.php index 34dc398..3cb1bf2 100644 --- a/resources/views/profile/edit-account.blade.php +++ b/resources/views/profile/edit-account.blade.php @@ -5,12 +5,16 @@ @section('content') @php(Widget::setLayout(3, 7)) -
+ @csrf
- {!! Widget::header(1, 'Your Account') !!} - {!! Widget::par('Confirm using the save button at the bottom.', 'text-muted') !!} + {!! Widget::header(1, 'Account Settings') !!} + + {!! Widget::par(' + Profile info can be changed on the + profile settings page. + ', 'text-muted', false) !!}
@@ -36,7 +40,7 @@ {!! Widget::password('new_password_confirmation', 'Confirm New Password') !!}
-
+
+
+ +
+
+ + {{-- Tab pane --}} +
+
+ + {{-- Description field --}} +
+ @if($table->description) + Description + {!! Widget::collapsible($table->description, 400, '8em') !!} + @if($table->origin) +
{{-- spacer --}} @endif - - + @endif + + @if($table->origin) +

+ Adapted From
+ {!! Widget::tryLink($table->origin) !!} +

+ @endif
-
-
-
- - {{-- Tab pane --}} -
-
- - {{-- Description field --}} -
- @if($table->description) - Description - {!! Widget::collapsible($table->description, 400, '8em') !!} - @if($table->origin) -
{{-- spacer --}} - @endif - @endif - - @if($table->origin) -

- Adapted From
- {!! Widget::tryLink($table->origin) !!} -

- @endif -
- - {{-- Info table --}} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Author - {{ $table->owner->title }} - ({{ $table->owner->handle }}) -
License{{ $table->license ?: 'CC0' }}
Created{{ $table->created_at->format("M j, Y") }}
Updated{{ $table->updated_at->format("M j, Y") }}
Revisions{{ $table->revisions()->count() }}
-
- -
{{-- inner row --}} -
{{-- Tab container --}} - -
- Column toggles, sort, filtering … coming soon -
- -
- Export … coming soon -
- -
{{-- Tab panel --}} - - {{-- Right column with menu --}} -
- - + {{-- Info table --}} +
+ + - + + + + - + + + + -
-
- -
-
+ + + + -
-
-
Author + {{ $table->owner->title }} + ({{ $table->owner->handle }}) +
License{{ $table->license ?: 'CC0' }}
Created{{ $table->created_at->format("M j, Y") }}
- - @foreach($columns as $col) - - @endforeach + + - - - @foreach($rows as $row) - - @php($rdata = json_decode($row['data'], true)) - @foreach($columns as $col) - - @endforeach - - @endforeach + + + + + +
{{ $col->title }}Updated{{ $table->updated_at->format("M j, Y") }}
{{ $rdata[$col->name] }}
Revisions{{ $table->revisions()->count() }}
-
- @endsection + +
{{-- inner row --}} +
{{-- Tab container --}} + +
+ Column toggles, sort, filtering … coming soon +
+ +
+ Export … coming soon +
+ +
{{-- Tab panel --}} + +{{-- Right column with menu --}} +
+ + + +
+ +
+ +
+
+ +
+
+ +
+
+ + + + @foreach($columns as $col) + + @endforeach + + + + @foreach($rows as $row) + + @php($rdata = json_decode($row['data'], true)) + @foreach($columns as $col) + + @endforeach + + @endforeach + +
{{ $col->title }}
{{ $rdata[$col->name] }}
+
+
+@endsection diff --git a/routes/web.php b/routes/web.php index aca41c1..6fae8d1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -12,9 +12,6 @@ Route::get('/about/privacy', function () { }); Route::get('/', function () { - if (!Auth::guest()) { - return redirect(route('profile.view', Auth::user()->name)); - } return view('welcome'); });