Skip to content

Commit

Permalink
Различные исправления
Browse files Browse the repository at this point in the history
  • Loading branch information
delaynore committed May 30, 2024
1 parent 51cde6c commit 2736ae4
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 18 deletions.
8 changes: 5 additions & 3 deletions lang/ru/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
'attachments' => 'Вложения',
],
'attachments' => [
'title' => 'Вложения ":concept"',
'header' => 'Вложения ":concept"',
'title' => '',
'header' => '',
],
'examples' => [
'header' => 'Примеры ":concept"',
'header' => '',
'table' => 'Экземпляры',
'attributes' => 'Атрибуты',
],
'relation' => [
'create' => [
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/dashboard/sidebar/menu.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex overflow-hidden bg-white border divide-x rounded-lg rtl:flex-row-reverse dark:bg-gray-900 dark:border-gray-700 dark:divide-gray-700">
<a href="{{ route('concept.create', $dictionary) }}" title="{{__('dashboard.sidebar.menu.create')}}" data-tooltip-placement="bottom" data-tooltip-target="tooltip-create-concept" class="px-3 py-1 font-medium text-gray-600 transition-colors duration-200 hover:text-blue-600 dark:hover:text-blue-500 sm:px-6 dark:hover:bg-gray-800 dark:text-gray-300 hover:bg-gray-100">
<svg class="w-5 h-5 sm:w-6 sm:h-6" data-slot="icon" aria-hidden="true" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M12 10.5v6m3-3H9m4.06-7.19-2.12-2.12a1.5 1.5 0 0 0-1.061-.44H4.5A2.25 2.25 0 0 0 2.25 6v12a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 18V9a2.25 2.25 0 0 0-2.25-2.25h-5.379a1.5 1.5 0 0 1-1.06-.44Z" stroke-linecap="round" stroke-linejoin="round"></path>
<svg class="w-5 h-5 sm:w-6 sm:h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m3.75 9v6m3-3H9m1.5-12H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" />
</svg>
</a>
<div id="tooltip-create-concept" role="tooltip" class="absolute z-10 invisible inline-block px-2 py-1 text-sm font-medium text-white transition-opacity duration-300 bg-gray-900 rounded-lg shadow-sm opacity-0 tooltip dark:bg-gray-700">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
</div>
<div class="relative overflow-x-auto shadow-md sm:rounded-lg">
<table class="w-full text-sm text-center text-gray-500 dark:text-gray-400">
<caption class="px-6 py-2 text-lg font-semibold text-left text-gray-800 bg-white dark:text-gray-200 dark:bg-gray-800">
{{__('dashboard.examples.attributes')}}
</caption>
<thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
<tr>
<th scope="col" class="px-2 py-3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
</div>
<div class="overflow-x-auto overflow-y-scroll shadow-md sm:rounded-lg">
<table class="w-full text-sm text-center text-gray-500 dark:text-gray-400">
<caption class="px-6 py-2 text-lg font-semibold text-left text-gray-800 bg-white dark:text-gray-200 dark:bg-gray-800">
{{__('dashboard.examples.table')}}
</caption>
<thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
<tr>
<th scope="col" class="px-2 py-3">
Expand Down
13 changes: 9 additions & 4 deletions resources/views/components/dashboard/tabs/tabs.blade.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
<div class="flex pt-2 overflow-x-auto border-b border-gray-300 whitespace-nowrap dark:border-gray-500">
<a href="{{Route::currentRouteName() == 'concept.show' ? "#" : route('concept.show', ['dictionary' => $dictionary, 'concept' => $concept->id])}}" class="hover:text-blue-600 dark:hover:text-blue-500 inline-flex items-center h-10 px-2 py-2 text-center text-gray-700 {{Route::currentRouteName() == 'concept.show' ? 'border border-b-0 rounded-t-md' : 'bg-transparent border-b'}} border-gray-300 sm:px-4 dark:border-gray-500 -px-1 dark:text-gray-200 whitespace-nowrap focus:outline-none">
<svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 mx-1 sm:w-6 sm:h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M10 6H5a2 2 0 00-2 2v9a2 2 0 002 2h14a2 2 0 002-2V8a2 2 0 00-2-2h-5m-4 0V5a2 2 0 114 0v1m-4 0a2 2 0 104 0m-5 8a2 2 0 100-4 2 2 0 000 4zm0 0c1.306 0 2.417.835 2.83 2M9 14a3.001 3.001 0 00-2.83 2M15 11h3m-3 4h2" />
<svg class="w-4 h-4 mx-1 sm:w-5 sm:h-5" stroke-width="1.5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M19 3L5 3C3.89543 3 3 3.89543 3 5L3 19C3 20.1046 3.89543 21 5 21H19C20.1046 21 21 20.1046 21 19V5C21 3.89543 20.1046 3 19 3Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M7 7L17 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">

</path>
<path d="M7 12L17 12" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M7 17L13 17" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
</svg>

<span class="mx-1 text-sm sm:text-base">
{{__('dashboard.tabs.concepts')}}
</span>
</a>
<a href="{{Route::currentRouteName() == 'concept.examples' ? "#" :route('concept.examples', ['dictionary' => $dictionary, 'concept' => $concept])}}" class="{{Route::currentRouteName() == 'concept.examples' ? 'border border-b-0 rounded-t-md' : 'bg-transparent border-b'}} hover:text-blue-600 dark:hover:text-blue-500 inline-flex items-center h-10 px-2 py-2 text-center text-gray-700 bg-transparent border-b border-gray-300 sm:px-4 dark:border-gray-500 -px-1 dark:text-gray-200 whitespace-nowrap cursor-base focus:outline-none hover:border-gray-400 dark:hover:border-gray-300">
<svg class="w-4 h-4 mx-1 sm:w-6 sm:h-6" data-slot="icon" aria-hidden="true" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<svg class="w-4 h-4 mx-1 sm:w-5 sm:h-5" data-slot="icon" aria-hidden="true" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M3.375 19.5h17.25m-17.25 0a1.125 1.125 0 0 1-1.125-1.125M3.375 19.5h7.5c.621 0 1.125-.504 1.125-1.125m-9.75 0V5.625m0 12.75v-1.5c0-.621.504-1.125 1.125-1.125m18.375 2.625V5.625m0 12.75c0 .621-.504 1.125-1.125 1.125m1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125m0 3.75h-7.5A1.125 1.125 0 0 1 12 18.375m9.75-12.75c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125m19.5 0v1.5c0 .621-.504 1.125-1.125 1.125M2.25 5.625v1.5c0 .621.504 1.125 1.125 1.125m0 0h17.25m-17.25 0h7.5c.621 0 1.125.504 1.125 1.125M3.375 8.25c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125m17.25-3.75h-7.5c-.621 0-1.125.504-1.125 1.125m8.625-1.125c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125M12 10.875v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 10.875c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125M13.125 12h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125M20.625 12c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5M12 14.625v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 14.625c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125m0 1.5v-1.5m0 0c0-.621.504-1.125 1.125-1.125m0 0h7.5" stroke-linecap="round" stroke-linejoin="round"></path>
</svg>

Expand All @@ -18,7 +23,7 @@
</span>
</a>
<a href="{{Route::currentRouteName() == 'concept.attachments' ? "#" :route('concept.attachments', ['dictionary' => $dictionary, 'concept' => $concept])}}" class="{{Route::currentRouteName() == 'concept.attachments' ? 'border border-b-0 rounded-t-md' : 'bg-transparent border-b'}} hover:text-blue-600 dark:hover:text-blue-500 inline-flex items-center h-10 px-2 py-2 text-center text-gray-700 bg-transparent border-b border-gray-300 sm:px-4 dark:border-gray-500 -px-1 dark:text-gray-200 whitespace-nowrap cursor-base focus:outline-none hover:border-gray-400 dark:hover:border-gray-300">
<svg class="w-4 h-4 mx-1 sm:w-6 sm:h-6" data-slot="icon" aria-hidden="true" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<svg class="w-4 h-4 mx-1 sm:w-5 sm:h-5" data-slot="icon" aria-hidden="true" fill="none" stroke-width="1.5" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13" stroke-linecap="round" stroke-linejoin="round"></path>
</svg>
<span class="mx-1 text-sm sm:text-base">
Expand Down
18 changes: 9 additions & 9 deletions resources/views/components/table.blade.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@props([
'headers',
'rows',
'names',
'editRouteName',
'deleteRouteName',
'isPaginated' => true,
'entityName',
'deleteGateName' => 'admin',
'editGateName' => 'redactor',
'headers',
'rows',
'names',
'editRouteName',
'deleteRouteName',
'isPaginated' => true,
'entityName',
'deleteGateName' => 'admin',
'editGateName' => 'redactor',
])

<div class="overflow-x-auto overflow-y-scroll shadow-md sm:rounded-lg">
Expand Down

0 comments on commit 2736ae4

Please sign in to comment.