miscellanea

Author: zcesur

lib/algora/accounts/schemas/user.ex

@@ -492,6 +492,7 @@ defmodule Algora.Accounts.User do
       :website_url,
       :location,
       :preferences,
+      :display_name,
       :internal_email,
       :internal_notes,
       :candidate_notes,

lib/algora_web/live/contract_live.ex

@@ -140,11 +140,6 @@ defmodule AlgoraWeb.ContractLive do
     messages = thread.id |> Chat.list_messages() |> Repo.preload(:sender)
     participants = thread.id |> Chat.list_participants() |> Repo.preload(:user)
 
-    if connected?(socket) do
-      Chat.subscribe(thread.id)
-      Payments.subscribe()
-    end
-
     share_url =
       if socket.assigns.ticket_ref do
         url(
@@ -154,28 +149,46 @@ defmodule AlgoraWeb.ContractLive do
         url(~p"/#{socket.assigns.bounty.owner.handle}/bounties/#{socket.assigns.bounty.id}")
       end
 
-    {:ok,
-     socket
-     |> assign(:can_create_bounty, Member.can_create_bounty?(socket.assigns.current_user_role))
-     |> assign(:share_url, share_url)
-     |> assign(:page_title, bounty.ticket.title)
-     |> assign(:ticket, bounty.ticket)
-     |> assign(:total_paid, total_paid)
-     |> assign(:ticket_body_html, ticket_body_html)
-     |> assign(:show_reward_modal, false)
-     |> assign(:show_authorize_modal, false)
-     |> assign(:show_release_modal, false)
-     |> assign(:selected_context, nil)
-     |> assign(:tx_id, nil)
-     |> assign(:line_items, [])
-     |> assign(:thread, thread)
-     |> assign(:messages, messages)
-     |> assign(:participants, participants)
-     |> assign(:reward_form, to_form(reward_changeset))
-     |> assign(:release_form, to_form(release_changeset))
-     |> assign_contractor(bounty.shared_with)
-     |> assign_transactions()
-     |> assign_line_items(reward_changeset)}
+    socket =
+      socket
+      |> assign(:can_create_bounty, Member.can_create_bounty?(socket.assigns.current_user_role))
+      |> assign(:share_url, share_url)
+      |> assign(:page_title, bounty.ticket.title)
+      |> assign(:ticket, bounty.ticket)
+      |> assign(:total_paid, total_paid)
+      |> assign(:ticket_body_html, ticket_body_html)
+      |> assign(:show_reward_modal, false)
+      |> assign(:show_authorize_modal, false)
+      |> assign(:show_release_modal, false)
+      |> assign(:selected_context, nil)
+      |> assign(:tx_id, nil)
+      |> assign(:line_items, [])
+      |> assign(:thread, thread)
+      |> assign(:messages, messages)
+      |> assign(:participants, participants)
+      |> assign(:reward_form, to_form(reward_changeset))
+      |> assign(:release_form, to_form(release_changeset))
+      |> assign_contractor(bounty.shared_with)
+      |> assign_transactions()
+      |> assign_line_items(reward_changeset)
+
+    current_user = socket.assigns[:current_user]
+
+    if not is_nil(socket.assigns.contractor) and
+         (is_nil(current_user) or
+            (socket.assigns.contractor.id != socket.assigns.current_user.id and socket.assigns.current_user_role == :none)) do
+      {:ok,
+       redirect(socket,
+         to: ~p"/auth/login?return_to=#{~p"/#{socket.assigns.current_org.handle}/contracts/#{socket.assigns.bounty.id}"}"
+       )}
+    else
+      if connected?(socket) do
+        Chat.subscribe(thread.id)
+        Payments.subscribe()
+      end
+
+      {:ok, socket}
+    end
   end
 
   @impl true

lib/algora_web/live/org/dashboard_live.ex

@@ -349,7 +349,7 @@ defmodule AlgoraWeb.Org.DashboardLive do
           </div>
         </.section>
 
-        <%= if @previewed_user.id in ["xT2oJ8z7wTHWgs8g"] or @previewed_user.contract_signed or (not is_nil(@previewed_user.stage) and @previewed_user.stage != :none) do %>
+        <%= if @previewed_user.id in ["xT2oJ8z7wTHWgs8g", "ETU6LA5QADkB2Dig"] or @previewed_user.contract_signed or (not is_nil(@previewed_user.stage) and @previewed_user.stage != :none) do %>
           <.section title={"#{header_prefix(@previewed_user)} Candidates"}>
             <.link href={"/#{@previewed_user.handle}/candidates"}>
               <img
@@ -1291,9 +1291,9 @@ defmodule AlgoraWeb.Org.DashboardLive do
 
           <div class="flex flex-col items-start sm:items-end gap-3">
             <div class="hidden sm:block sm:text-right">
-              <div class="whitespace-nowrap text-sm text-muted-foreground">Total contract value</div>
+              <div class="whitespace-nowrap text-sm text-muted-foreground">Amount</div>
               <div class="font-display text-lg font-semibold text-foreground">
-                {Money.to_string!(@contract.amount)} / wk
+                {Money.to_string!(@contract.amount)}
               </div>
             </div>
             <.button