Move DeviceGroup to correct namespace.

immense · Aug 1, 2023 · 45845e8 · 45845e8
1 parent 4cb129b
commit 45845e8
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 11 deletions.
diff --git a/Server/API/OrganizationManagementController.cs b/Server/API/OrganizationManagementController.cs
@@ -12,7 +12,6 @@
 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
@@ -11,7 +11,6 @@
 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
@@ -8,7 +8,6 @@
 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
@@ -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
@@ -10,7 +10,6 @@
 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
@@ -4,7 +4,6 @@
 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
@@ -8,7 +8,6 @@
 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 → Shared/Entities/DeviceGroup.cs b/Shared/Models/DeviceGroup.cs → Shared/Entities/DeviceGroup.cs
@@ -3,9 +3,8 @@
 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
@@ -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<ApiToken> ApiTokens { get; set; } = new List<ApiToken>();
 
     public BrandingInfo? BrandingInfo { get; set; }
+    public string? BrandingInfoId { get; set; }
 
     public ICollection<ScriptResult> ScriptResults { get; set; } = new List<ScriptResult>();
 

diff --git 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;