wip

Author: zcesur

lib/algora/bounties/bounties.ex

@@ -51,7 +51,8 @@ defmodule Algora.Bounties do
           amount: Money.t(),
           ticket: Ticket.t(),
           visibility: Bounty.visibility(),
-          shared_with: [String.t()]
+          shared_with: [String.t()],
+          hours_per_week: integer() | nil
         }) ::
           {:ok, Bounty.t()} | {:error, atom()}
   defp do_create_bounty(%{creator: creator, owner: owner, amount: amount, ticket: ticket} = params) do
@@ -62,7 +63,8 @@ defmodule Algora.Bounties do
         owner_id: owner.id,
         creator_id: creator.id,
         visibility: params[:visibility] || owner.bounty_mode,
-        shared_with: params[:shared_with] || []
+        shared_with: params[:shared_with] || [],
+        hours_per_week: params[:hours_per_week]
       })
 
     changeset
@@ -109,7 +111,8 @@ defmodule Algora.Bounties do
             command_id: integer(),
             command_source: :ticket | :comment,
             visibility: Bounty.visibility() | nil,
-            shared_with: [String.t()] | nil
+            shared_with: [String.t()] | nil,
+            hours_per_week: integer() | nil
           ]
         ) ::
           {:ok, Bounty.t()} | {:error, atom()}
@@ -140,7 +143,8 @@ defmodule Algora.Bounties do
                     amount: amount,
                     ticket: ticket,
                     visibility: opts[:visibility],
-                    shared_with: shared_with
+                    shared_with: shared_with,
+                    hours_per_week: opts[:hours_per_week]
                   })
 
                 :set ->
@@ -190,7 +194,8 @@ defmodule Algora.Bounties do
           opts :: [
             strategy: strategy(),
             visibility: Bounty.visibility() | nil,
-            shared_with: [String.t()] | nil
+            shared_with: [String.t()] | nil,
+            hours_per_week: integer() | nil
           ]
         ) ::
           {:ok, Bounty.t()} | {:error, atom()}
@@ -209,7 +214,8 @@ defmodule Algora.Bounties do
                amount: amount,
                ticket: ticket,
                visibility: opts[:visibility],
-               shared_with: shared_with
+               shared_with: shared_with,
+               hours_per_week: opts[:hours_per_week]
              }),
            {:ok, _job} <- notify_bounty(%{owner: owner, bounty: bounty}) do
         broadcast()

lib/algora/bounties/schemas/bounty.ex

@@ -15,6 +15,7 @@ defmodule Algora.Bounties.Bounty do
     field :visibility, Ecto.Enum, values: [:community, :exclusive, :public], null: false, default: :community
     field :shared_with, {:array, :string}, null: false, default: []
     field :deadline, :utc_datetime_usec
+    field :hours_per_week, :integer
 
     belongs_to :ticket, Algora.Workspace.Ticket
     belongs_to :owner, User
@@ -33,7 +34,7 @@ defmodule Algora.Bounties.Bounty do
 
   def changeset(bounty, attrs) do
     bounty
-    |> cast(attrs, [:amount, :ticket_id, :owner_id, :creator_id, :visibility, :shared_with])
+    |> cast(attrs, [:amount, :ticket_id, :owner_id, :creator_id, :visibility, :shared_with, :hours_per_week])
     |> validate_required([:amount, :ticket_id, :owner_id, :creator_id])
     |> generate_id()
     |> foreign_key_constraint(:ticket)

lib/algora/organizations/schemas/member.ex

@@ -36,4 +36,6 @@ defmodule Algora.Organizations.Member do
   end
 
   def can_create_bounty?(role), do: role in [:admin, :mod]
+
+  def can_create_contract?(role), do: role in [:admin, :mod]
 end

lib/algora/shared/validations.ex

@@ -40,6 +40,33 @@ defmodule Algora.Validations do
     end
   end
 
