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 601d963..177974a 100644 Binary files a/public/fonts/fa-dtbl-1.eot 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 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 3df7d2d..d6fb097 100644 Binary files a/public/fonts/fa-dtbl-1.ttf 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 index 3a7eeca..f95ba30 100644 Binary files a/public/fonts/fa-dtbl-1.woff2 and b/public/fonts/fa-dtbl-1.woff2 differ 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'); });