refactor: announcements is not part of the admin pages

cesium · Nov 7, 2024 · a80c0fa · a80c0fa
1 parent 4a36fa3
commit a80c0fa
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/lib/atomic_web/config.ex b/lib/atomic_web/config.ex
@@ -43,6 +43,13 @@ defmodule AtomicWeb.Config do
           url: ~p"/organizations/#{current_organization}/departments",
           tabs: []
         },
+        %{
+          key: :announcements,
+          title: "Announcements",
+          icon: "hero-newspaper",
+          url: ~p"/organizations/#{current_organization}/announcements",
+          tabs: []
+        },
         %{
           key: :partners,
           title: "Partners",
@@ -83,13 +90,6 @@ defmodule AtomicWeb.Config do
         url: ~p"/activities",
         tabs: []
       },
-      %{
-        key: :announcements,
-        title: "Announcements",
-        icon: "hero-newspaper",
-        url: ~p"/announcements",
-        tabs: []
-      },
       %{
         key: :organizations,
         title: "Organizations",

diff --git a/lib/atomic_web/live/announcement_live/edit.html.heex b/lib/atomic_web/live/announcement_live/edit.html.heex
@@ -5,6 +5,6 @@
     </.button>
   </:actions>
   <div class="pt-4 px-4">
-    <.live_component module={AtomicWeb.AnnouncementLive.FormComponent} id={@announcement.id} organization={@current_organization} title={@page_title} action={@live_action} announcement={@announcement} return_to={~p"/announcements/#{@announcement}"} />
+    <.live_component module={AtomicWeb.AnnouncementLive.FormComponent} id={@announcement.id} organization={@current_organization} title={@page_title} action={@live_action} announcement={@announcement} return_to={~p"/organizations/#{@current_organization}/announcements"} />
   </div>
 </.page>
diff --git a/lib/atomic_web/live/announcement_live/index.ex b/lib/atomic_web/live/announcement_live/index.ex
@@ -12,12 +12,15 @@ defmodule AtomicWeb.AnnouncementLive.Index do
   end
 
   @impl true
-  def handle_params(params, _, socket) do
+  def handle_params(%{"organization_id" => organization_id} = params, _, socket) do
+    organization = Organizations.get_organization!(organization_id)
+
     {:noreply,
      socket
      |> assign(:page_title, gettext("Announcements"))
      |> assign(:current_page, :announcements)
      |> assign(:current_tab, current_tab(socket, params))
+     |> assign(:organization, organization)
      |> assign(:params, params)
      |> assign(:has_permissions?, has_permissions?(socket))
      |> assign(list_announcements(socket, params))

diff --git a/lib/atomic_web/live/announcement_live/index.html.heex b/lib/atomic_web/live/announcement_live/index.html.heex
@@ -1,7 +1,7 @@
 <.page title="Announcements">
   <:actions>
     <%= if not @empty? and @has_permissions? do %>
-      <.button navigate={~p"/announcements/new"}>
+      <.button navigate={~p"/organizations/#{@current_organization}/announcements/new"} icon="hero-plus">
         <%= gettext("New") %>
       </.button>
     <% end %>
@@ -23,14 +23,14 @@
   <!-- Announcements index -->
   <%= if @empty? and @has_permissions? do %>
     <div class="mt-32">
-      <.empty_state url={~p"/announcements/new"} placeholder="announcement" />
+      <.empty_state url={~p"/organizations/#{@organization}/announcements/new"} placeholder="announcement" />
     </div>
   <% else %>
     <div class="overflow-hidden bg-white">
       <ul role="list" class="divide-y divide-zinc-200 overflow-auto">
         <%= for announcement <- @announcements do %>
           <li id={announcement.id}>
-            <.link navigate={~p"/announcements/#{announcement}"} class="block hover:bg-zinc-50">
+            <.link navigate={~p"/organizations/#{@organization}/announcements/#{announcement}"} class="block hover:bg-zinc-50">
               <div class="px-4 py-4 lg:px-6">
                 <div class="flex items-center justify-between">
                   <p class="truncate text-sm font-medium text-zinc-900">

diff --git a/lib/atomic_web/live/announcement_live/new.html.heex b/lib/atomic_web/live/announcement_live/new.html.heex
@@ -1,5 +1,5 @@
 <.page title={gettext("New Announcement")}>
   <div class="pt-4 px-4">
-    <.live_component module={AtomicWeb.AnnouncementLive.FormComponent} id={:new} organization={@current_organization} title={@page_title} action={@live_action} announcement={@announcement} return_to={~p"/announcements"} />
+    <.live_component module={AtomicWeb.AnnouncementLive.FormComponent} id={:new} organization={@current_organization} title={@page_title} action={@live_action} announcement={@announcement} return_to={~p"/organizations/#{@current_organization}/announcements"} />
   </div>
 </.page>
diff --git a/lib/atomic_web/router.ex b/lib/atomic_web/router.ex
@@ -132,6 +132,12 @@ defmodule AtomicWeb.Router do
           live "/", PartnerLive.Index, :index
           live "/:id", PartnerLive.Show, :show
         end
+
+        scope "/announcements" do
+          pipe_through :confirm_announcement_association
+          live "/", AnnouncementLive.Index, :index
+          live "/:id", AnnouncementLive.Show, :show
+        end
       end
 
       # Only masters can create organizations