<.link
- navigate={~p"/settings/api_tokens"}
+ navigate={~p"/#{@subject.account}/settings/api_tokens"}
class="flex items-center p-2 pl-11 w-full text-base font-medium text-gray-900 rounded-lg transition duration-75 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700"
>
API
diff --git a/elixir/apps/web/lib/web/components/layouts/root.html.heex b/elixir/apps/web/lib/web/components/layouts/root.html.heex
index e571fb4b8..9a3b749df 100644
--- a/elixir/apps/web/lib/web/components/layouts/root.html.heex
+++ b/elixir/apps/web/lib/web/components/layouts/root.html.heex
@@ -1,5 +1,5 @@
-
+
diff --git a/elixir/apps/web/lib/web/live/devices_live/index.ex b/elixir/apps/web/lib/web/live/devices_live/index.ex
index c3278ebfb..b7eed25da 100644
--- a/elixir/apps/web/lib/web/live/devices_live/index.ex
+++ b/elixir/apps/web/lib/web/live/devices_live/index.ex
@@ -6,8 +6,8 @@ defmodule Web.DevicesLive.Index do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Devices", path: ~p"/devices"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Devices", path: ~p"/#{@subject.account}/devices"}
]} />
<:title>
@@ -86,7 +86,7 @@ defmodule Web.DevicesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
v1.01 Linux
@@ -94,7 +94,7 @@ defmodule Web.DevicesLive.Index do
|
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
John Doe
@@ -149,7 +149,7 @@ defmodule Web.DevicesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
v1.01 iOS
@@ -157,7 +157,7 @@ defmodule Web.DevicesLive.Index do
|
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Steve Johnson
@@ -212,7 +212,7 @@ defmodule Web.DevicesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
v1.01 macOS
@@ -220,7 +220,7 @@ defmodule Web.DevicesLive.Index do
|
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Steinberg, Gabriel
@@ -272,7 +272,7 @@ defmodule Web.DevicesLive.Index do
- <.paginator page={3} total_pages={100} collection_base_path={~p"/devices"} />
+ <.paginator page={3} total_pages={100} collection_base_path={~p"/#{@subject.account}/devices"} />
"""
end
diff --git a/elixir/apps/web/lib/web/live/devices_live/show.ex b/elixir/apps/web/lib/web/live/devices_live/show.ex
index f66332159..ad8d99f0c 100644
--- a/elixir/apps/web/lib/web/live/devices_live/show.ex
+++ b/elixir/apps/web/lib/web/live/devices_live/show.ex
@@ -6,9 +6,12 @@ defmodule Web.DevicesLive.Show do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Devices", path: ~p"/devices"},
- %{label: "Jamil's Macbook Pro", path: ~p"/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Devices", path: ~p"/#{@subject.account}/devices"},
+ %{
+ label: "Jamil's Macbook Pro",
+ path: ~p"/#{@subject.account}/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ }
]} />
<:title>
@@ -39,7 +42,7 @@ defmodule Web.DevicesLive.Show do
|
<.link
- navigate={~p"/users/55DDA8CB-69A7-48FC-9048-639021C205A2"}
+ navigate={~p"/#{@subject.account}/users/55DDA8CB-69A7-48FC-9048-639021C205A2"}
class="text-blue-600 hover:underline"
>
Andrew Dryga
diff --git a/elixir/apps/web/lib/web/live/gateways_live/edit.ex b/elixir/apps/web/lib/web/live/gateways_live/edit.ex
index 808852b41..7ea7705ed 100644
--- a/elixir/apps/web/lib/web/live/gateways_live/edit.ex
+++ b/elixir/apps/web/lib/web/live/gateways_live/edit.ex
@@ -6,10 +6,16 @@ defmodule Web.GatewaysLive.Edit do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Gateways", path: ~p"/gateways"},
- %{label: "gcp-primary", path: ~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"},
- %{label: "Edit", path: ~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Gateways", path: ~p"/#{@subject.account}/gateways"},
+ %{
+ label: "gcp-primary",
+ path: ~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ },
+ %{
+ label: "Edit",
+ path: ~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/gateways_live/index.ex b/elixir/apps/web/lib/web/live/gateways_live/index.ex
index 82b8a9973..e3dffb0fb 100644
--- a/elixir/apps/web/lib/web/live/gateways_live/index.ex
+++ b/elixir/apps/web/lib/web/live/gateways_live/index.ex
@@ -6,15 +6,15 @@ defmodule Web.GatewaysLive.Index do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Gateways", path: ~p"/gateways"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Gateways", path: ~p"/#{@subject.account}/gateways"}
]} />
<:title>
All gateways
<:actions>
- <.add_button navigate={~p"/gateways/new"}>
+ <.add_button navigate={~p"/#{@subject.account}/gateways/new"}>
Add Gateway
@@ -99,7 +99,7 @@ defmodule Web.GatewaysLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
hungry-hippo
@@ -111,7 +111,7 @@ defmodule Web.GatewaysLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
GitLab, Jira, Confluence, and 2 more
@@ -165,7 +165,7 @@ defmodule Web.GatewaysLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
gcp-primary
@@ -177,7 +177,7 @@ defmodule Web.GatewaysLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
10.56.7.0/24
@@ -231,7 +231,7 @@ defmodule Web.GatewaysLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
gcp-secondary
@@ -243,7 +243,7 @@ defmodule Web.GatewaysLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
10.56.7.0/24
@@ -297,7 +297,7 @@ defmodule Web.GatewaysLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
wavering-walrus
@@ -313,7 +313,7 @@ defmodule Web.GatewaysLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
GitLab, Jira, Confluence, and 2 more
@@ -364,7 +364,7 @@ defmodule Web.GatewaysLive.Index do
- <.paginator page={3} total_pages={100} collection_base_path={~p"/gateways"} />
+ <.paginator page={3} total_pages={100} collection_base_path={~p"/#{@subject.account}/gateways"} />
"""
end
diff --git a/elixir/apps/web/lib/web/live/gateways_live/new.ex b/elixir/apps/web/lib/web/live/gateways_live/new.ex
index 8f1c8e03d..a06104948 100644
--- a/elixir/apps/web/lib/web/live/gateways_live/new.ex
+++ b/elixir/apps/web/lib/web/live/gateways_live/new.ex
@@ -6,9 +6,9 @@ defmodule Web.GatewaysLive.New do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Gateways", path: ~p"/gateways"},
- %{label: "Add Gateway", path: ~p"/gateways/new"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Gateways", path: ~p"/#{@subject.account}/gateways"},
+ %{label: "Add Gateway", path: ~p"/#{@subject.account}/gateways/new"}
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/gateways_live/show.ex b/elixir/apps/web/lib/web/live/gateways_live/show.ex
index a3baaf48d..4641099ce 100644
--- a/elixir/apps/web/lib/web/live/gateways_live/show.ex
+++ b/elixir/apps/web/lib/web/live/gateways_live/show.ex
@@ -6,16 +6,21 @@ defmodule Web.GatewaysLive.Show do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Gateways", path: ~p"/gateways"},
- %{label: "gcp-primary", path: ~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Gateways", path: ~p"/#{@subject.account}/gateways"},
+ %{
+ label: "gcp-primary",
+ path: ~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ }
]} />
<:title>
Viewing Gateway gcp-primary
<:actions>
- <.edit_button navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}>
+ <.edit_button navigate={
+ ~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }>
Edit Gateway
@@ -175,7 +180,7 @@ defmodule Web.GatewaysLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Engineering GitLab
@@ -191,7 +196,7 @@ defmodule Web.GatewaysLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
SJC VPC-1
diff --git a/elixir/apps/web/lib/web/live/groups_live/edit.ex b/elixir/apps/web/lib/web/live/groups_live/edit.ex
index 1580d9780..4d5c35d94 100644
--- a/elixir/apps/web/lib/web/live/groups_live/edit.ex
+++ b/elixir/apps/web/lib/web/live/groups_live/edit.ex
@@ -6,10 +6,16 @@ defmodule Web.GroupsLive.Edit do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Groups", path: ~p"/groups"},
- %{label: "Engineering", path: ~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"},
- %{label: "Edit", path: ~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Groups", path: ~p"/#{@subject.account}/groups"},
+ %{
+ label: "Engineering",
+ path: ~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ },
+ %{
+ label: "Edit",
+ path: ~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/groups_live/index.ex b/elixir/apps/web/lib/web/live/groups_live/index.ex
index 5bac81141..64ccbf109 100644
--- a/elixir/apps/web/lib/web/live/groups_live/index.ex
+++ b/elixir/apps/web/lib/web/live/groups_live/index.ex
@@ -6,15 +6,15 @@ defmodule Web.GroupsLive.Index do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Groups", path: ~p"/groups"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Groups", path: ~p"/#{@subject.account}/groups"}
]} />
<:title>
All groups
<:actions>
- <.add_button navigate={~p"/groups/new"}>
+ <.add_button navigate={~p"/#{@subject.account}/groups/new"}>
Add a new group
@@ -80,7 +80,7 @@ defmodule Web.GroupsLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Engineering
@@ -119,7 +119,9 @@ defmodule Web.GroupsLive.Index do
<.link
- navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ navigate={
+ ~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
class="block py-2 px-4 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"
>
Edit
@@ -143,7 +145,7 @@ defmodule Web.GroupsLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
DevOps
@@ -201,7 +203,7 @@ defmodule Web.GroupsLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Human Resources
@@ -255,7 +257,7 @@ defmodule Web.GroupsLive.Index do
- <.paginator page={3} total_pages={100} collection_base_path={~p"/groups"} />
+ <.paginator page={3} total_pages={100} collection_base_path={~p"/#{@subject.account}/groups"} />
"""
end
diff --git a/elixir/apps/web/lib/web/live/groups_live/new.ex b/elixir/apps/web/lib/web/live/groups_live/new.ex
index 4b04fd7de..e2a65a64c 100644
--- a/elixir/apps/web/lib/web/live/groups_live/new.ex
+++ b/elixir/apps/web/lib/web/live/groups_live/new.ex
@@ -6,9 +6,9 @@ defmodule Web.GroupsLive.New do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Groups", path: ~p"/groups"},
- %{label: "Add Group", path: ~p"/groups/new"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Groups", path: ~p"/#{@subject.account}/groups"},
+ %{label: "Add Group", path: ~p"/#{@subject.account}/groups/new"}
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/groups_live/show.ex b/elixir/apps/web/lib/web/live/groups_live/show.ex
index de339fb4c..8ad59ba55 100644
--- a/elixir/apps/web/lib/web/live/groups_live/show.ex
+++ b/elixir/apps/web/lib/web/live/groups_live/show.ex
@@ -6,16 +6,21 @@ defmodule Web.GroupsLive.Show do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Groups", path: ~p"/groups"},
- %{label: "Engineering", path: ~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Groups", path: ~p"/#{@subject.account}/groups"},
+ %{
+ label: "Engineering",
+ path: ~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ }
]} />
<:title>
Viewing Group Engineering
<:actions>
- <.edit_button navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}>
+ <.edit_button navigate={
+ ~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }>
Edit Group
@@ -46,7 +51,7 @@ defmodule Web.GroupsLive.Show do
Created manually by
<.link
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
- navigate={~p"/users/BEE2202A-2598-401D-A6C1-8CC09FFB853A"}
+ navigate={~p"/#{@subject.account}/users/BEE2202A-2598-401D-A6C1-8CC09FFB853A"}
>
Jamil Bou Kheir
@@ -92,7 +97,7 @@ defmodule Web.GroupsLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Bou Kheir, Jamil
@@ -108,7 +113,7 @@ defmodule Web.GroupsLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Dryga, Andrew
diff --git a/elixir/apps/web/lib/web/live/policies_live/edit.ex b/elixir/apps/web/lib/web/live/policies_live/edit.ex
new file mode 100644
index 000000000..568c2504a
--- /dev/null
+++ b/elixir/apps/web/lib/web/live/policies_live/edit.ex
@@ -0,0 +1,59 @@
+defmodule Web.PoliciesLive.Edit do
+ use Web, :live_view
+
+ def render(assigns) do
+ ~H"""
+ <.section_header>
+ <:breadcrumbs>
+ <.breadcrumbs entries={[
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Policies", path: ~p"/#{@subject.account}/policies"},
+ %{
+ label: "Engineering access to GitLab",
+ path: ~p"/#{@subject.account}/policies/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ },
+ %{
+ label: "Edit",
+ path: ~p"/#{@subject.account}/policies/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
+ ]} />
+
+ <:title>
+ Edit Policy Engineering access to GitLab
+
+
+
+
+
+ Edit Policy details
+
+
+
+ """
+ end
+end
diff --git a/elixir/apps/web/lib/web/live/policies_live/index.ex b/elixir/apps/web/lib/web/live/policies_live/index.ex
index 377d54077..6fcb33074 100644
--- a/elixir/apps/web/lib/web/live/policies_live/index.ex
+++ b/elixir/apps/web/lib/web/live/policies_live/index.ex
@@ -3,7 +3,189 @@ defmodule Web.PoliciesLive.Index do
def render(assigns) do
~H"""
- Listing Policies
+ <.section_header>
+ <:breadcrumbs>
+ <.breadcrumbs entries={[
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Policies", path: ~p"/#{@subject.account}/policies"}
+ ]} />
+
+ <:title>
+ All Policies
+
+ <:actions>
+ <.add_button navigate={~p"/#{@subject.account}/policies/new"}>
+ Add a new Policy
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ Actions
+ |
+
+
+
+
+ |
+ <.link
+ navigate={~p"/#{@subject.account}/policies/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
+ >
+ Engineering access to Gitlab
+
+ |
+
+ <.link
+ class="inline-block"
+ navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+
+ Engineering
+
+
+ |
+
+ <.link
+ class="text-blue-600 dark:text-blue-500 hover:underline"
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+ GitLab
+
+ |
+
+ <.link navigate="#" class="text-blue-600 dark:text-blue-500 hover:underline">
+ Delete
+
+ |
+
+
+ |
+ <.link
+ navigate={~p"/#{@subject.account}/policies/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
+ >
+ IT access to Staging VPC
+
+ |
+
+ <.link
+ class="inline-block"
+ navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+
+ IT
+
+
+ |
+
+ <.link
+ class="text-blue-600 dark:text-blue-500 hover:underline"
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+ Staging VPC
+
+ |
+
+ <.link navigate="#" class="text-blue-600 dark:text-blue-500 hover:underline">
+ Delete
+
+ |
+
+
+ |
+ <.link
+ navigate={~p"/#{@subject.account}/policies/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
+ >
+ Admin access to Jira
+
+ |
+
+ <.link
+ class="inline-block"
+ navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+
+ Admin
+
+
+ |
+
+ <.link
+ class="text-blue-600 dark:text-blue-500 hover:underline"
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+ Jira
+
+ |
+
+ <.link navigate="#" class="text-blue-600 dark:text-blue-500 hover:underline">
+ Delete
+
+ |
+
+
+
+
+ <.paginator page={3} total_pages={100} collection_base_path={~p"/#{@subject.account}/gateways"} />
+
"""
end
end
diff --git a/elixir/apps/web/lib/web/live/policies_live/new.ex b/elixir/apps/web/lib/web/live/policies_live/new.ex
index 4a2d91cb9..c68a91ab8 100644
--- a/elixir/apps/web/lib/web/live/policies_live/new.ex
+++ b/elixir/apps/web/lib/web/live/policies_live/new.ex
@@ -3,7 +3,81 @@ defmodule Web.PoliciesLive.New do
def render(assigns) do
~H"""
- Add Policy
+ <.section_header>
+ <:breadcrumbs>
+ <.breadcrumbs entries={[
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Policies", path: ~p"/#{@subject.account}/policies"},
+ %{label: "Add policy", path: ~p"/#{@subject.account}/policies/new"}
+ ]} />
+
+ <:title>
+ Add a new Policy
+
+
+
+
"""
end
end
diff --git a/elixir/apps/web/lib/web/live/policies_live/show.ex b/elixir/apps/web/lib/web/live/policies_live/show.ex
index f6f4670a7..4d49213b6 100644
--- a/elixir/apps/web/lib/web/live/policies_live/show.ex
+++ b/elixir/apps/web/lib/web/live/policies_live/show.ex
@@ -3,7 +3,143 @@ defmodule Web.PoliciesLive.Show do
def render(assigns) do
~H"""
- Viewing Policy
+ <.section_header>
+ <:breadcrumbs>
+ <.breadcrumbs entries={[
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Policies", path: ~p"/#{@subject.account}/policies"},
+ %{label: "Engineering access to GitLab", path: ~p"/#{@subject.account}/policies/new"}
+ ]} />
+
+ <:title>
+ Viewing Policy Engineering access to GitLab
+
+ <:actions>
+ <.edit_button navigate={
+ ~p"/#{@subject.account}/policies/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }>
+ Edit Policy
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Engineering access to GitLab
+ |
+
+
+ |
+ Group
+ |
+
+ Engineering
+ |
+
+
+ |
+ Resource
+ |
+
+ GitLab
+ |
+
+
+ |
+ Created
+ |
+
+ 4/15/22 12:32 PM by
+ <.link
+ class="text-blue-600 hover:underline"
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+ Andrew Dryga
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+ Authorized at
+ |
+
+ Device
+ |
+
+ User
+ |
+
+
+
+
+ |
+ May 1, 2023 8:45p
+ |
+
+ <.link
+ class="text-blue-600 dark:text-blue-500 hover:underline"
+ navigate={~p"/#{@subject.account}/devices/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+ 2425BD07A38D
+
+ |
+
+ <.link
+ class="text-blue-600 dark:text-blue-500 hover:underline"
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ >
+ <%= "Thomas Eizinger " %>
+
+ |
+
+
+
+
+
+ <.section_header>
+ <:title>
+ Danger zone
+
+ <:actions>
+ <.delete_button>
+ Delete Policy
+
+
+
"""
end
end
diff --git a/elixir/apps/web/lib/web/live/resources_live/edit.ex b/elixir/apps/web/lib/web/live/resources_live/edit.ex
index 7e2a9216c..6c8b715bf 100644
--- a/elixir/apps/web/lib/web/live/resources_live/edit.ex
+++ b/elixir/apps/web/lib/web/live/resources_live/edit.ex
@@ -6,17 +6,23 @@ defmodule Web.ResourcesLive.Edit do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Resources", path: ~p"/resources"},
- %{label: "GitLab", path: ~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"},
- %{label: "Edit", path: ~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Resources", path: ~p"/#{@subject.account}/resources"},
+ %{
+ label: "GitLab",
+ path: ~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ },
+ %{
+ label: "Edit",
+ path: ~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
]} />
<:title>
Edit Resource
-
+
Edit Resource details
diff --git a/elixir/apps/web/lib/web/live/resources_live/index.ex b/elixir/apps/web/lib/web/live/resources_live/index.ex
index 66d7c69bc..6bdbe6c48 100644
--- a/elixir/apps/web/lib/web/live/resources_live/index.ex
+++ b/elixir/apps/web/lib/web/live/resources_live/index.ex
@@ -6,15 +6,15 @@ defmodule Web.ResourcesLive.Index do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Resources", path: ~p"/resources"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Resources", path: ~p"/#{@subject.account}/resources"}
]} />
<:title>
All Resources
<:actions>
- <.add_button navigate={~p"/resources/new"}>
+ <.add_button navigate={~p"/#{@subject.account}/resources/new"}>
Add a new Resource
@@ -99,7 +99,7 @@ defmodule Web.ResourcesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
GitLab
@@ -110,28 +110,28 @@ defmodule Web.ResourcesLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
sjc-egress-1, <.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
sjc-egress-2,
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
sjc-egress-3
|
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
Engineering
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
DevOps
@@ -180,7 +180,7 @@ defmodule Web.ResourcesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Staging
@@ -191,19 +191,19 @@ defmodule Web.ResourcesLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
private-vpc
|
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
Engineering
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
IT
@@ -252,7 +252,7 @@ defmodule Web.ResourcesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Production
@@ -263,24 +263,24 @@ defmodule Web.ResourcesLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
prod-gw-1,
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
prod-gw-2
|
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
eng-prod
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
sec-prod
@@ -329,7 +329,7 @@ defmodule Web.ResourcesLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Jira
@@ -340,19 +340,19 @@ defmodule Web.ResourcesLive.Index do
|
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
prod-gw-1,
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
prod-gw-2
|
- <.link navigate={~p"/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
+ <.link navigate={~p"/#{@subject.account}/groups/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}>
Engineering
@@ -398,7 +398,7 @@ defmodule Web.ResourcesLive.Index do
- <.paginator page={3} total_pages={100} collection_base_path={~p"/gateways"} />
+ <.paginator page={3} total_pages={100} collection_base_path={~p"/#{@subject.account}/gateways"} />
"""
end
diff --git a/elixir/apps/web/lib/web/live/resources_live/new.ex b/elixir/apps/web/lib/web/live/resources_live/new.ex
index a5c3e14e6..df6a57a65 100644
--- a/elixir/apps/web/lib/web/live/resources_live/new.ex
+++ b/elixir/apps/web/lib/web/live/resources_live/new.ex
@@ -6,9 +6,9 @@ defmodule Web.ResourcesLive.New do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Resources", path: ~p"/resources"},
- %{label: "Add resource", path: ~p"/resources/new"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Resources", path: ~p"/#{@subject.account}/resources"},
+ %{label: "Add resource", path: ~p"/#{@subject.account}/resources/new"}
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/resources_live/show.ex b/elixir/apps/web/lib/web/live/resources_live/show.ex
index ca16e2292..e0082e1cb 100644
--- a/elixir/apps/web/lib/web/live/resources_live/show.ex
+++ b/elixir/apps/web/lib/web/live/resources_live/show.ex
@@ -6,21 +6,26 @@ defmodule Web.ResourcesLive.Show do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Resources", path: ~p"/resources"},
- %{label: "Engineering Jira", path: ~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Resources", path: ~p"/#{@subject.account}/resources"},
+ %{
+ label: "Engineering Jira",
+ path: ~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ }
]} />
<:title>
Viewing Resource Engineering Jira
<:actions>
- <.edit_button navigate={~p"/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}>
+ <.edit_button navigate={
+ ~p"/#{@subject.account}/resources/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }>
Edit Resource
-
+
@@ -68,7 +73,7 @@ defmodule Web.ResourcesLive.Show do
4/15/22 12:32 PM by
<.link
class="text-blue-600 hover:underline"
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
>
Andrew Dryga
@@ -77,7 +82,7 @@ defmodule Web.ResourcesLive.Show do
-
+
@@ -107,7 +112,7 @@ defmodule Web.ResourcesLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
aws-primary
@@ -128,7 +133,7 @@ defmodule Web.ResourcesLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
aws-secondary
@@ -149,7 +154,7 @@ defmodule Web.ResourcesLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
gcp-primary
@@ -170,7 +175,7 @@ defmodule Web.ResourcesLive.Show do
class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/gateways/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
gcp-secondary
diff --git a/elixir/apps/web/lib/web/live/users_live/edit.ex b/elixir/apps/web/lib/web/live/users_live/edit.ex
index e725b251c..ec4eaa785 100644
--- a/elixir/apps/web/lib/web/live/users_live/edit.ex
+++ b/elixir/apps/web/lib/web/live/users_live/edit.ex
@@ -6,10 +6,16 @@ defmodule Web.UsersLive.Edit do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Users", path: ~p"/users"},
- %{label: "Bou Kheir, Jamil", path: ~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"},
- %{label: "Edit", path: ~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Users", path: ~p"/#{@subject.account}/users"},
+ %{
+ label: "Bou Kheir, Jamil",
+ path: ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ },
+ %{
+ label: "Edit",
+ path: ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/users_live/index.ex b/elixir/apps/web/lib/web/live/users_live/index.ex
index 0990c75ae..667eb0ca8 100644
--- a/elixir/apps/web/lib/web/live/users_live/index.ex
+++ b/elixir/apps/web/lib/web/live/users_live/index.ex
@@ -6,15 +6,15 @@ defmodule Web.UsersLive.Index do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Users", path: ~p"/users"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Users", path: ~p"/#{@subject.account}/users"}
]} />
<:title>
All users
<:actions>
- <.add_button navigate={~p"/users/new"}>
+ <.add_button navigate={~p"/#{@subject.account}/users/new"}>
Add a new user
@@ -88,7 +88,7 @@ defmodule Web.UsersLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Bou Kheir, Jamil
@@ -127,7 +127,9 @@ defmodule Web.UsersLive.Index do
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ navigate={
+ ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
class="block py-2 px-4 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"
>
Edit
@@ -151,7 +153,7 @@ defmodule Web.UsersLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Dryga, Andrew
@@ -190,7 +192,9 @@ defmodule Web.UsersLive.Index do
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ navigate={
+ ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
class="block py-2 px-4 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"
>
Edit
@@ -214,7 +218,7 @@ defmodule Web.UsersLive.Index do
class="px-4 py-3 font-medium text-gray-900 whitespace-nowrap dark:text-white"
>
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ navigate={~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
class="font-medium text-blue-600 dark:text-blue-500 hover:underline"
>
Steinberg, Gabriel
@@ -253,7 +257,9 @@ defmodule Web.UsersLive.Index do
<.link
- navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}
+ navigate={
+ ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }
class="block py-2 px-4 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"
>
Edit
@@ -274,7 +280,7 @@ defmodule Web.UsersLive.Index do
- <.paginator page={3} total_pages={100} collection_base_path={~p"/users"} />
+ <.paginator page={3} total_pages={100} collection_base_path={~p"/#{@subject.account}/users"} />
"""
end
diff --git a/elixir/apps/web/lib/web/live/users_live/new.ex b/elixir/apps/web/lib/web/live/users_live/new.ex
index 037641b74..a4e23442b 100644
--- a/elixir/apps/web/lib/web/live/users_live/new.ex
+++ b/elixir/apps/web/lib/web/live/users_live/new.ex
@@ -6,9 +6,9 @@ defmodule Web.UsersLive.New do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Users", path: ~p"/users"},
- %{label: "Add user", path: ~p"/users/new"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Users", path: ~p"/#{@subject.account}/users"},
+ %{label: "Add user", path: ~p"/#{@subject.account}/users/new"}
]} />
<:title>
diff --git a/elixir/apps/web/lib/web/live/users_live/show.ex b/elixir/apps/web/lib/web/live/users_live/show.ex
index b0bb71530..d875ff655 100644
--- a/elixir/apps/web/lib/web/live/users_live/show.ex
+++ b/elixir/apps/web/lib/web/live/users_live/show.ex
@@ -6,16 +6,21 @@ defmodule Web.UsersLive.Show do
<.section_header>
<:breadcrumbs>
<.breadcrumbs entries={[
- %{label: "Home", path: ~p"/"},
- %{label: "Users", path: ~p"/users"},
- %{label: "Bou Kheir, Jamil", path: ~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"}
+ %{label: "Home", path: ~p"/#{@subject.account}/dashboard"},
+ %{label: "Users", path: ~p"/#{@subject.account}/users"},
+ %{
+ label: "Bou Kheir, Jamil",
+ path: ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89"
+ }
]} />
<:title>
Viewing User Bou Kheir, Jamil
<:actions>
- <.edit_button navigate={~p"/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"}>
+ <.edit_button navigate={
+ ~p"/#{@subject.account}/users/DF43E951-7DFB-4921-8F7F-BF0F8D31FA89/edit"
+ }>
Edit user
@@ -90,7 +95,7 @@ defmodule Web.UsersLive.Show do
|
<.link
- navigate={~p"/groups/55DDA8CB-69A7-48FC-9048-639021C205A2"}
+ navigate={~p"/#{@subject.account}/groups/55DDA8CB-69A7-48FC-9048-639021C205A2"}
class="text-blue-600 hover:underline"
>
Engineering
diff --git a/elixir/apps/web/lib/web/router.ex b/elixir/apps/web/lib/web/router.ex
index 5c1db6acd..6055e30fb 100644
--- a/elixir/apps/web/lib/web/router.ex
+++ b/elixir/apps/web/lib/web/router.ex
@@ -96,15 +96,7 @@ defmodule Web.Router do
{Web.Auth, :ensure_account_admin_user_actor}
] do
live "/dashboard", DashboardLive
- end
- end
- scope "/", Web do
- pipe_through [:browser, :ensure_authenticated]
-
- get "/", AuthController, :sign_out
-
- live_session :ensure_authenticated2 do
# Users
live "/users", UsersLive.Index
live "/users/new", UsersLive.New
|