From 757ea4d4751afc851ea3aaa26a45e237993ee049 Mon Sep 17 00:00:00 2001 From: Joe Kribs Date: Wed, 22 Jan 2025 18:05:33 -0700 Subject: [PATCH] [Meta] Re-Organize Admin Dashboard (#1401) * Re-organize Admin Dashboard --------- Co-authored-by: Ethan Pippin --- Swiftfin.xcodeproj/project.pbxproj | 68 ++++++++++++++----- .../Components/StreamSection.swift | 0 .../Components/TranscodeSection.swift | 0 .../ServerSessionDetailView.swift} | 0 .../ActiveSessionsView.swift | 0 .../ActiveSessionProgressSection.swift | 0 .../Components/ActiveSessionRow.swift | 0 .../Sections/CompatibilitiesSection.swift | 0 .../Sections/CustomDeviceNameSection.swift | 0 .../DeviceDetailsView/DeviceDetailsView.swift | 0 .../DevicesView/Components/DeviceRow.swift | 0 .../DevicesView/DevicesView.swift | 0 .../AddServerUserView/AddServerUserView.swift | 0 .../ServerUserDetailsView.swift | 0 .../AddAccessScheduleView.swift | 0 .../Components/EditAccessScheduleRow.swift | 0 .../EditAccessScheduleView.swift | 0 .../AddServerUserAccessTagsView.swift | 0 .../AccessTagSearchResultsSection.swift | 0 .../Components/TagInput.swift | 0 .../Components/EditAccessTagRow.swift | 0 .../EditServerUserAccessTagsView.swift | 0 .../ServerUserAccessView.swift | 0 .../ServerUserDeviceAccessView.swift | 0 .../ServerUserLiveTVAccessView.swift | 0 .../ServerUserParentalRatingView.swift | 0 .../Sections/ExternalAccessSection.swift | 0 .../Sections/ManagementSection.swift | 0 .../Sections/MediaPlaybackSection.swift | 0 .../Sections/PermissionSection.swift | 0 .../Sections/RemoteControlSection.swift | 0 .../Components/Sections/SessionsSection.swift | 0 .../Components/Sections/StatusSection.swift | 0 .../Components/Sections/SyncPlaySection.swift | 0 .../ServerUserPermissionsView.swift | 0 .../Components/ServerUsersRow.swift | 0 .../ServerUsersView/ServerUsersView.swift | 0 37 files changed, 50 insertions(+), 18 deletions(-) rename Swiftfin/Views/AdminDashboardView/{ => ActiveSessions}/ActiveSessionDetailView/Components/StreamSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ActiveSessions}/ActiveSessionDetailView/Components/TranscodeSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ActiveSessionDetailView/ActiveSessionDetailView.swift => ActiveSessions/ActiveSessionDetailView/ServerSessionDetailView.swift} (100%) rename Swiftfin/Views/AdminDashboardView/{ => ActiveSessions}/ActiveSessionsView/ActiveSessionsView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ActiveSessions}/ActiveSessionsView/Components/ActiveSessionProgressSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ActiveSessions}/ActiveSessionsView/Components/ActiveSessionRow.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerDevices}/DeviceDetailsView/Components/Sections/CompatibilitiesSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerDevices}/DeviceDetailsView/Components/Sections/CustomDeviceNameSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerDevices}/DeviceDetailsView/DeviceDetailsView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerDevices}/DevicesView/Components/DeviceRow.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerDevices}/DevicesView/DevicesView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers}/AddServerUserView/AddServerUserView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers}/ServerUserDetailsView/ServerUserDetailsView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessSchedule/AddAccessScheduleView/AddAccessScheduleView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessSchedule/EditAccessScheduleView/Components/EditAccessScheduleRow.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessSchedule/EditAccessScheduleView/EditAccessScheduleView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessTags/AddServerUserAccessTagsView/AddServerUserAccessTagsView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessTags/AddServerUserAccessTagsView/Components/AccessTagSearchResultsSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessTags/AddServerUserAccessTagsView/Components/TagInput.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessTags/EditServerUserAccessTagsView/Components/EditAccessTagRow.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessTags/EditServerUserAccessTagsView/EditServerUserAccessTagsView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserAccessView/ServerUserAccessView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserDeviceAccessView/ServerUserDeviceAccessView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserLiveTVAccessView/ServerUserLiveTVAccessView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserParentalRatingView/ServerUserParentalRatingView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/ExternalAccessSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/ManagementSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/MediaPlaybackSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/PermissionSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/RemoteControlSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/SessionsSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/StatusSection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/Components/Sections/SyncPlaySection.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers/ServerUserSettings}/ServerUserPermissionsView/ServerUserPermissionsView.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers}/ServerUsersView/Components/ServerUsersRow.swift (100%) rename Swiftfin/Views/AdminDashboardView/{ => ServerUsers}/ServerUsersView/ServerUsersView.swift (100%) diff --git a/Swiftfin.xcodeproj/project.pbxproj b/Swiftfin.xcodeproj/project.pbxproj index a526fe67..5eb254c5 100644 --- a/Swiftfin.xcodeproj/project.pbxproj +++ b/Swiftfin.xcodeproj/project.pbxproj @@ -138,7 +138,7 @@ 4E661A322CEFE7BC00025C99 /* SeriesStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E661A302CEFE7B900025C99 /* SeriesStatus.swift */; }; 4E699BB92CB33FC2007CBD5D /* HomeSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E699BB82CB33FB5007CBD5D /* HomeSection.swift */; }; 4E699BC02CB3477D007CBD5D /* HomeSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E699BBF2CB34775007CBD5D /* HomeSection.swift */; }; - 4E6C27082C8BD0AD00FD2185 /* ActiveSessionDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6C27072C8BD0AD00FD2185 /* ActiveSessionDetailView.swift */; }; + 4E6C27082C8BD0AD00FD2185 /* ServerSessionDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6C27072C8BD0AD00FD2185 /* ServerSessionDetailView.swift */; }; 4E71D6892C80910900A0174D /* EditCustomDeviceProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E71D6882C80910900A0174D /* EditCustomDeviceProfileView.swift */; }; 4E7315742D14772700EA2A95 /* UserProfileHeroImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E7315732D14770E00EA2A95 /* UserProfileHeroImage.swift */; }; 4E7315752D1485C900EA2A95 /* UserProfileImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E5508722D13AFE3002A5345 /* UserProfileImage.swift */; }; @@ -1306,7 +1306,7 @@ 4E661A302CEFE7B900025C99 /* SeriesStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeriesStatus.swift; sourceTree = ""; }; 4E699BB82CB33FB5007CBD5D /* HomeSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeSection.swift; sourceTree = ""; }; 4E699BBF2CB34775007CBD5D /* HomeSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeSection.swift; sourceTree = ""; }; - 4E6C27072C8BD0AD00FD2185 /* ActiveSessionDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveSessionDetailView.swift; sourceTree = ""; }; + 4E6C27072C8BD0AD00FD2185 /* ServerSessionDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSessionDetailView.swift; sourceTree = ""; }; 4E71D6882C80910900A0174D /* EditCustomDeviceProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditCustomDeviceProfileView.swift; sourceTree = ""; }; 4E7315732D14770E00EA2A95 /* UserProfileHeroImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileHeroImage.swift; sourceTree = ""; }; 4E73E2A52C41CFD3002D2A78 /* PlaybackBitrateTestSize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaybackBitrateTestSize.swift; sourceTree = ""; }; @@ -2419,25 +2419,14 @@ 4E63B9F52C8A5BEF00C25378 /* AdminDashboardView */ = { isa = PBXGroup; children = ( - 4E6C27062C8BD09200FD2185 /* ActiveSessionDetailView */, - 4EB1A8CF2C9B2FA200F43898 /* ActiveSessionsView */, - 4EB7C8D32CCED318000CC011 /* AddServerUserView */, + 4EFE80842D3EF80E0029CCB6 /* ActiveSessions */, 4E63B9F42C8A5BEF00C25378 /* AdminDashboardView.swift */, 4EA09DDF2CC4E4D000CB27E4 /* APIKeyView */, E1DE64902CC6F06C00E423B6 /* Components */, - 4E10C80F2CC030B20012CC9F /* DeviceDetailsView */, - 4EED87492CBF824B002354D2 /* DevicesView */, + 4EFE80852D3EF8270029CCB6 /* ServerDevices */, 4E35CE622CBED3FF00DBD886 /* ServerLogsView */, 4ECF5D8C2D0A780F00F066B1 /* ServerTasks */, - 4EFAC12A2D1E253300E40880 /* ServerUserAccessTags */, - 4EC2B1A72CC9725400D866BE /* ServerUserDetailsView */, - 4E2470072D078DD7009139D8 /* ServerUserParentalRatingView */, - 4E537A822D03D0FA00659A1A /* ServerUserDeviceAccessView */, - 4E537A8C2D04410E00659A1A /* ServerUserLiveTVAccessView */, - 4ED25C9F2D07E20C0010333C /* ServerUserAccessSchedule */, - 4EF3D80A2CF7D6670081AD20 /* ServerUserAccessView */, - 4EB538B32CE3C75900EB72D5 /* ServerUserPermissionsView */, - 4EC2B1992CC96E5E00D866BE /* ServerUsersView */, + 4EFE80862D3EF8640029CCB6 /* ServerUsers */, ); path = AdminDashboardView; sourceTree = ""; @@ -2542,7 +2531,7 @@ 4E6C27062C8BD09200FD2185 /* ActiveSessionDetailView */ = { isa = PBXGroup; children = ( - 4E6C27072C8BD0AD00FD2185 /* ActiveSessionDetailView.swift */, + 4E6C27072C8BD0AD00FD2185 /* ServerSessionDetailView.swift */, 4EB1A8D32C9B91A200F43898 /* Components */, ); path = ActiveSessionDetailView; @@ -3017,6 +3006,49 @@ path = Components; sourceTree = ""; }; + 4EFE80842D3EF80E0029CCB6 /* ActiveSessions */ = { + isa = PBXGroup; + children = ( + 4E6C27062C8BD09200FD2185 /* ActiveSessionDetailView */, + 4EB1A8CF2C9B2FA200F43898 /* ActiveSessionsView */, + ); + path = ActiveSessions; + sourceTree = ""; + }; + 4EFE80852D3EF8270029CCB6 /* ServerDevices */ = { + isa = PBXGroup; + children = ( + 4E10C80F2CC030B20012CC9F /* DeviceDetailsView */, + 4EED87492CBF824B002354D2 /* DevicesView */, + ); + path = ServerDevices; + sourceTree = ""; + }; + 4EFE80862D3EF8640029CCB6 /* ServerUsers */ = { + isa = PBXGroup; + children = ( + 4EB7C8D32CCED318000CC011 /* AddServerUserView */, + 4EC2B1A72CC9725400D866BE /* ServerUserDetailsView */, + 4EFE80882D3EF9150029CCB6 /* ServerUserSettings */, + 4EC2B1992CC96E5E00D866BE /* ServerUsersView */, + ); + path = ServerUsers; + sourceTree = ""; + }; + 4EFE80882D3EF9150029CCB6 /* ServerUserSettings */ = { + isa = PBXGroup; + children = ( + 4EFAC12A2D1E253300E40880 /* ServerUserAccessTags */, + 4E2470072D078DD7009139D8 /* ServerUserParentalRatingView */, + 4E537A822D03D0FA00659A1A /* ServerUserDeviceAccessView */, + 4E537A8C2D04410E00659A1A /* ServerUserLiveTVAccessView */, + 4ED25C9F2D07E20C0010333C /* ServerUserAccessSchedule */, + 4EF3D80A2CF7D6670081AD20 /* ServerUserAccessView */, + 4EB538B32CE3C75900EB72D5 /* ServerUserPermissionsView */, + ); + path = ServerUserSettings; + sourceTree = ""; + }; 5310694F2684E7EE00CFFDBA /* VideoPlayer */ = { isa = PBXGroup; children = ( @@ -6240,7 +6272,7 @@ E12376AE2A33D680001F5B44 /* AboutView+Card.swift in Sources */, E1A2C154279A7D5A005EC829 /* UIApplication.swift in Sources */, 4E49DEE62CE5616800352DCD /* UserProfileImagePickerView.swift in Sources */, - 4E6C27082C8BD0AD00FD2185 /* ActiveSessionDetailView.swift in Sources */, + 4E6C27082C8BD0AD00FD2185 /* ServerSessionDetailView.swift in Sources */, E11C15352BF7C505006BC9B6 /* UserProfileImageCoordinator.swift in Sources */, 4EA78B232D2B5CFC0093BFCE /* ItemPhotoCropView.swift in Sources */, E1D8428F2933F2D900D1041A /* MediaSourceInfo.swift in Sources */, diff --git a/Swiftfin/Views/AdminDashboardView/ActiveSessionDetailView/Components/StreamSection.swift b/Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionDetailView/Components/StreamSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ActiveSessionDetailView/Components/StreamSection.swift rename to Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionDetailView/Components/StreamSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ActiveSessionDetailView/Components/TranscodeSection.swift b/Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionDetailView/Components/TranscodeSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ActiveSessionDetailView/Components/TranscodeSection.swift rename to Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionDetailView/Components/TranscodeSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ActiveSessionDetailView/ActiveSessionDetailView.swift b/Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionDetailView/ServerSessionDetailView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ActiveSessionDetailView/ActiveSessionDetailView.swift rename to Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionDetailView/ServerSessionDetailView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ActiveSessionsView/ActiveSessionsView.swift b/Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionsView/ActiveSessionsView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ActiveSessionsView/ActiveSessionsView.swift rename to Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionsView/ActiveSessionsView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ActiveSessionsView/Components/ActiveSessionProgressSection.swift b/Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionsView/Components/ActiveSessionProgressSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ActiveSessionsView/Components/ActiveSessionProgressSection.swift rename to Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionsView/Components/ActiveSessionProgressSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ActiveSessionsView/Components/ActiveSessionRow.swift b/Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionsView/Components/ActiveSessionRow.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ActiveSessionsView/Components/ActiveSessionRow.swift rename to Swiftfin/Views/AdminDashboardView/ActiveSessions/ActiveSessionsView/Components/ActiveSessionRow.swift diff --git a/Swiftfin/Views/AdminDashboardView/DeviceDetailsView/Components/Sections/CompatibilitiesSection.swift b/Swiftfin/Views/AdminDashboardView/ServerDevices/DeviceDetailsView/Components/Sections/CompatibilitiesSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/DeviceDetailsView/Components/Sections/CompatibilitiesSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerDevices/DeviceDetailsView/Components/Sections/CompatibilitiesSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/DeviceDetailsView/Components/Sections/CustomDeviceNameSection.swift b/Swiftfin/Views/AdminDashboardView/ServerDevices/DeviceDetailsView/Components/Sections/CustomDeviceNameSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/DeviceDetailsView/Components/Sections/CustomDeviceNameSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerDevices/DeviceDetailsView/Components/Sections/CustomDeviceNameSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/DeviceDetailsView/DeviceDetailsView.swift b/Swiftfin/Views/AdminDashboardView/ServerDevices/DeviceDetailsView/DeviceDetailsView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/DeviceDetailsView/DeviceDetailsView.swift rename to Swiftfin/Views/AdminDashboardView/ServerDevices/DeviceDetailsView/DeviceDetailsView.swift diff --git a/Swiftfin/Views/AdminDashboardView/DevicesView/Components/DeviceRow.swift b/Swiftfin/Views/AdminDashboardView/ServerDevices/DevicesView/Components/DeviceRow.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/DevicesView/Components/DeviceRow.swift rename to Swiftfin/Views/AdminDashboardView/ServerDevices/DevicesView/Components/DeviceRow.swift diff --git a/Swiftfin/Views/AdminDashboardView/DevicesView/DevicesView.swift b/Swiftfin/Views/AdminDashboardView/ServerDevices/DevicesView/DevicesView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/DevicesView/DevicesView.swift rename to Swiftfin/Views/AdminDashboardView/ServerDevices/DevicesView/DevicesView.swift diff --git a/Swiftfin/Views/AdminDashboardView/AddServerUserView/AddServerUserView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/AddServerUserView/AddServerUserView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/AddServerUserView/AddServerUserView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/AddServerUserView/AddServerUserView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserDetailsView/ServerUserDetailsView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserDetailsView/ServerUserDetailsView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserDetailsView/ServerUserDetailsView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserDetailsView/ServerUserDetailsView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessSchedule/AddAccessScheduleView/AddAccessScheduleView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessSchedule/AddAccessScheduleView/AddAccessScheduleView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessSchedule/AddAccessScheduleView/AddAccessScheduleView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessSchedule/AddAccessScheduleView/AddAccessScheduleView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessSchedule/EditAccessScheduleView/Components/EditAccessScheduleRow.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessSchedule/EditAccessScheduleView/Components/EditAccessScheduleRow.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessSchedule/EditAccessScheduleView/Components/EditAccessScheduleRow.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessSchedule/EditAccessScheduleView/Components/EditAccessScheduleRow.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessSchedule/EditAccessScheduleView/EditAccessScheduleView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessSchedule/EditAccessScheduleView/EditAccessScheduleView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessSchedule/EditAccessScheduleView/EditAccessScheduleView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessSchedule/EditAccessScheduleView/EditAccessScheduleView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/AddServerUserAccessTagsView/AddServerUserAccessTagsView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/AddServerUserAccessTagsView/AddServerUserAccessTagsView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/AddServerUserAccessTagsView/AddServerUserAccessTagsView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/AddServerUserAccessTagsView/AddServerUserAccessTagsView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/AddServerUserAccessTagsView/Components/AccessTagSearchResultsSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/AddServerUserAccessTagsView/Components/AccessTagSearchResultsSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/AddServerUserAccessTagsView/Components/AccessTagSearchResultsSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/AddServerUserAccessTagsView/Components/AccessTagSearchResultsSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/AddServerUserAccessTagsView/Components/TagInput.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/AddServerUserAccessTagsView/Components/TagInput.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/AddServerUserAccessTagsView/Components/TagInput.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/AddServerUserAccessTagsView/Components/TagInput.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/EditServerUserAccessTagsView/Components/EditAccessTagRow.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/EditServerUserAccessTagsView/Components/EditAccessTagRow.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/EditServerUserAccessTagsView/Components/EditAccessTagRow.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/EditServerUserAccessTagsView/Components/EditAccessTagRow.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/EditServerUserAccessTagsView/EditServerUserAccessTagsView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/EditServerUserAccessTagsView/EditServerUserAccessTagsView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessTags/EditServerUserAccessTagsView/EditServerUserAccessTagsView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessTags/EditServerUserAccessTagsView/EditServerUserAccessTagsView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserAccessView/ServerUserAccessView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessView/ServerUserAccessView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserAccessView/ServerUserAccessView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserAccessView/ServerUserAccessView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserDeviceAccessView/ServerUserDeviceAccessView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserDeviceAccessView/ServerUserDeviceAccessView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserDeviceAccessView/ServerUserDeviceAccessView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserDeviceAccessView/ServerUserDeviceAccessView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserLiveTVAccessView/ServerUserLiveTVAccessView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserLiveTVAccessView/ServerUserLiveTVAccessView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserLiveTVAccessView/ServerUserLiveTVAccessView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserLiveTVAccessView/ServerUserLiveTVAccessView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserParentalRatingView/ServerUserParentalRatingView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserParentalRatingView/ServerUserParentalRatingView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserParentalRatingView/ServerUserParentalRatingView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserParentalRatingView/ServerUserParentalRatingView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/ExternalAccessSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/ExternalAccessSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/ExternalAccessSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/ExternalAccessSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/ManagementSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/ManagementSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/ManagementSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/ManagementSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/MediaPlaybackSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/MediaPlaybackSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/MediaPlaybackSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/MediaPlaybackSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/PermissionSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/PermissionSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/PermissionSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/PermissionSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/RemoteControlSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/RemoteControlSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/RemoteControlSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/RemoteControlSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/SessionsSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/SessionsSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/SessionsSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/SessionsSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/StatusSection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/StatusSection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/StatusSection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/StatusSection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/SyncPlaySection.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/SyncPlaySection.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/Components/Sections/SyncPlaySection.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/Components/Sections/SyncPlaySection.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/ServerUserPermissionsView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/ServerUserPermissionsView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUserPermissionsView/ServerUserPermissionsView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUserSettings/ServerUserPermissionsView/ServerUserPermissionsView.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUsersView/Components/ServerUsersRow.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUsersView/Components/ServerUsersRow.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUsersView/Components/ServerUsersRow.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUsersView/Components/ServerUsersRow.swift diff --git a/Swiftfin/Views/AdminDashboardView/ServerUsersView/ServerUsersView.swift b/Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUsersView/ServerUsersView.swift similarity index 100% rename from Swiftfin/Views/AdminDashboardView/ServerUsersView/ServerUsersView.swift rename to Swiftfin/Views/AdminDashboardView/ServerUsers/ServerUsersView/ServerUsersView.swift