add reward bounty drawer

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -284,86 +284,123 @@ defmodule Algora.Bounties do
     )
   end
 
-  @spec create_payment_session(
-          %{creator: User.t(), amount: Money.t(), description: String.t()},
+  # TODO: move to separate module
+  defmodule LineItem do
+    @moduledoc false
+    defstruct [:amount, :title, :description, :image, :type]
+
+    @type t :: %__MODULE__{
+            amount: Money.t(),
+            title: String.t(),
+            description: String.t() | nil,
+            image: String.t() | nil,
+            type: :payment | :fee
+          }
+
+    def to_stripe(line_item) do
+      %{
+        price_data: %{
+          unit_amount: MoneyUtils.to_minor_units(line_item.amount),
+          currency: to_string(line_item.amount.currency),
+          product_data: %{
+            name: line_item.title,
+            description: line_item.description,
+            images: if(line_item.image, do: [line_item.image])
+          }
+        },
+        quantity: 1
+      }
+    end
+
+    def gross_amount(line_items) do
+      Enum.reduce(line_items, Money.zero(:USD), fn item, acc -> Money.add!(acc, item.amount) end)
+    end
+
+    def total_fee(line_items) do
+      Enum.reduce(line_items, Money.zero(:USD), fn item, acc ->
+        if item.type == :fee, do: Money.add!(acc, item.amount), else: acc
+      end)
+    end
+  end
+
+  @spec generate_line_items(
+          %{amount: Money.t()},
           opts :: [
             ticket_ref: %{owner: String.t(), repo: String.t(), number: integer()},
-            tip_id: String.t(),
-            bounty_id: String.t(),
             claims: [Claim.t()],
             recipient: User.t()
           ]
         ) ::
-          {:ok, String.t()} | {:error, atom()}
-  def create_payment_session(%{creator: creator, amount: amount, description: description}, opts \\ []) do
+          [LineItem.t()]
+  def generate_line_items(%{amount: amount}, opts \\ []) do
     ticket_ref = opts[:ticket_ref]
     recipient = opts[:recipient]
     claims = opts[:claims]
 
-    tx_group_id = Nanoid.generate()
+    description = if(ticket_ref, do: "#{ticket_ref[:owner]}/#{ticket_ref[:repo]}##{ticket_ref[:number]}")
 
-    # Calculate fees
-    currency = to_string(amount.currency)
     platform_fee_pct = FeeTier.calculate_fee_percentage(Money.zero(:USD))
     transaction_fee_pct = Payments.get_transaction_fee_pct()
 
-    platform_fee = Money.mult!(amount, platform_fee_pct)
-    transaction_fee = Money.mult!(amount, transaction_fee_pct)
-    total_fee = Money.add!(platform_fee, transaction_fee)
-    gross_amount = Money.add!(amount, total_fee)
+    if recipient do
+      [
+        %LineItem{
+          amount: amount,
+          title: "Payment to @#{recipient.provider_login}",
+          description: description,
+          image: recipient.avatar_url,
+          type: :payment
+        }
+      ]
+    else
+      []
+    end ++
+      Enum.map(claims, fn claim ->
+        %LineItem{
+          # TODO: ensure shares are normalized
+          amount: Money.mult!(amount, claim.group_share),
+          title: "Payment to @#{claim.user.provider_login}",
+          description: description,
+          image: claim.user.avatar_url,
+          type: :payment
+        }
+      end) ++
+      [
+        %LineItem{
+          amount: Money.mult!(amount, platform_fee_pct),
+          title: "Algora platform fee (#{Util.format_pct(platform_fee_pct)})",
+          type: :fee
+        },
+        %LineItem{
+          amount: Money.mult!(amount, transaction_fee_pct),
+          title: "Transaction fee (#{Util.format_pct(transaction_fee_pct)})",
+          type: :fee
+        }
+      ]
+  end
+
+  @spec create_payment_session(
+          %{creator: User.t(), amount: Money.t(), description: String.t()},
+          opts :: [
+            ticket_ref: %{owner: String.t(), repo: String.t(), number: integer()},
+            tip_id: String.t(),
+            bounty_id: String.t(),
+            claims: [Claim.t()],
+            recipient: User.t()
+          ]
+        ) ::
+          {:ok, String.t()} | {:error, atom()}
+  def create_payment_session(%{creator: creator, amount: amount, description: description}, opts \\ []) do
+    tx_group_id = Nanoid.generate()
 
     line_items =
-      if recipient do
-        [
-          %{
-            price_data: %{
-              unit_amount: MoneyUtils.to_minor_units(amount),
-              currency: currency,
-              product_data: %{
-                name: "Payment to @#{recipient.provider_login}",
-                description: if(ticket_ref, do: "#{ticket_ref[:owner]}/#{ticket_ref[:repo]}##{ticket_ref[:number]}"),
-                images: [recipient.avatar_url]
-              }
-            },
-            quantity: 1
-          }
-        ]
-      else
-        []
-      end ++
-        Enum.map(claims, fn claim ->
-          %{
-            price_data: %{
-              # TODO: ensure shares are normalized
-              unit_amount: amount |> Money.mult!(claim.group_share) |> MoneyUtils.to_minor_units(),
-              currency: currency,
-              product_data: %{
-                name: "Payment to @#{claim.user.provider_login}",
-                description: if(ticket_ref, do: "#{ticket_ref[:owner]}/#{ticket_ref[:repo]}##{ticket_ref[:number]}"),
-                images: [claim.user.avatar_url]
-              }
-            },
-            quantity: 1
-          }
-        end) ++
-        [
-          %{
-            price_data: %{
-              unit_amount: MoneyUtils.to_minor_units(Money.mult!(amount, platform_fee_pct)),
-              currency: currency,
-              product_data: %{name: "Algora platform fee (#{Util.format_pct(platform_fee_pct)})"}
-            },
-            quantity: 1
-          },
-          %{
-            price_data: %{
-              unit_amount: MoneyUtils.to_minor_units(Money.mult!(amount, transaction_fee_pct)),
-              currency: currency,
-              product_data: %{name: "Transaction fee (#{Util.format_pct(transaction_fee_pct)})"}
-            },
-            quantity: 1
-          }
-        ]
+      generate_line_items(%{amount: amount},
+        ticket_ref: opts[:ticket_ref],
+        recipient: opts[:recipient],
+        claims: opts[:claims]
+      )
+
+    gross_amount = LineItem.gross_amount(line_items)
 
     Repo.transact(fn ->
       with {:ok, _charge} <-
@@ -375,7 +412,7 @@ defmodule Algora.Bounties do
                user_id: creator.id,
                gross_amount: gross_amount,
                net_amount: amount,
-               total_fee: total_fee,
+               total_fee: Money.sub!(gross_amount, amount),
                line_items: line_items,
                group_id: tx_group_id
              }),
