update champion card

apps/lol_analytics_web/lib/lol_analytics_web/components/champion_components/champion_card.ex

@@ -13,13 +13,22 @@ defmodule LolAnalyticsWeb.ChampionComponents.ChampionCard do
     ~H"""
     <.link patch={"/champions/#{@props.id}"}>
       <div class="flex flex-col rounded-xl bg-clip-border overflow-hidden bg-gray-200">
-        <img src={"https://ddragon.leagueoflegends.com/cdn/14.11.1/img/champion/#{@props.image}"} />
+        <div class="flex flex-column overflow-hidden">
-        <div class="py-2" />
+          <div class=" px-4 py-1 opacity-80 gap-2 absolute z-10 align-bottom flex mx-auto bg-black w-max">
-        <div class="flex mx-auto">
+            <img src={team_position_image(@props.team_position)} class="w-5 h-5" />
-          <img src={team_position_image(@props.team_position)} class="w-5 h-5" />
+            <h3 class="text-white"><%= @props.name %></h3>
-          <h3><%= @props.name %></h3>
+          </div>
+          <img
+            class="static w-40 h-40"
+            src={"https://ddragon.leagueoflegends.com/cdn/14.11.1/img/champion/#{@props.image}"}
+          />
         </div>
-        <div class="py-2" />
+        <div class="py-1" />
+        <div class="pl-2">
+          <h3>Win rate: <%= @props.win_rate %></h3>
+          <h3>Wins: <%= @props.wins %> / <%= @props.total_games %></h3>
+        </div>
+        <div class="py-1" />
       </div>
     </.link>
     """

apps/lol_analytics_web/lib/lol_analytics_web/components/loader.ex

@@ -0,0 +1,28 @@
+defmodule LolAnalyticsWeb.Loader do
+  use Phoenix.Component
+
+  def loader(assigns) do
+    ~H"""
+    <div role="status" class="flex flex-col mx-auto w-max justify-center items-center gap-4">
+      <span class="text-3xl">Loading</span>
+      <svg
+        aria-hidden="true"
+        class="w-16 h-16 text-gray-300 animate-spin dark:text-gray-300 fill-orange-600"
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+      <span class="sr-only">Loading...</span>
+    </div>
+    """
+  end
+end

apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/components/champion_filters.ex

@@ -17,49 +17,16 @@ defmodule LolAnalyticsWeb.ChampionLive.Components.ChampionFilters do
   def mount(socket) do
     socket =
       assign(socket, :roles, @roles_definition)
-      |> assign(:form, build_roles_form())
 
     {:ok, socket}
   end
 
-  defp build_roles() do
-    @roles_definition
-    |> Enum.reduce(%{}, fn role, acc ->
-      Map.merge(acc, %{"#{role.value}" => false})
-    end)
-    |> Map.merge(%{"all" => true})
-  end
-
-  defp build_roles_form() do
-    @roles_definition
-    |> Enum.reduce(%{}, fn role, acc ->
-      Map.merge(acc, %{"#{role.value}" => false})
-    end)
-    |> Map.merge(%{"all" => true})
-    |> to_form
-  end
-
-  def handle_event("filter", unsigned_params, socket) do
-    # updated_form =
-    #   unsigned_params
-    #   |> Enum.map(fn {key, val} -> {key, key == unsigned_params["_target"]} end)
-
-    IO.inspect(unsigned_params)
-    # # assign()
-    # {:noreply, socket |> assign(:form, to_form(updated_form))}
-  end
-
   attr :selectedrole, :string, required: true
   attr :roles, :list, default: []
 
   def render(assigns) do
-    IO.puts(">>>>1")
-    # IO.inspect(assigns)
-    IO.inspect(assigns.selectedrole)
-    IO.inspect(">>>>>2")
-
     selected_class =
