-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop': Extra search fields
Also contains small fixes for labels and pagination and changes for tailwind class usage (reuse multiple classes for more than one component)
- Loading branch information
Showing
15 changed files
with
203 additions
and
210 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <template> | ||
| <div class="grid grid-cols-4 border rounded-md px-3 py-3 bg-gray-50"> | ||
| <div> | ||
| <span class="text-sm font-medium text-sky-900 dark:text-sky-300 m-1 px-1">Author:</span> | ||
| <input type="text" class="w-56 px-1 m-1 border rounded-sm" :value="extraFilters['author']" | ||
| @change="handleFilterChange($event.target.value, 'author')" /> | ||
| </div> | ||
| <div> | ||
| <span class="text-sm font-medium text-sky-900 dark:text-sky-300 m-1 px-1">Title:</span> | ||
| <input type="text" class="w-56 px-1 m-1 border rounded-sm" :value="extraFilters['title']" | ||
| @change="handleFilterChange($event.target.value, 'title')" /> | ||
| </div> | ||
| <div> | ||
| <span class="text-sm font-medium text-sky-900 dark:text-sky-300 m-1 px-1">Place:</span> | ||
| <input type="text" class="w-56 px-1 m-1 border rounded-sm" :value="extraFilters['place']" | ||
| @change="handleFilterChange($event.target.value, 'place')" /> | ||
| </div> | ||
| <div> | ||
| <span class="text-sm font-medium text-sky-900 dark:text-sky-300 m-1 px-1">Year:</span> | ||
| <input type="text" class="w-56 px-1 m-1 border rounded-sm" :value="extraFilters['year']" | ||
| @change="handleFilterChange($event.target.value, 'year')" /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| data() { | ||
| return { | ||
| filters: {} | ||
| } | ||
| }, | ||
| props: { | ||
| extraFilters: { | ||
| type: Object, | ||
| default: {}, | ||
| }, | ||
| onFilterChange: { | ||
| type: Function, | ||
| default: () => {}, | ||
| } | ||
| }, | ||
| methods: { | ||
| handleFilterChange(value, fieldname) { | ||
| this.filters[fieldname] = value | ||
| this.onFilterChange(this.filters); | ||
| }, | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,23 @@ | ||
| @tailwind base; | ||
| @tailwind components; | ||
| @tailwind utilities; | ||
| @tailwind utilities; | ||
|
|
||
| .normal-blue-button { | ||
| @apply bg-sky-600 font-medium px-3 py-1 mt-1 shadow-sm text-white rounded-md; | ||
| } | ||
| .normal-blue-button:hover { | ||
| @apply hover:bg-sky-700 | ||
| } | ||
|
|
||
| .detail-blue-button { | ||
| @apply rounded border mr-4 px-3 py-1 border-sky-500 bg-sky-500 text-white | ||
| } | ||
|
|
||
| .detail-blue-button:disabled { | ||
| @apply bg-sky-200 border-sky-200 | ||
| } | ||
|
|
||
| .gray-div-header { | ||
| @apply text-gray-700 flex items-center justify-between px-4 py-2 rounded-t border-b | ||
| bg-gray-100 | ||
| } |
Oops, something went wrong.