@@ -65,7 +65,6 @@ defmodule AtomicWeb.Components.Modal do
)
|> show("##{id}-container")
|> JS.add_class("overflow-hidden", to: "body")
- |> JS.focus_first(to: "##{id}-content")
end
def hide_modal(js \\ %JS{}, id) do
diff --git a/lib/atomic_web/components/table.ex b/lib/atomic_web/components/table.ex
index 9c21ca8c8..d928d0210 100644
--- a/lib/atomic_web/components/table.ex
+++ b/lib/atomic_web/components/table.ex
@@ -29,7 +29,7 @@ defmodule AtomicWeb.Components.Table do
<%= for item <- @items do %>
<%= for col <- @col do %>
-
+
<%= render_slot(col, item) %>
<% end %>
@@ -48,7 +48,7 @@ defmodule AtomicWeb.Components.Table do
assign(assigns, :direction, order_direction(assigns.meta.flop.order_directions, index))
~H"""
-
+
<%= if is_sortable?(@field, @meta.schema) && is_filterable?(@field, @meta.schema) && should_filter(@field, @filter) do %>
<.link patch={build_sorting_query(@field, @meta)} class="mr-2 w-full">
diff --git a/lib/atomic_web/emails/department_emails.ex b/lib/atomic_web/emails/department_emails.ex
new file mode 100644
index 000000000..7bbf4eb10
--- /dev/null
+++ b/lib/atomic_web/emails/department_emails.ex
@@ -0,0 +1,63 @@
+defmodule AtomicWeb.DepartmentEmails do
+ @moduledoc """
+ A module to build department related emails.
+ """
+ use Phoenix.Swoosh, view: AtomicWeb.EmailView
+
+ alias Atomic.Mailer
+
+ @doc """
+ Sends an email to the collaborator when their application to join the department is accepted.
+
+ ## Examples
+
+ iex> send_collaborator_request_email(collaborator, department, department_show_url, to: email)
+ {:ok, email}
+
+ iex> send_collaborator_request_email(collaborator, department, department_show_url, to: email)
+ {:error, reason}
+ """
+ def send_collaborator_accepted_email(collaborator, department, department_show_url, to: email) do
+ base_email(to: email)
+ |> subject("[Atomic] You are now a collaborator of #{department.name}")
+ |> assign(:collaborator, collaborator)
+ |> assign(:department, department)
+ |> assign(:department_url, department_show_url)
+ |> render_body("collaborator_accepted.html")
+ |> Mailer.deliver()
+ end
+
+ @doc """
+ Sends an email to the department admins when a new collaborator requests to join the department.
+
+ ## Examples
+
+ iex> send_collaborator_request_email(collaborator, department, collaborator_review_url,
+ ...> to: emails
+ ...> )
+ {:ok, email}
+
+ iex> send_collaborator_request_email(collaborator, department, collaborator_review_url,
+ ...> to: emails
+ ...> )
+ {:error, reason}
+ """
+ def send_collaborator_request_email(collaborator, department, collaborator_review_url,
+ to: emails
+ ) do
+ base_email(to: emails)
+ |> subject("[Atomic] New collaborator request for #{department.name}")
+ |> assign(:collaborator, collaborator)
+ |> assign(:department, department)
+ |> assign(:collaborator_review_url, collaborator_review_url)
+ |> render_body("collaborator_request.html")
+ |> Mailer.deliver()
+ end
+
+ defp base_email(to: email) do
+ new()
+ |> from({"Atomic", "noreply@atomic.cesium.pt"})
+ |> to(email)
+ |> reply_to("caos@cesium.di.uminho.pt")
+ end
+end
diff --git a/lib/atomic_web/live/collaborator_live/form_component.ex b/lib/atomic_web/live/collaborator_live/form_component.ex
new file mode 100644
index 000000000..09082e9a9
--- /dev/null
+++ b/lib/atomic_web/live/collaborator_live/form_component.ex
@@ -0,0 +1,212 @@
+defmodule AtomicWeb.CollaboratorLive.FormComponent do
+ use AtomicWeb, :live_component
+
+ import AtomicWeb.Components.{Avatar, Badge}
+
+ alias Atomic.Departments
+ alias Phoenix.LiveView.JS
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+
Collaborator
+
+ <%= if !@collaborator.accepted do %>
+
+ <%= gettext("%{user_name} has requested to be a collaborator of %{department_name}.", user_name: extract_first_name(@collaborator.user.name), department_name: @department.name) %>
+
+ """
+ end
+
+ @impl true
+ def update(%{collaborator: collaborator} = assigns, socket) do
+ changeset = Departments.change_collaborator(collaborator)
+
+ {:ok,
+ socket
+ |> assign(assigns)
+ |> assign(:action_modal, nil)
+ |> assign(:changeset, changeset)}
+ end
+
+ defp deny_collaborator_request(socket) do
+ case Departments.delete_collaborator(socket.assigns.collaborator) do
+ {:ok, _} ->
+ notify_result(socket, :success, gettext("Collaborator request denied."))
+
+ _ ->
+ notify_result(
+ socket,
+ :error,
+ gettext("Could not deny the collaborator request. Please try again later.")
+ )
+ end
+ end
+
+ defp delete_collaborator(socket) do
+ case Departments.delete_collaborator(socket.assigns.collaborator) do
+ {:ok, _} ->
+ notify_result(socket, :success, gettext("Collaborator removed successfully."))
+
+ _ ->
+ notify_result(
+ socket,
+ :error,
+ gettext("Could not delete the collaborator. Please try again later.")
+ )
+ end
+ end
+
+ defp accept_collaborator_request(socket) do
+ case Departments.accept_collaborator_request(socket.assigns.collaborator) do
+ {:ok, _} ->
+ notify_result(socket, :success, gettext("Collaborator accepted successfully."))
+
+ _ ->
+ notify_result(
+ socket,
+ :error,
+ gettext("Could not accept the collaborator. Please try again later.")
+ )
+ end
+ end
+
+ defp notify_result(socket, status, message) do
+ send(self(), {:change_collaborator, %{status: status, message: message}})
+ {:noreply, assign(socket, :action_modal, nil)}
+ end
+
+ @impl true
+ def handle_event("confirm", _, socket) do
+ case socket.assigns.action_modal do
+ :confirm_request -> accept_collaborator_request(socket)
+ :deny_request -> deny_collaborator_request(socket)
+ :delete_collaborator -> delete_collaborator(socket)
+ end
+ end
+
+ @impl true
+ def handle_event("clear-action", _, socket) do
+ {:noreply,
+ socket
+ |> assign(:action_modal, nil)}
+ end
+
+ @impl true
+ def handle_event("allow", _, socket) do
+ {:noreply,
+ socket
+ |> assign(:action_modal, :confirm_request)}
+ end
+
+ @impl true
+ def handle_event("deny", _, socket) do
+ {:noreply,
+ socket
+ |> assign(:action_modal, :deny_request)}
+ end
+
+ @impl true
+ def handle_event("delete", _, socket) do
+ {:noreply,
+ socket
+ |> assign(:action_modal, :delete_collaborator)}
+ end
+
+ defp display_action_goal_confirm_title(action) do
+ case action do
+ :confirm_request ->
+ gettext("Are you sure you want to accept this request?")
+
+ :deny_request ->
+ gettext("Are you sure you want to deny this request?")
+
+ :delete_collaborator ->
+ gettext("Are you sure you want to remove this person from the department?")
+ end
+ end
+
+ defp display_action_goal_confirm_description(action, department) do
+ case action do
+ :confirm_request ->
+ gettext("If you change your mind you can always remove this person later.")
+
+ :deny_request ->
+ gettext("If you deny this request, this person will not get access to the department.")
+
+ :delete_collaborator ->
+ gettext(
+ "If you remove this person, they will no longer have access to %{department_name}.",
+ department_name: department.name
+ )
+ end
+ end
+end
diff --git a/lib/atomic_web/live/department_live/components/department_card.ex b/lib/atomic_web/live/department_live/components/department_card.ex
new file mode 100644
index 000000000..f67f711f7
--- /dev/null
+++ b/lib/atomic_web/live/department_live/components/department_card.ex
@@ -0,0 +1,43 @@
+defmodule AtomicWeb.DepartmentLive.Components.DepartmentCard do
+ @moduledoc false
+ use AtomicWeb, :component
+
+ import AtomicWeb.Components.{Avatar, Badge, Gradient}
+
+ attr :department, :map, required: true, doc: "The department to display."
+ attr :collaborators, :list, required: true, doc: "The list of collaborators in the department."
+
+ def department_card(assigns) do
+ ~H"""
+
+
+ <%= if @department.banner do %>
+
+ <% else %>
+ <.gradient seed={@department.id} class="rounded-t-lg" />
+ <% end %>
+
+ <.field type="text" help_text={gettext("The name of the department")} field={f[:name]} placeholder="Name" required />
+ <.field type="textarea" help_text={gettext("A brief description of the department")} field={f[:description]} placeholder="Description" />
+ <.field type="checkbox" help_text={gettext("Allow any user to apply to be a collaborator in this department")} field={f[:collaborator_applications]} />
+
This email has been automatically generated. Please, do not reply.
+
+
+
diff --git a/lib/atomic_web/views/helpers.ex b/lib/atomic_web/views/helpers.ex
index 318725c37..75bdce693 100644
--- a/lib/atomic_web/views/helpers.ex
+++ b/lib/atomic_web/views/helpers.ex
@@ -225,6 +225,31 @@ defmodule AtomicWeb.Helpers do
end
end
+ @doc """
+ Return the first name of a name.
+
+ ## Examples
+
+ iex> extract_first_name("John Doe")
+ "John"
+
+ iex> extract_first_name("John")
+ "John"
+
+ iex> extract_first_name(nil)
+ ""
+
+ """
+ def extract_first_name(nil), do: ""
+
+ def extract_first_name(name) do
+ name
+ |> String.split(" ")
+ |> Enum.filter(&String.match?(String.slice(&1, 0, 1), ~r/^\p{L}$/u))
+ |> Enum.map(&String.capitalize/1)
+ |> hd()
+ end
+
@doc """
Slices a string if it is longer than the given length
diff --git a/priv/repo/migrations/20221000000000_create_departments.exs b/priv/repo/migrations/20221000000000_create_departments.exs
index 14a22628a..641873234 100644
--- a/priv/repo/migrations/20221000000000_create_departments.exs
+++ b/priv/repo/migrations/20221000000000_create_departments.exs
@@ -6,6 +6,9 @@ defmodule Atomic.Repo.Migrations.CreateDepartments do
add :id, :binary_id, primary_key: true
add :name, :string, null: false
add :description, :text
+ add :banner, :string
+ add :collaborator_applications, :boolean, default: false, null: false
+ add :archived, :boolean, default: false, null: false
add :organization_id, references(:organizations, on_delete: :delete_all, type: :binary_id),
null: false
diff --git a/priv/repo/migrations/20230880102641_create_collaborators.exs b/priv/repo/migrations/20230880102641_create_collaborators.exs
index 2b0410d0b..e6446ccb5 100644
--- a/priv/repo/migrations/20230880102641_create_collaborators.exs
+++ b/priv/repo/migrations/20230880102641_create_collaborators.exs
@@ -5,10 +5,11 @@ defmodule Atomic.Repo.Migrations.CreateCollaborators do
create table(:collaborators, primary_key: false) do
add :id, :binary_id, primary_key: true
add :accepted, :boolean, default: false
+ add :accepted_at, :naive_datetime
add :user_id, references(:users, on_delete: :nothing, type: :binary_id), null: false
- add :department_id, references(:departments, on_delete: :nothing, type: :binary_id),
+ add :department_id, references(:departments, on_delete: :delete_all, type: :binary_id),
null: false
timestamps()
diff --git a/priv/repo/seeds/departments.exs b/priv/repo/seeds/departments.exs
index faa11ee42..cbab532b6 100644
--- a/priv/repo/seeds/departments.exs
+++ b/priv/repo/seeds/departments.exs
@@ -6,23 +6,28 @@ defmodule Atomic.Repo.Seeds.Departments do
alias Atomic.Organizations.{Department, Organization}
alias Atomic.Repo
- @department_names [
- "CAOS",
- "Marketing e Conteúdo",
- "Relações Externas e Parcerias",
- "Pedagógico",
- "Recreativo",
- "Financeiro",
- "Administrativo",
- "Comunicação",
- "Tecnologia",
- "Design"
+ @departments [
+ {"CAOS",
+ "O CAOS (Centro de Apoio ao Open-Source) é o departamento responsável por todo o desenvolvimento de software associado ao CeSIUM, quer sejam as plataformas que servem diretamente o núcleo e os seus eventos, ou as plataformas úteis para os alunos. Durante o processo, procura expandir o conhecimento dos seus colaboradores, para além daquilo que aprendem no curso. 💻"},
+ {"Marketing e Conteúdo",
+ "O Departamento de Marketing e Conteúdo é responsável por promover todas as atividades efetuadas pelo núcleo, manter toda a identidade visual do CeSIUM e efetuar a comunicação através das nossas redes sociais. 💡"},
+ {"Recreativo",
+ "O Departamento Recreativo é o responsável por organizar atividades de cariz cultural e/ou lúdico, com o intuito de promover a relação entre os vários estudantes, professores e funcionários. 🤪"},
+ {"Pedagógico",
+ "O Departamento Pedagógico é o responsável por promover a relação entre a Direção de Curso e os alunos do LEI/MEI/MIEI e, ainda, por organizar atividades que complementam a formação académica dos mesmos. ✏️"},
+ {"Relações Externas e Merch",
+ "O Departamento de Relações Externas e Merch é responsável por todo o merchandising do núcleo e por manter e fechar parceriais com diversas entidades e negócios, das quais os sócios do CeSIUM, assim como o núcleo, possam tirar proveito. 🤝"},
+ {"Financeiro",
+ "O Departamento Financeiro é o responsável por toda a gestão financeira do núcleo, desde a organização de contas, ao controlo de despesas e receitas. 💰"},
+ {"Administrativo",
+ "O Departamento Administrativo é o responsável por toda a gestão administrativa do núcleo, desde a organização de documentos, ao controlo de processos e procedimentos. 📝"}
]
def run do
case Repo.all(Department) do
[] ->
seed_departments()
+ seed_collaborators()
_ ->
Mix.shell().error("Found departments, aborting seeding departments.")
@@ -33,12 +38,40 @@ defmodule Atomic.Repo.Seeds.Departments do
organizations = Repo.all(Organization)
for organization <- organizations do
- for i <- 0..Enum.random(4..(length(@department_names) - 1)) do
- %{
- name: Enum.at(@department_names, i),
- organization_id: organization.id
- }
- |> Departments.create_department()
+ for i <- 0..Enum.random(4..(length(@departments) - 1)) do
+ case @departments |> Enum.at(i) do
+ {name, description} ->
+ %{
+ name: name,
+ description: description,
+ organization_id: organization.id,
+ collaborator_applications: Enum.random([true, false])
+ }
+ |> Departments.create_department()
+ end
+ end
+ end
+ end
+
+ def seed_collaborators do
+ for department <- Repo.all(Department) do
+ for user <- Repo.all(Atomic.Accounts.User) do
+ is_accepted = Enum.random([true, false])
+
+ if Enum.random(0..6) == 1 do
+ %{
+ department_id: department.id,
+ user_id: user.id,
+ accepted: is_accepted,
+ accepted_at:
+ if is_accepted do
+ NaiveDateTime.utc_now()
+ else
+ nil
+ end
+ }
+ |> Departments.create_collaborator()
+ end
end
end
end
diff --git a/storybook/components/gradient.story.exs b/storybook/components/gradient.story.exs
new file mode 100644
index 000000000..df2e86958
--- /dev/null
+++ b/storybook/components/gradient.story.exs
@@ -0,0 +1,29 @@
+defmodule AtomicWeb.Storybook.Components.Gradient do
+ use PhoenixStorybook.Story, :component
+
+ alias AtomicWeb.Components.Gradient
+
+ def function, do: &Gradient.gradient/1
+
+ def template do
+ """
+