diff --git a/resources/views/components/layout/app.blade.php b/resources/views/components/layout/app.blade.php index eb58fa3..e845beb 100644 --- a/resources/views/components/layout/app.blade.php +++ b/resources/views/components/layout/app.blade.php @@ -8,7 +8,12 @@ AuditionAdmin @vite(['resources/css/app.css', 'resources/js/app.js']) - @stack('scripts') + {{-- Code below from https://codepen.io/ryangjchandler/pen/WNQQKeR --}} + {{-- JS for sorting tables by a column --}} + {{-- Sortable columns need this on their : @click="sortByColumn" class="cursor-pointer select-none" --}} + {{-- One level above the table needs x-data="data()" --}} + {{-- tbody needs x-ref="tbody" --}} + diff --git a/resources/views/components/table/body.blade.php b/resources/views/components/table/body.blade.php index 4bbe5f6..6e42aa5 100644 --- a/resources/views/components/table/body.blade.php +++ b/resources/views/components/table/body.blade.php @@ -1,3 +1,4 @@ -merge(['class' => "divide-y divide-gray-200 bg-white" ]) }}> +@props(['sortable' => true]) +merge(['class' => 'divide-y divide-gray-200']) }}> {{ $slot }} diff --git a/resources/views/components/table/button.blade.php b/resources/views/components/table/button.blade.php new file mode 100644 index 0000000..b513a3c --- /dev/null +++ b/resources/views/components/table/button.blade.php @@ -0,0 +1,6 @@ +@php($classes = 'text-indigo-600 hover:text-indigo-900 font-medium') +@if($attributes->has('href')) + merge(['class' => $classes]) }}>{{ $slot }} +@else + +@endif diff --git a/resources/views/components/table/container.blade.php b/resources/views/components/table/container.blade.php deleted file mode 100644 index 7b9b06a..0000000 --- a/resources/views/components/table/container.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -
merge(['class' => 'px-4 sm:px-6 lg:px-8']) }}> - {{ $slot }} -
diff --git a/resources/views/components/table/table.blade.php b/resources/views/components/table/table.blade.php index 20f89c9..8e224b4 100644 --- a/resources/views/components/table/table.blade.php +++ b/resources/views/components/table/table.blade.php @@ -1,8 +1,29 @@ -
-
-
-
- +@props([ + 'with_title_area' => false, + 'title_block_right' => false, + 'title' => false, + 'subtitle' => false, + 'sortable' => true +]) +
+ @if($with_title_area) +
+
+ @if($title)

attributes->merge(['class' => 'text-base font-semibold leading-6 text-gray-900']) }}>{{ $title }}

@endif + @if($subtitle)

attributes->merge(['class' => 'mt-2 text-sm text-gray-700']) }}>{{ $subtitle }}

