Merge branch 'development' into feat-charts

Steinbeck-Lab · Dec 10, 2024 · 634221b · 634221b
2 parents 10d3283 + 9fd9259
commit 634221b
Show file tree

Hide file tree

Showing 9 changed files with 332 additions and 217 deletions.
diff --git a/public/vendor/livewire/livewire.esm.js b/public/vendor/livewire/livewire.esm.js
diff --git a/public/vendor/livewire/livewire.esm.js.map b/public/vendor/livewire/livewire.esm.js.map
diff --git a/public/vendor/livewire/livewire.js b/public/vendor/livewire/livewire.js
diff --git a/public/vendor/livewire/livewire.min.js b/public/vendor/livewire/livewire.min.js
diff --git a/public/vendor/livewire/livewire.min.js.map b/public/vendor/livewire/livewire.min.js.map
diff --git a/public/vendor/livewire/manifest.json b/public/vendor/livewire/manifest.json
@@ -1,2 +1,2 @@
 
-{"/livewire.js":"cc800bf4"}
+{"/livewire.js":"38dc8241"}
diff --git a/resources/views/livewire/search.blade.php b/resources/views/livewire/search.blade.php
@@ -294,7 +294,7 @@ class="px-4 py-2 rounded-r-md font-medium focus:outline-none">
                 {{ $molecules->links() }}
             </div>
 
-            <template x-if="view === 'card'">
+            <div x-show="view === 'card'">
                 <div class="items-center block p-6 bg-white">
                     <div
                         class="grid grid-cols-1 gap-y-4 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-10 lg:grid-cols-4 lg:gap-x-8">
@@ -303,21 +303,20 @@ class="grid grid-cols-1 gap-y-4 sm:grid-cols-2 sm:gap-x-6 sm:gap-y-10 lg:grid-co
                         @endforeach
                     </div>
                 </div>
-            </template>
-            <template x-if="view === 'table'">
+            </div>
+            <div x-show="view === 'table'">
                 <div class="relative overflow-x-auto shadow-md sm:rounded-lg border border-gray-200">
                     <table class="w-full rounded-md border-collapse">
                         <tbody>
                             @foreach ($molecules as $molecule)
                                 <tr>
                                     <td class="border border-gray-200 px-4 py-2 text-center" style="width: 300px;">
                                         <div class="aspect-h-3 aspect-w-3 sm:aspect-none group-hover:opacity-75">
-                                            <livewire:molecule-depict2d :name="$molecule->name" :smiles="$molecule->canonical_smiles">
-                                                <a href="{{ route('compound', $molecule->identifier) }}" wire:navigate
-                                                    class="text-blue-500 hover:underline">
-                                                    {{ $molecule->identifier }}
-                                                </a>
-
+                                            <livewire:molecule-depict2d :key="$loop->index . '_' . $molecule->identifier"  :name="$molecule->name" :smiles="$molecule->canonical_smiles">
+                                            <a href="{{ route('compound', $molecule->identifier) }}" wire:navigate
+                                                class="text-blue-500 hover:underline">
+                                                {{ $molecule->identifier }}
+                                            </a>
                                         </div>
                                     </td>
                                     <td class="border border-gray-200 px-4 py-2 text-left text-wrap align-top pt-5">
@@ -441,8 +440,7 @@ class="w-5 h-5 inline mr-1">
                         </tbody>
                     </table>
                 </div>
-
-            </template>
+            </div>
             <div wire:loading role="status"
                 class="border rounded-lg shadow-md opacity-90 absolute -translate-x-1/2 top-24 left-1/2 text-center justify-center">
                 <img class="w-full rounded-md" alt="loading" src="/img/loading.gif" />

diff --git a/resources/views/vendor/livewire/simple-tailwind.blade.php b/resources/views/vendor/livewire/simple-tailwind.blade.php
@@ -16,17 +16,17 @@
             <span>
                 {{-- Previous Page Link --}}
                 @if ($paginator->onFirstPage())
-                    <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
+                    <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md dark:text-gray-600 dark:bg-gray-800 dark:border-gray-600">
                         {!! __('pagination.previous') !!}
                     </span>
                 @else
                     @if(method_exists($paginator,'getCursorName'))
-                        <button type="button" dusk="previousPage" wire:key="cursor-{{ $paginator->getCursorName() }}-{{ $paginator->previousCursor()->encode() }}" wire:click="setPage('{{$paginator->previousCursor()->encode()}}','{{ $paginator->getCursorName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                        <button type="button" dusk="previousPage" wire:key="cursor-{{ $paginator->getCursorName() }}-{{ $paginator->previousCursor()->encode() }}" wire:click="setPage('{{$paginator->previousCursor()->encode()}}','{{ $paginator->getCursorName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
                                 {!! __('pagination.previous') !!}
                         </button>
                     @else
                         <button
-                            type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                            type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
                                 {!! __('pagination.previous') !!}
                         </button>
                     @endif
@@ -37,11 +37,11 @@
                 {{-- Next Page Link --}}
                 @if ($paginator->hasMorePages())
                     @if(method_exists($paginator,'getCursorName'))
-                        <button type="button" dusk="nextPage" wire:key="cursor-{{ $paginator->getCursorName() }}-{{ $paginator->nextCursor()->encode() }}" wire:click="setPage('{{$paginator->nextCursor()->encode()}}','{{ $paginator->getCursorName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                        <button type="button" dusk="nextPage" wire:key="cursor-{{ $paginator->getCursorName() }}-{{ $paginator->nextCursor()->encode() }}" wire:click="setPage('{{$paginator->nextCursor()->encode()}}','{{ $paginator->getCursorName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
                                 {!! __('pagination.next') !!}
                         </button>
                     @else
-                        <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+                        <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
                                 {!! __('pagination.next') !!}
                         </button>
                     @endif
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@

		{"/livewire.js":"cc800bf4"}
		{"/livewire.js":"38dc8241"}