-      "px-8 py-2 flex flex-row gap-2 align-middle rounded-md border-gray-200 border border-sky-500"
+      "px-8 py-2 flex flex-row gap-2 align-middle rounded-full border-gray-200 border border-orange-600 cursor-pointer"
 
     ~H"""
     <div>
@@ -68,16 +35,14 @@ defmodule LolAnalyticsWeb.ChampionLive.Components.ChampionFilters do
           <%!-- <%= IO.inspect(role) %> --%>
           <%= if (assigns.selectedrole == role.value) do %>
             <div phx-click="filter" phx-value-role={role.title} class={selected_class}>
-              <%!-- <.input enabled={false} type="checkbox" field={@form[role.value]} /> --%>
               <p><%= role.title %></p>
             </div>
           <% else %>
             <div
               phx-click="filter"
               phx-value-role={role.value}
-              class="px-8 py-2 flex flex-row gap-2 align-middle"
+              class="px-8 py-2 flex flex-row gap-2 align-middle cursor-pointer"
             >
-              <%!-- <.input enabled={false} type="checkbox" field={@form[role.value]} /> --%>
               <p><%= role.title %></p>
             </div>
           <% end %>

apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.ex

@@ -2,51 +2,74 @@ defmodule LoLAnalyticsWeb.ChampionLive.Index do
   use LoLAnalyticsWeb, :live_view
 
   import LolAnalyticsWeb.ChampionComponents.ChampionCard
+  import LolAnalyticsWeb.Loader
+  import Phoenix.VerifiedRoutes
 
   alias LolAnalyticsWeb.ChampionLive.Mapper
   alias LolAnalyticsWeb.ChampionLive.Components.ChampionFilters
 
   @behaviour LolAnalyticsWeb.ChampionFilters.EventHandler
 
-  @roles [
-    %{title: "All", value: "all"},
-    %{title: "Top", value: "TOP"},
-    %{title: "Jungle", value: "JUNGLE"},
-    %{title: "Mid", value: "MIDDLE"},
-    %{title: "Bot", value: "BOTTOM"},
-    %{title: "Support", value: "UTILITY"}
-  ]
-
   @impl true
   def mount(_params, _session, socket) do
-    champs = LolAnalytics.Facts.ChampionPlayedGame.Repo.get_win_rates()
-
-    mapped =
-      champs
-      |> Mapper.map_champs()
-      |> Enum.sort(&(&1.win_rate >= &2.win_rate))
-
     socket =
       socket
-      |> stream(:champions, mapped)
+      |> assign(:champions, %{status: :loading})
+      |> load_champs("all")
       |> assign(:selected_role, "all")
 
     {:ok, socket}
   end
 
+  def handle_params(params, _uri, socket) do
+    socket =
+      case params["role"] do
+        role -> {:noreply, assign(socket, selected_role: role)}
+        _ -> {:noreply, socket}
+      end
+  end
+
   @impl true
   def handle_event("filter", %{"role" => selected_role} = params, socket) do
-    champs =
+    {:reply, %{},
-      LolAnalytics.Facts.ChampionPlayedGame.Repo.get_win_rates()
-      |> filter_champs(selected_role)
-
-    {:noreply,
      socket
-     |> stream(:champions, champs)
+     |> push_navigate(to: ~p"/champions?#{params}")
+     |> assign(:champions, %{status: :loading})
+     |> load_champs(selected_role)
      |> assign(:selected_role, selected_role)}
   end
 
-  def handle_event("filter_champs", params, socket) do
+  defp load_champs(socket, selected_role) do
+    socket
+    |> start_async(
+      :get_champs,
+      fn ->
+        LolAnalytics.Facts.ChampionPlayedGame.Repo.get_win_rates()
+        |> filter_champs(selected_role)
+      end
+    )
+  end
+
+  def handle_async(:get_champs, {:ok, fetched_events} = params, socket) do
+    {:noreply, assign(socket, :champions, %{status: :data, data: fetched_events})}
+  end
+
+  def render_champions(assigns) do
+    case assigns.champions do
+      %{status: :loading} ->
+        ~H"""
+        <.loader />
+        """
+
+      %{status: :data, data: champions} ->
+        ~H"""
+        <div id="champions" class="grid grid-cols-4 gap-4">
+          <%= for champion <- champions do %>
+            <.champion_card props={champion} />
+          <% end %>
+        </div>
+        """
+    end
   end
 
   defp filter_champs(champs, selected_role) do

apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.html.heex

@@ -7,12 +7,8 @@
 
 <.live_component module={ChampionFilters} id="role-filters" selectedrole={@selected_role} />
 
+<.render_champions champions={@champions} />
 
-<div id="champions" class="grid grid-cols-4 gap-4">
-  <%= for {_, champion} <- @streams.champions do %>
-    <.champion_card props={champion} />
-    <% end %>
-</div>
 
 <.modal :if={@live_action in [:new, :edit]} id="champion-modal" show on_cancel={JS.patch(~p"/champions")}>
   <.live_component module={LoLAnalyticsWeb.ChampionLive.FormComponent} id={@champion.champion_id || :new}

apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/show.html.heex

@@ -8,8 +8,4 @@
 
 <div class="my-4" />
 
-<.summoner_spells spells={@summoner_spells} />
+<.summoner_spells spells={@summoner_spells} />
-
-<.back navigate={~p"/champions"}>
-  Back to champions
-</.back>