From 45845e88777d82f5fc37ead2e35e28ebbb1fbea6 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Tue, 1 Aug 2023 11:35:20 -0700 Subject: [PATCH] Move DeviceGroup to correct namespace. --- Server/API/OrganizationManagementController.cs | 1 - Server/Components/Devices/DeviceCard.razor.cs | 1 - Server/Components/Devices/DevicesFrame.razor.cs | 1 - Server/Components/ModalContents/EditDeviceGroup.razor.cs | 1 - Server/Components/Scripts/RunScript.razor.cs | 1 - Server/Components/Scripts/ScriptSchedules.razor.cs | 1 - Server/Pages/ManageOrganization.razor.cs | 1 - Shared/{Models => Entities}/DeviceGroup.cs | 3 +-- Shared/Entities/Organization.cs | 2 +- Shared/Entities/ScriptSchedule.cs | 1 - 10 files changed, 2 insertions(+), 11 deletions(-) rename Shared/{Models => Entities}/DeviceGroup.cs (91%) diff --git a/Server/API/OrganizationManagementController.cs b/Server/API/OrganizationManagementController.cs index c8d58229..be275cfe 100644 --- a/Server/API/OrganizationManagementController.cs +++ b/Server/API/OrganizationManagementController.cs @@ -12,7 +12,6 @@ using Remotely.Server.Auth; using Remotely.Server.Extensions; using Remotely.Server.Services; using Remotely.Shared.Entities; -using Remotely.Shared.Models; using Remotely.Shared.ViewModels; using System; using System.Text; diff --git a/Server/Components/Devices/DeviceCard.razor.cs b/Server/Components/Devices/DeviceCard.razor.cs index c9ef0d3c..8a5f677e 100644 --- a/Server/Components/Devices/DeviceCard.razor.cs +++ b/Server/Components/Devices/DeviceCard.razor.cs @@ -11,7 +11,6 @@ using Remotely.Server.Models; using Remotely.Server.Services; using Remotely.Shared.Entities; using Remotely.Shared.Enums; -using Remotely.Shared.Models; using Remotely.Shared.Utilities; using Remotely.Shared.ViewModels; using System; diff --git a/Server/Components/Devices/DevicesFrame.razor.cs b/Server/Components/Devices/DevicesFrame.razor.cs index 292a90ad..cefa89fe 100644 --- a/Server/Components/Devices/DevicesFrame.razor.cs +++ b/Server/Components/Devices/DevicesFrame.razor.cs @@ -8,7 +8,6 @@ using Remotely.Server.Models; using Remotely.Server.Services; using Remotely.Shared.Attributes; using Remotely.Shared.Entities; -using Remotely.Shared.Models; using Remotely.Shared.Utilities; using System; using System.Collections; diff --git a/Server/Components/ModalContents/EditDeviceGroup.razor.cs b/Server/Components/ModalContents/EditDeviceGroup.razor.cs index f032b657..90dfae74 100644 --- a/Server/Components/ModalContents/EditDeviceGroup.razor.cs +++ b/Server/Components/ModalContents/EditDeviceGroup.razor.cs @@ -2,7 +2,6 @@ using Microsoft.AspNetCore.Components; using Remotely.Server.Services; using Remotely.Shared.Entities; -using Remotely.Shared.Models; using System.Linq; using System.Threading.Tasks; diff --git a/Server/Components/Scripts/RunScript.razor.cs b/Server/Components/Scripts/RunScript.razor.cs index 9dbfd262..72961f4c 100644 --- a/Server/Components/Scripts/RunScript.razor.cs +++ b/Server/Components/Scripts/RunScript.razor.cs @@ -10,7 +10,6 @@ using Remotely.Server.Pages; using Remotely.Server.Services; using Remotely.Shared.Entities; using Remotely.Shared.Enums; -using Remotely.Shared.Models; using Remotely.Shared.Utilities; using System; using System.Collections.Generic; diff --git a/Server/Components/Scripts/ScriptSchedules.razor.cs b/Server/Components/Scripts/ScriptSchedules.razor.cs index c7a2b942..74fb3ca0 100644 --- a/Server/Components/Scripts/ScriptSchedules.razor.cs +++ b/Server/Components/Scripts/ScriptSchedules.razor.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Components.Forms; using Remotely.Server.Pages; using Remotely.Server.Services; using Remotely.Shared.Entities; -using Remotely.Shared.Models; using Remotely.Shared.Utilities; using System; using System.Collections.Generic; diff --git a/Server/Pages/ManageOrganization.razor.cs b/Server/Pages/ManageOrganization.razor.cs index fbd6b3fb..eea0a6d4 100644 --- a/Server/Pages/ManageOrganization.razor.cs +++ b/Server/Pages/ManageOrganization.razor.cs @@ -8,7 +8,6 @@ using Remotely.Server.Components; using Remotely.Server.Components.ModalContents; using Remotely.Server.Services; using Remotely.Shared.Entities; -using Remotely.Shared.Models; using Remotely.Shared.ViewModels; using System; using System.Collections.Generic; diff --git a/Shared/Models/DeviceGroup.cs b/Shared/Entities/DeviceGroup.cs similarity index 91% rename from Shared/Models/DeviceGroup.cs rename to Shared/Entities/DeviceGroup.cs index a04d55b1..93ec714b 100644 --- a/Shared/Models/DeviceGroup.cs +++ b/Shared/Entities/DeviceGroup.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using Remotely.Shared.Entities; -namespace Remotely.Shared.Models; +namespace Remotely.Shared.Entities; public class DeviceGroup { diff --git a/Shared/Entities/Organization.cs b/Shared/Entities/Organization.cs index 8ec7b6da..a2f257f4 100644 --- a/Shared/Entities/Organization.cs +++ b/Shared/Entities/Organization.cs @@ -1,6 +1,5 @@ using Immense.RemoteControl.Shared.Models; using Remotely.Shared.Enums; -using Remotely.Shared.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -15,6 +14,7 @@ public class Organization public ICollection ApiTokens { get; set; } = new List(); public BrandingInfo? BrandingInfo { get; set; } + public string? BrandingInfoId { get; set; } public ICollection ScriptResults { get; set; } = new List(); diff --git a/Shared/Entities/ScriptSchedule.cs b/Shared/Entities/ScriptSchedule.cs index 63f64664..76277947 100644 --- a/Shared/Entities/ScriptSchedule.cs +++ b/Shared/Entities/ScriptSchedule.cs @@ -1,5 +1,4 @@ using Remotely.Shared.Enums; -using Remotely.Shared.Models; using Remotely.Shared.Utilities; using System; using System.Collections.Generic;