@@ -389,7 +426,7 @@ defmodule Algora.Bounties do
                group_id: tx_group_id
              }),
            {:ok, session} <-
-             Payments.create_stripe_session(line_items, %{
+             Payments.create_stripe_session(LineItem.to_stripe(line_items), %{
                description: description,
                metadata: %{"version" => "2", "group_id" => tx_group_id}
              }) do

lib/algora_web/components/core_components.ex

@@ -13,6 +13,7 @@ defmodule AlgoraWeb.CoreComponents do
   use Gettext, backend: AlgoraWeb.Gettext
 
   alias AlgoraWeb.Components.UI.Accordion
+  alias AlgoraWeb.Components.UI.Alert
   alias AlgoraWeb.Components.UI.Avatar
   alias AlgoraWeb.Components.UI.Card
   alias AlgoraWeb.Components.UI.Dialog
@@ -231,18 +232,19 @@ defmodule AlgoraWeb.CoreComponents do
   slot :link do
     attr :navigate, :string
     attr :href, :string
+    attr :patch, :string
     attr :method, :any
   end
 
   def dropdown2(assigns) do
     ~H"""
     <!-- User account dropdown -->
     <div class={classes(["relative w-full text-left", @class])}>
-      <div>
+      <div class="overflow-visible relative">
         <button
           id={@id}
           type="button"
-          class="group w-full rounded-md px-3.5 py-2 text-left text-sm font-medium text-foreground hover:bg-accent focus:outline-none focus:ring-2 focus:ring-ring"
+          class="group w-full rounded-md p-3 text-left text-sm font-medium text-foreground hover:bg-accent focus:outline-none focus:ring-2 focus:ring-ring border border-input"
           phx-click={show_dropdown("##{@id}-dropdown")}
           phx-hook="Menu"
           data-active-class="bg-accent"
@@ -265,7 +267,7 @@ defmodule AlgoraWeb.CoreComponents do
             </span>
             <.icon
               name="tabler-selector"
-              class="ml-2 h-5 w-5 flex-shrink-0 text-gray-500 group-hover:text-gray-400"
+              class="ml-2 h-6 w-6 flex-shrink-0 text-gray-500 group-hover:text-gray-400"
             />
           </span>
         </button>
@@ -282,7 +284,8 @@ defmodule AlgoraWeb.CoreComponents do
             <.link
               tabindex="-1"
               role="menuitem"
-              class="block px-4 py-2 text-sm text-foreground hover:bg-accent focus:outline-none focus:ring-2 focus:ring-ring"
+              class="block p-3 text-sm text-foreground hover:bg-accent focus:outline-none focus:ring-2 focus:ring-ring"
+              phx-click={hide_dropdown("##{@id}-dropdown")}
               {link}
             >
               {render_slot(link)}
@@ -857,8 +860,8 @@ defmodule AlgoraWeb.CoreComponents do
           value={Phoenix.HTML.Form.normalize_value(@type, @value)}
           class={[
             "py-[7px] px-[11px] block w-full rounded-lg border-input bg-background",
-            "text-foreground focus:outline-none focus:ring-4 sm:text-sm sm:leading-6",
-            "border-input focus:border-ring focus:ring-ring/5",
+            "text-foreground focus:outline-none focus:ring-1 sm:text-sm sm:leading-6",
+            "border-input focus:border-ring focus:ring-ring",
             @errors != [] &&
               "border-destructive placeholder-destructive-foreground/50 focus:border-destructive focus:ring-destructive/10",
             @icon && "pl-10",
@@ -1258,7 +1261,9 @@ defmodule AlgoraWeb.CoreComponents do
   defdelegate accordion_item(assigns), to: Accordion
   defdelegate accordion_trigger(assigns), to: Accordion
   defdelegate accordion(assigns), to: Accordion
-  defdelegate alert(assigns), to: AlgoraWeb.Components.UI.Alert
+  defdelegate alert_description(assigns), to: Alert
+  defdelegate alert_title(assigns), to: Alert
+  defdelegate alert(assigns), to: Alert
   defdelegate avatar_fallback(assigns), to: Avatar
   defdelegate avatar_image(assigns), to: Avatar
   defdelegate avatar(assigns), to: Avatar
@@ -1305,7 +1310,6 @@ defmodule AlgoraWeb.CoreComponents do
   defdelegate popover_content(assigns), to: Popover
   defdelegate popover_trigger(assigns), to: Popover
   defdelegate popover(assigns), to: Popover
-  defdelegate radio_group_item(assigns), to: RadioGroup
   defdelegate radio_group(assigns), to: RadioGroup
   defdelegate scroll_area(assigns), to: AlgoraWeb.Components.UI.ScrollArea
   defdelegate select_content(assigns), to: Select

lib/algora_web/components/ui/drawer.ex

@@ -114,7 +114,7 @@ defmodule AlgoraWeb.Components.UI.Drawer do
 
   def drawer_content(assigns) do
     ~H"""
-    <div class={classes(["overflow-y-auto", @class])} {@rest}>
+    <div class={classes(["overflow-y-auto px-1 -mx-1", @class])} {@rest}>
       {render_slot(@inner_block)}
     </div>
     """