Merge branch 'develop' into nm/improve-sidebar

Author: nunom27

lib/atomic/accounts.ex

@@ -491,10 +491,11 @@ defmodule Atomic.Accounts do
       {:error, %Ecto.Changeset{}}
 
   """
-  def update_user(%User{} = user, attrs \\ %{}) do
+  def update_user(%User{} = user, attrs \\ %{}, after_save \\ &{:ok, &1}) do
     user
     |> User.changeset(attrs)
     |> Repo.update()
+    |> after_save(after_save)
   end
 
   @doc """

lib/atomic/accounts/user.ex

@@ -12,6 +12,7 @@ defmodule Atomic.Accounts.User do
   alias Atomic.Accounts.Course
   alias Atomic.Activities.Enrollment
   alias Atomic.Organizations.{Collaborator, Membership, Organization}
+  alias Atomic.Socials
 
   @required_fields ~w(email password)a
   @optional_fields ~w(name slug role confirmed_at phone_number course_id current_organization_id)a
@@ -32,13 +33,16 @@ defmodule Atomic.Accounts.User do
     field :confirmed_at, :naive_datetime
     field :phone_number, :string
     field :profile_picture, Uploaders.ProfilePicture.Type
+    field :banner, Uploaders.Banner.Type
 
     belongs_to :course, Course
     belongs_to :current_organization, Organization
 
     has_many :enrollments, Enrollment
     has_many :collaborators, Collaborator
 
+    embeds_one :socials, Socials, on_replace: :update
+
     many_to_many :organizations, Organization, join_through: Membership
 
     timestamps()
@@ -70,8 +74,7 @@ defmodule Atomic.Accounts.User do
 
   def picture_changeset(user, attrs) do
     user
-    |> cast(attrs, @required_fields ++ @optional_fields)
-    |> cast_attachments(attrs, [:profile_picture])
+    |> cast_attachments(attrs, [:profile_picture, :banner])
   end
 
   @doc """
@@ -83,6 +86,7 @@ defmodule Atomic.Accounts.User do
     |> validate_email()
     |> validate_slug()
     |> validate_phone_number()
+    |> cast_embed(:socials, with: &Socials.changeset/2)
   end
 
   defp validate_email(changeset) do

lib/atomic/accounts/user_notifier.ex

@@ -34,7 +34,7 @@ defmodule Atomic.Accounts.UserNotifier do
       |> subject("Confirm your Account")
       |> assign(:user, user)
       |> assign(:url, url)
-      |> render_body("user_confirmation.txt")
+      |> render_body("user_confirmation.html")
 
     case Mailer.deliver(email) do
       {:ok, _term} -> {:ok, email}
@@ -51,7 +51,7 @@ defmodule Atomic.Accounts.UserNotifier do
       |> subject("Reset Password Instructions")
       |> assign(:user, user)
       |> assign(:url, url)
-      |> render_body("user_reset_password.txt")
+      |> render_body("user_reset_password.html")
 
     case Mailer.deliver(email) do
       {:ok, _term} -> {:ok, email}

lib/atomic/departments.ex

@@ -5,7 +5,7 @@ defmodule Atomic.Departments do
   use Atomic.Context
 
   alias Atomic.Accounts.User
-  alias Atomic.Organizations.{Collaborator, Department}
+  alias Atomic.Organizations.{Collaborator, Department, Membership}
   alias AtomicWeb.DepartmentEmails
   alias AtomicWeb.Router.Helpers
 
@@ -405,7 +405,7 @@ defmodule Atomic.Departments do
     User
     |> join(:inner, [u], c in assoc(u, :collaborators))
     |> where([u, c], c.department_id == ^department.id and c.accepted == true)
-    |> join(:inner, [u, c], m in assoc(u, :memberships))
+    |> join(:inner, [u, c], m in Membership, on: m.user_id == u.id)
     |> where(
       [u, c, m],
       m.organization_id == ^department.organization_id and m.role in [:admin, :owner]
@@ -439,7 +439,7 @@ defmodule Atomic.Departments do
             collaborator,
             tab: "collaborators"
           ),
-          to: get_admin_collaborators(department) |> Enum.map(& &1.email)
+          to: get_admin_collaborators(department)
         )
 
         {:ok, collaborator}

lib/atomic/generate_avatar.ex

@@ -0,0 +1,63 @@
+defmodule Atomic.GenerateAvatar do
+  @moduledoc """
+  A module for generating unique, GitHub-style avatars for organizations.
+  """
+
+  import Phoenix.HTML
+
+  @grid_size 5
+  @cell_size 50
+
+  def generate_avatar(seed, output_type) do
+    hash = :crypto.hash(:sha256, seed) |> :binary.bin_to_list()
+    color = Enum.take(hash, 3)
+    grid = build_grid(hash)
+    svg = draw(grid, color)
+
+    handle_output(svg, output_type)
+  end
+
+  defp handle_output(svg, output) when is_binary(output), do: File.write(output, svg)
+
+  defp handle_output(svg, :svg), do: svg
+  defp handle_output(svg, :blob), do: :erlang.term_to_binary(svg)
+  defp handle_output(svg, :html), do: raw(svg)
+
+  defp handle_output(_svg, invalid) do
+    raise ArgumentError,
+          "Invalid output type: #{inspect(invalid)}. Expected one of :svg, :blob, :html, or a file path string."
+  end
+
+  defp build_grid(hash) do
+    hash
+    |> Enum.chunk_every(@grid_size, @grid_size, :discard)
+    |> Enum.map(&mirror/1)
+    |> List.flatten()
+  end
+
+  defp mirror([a, b, c | _]), do: [a, b, c, b, a]
+
+  defp draw(grid, [r, g, b]) do
+    header = """
+    <svg width="#{@grid_size * @cell_size}" height="#{@grid_size * @cell_size}" xmlns="http://www.w3.org/2000/svg">
+    """
+
+    footer = "</svg>"
+
+    body =
+      Enum.map_join(
+        grid
+        |> Enum.with_index()
+        |> Enum.filter(fn {val, _} -> rem(val, 2) == 0 end),
+        "\n",
+        fn {_val, index} ->
+          x = rem(index, @grid_size) * @cell_size
+          y = div(index, @grid_size) * @cell_size
+
+          "<rect x='#{x}' y='#{y}' width='#{@cell_size}' height='#{@cell_size}' fill='rgb(#{r},#{g},#{b})' />"
+        end
+      )
+
+    header <> body <> footer
+  end
+end

lib/atomic/uploaders/banner.ex

@@ -1,15 +1,14 @@
 defmodule Atomic.Uploaders.Banner do
   @moduledoc """