+  def validate_github_handle(changeset, field, embed_field \\ nil) do
+    case get_change(changeset, field) do
+      handle when not is_nil(handle) ->
+        # Check if user is already embedded with matching provider_login
+        existing_user = embed_field && get_field(changeset, embed_field)
+
+        if existing_user && existing_user.provider_login == handle do
+          changeset
+        else
+          case Algora.Workspace.ensure_user(Algora.Admin.token!(), handle) do
+            {:ok, user} ->
+              if embed_field do
+                put_embed(changeset, embed_field, user)
+              else
+                changeset
+              end
+
+            {:error, error, _, _, _, _} ->
+              add_error(changeset, field, error)
+          end
+        end
+
+      _ ->
+        changeset
+    end
+  end
+
   def validate_date_in_future(changeset, field) do
     validate_change(changeset, field, fn _, date ->
       if date && Date.before?(date, DateTime.utc_now()) do

lib/algora_web/components/layouts/user.html.heex

@@ -135,6 +135,35 @@
         </ul>
       <% end %>
     </nav>
+    <%= if main_contract_form = Map.get(assigns, :main_contract_form) do %>
+      <div class="mt-auto mx-auto">
+        <.button
+          phx-click="open_main_contract_form"
+          class="h-9 w-9 rounded-md flex items-center justify-center relative"
+        >
+          <.icon name="tabler-user-dollar" class="h-6 w-6 shrink-0" />
+          <.icon
+            name="tabler-plus"
+            class="h-[0.8rem] w-[0.8rem] shrink-0 absolute bottom-[0.2rem] right-[0.2rem]"
+          />
+        </.button>
+        <.drawer
+          show={@main_contract_form_open?}
+          direction="right"
+          on_cancel="close_main_contract_form"
+        >
+          <.drawer_header>
+            <.drawer_title>Create new contract</.drawer_title>
+            <.drawer_description>
+              Engage a developer for ongoing work
+            </.drawer_description>
+          </.drawer_header>
+          <.drawer_content class="mt-4">
+            <AlgoraWeb.Forms.ContractForm.contract_form form={main_contract_form} />
+          </.drawer_content>
+        </.drawer>
+      </div>
+    <% end %>
     <%= if main_bounty_form = Map.get(assigns, :main_bounty_form) do %>
       <div class="mt-auto mx-auto">
         <.button
@@ -237,6 +266,26 @@
           </div>
         </.link>
         <%= if @current_user do %>
+          <.button
+            phx-click="open_main_contract_form"
+            class="h-9 w-9 rounded-md flex items-center justify-center relative"
+          >
+            <.icon name="tabler-user-dollar" class="h-6 w-6 shrink-0" />
+            <%!-- <.icon
+              name="tabler-plus"
+              class="h-[0.8rem] w-[0.8rem] shrink-0 absolute bottom-[0.2rem] right-[0.2rem]"
+            /> --%>
+          </.button>
+          <.button
+            phx-click="open_main_bounty_form"
+            class="h-9 w-9 rounded-md flex items-center justify-center relative"
+          >
+            <.icon name="tabler-diamond" class="h-6 w-6 shrink-0" />
+            <.icon
+              name="tabler-plus"
+              class="h-[0.8rem] w-[0.8rem] shrink-0 absolute bottom-[0.2rem] right-[0.2rem]"
+            />
+          </.button>
           <%!-- {live_render(@socket, AlgoraWeb.Activity.UserNavTimelineLive,
             id: "activity-timeline",
             session: %{},

lib/algora_web/forms/contract_form.ex

@@ -1,22 +1,122 @@
 defmodule AlgoraWeb.Forms.ContractForm do
   @moduledoc false
   use Ecto.Schema
+  use AlgoraWeb, :html
 
   import Ecto.Changeset
 
+  alias Algora.Accounts.User
   alias Algora.Types.USD
   alias Algora.Validations
 
   embedded_schema do
-    field :hourly_rate, USD
+    field :amount, USD
     field :hours_per_week, :integer
+    field :type, Ecto.Enum, values: [:fixed, :hourly], default: :fixed
+    field :title, :string
+    field :description, :string
+    field :contractor_handle, :string
+
+    embeds_one :contractor, User
+  end
+
+  def type_options do
+    [{"Fixed", :fixed}, {"Hourly", :hourly}]
   end
 
   def changeset(form, attrs) do
     form
-    |> cast(attrs, [:hourly_rate, :hours_per_week])
-    |> validate_required([:hourly_rate, :hours_per_week])
-    |> Validations.validate_money_positive(:hourly_rate)
-    |> validate_number(:hours_per_week, greater_than: 0, less_than_or_equal_to: 40)
+    |> cast(attrs, [:amount, :hours_per_week, :type, :title, :description, :contractor_handle])
+    |> validate_required([:contractor_handle])
+    |> validate_type_fields()
+    |> Validations.validate_money_positive(:amount)
+    |> Validations.validate_github_handle(:contractor_handle, :contractor)
+  end
+
+  defp validate_type_fields(changeset) do
+    case get_field(changeset, :type) do
+      :hourly -> validate_required(changeset, [:amount, :hours_per_week])
+      _ -> validate_required(changeset, [:amount])
+    end
+  end
+
+  def contract_form(assigns) do
+    ~H"""
+    <.form
+      id="main-contract-form"
+      for={@form}
+      phx-submit="create_contract_main"
+      phx-change="validate_contract_main"
+    >
+      <div class="space-y-4">
+        <div class="grid grid-cols-2 gap-4" phx-update="ignore" id="main-contract-form-tabs">
+          <%= for {label, value} <- type_options() do %>
+            <label class={[
+              "group relative flex cursor-pointer rounded-lg px-3 py-2 shadow-sm focus:outline-none",
+              "border-2 bg-background transition-all duration-200 hover:border-primary hover:bg-primary/10",
+              "border-border has-[:checked]:border-primary has-[:checked]:bg-primary/10"
+            ]}>
+              <.input
+                id={"main-contract-form-type-#{value}"}
+                type="radio"
+                field={@form[:type]}
+                checked={@form[:type].value == value}
+                value={value}
+                class="sr-only"
+                phx-click={
+                  %JS{}
+                  |> JS.hide(to: "#main-contract-form [data-tab]:not([data-tab=#{value}])")
+                  |> JS.show(to: "#main-contract-form [data-tab=#{value}]")
+                }
+              />
+              <span class="flex flex-1 items-center justify-between">
+                <span class="text-sm font-medium">{label}</span>
+                <.icon
+                  name="tabler-check"
+                  class="invisible size-5 text-primary group-has-[:checked]:visible"
+                />
+              </span>
+            </label>
+          <% end %>
+        </div>
+
+        <.input label="Title" field={@form[:title]} placeholder="Brief description of the contract" />
+        <.input
+          label="Description (optional)"
+          field={@form[:description]}
+          type="textarea"
+          placeholder="Requirements and acceptance criteria"
+        />
+        <.input label="Amount" icon="tabler-currency-dollar" field={@form[:amount]} />
+
+        <div data-tab="hourly" class="hidden">
+          <.input label="Hours per week" field={@form[:hours_per_week]} />
+        </div>
+
+        <div class="relative">
+          <.input
+            label="GitHub handle"
+            field={@form[:contractor_handle]}
+            phx-debounce="500"
+            class="pl-10"
+          />
+          <div class="pointer-events-none absolute left-0 top-9 flex items-center justify-center pl-3 h-7 w-7">
+            <.avatar :if={get_field(@form.source, :contractor)} class="h-7 w-7">
+              <.avatar_image src={get_field(@form.source, :contractor).avatar_url} />
+            </.avatar>
+            <.icon name="github" class="h-7 w-7 text-muted-foreground" />
+          </div>
+        </div>
+      </div>
+      <div class="pt-4 ml-auto flex gap-4">
+        <.button variant="secondary" phx-click="close_share_drawer" type="button">
+          Cancel
+        </.button>
+        <.button type="submit">
+          Share Contract <.icon name="tabler-arrow-right" class="-mr-1 ml-2 h-4 w-4" />
+        </.button>
+      </div>
+    </.form>
+    """
   end
 end