From 30ff2a6350e332b0903e6ac3390e58170d76ab03 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:43:38 +0200 Subject: [PATCH] Moved api models --- .../Google/Requests/GoogleOAuth2CodePayload.cs | 2 +- .../App/{Models => ApiClients}/IpLocate/Resources/IpLocate.cs | 2 +- Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs | 1 - Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs | 2 +- Moonlight/App/Services/Sessions/IpLocateService.cs | 2 +- Moonlight/Moonlight.csproj | 1 - 6 files changed, 4 insertions(+), 6 deletions(-) rename Moonlight/App/{Models => ApiClients}/Google/Requests/GoogleOAuth2CodePayload.cs (90%) rename Moonlight/App/{Models => ApiClients}/IpLocate/Resources/IpLocate.cs (94%) diff --git a/Moonlight/App/Models/Google/Requests/GoogleOAuth2CodePayload.cs b/Moonlight/App/ApiClients/Google/Requests/GoogleOAuth2CodePayload.cs similarity index 90% rename from Moonlight/App/Models/Google/Requests/GoogleOAuth2CodePayload.cs rename to Moonlight/App/ApiClients/Google/Requests/GoogleOAuth2CodePayload.cs index 4d47dda2..a4ef4bb1 100644 --- a/Moonlight/App/Models/Google/Requests/GoogleOAuth2CodePayload.cs +++ b/Moonlight/App/ApiClients/Google/Requests/GoogleOAuth2CodePayload.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Google.Requests; +namespace Moonlight.App.ApiClients.Google.Requests; public class GoogleOAuth2CodePayload { diff --git a/Moonlight/App/Models/IpLocate/Resources/IpLocate.cs b/Moonlight/App/ApiClients/IpLocate/Resources/IpLocate.cs similarity index 94% rename from Moonlight/App/Models/IpLocate/Resources/IpLocate.cs rename to Moonlight/App/ApiClients/IpLocate/Resources/IpLocate.cs index 58e6ced2..d75717cf 100644 --- a/Moonlight/App/Models/IpLocate/Resources/IpLocate.cs +++ b/Moonlight/App/ApiClients/IpLocate/Resources/IpLocate.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.IpLocate.Resources; +namespace Moonlight.App.ApiClients.IpLocate.Resources; public class IpLocate { diff --git a/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs b/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs index 4971b933..c387999e 100644 --- a/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs +++ b/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs @@ -2,7 +2,6 @@ using Logging.Net; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; -using Moonlight.App.Models.Google.Requests; using Moonlight.App.Models.Misc; using RestSharp; diff --git a/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs b/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs index de742034..391308ab 100644 --- a/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs +++ b/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs @@ -1,8 +1,8 @@ using System.Text; using Logging.Net; +using Moonlight.App.ApiClients.Google.Requests; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; -using Moonlight.App.Models.Google.Requests; using RestSharp; namespace Moonlight.App.Services.OAuth2; diff --git a/Moonlight/App/Services/Sessions/IpLocateService.cs b/Moonlight/App/Services/Sessions/IpLocateService.cs index 26af179d..95d59a8c 100644 --- a/Moonlight/App/Services/Sessions/IpLocateService.cs +++ b/Moonlight/App/Services/Sessions/IpLocateService.cs @@ -1,5 +1,5 @@ using System.Net; -using Moonlight.App.Models.IpLocate.Resources; +using Moonlight.App.ApiClients.IpLocate.Resources; using Newtonsoft.Json; namespace Moonlight.App.Services.Sessions; diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index 28c30e5a..5b12d365 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -73,7 +73,6 @@ -