-  Uploader for department banners.
+  Uploader for user banners.
   """
-  use Atomic.Uploader, extensions: ~w(.jpg .jpeg .png)
-
-  alias Atomic.Organizations.Department
+  use Atomic.Uploader, extensions: ~w(.jpg .jpeg .png .gif)
+  alias Atomic.Accounts.User
 
   @versions [:original]
 
-  def storage_dir(_version, {_file, %Department{} = department}) do
-    "uploads/atomic/departments/#{department.id}/banner"
+  def storage_dir(_version, {_file, %User{} = user}) do
+    "uploads/atomic/users/#{user.id}/banner"
   end
 
   def filename(version, _) do

lib/atomic_web.ex

@@ -17,7 +17,7 @@ defmodule AtomicWeb do
   and import those modules here.
   """
 
-  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt)
+  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt humans.txt)
 
   def controller do
     quote do

lib/atomic_web/components/avatar.ex

@@ -44,7 +44,7 @@ defmodule AtomicWeb.Components.Avatar do
     ~H"""
     <span class={generate_avatar_classes(assigns)}>
       <%= if @src do %>
-        <img src={@src} class={"atomic-avatar--#{assigns.type} h-full w-full"} />
+        <img src={@src} class={"atomic-avatar--#{assigns.type} h-full w-full"} alt={assigns.name} />
       <% else %>
         <%= if @auto_generate_initials do %>
           {extract_initials(@name)}

lib/atomic_web/components/image_uploader.ex

@@ -3,83 +3,109 @@ defmodule AtomicWeb.Components.ImageUploader do
   An image uploader component that allows you to upload an image.
   """
 
-  use AtomicWeb, :live_component
+  use AtomicWeb, :component
+
+  attr :id, :string, default: "image-uploader"
+  attr :upload, :any
+  attr :class, :string, default: ""
+  attr :image_class, :string, default: ""
+  attr :image, :string, default: nil
+  attr :icon, :string, default: "hero-photo"
+  attr :preview_disabled, :boolean, default: false
+  attr :rounded, :boolean, default: false
+  attr :editable, :boolean, default: true
+  attr :memory_unit, :string, default: "MB"
+
+  slot :placeholder, required: false, doc: "Slot for the placeholder content."
+
+  def image_uploader(assigns) do
+    assigns = update(assigns, %{})
 
