Skip to content

Commit e9cde29

Browse files
committed
re-sorting some files to a new folder structure and making working
1 parent 2e6d426 commit e9cde29

File tree

67 files changed

+224
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+224
-315
lines changed

Intersect.Server.Core/Collections/Indexing/LookupKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Intersect.Server.Localization;
44
using Intersect.Utilities;
55

6-
namespace Intersect.Server.Web.RestApi.Payloads;
6+
namespace Intersect.Server.Web.RestApi.Types;
77

88
// TODO: Figure out how to get LookupKey to show up in swagger.json components/schemas despite being a "string", one or more of the following commented out attributes may help
99
// [SwaggerSubType(typeof(Guid))]

Intersect.Server.Core/Collections/Sorting/Sort.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Intersect.Server.Web.RestApi.Payloads;
1+
namespace Intersect.Server.Web.RestApi.Types;
22

33

44
public partial struct Sort
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
namespace Intersect.Server.Web.RestApi.Payloads;
2-
1+
namespace Intersect.Server.Web.RestApi.Types;
32

43
public enum SortDirection
54
{
6-
75
Ascending,
86

9-
Descending
10-
7+
Descending,
118
}

Intersect.Server.Core/Database/PlayerData/Players/Guild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
using Intersect.Logging;
1515
using Intersect.Utilities;
1616
using Intersect.Server.Localization;
17-
using Intersect.Server.Web.RestApi.Payloads;
1817
using static Intersect.Server.Database.Logging.Entities.GuildHistory;
18+
using Intersect.Server.Web.RestApi.Types;
1919

2020
namespace Intersect.Server.Database.PlayerData.Players;
2121

Intersect.Server.Core/Database/PlayerData/User.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using Intersect.Server.General;
2020
using Intersect.Server.Localization;
2121
using Intersect.Server.Networking;
22-
using Intersect.Server.Web.RestApi.Payloads;
22+
using Intersect.Server.Web.RestApi.Types;
2323
using Intersect.Utilities;
2424
using Microsoft.EntityFrameworkCore;
2525
using Newtonsoft.Json;

Intersect.Server.Core/Entities/Player.Database.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
using System.ComponentModel.DataAnnotations.Schema;
1+
using System.ComponentModel.DataAnnotations.Schema;
22
using System.Diagnostics.CodeAnalysis;
33
using Intersect.Logging;
44
using Intersect.Server.Database;
55
using Intersect.Server.Database.PlayerData;
66
using Intersect.Server.General;
77
using Intersect.Server.Networking;
8-
using Intersect.Server.Web.RestApi.Payloads;
98
using Intersect.Server.Database.PlayerData.Players;
109
using Intersect.Utilities;
1110

1211
using Microsoft.EntityFrameworkCore;
1312

1413
using Newtonsoft.Json;
14+
using Intersect.Server.Web.RestApi.Types;
1515

1616
namespace Intersect.Server.Entities;
1717

Intersect.Server.Core/Extensions/EnumerableExtensions.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Intersect.Server.Web.RestApi.Payloads;
2-
1+
using Intersect.Server.Web.RestApi.Types;
32
using Microsoft.EntityFrameworkCore;
43

54
namespace Intersect.Server.Extensions;

Intersect.Server.Core/Extensions/QueryableExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using System.Linq.Expressions;
1+
using System.Linq.Expressions;
22

3-
using Intersect.Server.Web.RestApi.Payloads;
3+
using Intersect.Server.Web.RestApi.Types;
44

55
using Microsoft.EntityFrameworkCore;
66

Intersect.Server/Web/Net7/ApiService.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
using Intersect.Server.Web.Configuration;
1111
using Intersect.Server.Web.Constraints;
1212
using Intersect.Server.Web.Middleware;
13-
using Intersect.Server.Web.RestApi.Payloads;
13+
using Intersect.Server.Web.RestApi.Types;
14+
using Intersect.Server.Web.RestApi.Types.Chat;
1415
using Intersect.Server.Web.RestApi.Routes;
1516
using Intersect.Server.Web.Serialization;
1617
using Intersect.Server.Web.Swagger.Filters;
@@ -251,10 +252,10 @@ internal partial class ApiService : ApplicationService<ServerContext, IApiServic
251252
options.TokenValidationParameters.ValidIssuer ??= tokenGenerationOptions.Issuer;
252253
options.Events = new JwtBearerEvents
253254
{
254-
OnAuthenticationFailed = async _ => {},
255-
OnChallenge = async _ => {},
256-
OnMessageReceived = async _ => {},
257-
OnTokenValidated = async _ => {},
255+
OnAuthenticationFailed = async _ => { },
256+
OnChallenge = async _ => { },
257+
OnMessageReceived = async _ => { },
258+
OnTokenValidated = async _ => { },
258259
};
259260
SymmetricSecurityKey issuerKey = new(tokenGenerationOptions.SecretData);
260261
options.TokenValidationParameters.IssuerSigningKey = issuerKey;

Intersect.Server/Web/Net7/Swagger/Filters/LookupKeySchemaFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Intersect.Server.Localization;
2-
using Intersect.Server.Web.RestApi.Payloads;
2+
using Intersect.Server.Web.RestApi.Types;
33
using Microsoft.OpenApi.Any;
44
using Microsoft.OpenApi.Models;
55
using Swashbuckle.AspNetCore.SwaggerGen;

0 commit comments

Comments
 (0)