diff --git a/lib/decentralised_book_index_web/components/core_components.ex b/lib/decentralised_book_index_web/components/core_components.ex index 30e1a47..0dafe96 100644 --- a/lib/decentralised_book_index_web/components/core_components.ex +++ b/lib/decentralised_book_index_web/components/core_components.ex @@ -546,8 +546,8 @@ defmodule DecentralisedBookIndexWeb.CoreComponents do ~H"""
- - +
+ +
{col[:label]} @@ -560,7 +560,11 @@ defmodule DecentralisedBookIndexWeb.CoreComponents do phx-update={match?(%Phoenix.LiveView.LiveStream{}, @rows) && "stream"} class="relative divide-zinc-100 text-sm leading-6 text-zinc-700" > -
+
<%= if @current_user != nil and Role.can_moderate?(@current_user.role) and is_nil(@author.dbi_server) do %>
- - <% end %> - <.dropdown_settings - search_mode={@search_mode} - search_mode_options={@search_mode_options} - select_options={@select_options} - selected_option={@selected_option} - /> + <%= if @current_user != nil and Role.can_moderate?(@current_user.role) do %> + <.link patch={~p"/books/new"} class="flex-shrink-0 my-auto"> + + + <% end %> + <.dropdown_settings + search_mode={@search_mode} + search_mode_options={@search_mode_options} + select_options={@select_options} + selected_option={@selected_option} + />
""" @@ -58,17 +90,42 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.BookSearch do def dropdown_settings(assigns) do ~H"""
- - - +
""" end diff --git a/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex b/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex index 48cdc4c..9e6730b 100644 --- a/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex +++ b/lib/decentralised_book_index_web/components/my_components/just_search_resources.ex @@ -11,33 +11,56 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.JustSearchResources def just_search_resources(assigns) do ~H""" -
+
-
- +
- + <%= for {name, value} <- @select_options do %> + <%= if value == @selected_option do %> + + <% else %> + + <% end %> <% end %> - <% end %> - +
diff --git a/lib/decentralised_book_index_web/components/my_components/pagination.ex b/lib/decentralised_book_index_web/components/my_components/pagination.ex index dc2c438..c9df018 100644 --- a/lib/decentralised_book_index_web/components/my_components/pagination.ex +++ b/lib/decentralised_book_index_web/components/my_components/pagination.ex @@ -20,7 +20,7 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.Pagination do kind="primary" inverse patch={"#{@endpoint}?#{page_params_which(@page, @params, "prev")}"} - class="flex items-center justify-center px-4 h-10 ms-0 leading-tight text-gray-500 bg-white border border-e-0 border-gray-300 rounded-s-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" + class="flex items-center justify-center px-4 h-10 ms-0 leading-tight text-gray-500 bg-slate-100 border border-e-0 border-gray-300 rounded-s-lg hover:bg-slate-300 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" disabled={!AshPhoenix.LiveView.prev_page?(@page)} > Previous @@ -32,7 +32,7 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.Pagination do {number} @@ -41,7 +41,7 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.Pagination do
  • {number} @@ -54,7 +54,7 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.Pagination do kind="primary" inverse patch={"#{@endpoint}?#{page_params_which(@page, @params, "next")}"} - class="flex items-center justify-center px-4 h-10 leading-tight text-gray-500 bg-white border border-gray-300 rounded-e-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" + class="flex items-center justify-center px-4 h-10 leading-tight text-gray-500 bg-slate-100 border border-gray-300 rounded-e-lg hover:bg-slate-300 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" disabled={!AshPhoenix.LiveView.next_page?(@page)} > Next diff --git a/lib/decentralised_book_index_web/components/my_components/search_resources.ex b/lib/decentralised_book_index_web/components/my_components/search_resources.ex index 9f6a0ab..af251c5 100644 --- a/lib/decentralised_book_index_web/components/my_components/search_resources.ex +++ b/lib/decentralised_book_index_web/components/my_components/search_resources.ex @@ -17,27 +17,59 @@ defmodule DecentralisedBookIndexWeb.Components.MyComponents.SearchResources do def search_resources(assigns) do ~H""" -
    +
    -
    - +
    <%= if can_add?(@current_user, @moderator_role) do %> <.link patch={@resource_new_url}> -
    diff --git a/lib/decentralised_book_index_web/components/my_partials/navbar.ex b/lib/decentralised_book_index_web/components/my_partials/navbar.ex index 74c3ec1..e544fbb 100644 --- a/lib/decentralised_book_index_web/components/my_partials/navbar.ex +++ b/lib/decentralised_book_index_web/components/my_partials/navbar.ex @@ -11,7 +11,7 @@ defmodule DecentralisedBookIndexWeb.Components.MyPartials.Navbar do def partial_navbar(assigns) do ~H""" -