@endif +
+{{-- Title block right often used for add button--}} + @if($title_block_right) +
+ {{ $title_block_right }} +
+ @endif +
+ @endif +
+
+
+
merge(['class' => 'min-w-full divide-y divide-gray-300']) }}> {{ $slot }}
diff --git a/resources/views/components/table/table_header_row.blade.php b/resources/views/components/table/table_header_row.blade.php deleted file mode 100644 index 7620fb1..0000000 --- a/resources/views/components/table/table_header_row.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - - - {{ $slot }} - - diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php index 21c05ee..c8069c1 100644 --- a/resources/views/components/table/td.blade.php +++ b/resources/views/components/table/td.blade.php @@ -1,7 +1,17 @@ -@props(['first' => false, 'emphasis'=> false]) +@props([ + 'emphasis' => false, + 'first' => false, + 'for_button' => false, +]) @php - $td_classes = "whitespace-nowrap py-4 text-sm"; - $td_classes .= $first ? ' pl-4 pr-3 sm:pl-6':' px-3'; - $td_classes .= $emphasis ? ' text-gray-900 font-medium':' text-gray-500'; + $classes = 'whitespace-nowrap py-4 text-sm'; + $classes .= $emphasis ? ' font-medium text-gray-900' : ' text-gray-500'; + $classes .= $first ? ' pl-3 pr-4 sm:pl-0' : ' px-3'; + $classes .= $for_button ? ' relative text-right sm:pr-0' : ''; + + @endphp -merge(['class'=>$td_classes]) }}>{{ $slot }} +merge(['class' => $classes]) }}>{{ $slot }} + + + diff --git a/resources/views/components/table/td_right_link.blade.php b/resources/views/components/table/td_right_link.blade.php deleted file mode 100644 index f9d2fd9..0000000 --- a/resources/views/components/table/td_right_link.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@props(['sr_text' => false,'button' => false,'a' => false]) -@php $td_class = "relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6"; @endphp -@php $link_class = "text-indigo-600 hover:text-indigo-900"; @endphp -merge(['class' => $td_class]) }}> - @if($a) - attributes->merge(['class' => $link_class]) }}> - {{ $a }}@if($sr_text){{ $sr_text }}@endif - - @elseif($button) - @php($aria_label = $button . $sr_text) - - @else - {{ $slot }}{{ $sr_text ? '' . $sr_text . '' : '' }} - @endif - diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php index 1cf001a..6780b78 100644 --- a/resources/views/components/table/th.blade.php +++ b/resources/views/components/table/th.blade.php @@ -1,8 +1,20 @@ -@props(['first' => false, 'placeholder' => false]) +@props([ + 'first' => false, + 'spacer_only' => false, + 'sortable' => true +]) @php - $th_classes = "py-3.5 text-left text-sm font-semibold text-gray-900"; - $th_classes .= $first ? ' pl-4 pr-3 sm:pl-6':' px-3'; - if($placeholder) $th_classes = "relative py-3.5 pl-3 pr-4 sm:pr-6"; + $classes = ($first) ? 'pl-4 pr-3 sm:pl-0' : 'px-3'; + $classes .= " py-3.5 text-left text-sm font-semibold text-gray-900"; + $classes .= $sortable ? ' cursor-pointer select-none' : ''; + if($spacer_only) $classes = 'relative py-3.5 pl-3 pr-4 sm:pr-0'; + $atrib = [ + 'scope' => 'col', + 'class' => $classes + ]; @endphp -merge(['scope' =>'col','class' => $th_classes]) }}>{{ $slot }} +merge($atrib) }}> + {{ $slot }} + + diff --git a/resources/views/components/table/title_above_table.blade.php b/resources/views/components/table/title_above_table.blade.php deleted file mode 100644 index 6825f8a..0000000 --- a/resources/views/components/table/title_above_table.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@props(['title' => false,'subtitle' => false, 'button' => false]) -
-
- @if($title) -

attributes->merge(['class' => 'text-base font-semibold leading-6 text-gray-900']) }}>{{ $title }}

- @endif - @if($subtitle) -

attributes->merge(['class' => 'mt-2 text-sm text-gray-700']) }}>{{ $subtitle }}

- @endif -
-
- @if($button) - @php $button_classes = 'block rounded-md bg-indigo-600 px-3 py-2 text-center text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'; @endphp - - @endif -
-
diff --git a/resources/views/students/edit.blade.php b/resources/views/students/edit.blade.php new file mode 100644 index 0000000..bedf84e --- /dev/null +++ b/resources/views/students/edit.blade.php @@ -0,0 +1,5 @@ + + + boo + + diff --git a/resources/views/students/index.blade.php b/resources/views/students/index.blade.php index 45a9425..c7b408a 100644 --- a/resources/views/students/index.blade.php +++ b/resources/views/students/index.blade.php @@ -14,23 +14,39 @@ -{{-- TODO make grade a dropdown--}} + {{-- TODO make grade a dropdown --}} Save + Student Listing - - - Name - Grade - - Edit - - - +
+ + + + Name + Grade + + Edit + + + + + @foreach($students as $student) + + {{ $student->full_name(true) }} + {{ $student->grade }} + + Edit + + + @endforeach + + +
diff --git a/resources/views/test.blade.php b/resources/views/test.blade.php index c77ff5b..dc47540 100644 --- a/resources/views/test.blade.php +++ b/resources/views/test.blade.php @@ -2,6 +2,48 @@ Test Page - {{ request()->is('test') ? 'yes':'no' }} + + + Users + A list of all the users in your account including their name, title, email and role. + Add User + + + + Name + Title + Email + Role + + Edit + + + + + + Lindsay Walton + Front-end Developer + lindsay.walton@example.com + Member + + Edit, Lindsay Walton + + + + + Lindsay Walton + Front-end Developer + lindsay.walton@example.com + Member + + Edit + + + + + + + +