-  def render(assigns) do
     ~H"""
     <div id={@id}>
-      <div class="shrink-0 1.5xl:shrink-0">
+      <%= if @editable do %>
         <.live_file_input upload={@upload} class="hidden" />
-        <div class={
-            "#{if length(@upload.entries) != 0 do
-              "hidden"
-            end} #{@class} border-2 border-gray-300 border-dashed rounded-md"
-          } phx-drop-target={@upload.ref}>
-          <div class="flex h-full items-center justify-center px-6">
-            <div class="flex flex-col items-center justify-center space-y-1">
-              <.icon name={@icon} class="size-8 text-zinc-400" />
-              <div class="flex flex-col items-center text-sm text-zinc-600">
-                <label for="file-upload" class="relative cursor-pointer rounded-md font-medium text-orange-500 hover:text-red-800">
-                  <a onclick={"document.getElementById('#{@upload.ref}').click()"}>Upload a file</a>
-                </label>
-                <p class="pl-1">or drag and drop</p>
-              </div>
-              <p class="text-xs text-gray-500">
-                {extensions_to_string(@upload.accept)} up to {assigns.size_file} {@type}
-              </p>
-            </div>
-          </div>
-        </div>
-        <section>
+      <% end %>
+      <section
+        phx-drop-target={@upload.ref}
+        class={[
+          "hover:cursor-pointer",
+          @rounded && "rounded-full overflow-hidden",
+          not @rounded && "rounded-xl",
+          @class
+        ]}
+        onclick={"document.getElementById('#{@upload.ref}').click()"}
+      >
+        <%= if @upload.entries == [] do %>
+          <article class="h-full">
+            <figure class="flex h-full items-center justify-center">
+              <%= if @image do %>
+                <img class={[@rounded && "p-0", not @rounded, @image_class]} src={@image} />
+              <% else %>
+                <%= if @placeholder do %>
+                  <div class="flex flex-col items-center gap-2">
+                    {render_slot(@placeholder)}
+                    <p class="text-xs text-gray-500">
+                      {extensions_to_string(@upload.accept)}<br /> up to {@size_file} {@memory_unit}
+                    </p>
+                  </div>
+                <% else %>
+                  <div class="flex select-none flex-col items-center gap-2">
+                    <.icon name={@icon} class="h-12 w-12" />
+                    <p class="px-4 text-center">{gettext("Upload a file or drag and drop.")}</p>
+                  </div>
+                <% end %>
+              <% end %>
+            </figure>
+          </article>
+        <% end %>
+        <%= if !@preview_disabled do %>
           <%= for entry <- @upload.entries do %>
-            <%= for err <- upload_errors(@upload, entry) do %>
-              <div class="alert alert-danger relative rounded border border-red-400 bg-red-100 px-4 py-3 text-red-700" role="alert">
-                <span class="block sm:inline">{Phoenix.Naming.humanize(err)}</span>
-                <span class="absolute top-0 right-0 bottom-0 px-4 py-3">
-                  <title>Close</title>
-                </span>
-              </div>
-            <% end %>
-            <article class="upload-entry">
-              <figure class="w-[100px]">
-                <.live_img_preview entry={entry} id={"preview-#{entry.ref}"} class="rounded-lg shadow-lg" />
-                <div class="flex">
-                  <figcaption>
-                    <%= if String.length(entry.client_name) < 30 do %>
-                      {entry.client_name}
-                    <% else %>
-                      {String.slice(entry.client_name, 0..30) <> "... "}
-                    <% end %>
-                  </figcaption>
-                  <button type="button" phx-click="cancel-image" phx-target={@target} phx-value-ref={entry.ref} aria-label="cancel" class="pl-4">
-                    <.icon name="hero-x-mark-solid" class="size-5 text-zinc-400" />
-                  </button>
-                </div>
+            <article class="h-full">
+              <figure class="flex h-full items-center justify-center">
+                <%= if entry.ref do %>
+                  <.live_img_preview id={"preview-#{entry.ref}"} class={[@rounded && "p-0", not @rounded && "p-4", @image_class]} entry={entry} />
+                <% else %>
+                  <div class="flex select-none flex-col items-center gap-2">
+                    <.icon name="hero-document" class="h-12 w-12" />
+                    <p class="px-4 text-center">{entry.client_name}</p>
+                  </div>
+                <% end %>
               </figure>
+              <%= for err <- upload_errors(@upload, entry) do %>
+                <p class="alert alert-danger">{Phoenix.Naming.humanize(err)}</p>
+              <% end %>
             </article>
           <% end %>
-        </section>
-      </div>
+        <% end %>
+        <%= for err <- upload_errors(@upload) do %>
+          <p class="alert alert-danger">{Phoenix.Naming.humanize(err)}</p>
+        <% end %>
+      </section>
     </div>
     """
   end
 
-  def update(assigns, socket) do
-    max_size = assigns.upload.max_file_size
-    type = assigns[:type]
+  def update(assigns, _socket) do
+    max_size =
+      if Map.has_key?(assigns, :upload) do
+        assigns.upload.max_file_size
+      else
+        0
+      end
+
+    memory_unit = assigns[:memory_unit]
 
-    size_file = convert_size(max_size, type)
+    size_file = convert_size(max_size, memory_unit)
 
-    {:ok,
-     socket
-     |> assign(assigns)
-     |> assign(:size_file, size_file)}
+    assigns
+    |> Map.put(:size_file, size_file)
   end
 
-  defp convert_size(size_in_bytes, type) do
+  defp convert_size(size_in_bytes, memory_unit) do
     size_in_bytes_float = size_in_bytes * 1.0
 
-    case type do
+    case memory_unit do
       "kB" -> Float.round(size_in_bytes_float / 1_000, 2)
       "MB" -> Float.round(size_in_bytes_float / 1_000_000, 2)
       "GB" -> Float.round(size_in_bytes_float / 1_000_000_000, 2)