From 32abc2160e3c3387f928dcdfbc9780ee7faed3c4 Mon Sep 17 00:00:00 2001 From: Ridhwana Date: Thu, 17 Feb 2022 14:37:17 +0200 Subject: [PATCH] Update the directory structure for Admin Member View (#16608) * feat: update the directory structure for partial * feat: update the current tab --- app/views/admin/users/show.html.erb | 28 +++++++++---------- .../_profile.html.erb} | 4 +-- .../_tabs.html.erb} | 0 .../users/{ => show}/emails/_form.html.erb | 0 .../users/{ => show}/emails/_index.html.erb | 0 .../{ => show}/emails/_verification.html.erb | 0 .../users/{ => show}/flags/_index.html.erb | 0 .../users/{ => show}/notes/_form.html.erb | 0 .../users/{ => show}/notes/_index.html.erb | 0 .../overview}/_credits.html.erb | 0 .../overview}/_organizations.html.erb | 0 .../overview}/_roles.html.erb | 0 .../users/{ => show/overview}/_stats.html.erb | 0 .../overview}/_tag_moderation.html.erb | 0 .../{ => show/profile}/_actions.html.erb | 12 ++++---- .../users/{ => show/profile}/_status.html.erb | 0 .../profile}/actions/_banish.html.erb | 0 .../profile}/actions/_delete.html.erb | 0 .../profile}/actions/_export.html.erb | 0 .../profile}/actions/_merge.html.erb | 0 .../actions/_social_accounts.html.erb | 0 .../profile}/actions/_unpublish.html.erb | 0 .../users/{ => show}/reports/_index.html.erb | 0 23 files changed, 22 insertions(+), 22 deletions(-) rename app/views/admin/users/{_header.html.erb => show/_profile.html.erb} (96%) rename app/views/admin/users/{_navigation.html.erb => show/_tabs.html.erb} (100%) rename app/views/admin/users/{ => show}/emails/_form.html.erb (100%) rename app/views/admin/users/{ => show}/emails/_index.html.erb (100%) rename app/views/admin/users/{ => show}/emails/_verification.html.erb (100%) rename app/views/admin/users/{ => show}/flags/_index.html.erb (100%) rename app/views/admin/users/{ => show}/notes/_form.html.erb (100%) rename app/views/admin/users/{ => show}/notes/_index.html.erb (100%) rename app/views/admin/users/{widgets => show/overview}/_credits.html.erb (100%) rename app/views/admin/users/{widgets => show/overview}/_organizations.html.erb (100%) rename app/views/admin/users/{widgets => show/overview}/_roles.html.erb (100%) rename app/views/admin/users/{ => show/overview}/_stats.html.erb (100%) rename app/views/admin/users/{widgets => show/overview}/_tag_moderation.html.erb (100%) rename app/views/admin/users/{ => show/profile}/_actions.html.erb (88%) rename app/views/admin/users/{ => show/profile}/_status.html.erb (100%) rename app/views/admin/users/{ => show/profile}/actions/_banish.html.erb (100%) rename app/views/admin/users/{ => show/profile}/actions/_delete.html.erb (100%) rename app/views/admin/users/{ => show/profile}/actions/_export.html.erb (100%) rename app/views/admin/users/{ => show/profile}/actions/_merge.html.erb (100%) rename app/views/admin/users/{ => show/profile}/actions/_social_accounts.html.erb (100%) rename app/views/admin/users/{ => show/profile}/actions/_unpublish.html.erb (100%) rename app/views/admin/users/{ => show}/reports/_index.html.erb (100%) diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index f5a0f7e0d..374cdd569 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -1,31 +1,31 @@ <%# TODO: incorporate a tab component. For now you have to manually change the value %> <% current_tab = "overview" # overview|emails|notes|reports|flags %> <% if FeatureFlag.enabled?(:admin_member_view) %> - <%= render "header" %> - <%= render "navigation" %> + <%= render "admin/users/show/profile" %> + <%= render "admin/users/show/tabs" %> <% if current_tab == 'overview' %>
- <%= render "stats" if @user.registered %> + <%= render "admin/users/show/overview/stats" if @user.registered %>
- <%= render "admin/users/widgets/roles" %> + <%= render "admin/users/show/overview/roles" %>
- <%= render "admin/users/widgets/tag_moderation" %> + <%= render "admin/users/show/overview/tag_moderation" %>
- <%= render "admin/users/widgets/organizations" %> + <%= render "admin/users/show/overview/organizations" %>
- <%= render "admin/users/widgets/credits" %> + <%= render "admin/users/show/overview/credits" %>
@@ -33,29 +33,29 @@ <% elsif current_tab == 'notes' %>
- <%= render "admin/users/notes/form" %> + <%= render "admin/users/show/notes/form" %>
- <%= render "admin/users/notes/index" %> + <%= render "admin/users/show/notes/index" %>
<% elsif current_tab == 'emails' %> - <%= render "admin/users/emails/verification" %> + <%= render "admin/users/show/emails/verification" %>
- <%= render "admin/users/emails/form" %> + <%= render "admin/users/show/emails/form" %>
- <%= render "admin/users/emails/index" %> + <%= render "admin/users/show/emails/index" %>
<% elsif current_tab == 'reports' %>
- <%= render "admin/users/reports/index" %> + <%= render "admin/users/show/reports/index" %>
<% elsif current_tab == 'flags' %>
- <%= render "admin/users/flags/index" %> + <%= render "admin/users/show/flags/index" %>
<% end %> <% else %> diff --git a/app/views/admin/users/_header.html.erb b/app/views/admin/users/show/_profile.html.erb similarity index 96% rename from app/views/admin/users/_header.html.erb rename to app/views/admin/users/show/_profile.html.erb index 28de23146..7be4cb72f 100644 --- a/app/views/admin/users/_header.html.erb +++ b/app/views/admin/users/show/_profile.html.erb @@ -18,9 +18,9 @@

<%= @user.name %>

- <%= render "status" %> + <%= render "admin/users/show/profile/status" %>
- <%= render "actions" %> + <%= render "admin/users/show/profile/actions" %>
@<%= @user.username %> ID <%= @user.id %> diff --git a/app/views/admin/users/_navigation.html.erb b/app/views/admin/users/show/_tabs.html.erb similarity index 100% rename from app/views/admin/users/_navigation.html.erb rename to app/views/admin/users/show/_tabs.html.erb diff --git a/app/views/admin/users/emails/_form.html.erb b/app/views/admin/users/show/emails/_form.html.erb similarity index 100% rename from app/views/admin/users/emails/_form.html.erb rename to app/views/admin/users/show/emails/_form.html.erb diff --git a/app/views/admin/users/emails/_index.html.erb b/app/views/admin/users/show/emails/_index.html.erb similarity index 100% rename from app/views/admin/users/emails/_index.html.erb rename to app/views/admin/users/show/emails/_index.html.erb diff --git a/app/views/admin/users/emails/_verification.html.erb b/app/views/admin/users/show/emails/_verification.html.erb similarity index 100% rename from app/views/admin/users/emails/_verification.html.erb rename to app/views/admin/users/show/emails/_verification.html.erb diff --git a/app/views/admin/users/flags/_index.html.erb b/app/views/admin/users/show/flags/_index.html.erb similarity index 100% rename from app/views/admin/users/flags/_index.html.erb rename to app/views/admin/users/show/flags/_index.html.erb diff --git a/app/views/admin/users/notes/_form.html.erb b/app/views/admin/users/show/notes/_form.html.erb similarity index 100% rename from app/views/admin/users/notes/_form.html.erb rename to app/views/admin/users/show/notes/_form.html.erb diff --git a/app/views/admin/users/notes/_index.html.erb b/app/views/admin/users/show/notes/_index.html.erb similarity index 100% rename from app/views/admin/users/notes/_index.html.erb rename to app/views/admin/users/show/notes/_index.html.erb diff --git a/app/views/admin/users/widgets/_credits.html.erb b/app/views/admin/users/show/overview/_credits.html.erb similarity index 100% rename from app/views/admin/users/widgets/_credits.html.erb rename to app/views/admin/users/show/overview/_credits.html.erb diff --git a/app/views/admin/users/widgets/_organizations.html.erb b/app/views/admin/users/show/overview/_organizations.html.erb similarity index 100% rename from app/views/admin/users/widgets/_organizations.html.erb rename to app/views/admin/users/show/overview/_organizations.html.erb diff --git a/app/views/admin/users/widgets/_roles.html.erb b/app/views/admin/users/show/overview/_roles.html.erb similarity index 100% rename from app/views/admin/users/widgets/_roles.html.erb rename to app/views/admin/users/show/overview/_roles.html.erb diff --git a/app/views/admin/users/_stats.html.erb b/app/views/admin/users/show/overview/_stats.html.erb similarity index 100% rename from app/views/admin/users/_stats.html.erb rename to app/views/admin/users/show/overview/_stats.html.erb diff --git a/app/views/admin/users/widgets/_tag_moderation.html.erb b/app/views/admin/users/show/overview/_tag_moderation.html.erb similarity index 100% rename from app/views/admin/users/widgets/_tag_moderation.html.erb rename to app/views/admin/users/show/overview/_tag_moderation.html.erb diff --git a/app/views/admin/users/_actions.html.erb b/app/views/admin/users/show/profile/_actions.html.erb similarity index 88% rename from app/views/admin/users/_actions.html.erb rename to app/views/admin/users/show/profile/_actions.html.erb index cb2be0135..97354ac0d 100644 --- a/app/views/admin/users/_actions.html.erb +++ b/app/views/admin/users/show/profile/_actions.html.erb @@ -34,10 +34,10 @@ <%# These are contents for modals %> diff --git a/app/views/admin/users/_status.html.erb b/app/views/admin/users/show/profile/_status.html.erb similarity index 100% rename from app/views/admin/users/_status.html.erb rename to app/views/admin/users/show/profile/_status.html.erb diff --git a/app/views/admin/users/actions/_banish.html.erb b/app/views/admin/users/show/profile/actions/_banish.html.erb similarity index 100% rename from app/views/admin/users/actions/_banish.html.erb rename to app/views/admin/users/show/profile/actions/_banish.html.erb diff --git a/app/views/admin/users/actions/_delete.html.erb b/app/views/admin/users/show/profile/actions/_delete.html.erb similarity index 100% rename from app/views/admin/users/actions/_delete.html.erb rename to app/views/admin/users/show/profile/actions/_delete.html.erb diff --git a/app/views/admin/users/actions/_export.html.erb b/app/views/admin/users/show/profile/actions/_export.html.erb similarity index 100% rename from app/views/admin/users/actions/_export.html.erb rename to app/views/admin/users/show/profile/actions/_export.html.erb diff --git a/app/views/admin/users/actions/_merge.html.erb b/app/views/admin/users/show/profile/actions/_merge.html.erb similarity index 100% rename from app/views/admin/users/actions/_merge.html.erb rename to app/views/admin/users/show/profile/actions/_merge.html.erb diff --git a/app/views/admin/users/actions/_social_accounts.html.erb b/app/views/admin/users/show/profile/actions/_social_accounts.html.erb similarity index 100% rename from app/views/admin/users/actions/_social_accounts.html.erb rename to app/views/admin/users/show/profile/actions/_social_accounts.html.erb diff --git a/app/views/admin/users/actions/_unpublish.html.erb b/app/views/admin/users/show/profile/actions/_unpublish.html.erb similarity index 100% rename from app/views/admin/users/actions/_unpublish.html.erb rename to app/views/admin/users/show/profile/actions/_unpublish.html.erb diff --git a/app/views/admin/users/reports/_index.html.erb b/app/views/admin/users/show/reports/_index.html.erb similarity index 100% rename from app/views/admin/users/reports/_index.html.erb rename to app/views/admin/users/show/reports/_index.html.erb