diff --git a/src/Api/Controllers/Blogspot/BlogApiController.cs b/src/Api/Controllers/Blogspot/BlogApiController.cs index 481e9994..b08ff9cc 100644 --- a/src/Api/Controllers/Blogspot/BlogApiController.cs +++ b/src/Api/Controllers/Blogspot/BlogApiController.cs @@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Blog; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Blogspot/CommentsApiController.cs b/src/Api/Controllers/Blogspot/CommentsApiController.cs index 41cdd95c..567d6a14 100644 --- a/src/Api/Controllers/Blogspot/CommentsApiController.cs +++ b/src/Api/Controllers/Blogspot/CommentsApiController.cs @@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Blog; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Blogspot/PostTagsApiController.cs b/src/Api/Controllers/Blogspot/PostTagsApiController.cs index 58bd53e5..bd2a9e2a 100644 --- a/src/Api/Controllers/Blogspot/PostTagsApiController.cs +++ b/src/Api/Controllers/Blogspot/PostTagsApiController.cs @@ -10,6 +10,7 @@ namespace Yavsc.Controllers using Models; using Yavsc.Helpers; using Yavsc.Models.Blog; + using Yavsc.Server.Helpers; [Produces("application/json")] [Route("~/api/PostTagsApi")] diff --git a/src/Api/Controllers/Blogspot/TagsApiController.cs b/src/Api/Controllers/Blogspot/TagsApiController.cs index 5a86e24c..de305733 100644 --- a/src/Api/Controllers/Blogspot/TagsApiController.cs +++ b/src/Api/Controllers/Blogspot/TagsApiController.cs @@ -8,6 +8,7 @@ namespace Yavsc.Controllers using Microsoft.EntityFrameworkCore; using Models.Relationship; using Yavsc.Helpers; + using Yavsc.Server.Helpers; [Produces("application/json")] [Route("api/TagsApi")] diff --git a/src/Api/Controllers/Business/ActivityApiController.cs b/src/Api/Controllers/Business/ActivityApiController.cs index 709fab7a..f6b215e7 100644 --- a/src/Api/Controllers/Business/ActivityApiController.cs +++ b/src/Api/Controllers/Business/ActivityApiController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Yavsc.Api.Helpers; +using Yavsc.Server.Helpers; using Yavsc.Models; using Yavsc.Models.Workflow; diff --git a/src/Api/Controllers/Business/BookQueryApiController.cs b/src/Api/Controllers/Business/BookQueryApiController.cs index f8e9282f..6603d65b 100644 --- a/src/Api/Controllers/Business/BookQueryApiController.cs +++ b/src/Api/Controllers/Business/BookQueryApiController.cs @@ -15,6 +15,7 @@ namespace Yavsc.Controllers using Yavsc.Abstract.Identity; using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; + using Yavsc.Server.Helpers; [Produces("application/json")] [Route("api/bookquery"), Authorize(Roles = "Performer,Administrator")] diff --git a/src/Api/Controllers/Business/EstimateApiController.cs b/src/Api/Controllers/Business/EstimateApiController.cs index 79b103e4..f7cb1e6c 100644 --- a/src/Api/Controllers/Business/EstimateApiController.cs +++ b/src/Api/Controllers/Business/EstimateApiController.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Billing; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Business/EstimateTemplatesApiController.cs b/src/Api/Controllers/Business/EstimateTemplatesApiController.cs index a960b9d1..073cb7ce 100644 --- a/src/Api/Controllers/Business/EstimateTemplatesApiController.cs +++ b/src/Api/Controllers/Business/EstimateTemplatesApiController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Billing; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Business/ProductApiController.cs b/src/Api/Controllers/Business/ProductApiController.cs index 10382138..211104c9 100644 --- a/src/Api/Controllers/Business/ProductApiController.cs +++ b/src/Api/Controllers/Business/ProductApiController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Market; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/DimissClicksApiController.cs b/src/Api/Controllers/DimissClicksApiController.cs index d3b31afc..bc1c10b6 100644 --- a/src/Api/Controllers/DimissClicksApiController.cs +++ b/src/Api/Controllers/DimissClicksApiController.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Messaging; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/HairCut/BursherProfilesApiController.cs b/src/Api/Controllers/HairCut/BursherProfilesApiController.cs index a29ae74a..22fdf1e9 100644 --- a/src/Api/Controllers/HairCut/BursherProfilesApiController.cs +++ b/src/Api/Controllers/HairCut/BursherProfilesApiController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Haircut; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/HairCut/HairCutController.cs b/src/Api/Controllers/HairCut/HairCutController.cs index 569efcdb..12a93758 100644 --- a/src/Api/Controllers/HairCut/HairCutController.cs +++ b/src/Api/Controllers/HairCut/HairCutController.cs @@ -22,6 +22,7 @@ namespace Yavsc.ApiControllers using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Authorization; + using Yavsc.Server.Helpers; [Route("api/haircut")][Authorize] public class HairCutController : Controller diff --git a/src/Api/Controllers/Musical/MusicalPreferencesApiController.cs b/src/Api/Controllers/Musical/MusicalPreferencesApiController.cs index a2d8c5bf..944b335b 100644 --- a/src/Api/Controllers/Musical/MusicalPreferencesApiController.cs +++ b/src/Api/Controllers/Musical/MusicalPreferencesApiController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Musical; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Musical/MusicalTendenciesApiController.cs b/src/Api/Controllers/Musical/MusicalTendenciesApiController.cs index d9aedd14..eacccb0a 100644 --- a/src/Api/Controllers/Musical/MusicalTendenciesApiController.cs +++ b/src/Api/Controllers/Musical/MusicalTendenciesApiController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Musical; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/NativeConfidentialController.cs b/src/Api/Controllers/NativeConfidentialController.cs index 8986c5fb..c8784cbc 100644 --- a/src/Api/Controllers/NativeConfidentialController.cs +++ b/src/Api/Controllers/NativeConfidentialController.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Identity; +using Yavsc.Server.Helpers; [Authorize, Route("~/api/gcm")] public class NativeConfidentialController : Controller diff --git a/src/Api/Controllers/PostRateApiController.cs b/src/Api/Controllers/PostRateApiController.cs index a989587d..50d6d2e9 100644 --- a/src/Api/Controllers/PostRateApiController.cs +++ b/src/Api/Controllers/PostRateApiController.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Yavsc.Helpers; using Yavsc.Models; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Relationship/BlackListApiController.cs b/src/Api/Controllers/Relationship/BlackListApiController.cs index ced46b21..a8c00d40 100644 --- a/src/Api/Controllers/Relationship/BlackListApiController.cs +++ b/src/Api/Controllers/Relationship/BlackListApiController.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Access; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Relationship/BlogAclApiController.cs b/src/Api/Controllers/Relationship/BlogAclApiController.cs index cf3f4150..6e8b905c 100644 --- a/src/Api/Controllers/Relationship/BlogAclApiController.cs +++ b/src/Api/Controllers/Relationship/BlogAclApiController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Access; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Relationship/ChatRoomApiController.cs b/src/Api/Controllers/Relationship/ChatRoomApiController.cs index 9eee40ff..a9e0e405 100644 --- a/src/Api/Controllers/Relationship/ChatRoomApiController.cs +++ b/src/Api/Controllers/Relationship/ChatRoomApiController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Chat; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Relationship/CircleApiController.cs b/src/Api/Controllers/Relationship/CircleApiController.cs index 7c3a85a0..7a8b4deb 100644 --- a/src/Api/Controllers/Relationship/CircleApiController.cs +++ b/src/Api/Controllers/Relationship/CircleApiController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Relationship; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/Relationship/ContactsApiController.cs b/src/Api/Controllers/Relationship/ContactsApiController.cs index 2da02e46..ffd6eb0b 100644 --- a/src/Api/Controllers/Relationship/ContactsApiController.cs +++ b/src/Api/Controllers/Relationship/ContactsApiController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Abstract.Identity; using Yavsc.Helpers; using Yavsc.Models; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/ServiceApiController.cs b/src/Api/Controllers/ServiceApiController.cs index cb612b34..63528335 100644 --- a/src/Api/Controllers/ServiceApiController.cs +++ b/src/Api/Controllers/ServiceApiController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Market; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/accounting/ApplicationUserApiController.cs b/src/Api/Controllers/accounting/ApplicationUserApiController.cs index ac9de3b1..b7c47221 100644 --- a/src/Api/Controllers/accounting/ApplicationUserApiController.cs +++ b/src/Api/Controllers/accounting/ApplicationUserApiController.cs @@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Abstract.Identity; using Yavsc.Helpers; using Yavsc.Models; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Api/Controllers/accounting/ProfileApiController.cs b/src/Api/Controllers/accounting/ProfileApiController.cs index 16e1425f..4f9d316d 100644 --- a/src/Api/Controllers/accounting/ProfileApiController.cs +++ b/src/Api/Controllers/accounting/ProfileApiController.cs @@ -6,6 +6,7 @@ using System.Linq; using Yavsc.Models; using Yavsc.Abstract.Identity; using Yavsc.Helpers; +using Yavsc.Server.Helpers; namespace Yavsc.ApiControllers.accounting { diff --git a/src/Api/Helpers/UserHelpers.cs b/src/Api/Helpers/UserHelpers.cs deleted file mode 100644 index ee895600..00000000 --- a/src/Api/Helpers/UserHelpers.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Security.Claims; -using System.Collections.Generic; -using System.Linq; -using Microsoft.EntityFrameworkCore; -using Yavsc.Models; -using Yavsc.Models.Blog; - -namespace Yavsc.Api.Helpers -{ - public static class UserHelpers - { - public static string? GetUserId(this ClaimsPrincipal user) - { - return user.FindFirstValue("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"); - } - } -} diff --git a/src/Yavsc.Server/Helpers/UserHelpers.cs b/src/Yavsc.Server/Helpers/UserHelpers.cs index d5b57a29..3a1a100e 100644 --- a/src/Yavsc.Server/Helpers/UserHelpers.cs +++ b/src/Yavsc.Server/Helpers/UserHelpers.cs @@ -1,11 +1,6 @@ using System.Security.Claims; -using System.Collections.Generic; -using System.Linq; -using Microsoft.EntityFrameworkCore; -using Yavsc.Models; -using Yavsc.Models.Blog; -namespace Yavsc.Helpers +namespace Yavsc.Server.Helpers { public static class UserHelpers { @@ -24,30 +19,5 @@ namespace Yavsc.Helpers return user.Identity.IsAuthenticated; } - public static IEnumerable UserPosts(this ApplicationDbContext dbContext, string posterId, string? readerId) - { - if (readerId == null) - { - var userPosts = dbContext.blogSpotPublications.Include( - b => b.BlogPost - ).Where(x => x.BlogPost.AuthorId == posterId) - .Select(x=>x.BlogPost).ToArray(); - return userPosts; - } - else - { - long[] readerCirclesMemberships = - dbContext.Circle.Include(c => c.Members) - .Where(c => c.Members.Any(m => m.MemberId == readerId)) - .Select(c => c.Id).ToArray(); - return dbContext.BlogSpot.Include( - b => b.Author - ).Include(p => p.ACL).Where(x => x.Author.Id == posterId && - (x.ACL.Count == 0 || x.ACL.Any(a => readerCirclesMemberships.Contains(a.CircleId)))); - - - } - - } } } diff --git a/src/Yavsc.Server/Hubs/ChatHub.cs b/src/Yavsc.Server/Hubs/ChatHub.cs index 518575d9..313af6a2 100644 --- a/src/Yavsc.Server/Hubs/ChatHub.cs +++ b/src/Yavsc.Server/Hubs/ChatHub.cs @@ -36,6 +36,7 @@ namespace Yavsc using Models.Chat; using Yavsc.Abstract.Chat; using Yavsc.Helpers; + using Yavsc.Server.Helpers; using Yavsc.Services; public partial class ChatHub : Hub, IDisposable { diff --git a/src/Yavsc.Server/Makefile b/src/Yavsc.Server/Makefile index 0e010a72..b80f5ae7 100644 --- a/src/Yavsc.Server/Makefile +++ b/src/Yavsc.Server/Makefile @@ -1,26 +1,5 @@ -SOURCE_DIR=../.. -MAKEFILE_DIR=$(SOURCE_DIR)/scripts/make -BASERESX=Resources/Yavsc.Models.Relationship.HyperLink.resx \ - Resources/Yavsc.Models.Streaming.LiveFlow.resx -BASERESXGEN=$(BASERESX:.resx=.Designer.cs) +SOURCE_DIR=.. +SOLUTION_DIR=../.. -include $(MAKEFILE_DIR)/dnx.mk -include $(MAKEFILE_DIR)/versioning.mk -default: all -$(BINTARGETPATH): ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll \ - ../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll prepare_code - -../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll: - make -C ../OAuth.AspNet.AuthServer - -../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll: - make -C ../Yavsc.Abstract - -%.Designer.cs: %.resx - strongresbuildercli -l -p -t -r "Yavsc.Server.Resources." $^ - -prepare_code: $(BASERESXGEN) - -all: $(BINTARGETPATH) diff --git a/src/Yavsc.Server/Services/FileSystemAuthManager.cs b/src/Yavsc.Server/Services/FileSystemAuthManager.cs index 25ca399f..dd18d964 100644 --- a/src/Yavsc.Server/Services/FileSystemAuthManager.cs +++ b/src/Yavsc.Server/Services/FileSystemAuthManager.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Options; using rules; using Yavsc.Helpers; using Yavsc.Models; +using Yavsc.Server.Helpers; namespace Yavsc.Services { diff --git a/src/Yavsc.Server/Services/YavscClientStore.cs b/src/Yavsc.Server/Services/YavscClientStore.cs deleted file mode 100644 index 46576662..00000000 --- a/src/Yavsc.Server/Services/YavscClientStore.cs +++ /dev/null @@ -1,66 +0,0 @@ - -using IdentityServer8.Models; -using IdentityServer8.Stores; -using Microsoft.EntityFrameworkCore; -using Yavsc.Models; - -namespace Yavsc.Services; - -public class YavscClientStore : IClientStore -{ - ApplicationDbContext _context=null; - public YavscClientStore(ApplicationDbContext context) - { - _context = context; - } - - - async Task IClientStore.FindClientByIdAsync(string clientId) - { - var app = await _context.Applications.FirstOrDefaultAsync(c=>c.Id == clientId); - - if (app == null) return null; - - Client client = new() - { - ClientId = app.Id, - ClientName = app.DisplayName, - AbsoluteRefreshTokenLifetime = app.RefreshTokenLifeTime, - AccessTokenLifetime = app.AccessTokenLifetime, - AllowedGrantTypes = - [ - GrantType.AuthorizationCode, - GrantType.DeviceFlow, - GrantType.ClientCredentials - ], - ClientSecrets = [ - new Secret(app.Secret), - ] - }; - - - switch(app.Type) - { - case Models.Auth.ApplicationTypes.NativeConfidential: - client.AccessTokenType = AccessTokenType.Reference; - client.AllowedGrantTypes = - [ - GrantType.DeviceFlow - ]; - client.AllowedScopes = [] ; - break; - case Models.Auth.ApplicationTypes.JavaScript: - default: - client.AccessTokenType = AccessTokenType.Jwt; - client.AllowedGrantTypes = - [ - GrantType.AuthorizationCode, - GrantType.ClientCredentials - ]; - client.AllowedScopes = ["openid", "profile"]; - break; - - } - return client; - } -} diff --git a/src/Yavsc/Controllers/Accounting/AccountController.cs b/src/Yavsc/Controllers/Accounting/AccountController.cs index 12f56967..e5f0ec78 100644 --- a/src/Yavsc/Controllers/Accounting/AccountController.cs +++ b/src/Yavsc/Controllers/Accounting/AccountController.cs @@ -27,6 +27,7 @@ using IdentityModel; using System.Security.Cryptography; using System.Text.Unicode; using System.Text; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Accounting/ManageController.cs b/src/Yavsc/Controllers/Accounting/ManageController.cs index d0f9dc01..7f9df3fb 100644 --- a/src/Yavsc/Controllers/Accounting/ManageController.cs +++ b/src/Yavsc/Controllers/Accounting/ManageController.cs @@ -16,6 +16,7 @@ using Yavsc.Services; using Yavsc.ViewModels.Manage; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Authorization; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { @@ -709,7 +710,8 @@ namespace Yavsc.Controllers private async Task GetCurrentUserAsync() { - return await _dbContext.Users.Include(u => u.PostalAddress).FirstOrDefaultAsync(u => u.Id == User.GetUserId()); + return await _dbContext.Users.Include(u => u.PostalAddress) + .FirstOrDefaultAsync(u => u.Id == User.GetUserId()); } #endregion diff --git a/src/Yavsc/Controllers/Administration/AdministrationController.cs b/src/Yavsc/Controllers/Administration/AdministrationController.cs index 41770082..76cde6e4 100644 --- a/src/Yavsc/Controllers/Administration/AdministrationController.cs +++ b/src/Yavsc/Controllers/Administration/AdministrationController.cs @@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Abstract.Identity; using Yavsc.Helpers; using Yavsc.Models; +using Yavsc.Server.Helpers; using Yavsc.ViewModels; using Yavsc.ViewModels.Administration; diff --git a/src/Yavsc/Controllers/Administration/MailingTemplateController.cs b/src/Yavsc/Controllers/Administration/MailingTemplateController.cs index 25b57a14..caaebc11 100644 --- a/src/Yavsc/Controllers/Administration/MailingTemplateController.cs +++ b/src/Yavsc/Controllers/Administration/MailingTemplateController.cs @@ -9,6 +9,7 @@ using Yavsc.Server.Settings; using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Server.Models.Calendar; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Communicating/BlogspotController.cs b/src/Yavsc/Controllers/Communicating/BlogspotController.cs index 8ca8220f..b29e2487 100644 --- a/src/Yavsc/Controllers/Communicating/BlogspotController.cs +++ b/src/Yavsc/Controllers/Communicating/BlogspotController.cs @@ -10,6 +10,7 @@ using Microsoft.Extensions.Options; using Microsoft.EntityFrameworkCore; using Yavsc.ViewModels.Blog; using Yavsc.Server.Exceptions; +using Yavsc.Server.Helpers; // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 diff --git a/src/Yavsc/Controllers/Communicating/CircleController.cs b/src/Yavsc/Controllers/Communicating/CircleController.cs index c0e44754..8a19ba6b 100644 --- a/src/Yavsc/Controllers/Communicating/CircleController.cs +++ b/src/Yavsc/Controllers/Communicating/CircleController.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Relationship; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Communicating/CircleMembersController.cs b/src/Yavsc/Controllers/Communicating/CircleMembersController.cs index d532456b..8a8786bd 100644 --- a/src/Yavsc/Controllers/Communicating/CircleMembersController.cs +++ b/src/Yavsc/Controllers/Communicating/CircleMembersController.cs @@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Relationship; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Communicating/CommentsController.cs b/src/Yavsc/Controllers/Communicating/CommentsController.cs index 6c535fe8..0f9d50bc 100644 --- a/src/Yavsc/Controllers/Communicating/CommentsController.cs +++ b/src/Yavsc/Controllers/Communicating/CommentsController.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Blog; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Communicating/NotificationsController.cs b/src/Yavsc/Controllers/Communicating/NotificationsController.cs index f9f86187..5a3c25de 100644 --- a/src/Yavsc/Controllers/Communicating/NotificationsController.cs +++ b/src/Yavsc/Controllers/Communicating/NotificationsController.cs @@ -4,6 +4,7 @@ using Yavsc.Abstract.Models.Messaging; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Messaging; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Contracting/ActivityController.cs b/src/Yavsc/Controllers/Contracting/ActivityController.cs index a593fa8d..a147b5a5 100644 --- a/src/Yavsc/Controllers/Contracting/ActivityController.cs +++ b/src/Yavsc/Controllers/Contracting/ActivityController.cs @@ -9,6 +9,7 @@ namespace Yavsc.Controllers using Models; using Models.Workflow; using Yavsc.Helpers; + using Yavsc.Server.Helpers; [Authorize("AdministratorOnly")] public class ActivityController : Controller diff --git a/src/Yavsc/Controllers/Contracting/ClientController.cs b/src/Yavsc/Controllers/Contracting/ClientController.cs index 10702f11..7cf5e2f8 100644 --- a/src/Yavsc/Controllers/Contracting/ClientController.cs +++ b/src/Yavsc/Controllers/Contracting/ClientController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Auth; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Contracting/CoWorkingController.cs b/src/Yavsc/Controllers/Contracting/CoWorkingController.cs index 3e0eeeb5..97287ca6 100644 --- a/src/Yavsc/Controllers/Contracting/CoWorkingController.cs +++ b/src/Yavsc/Controllers/Contracting/CoWorkingController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Workflow; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Contracting/CommandController.cs b/src/Yavsc/Controllers/Contracting/CommandController.cs index 5332a64e..c9d1979b 100644 --- a/src/Yavsc/Controllers/Contracting/CommandController.cs +++ b/src/Yavsc/Controllers/Contracting/CommandController.cs @@ -16,6 +16,7 @@ namespace Yavsc.Controllers using Models.Workflow; using Services; using Yavsc.Interface; + using Yavsc.Server.Helpers; using Yavsc.Settings; public class CommandController : Controller diff --git a/src/Yavsc/Controllers/Contracting/CommandFormsController.cs b/src/Yavsc/Controllers/Contracting/CommandFormsController.cs index 44d8efc6..4428105e 100644 --- a/src/Yavsc/Controllers/Contracting/CommandFormsController.cs +++ b/src/Yavsc/Controllers/Contracting/CommandFormsController.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Workflow; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Contracting/DoController.cs b/src/Yavsc/Controllers/Contracting/DoController.cs index 359cb89a..c69cc411 100644 --- a/src/Yavsc/Controllers/Contracting/DoController.cs +++ b/src/Yavsc/Controllers/Contracting/DoController.cs @@ -13,6 +13,7 @@ namespace Yavsc.Controllers using System.Threading.Tasks; using Yavsc.Helpers; using Microsoft.EntityFrameworkCore; + using Yavsc.Server.Helpers; [Authorize] public class DoController : Controller diff --git a/src/Yavsc/Controllers/Contracting/FormsController.cs b/src/Yavsc/Controllers/Contracting/FormsController.cs index 6aff0418..e7243022 100644 --- a/src/Yavsc/Controllers/Contracting/FormsController.cs +++ b/src/Yavsc/Controllers/Contracting/FormsController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Forms; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Contracting/MusicalTendenciesController.cs b/src/Yavsc/Controllers/Contracting/MusicalTendenciesController.cs index 198e3177..ca7996a3 100644 --- a/src/Yavsc/Controllers/Contracting/MusicalTendenciesController.cs +++ b/src/Yavsc/Controllers/Contracting/MusicalTendenciesController.cs @@ -5,6 +5,7 @@ namespace Yavsc.Controllers using Models; using Models.Musical; using Yavsc.Helpers; + using Yavsc.Server.Helpers; public class MusicalTendenciesController : Controller { diff --git a/src/Yavsc/Controllers/Contracting/SIRENExceptionsController.cs b/src/Yavsc/Controllers/Contracting/SIRENExceptionsController.cs index 64338f9a..4d485558 100644 --- a/src/Yavsc/Controllers/Contracting/SIRENExceptionsController.cs +++ b/src/Yavsc/Controllers/Contracting/SIRENExceptionsController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Billing; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Generic/SettingsController.cs b/src/Yavsc/Controllers/Generic/SettingsController.cs index 96002836..8c490a1c 100644 --- a/src/Yavsc/Controllers/Generic/SettingsController.cs +++ b/src/Yavsc/Controllers/Generic/SettingsController.cs @@ -7,6 +7,7 @@ namespace Yavsc.Controllers.Generic using Microsoft.EntityFrameworkCore; using Models; using Yavsc.Helpers; + using Yavsc.Server.Helpers; using Yavsc.Services; [Authorize] diff --git a/src/Yavsc/Controllers/Haircut/ColorsController.cs b/src/Yavsc/Controllers/Haircut/ColorsController.cs index 06ff3ba8..ef390f84 100644 --- a/src/Yavsc/Controllers/Haircut/ColorsController.cs +++ b/src/Yavsc/Controllers/Haircut/ColorsController.cs @@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Drawing; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Haircut/HairCutCommandController.cs b/src/Yavsc/Controllers/Haircut/HairCutCommandController.cs index 182e0cf0..340a0776 100644 --- a/src/Yavsc/Controllers/Haircut/HairCutCommandController.cs +++ b/src/Yavsc/Controllers/Haircut/HairCutCommandController.cs @@ -26,6 +26,7 @@ namespace Yavsc.Controllers using Yavsc.Interface; using Yavsc.Settings; using Yavsc.Abstract.Models.Messaging; + using Yavsc.Server.Helpers; public class HairCutCommandController : CommandController { diff --git a/src/Yavsc/Controllers/Haircut/HairTaintsController.cs b/src/Yavsc/Controllers/Haircut/HairTaintsController.cs index c3662f69..a0a25246 100644 --- a/src/Yavsc/Controllers/Haircut/HairTaintsController.cs +++ b/src/Yavsc/Controllers/Haircut/HairTaintsController.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Haircut; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/HomeController.cs b/src/Yavsc/Controllers/HomeController.cs index 7f53eeda..fb040b73 100644 --- a/src/Yavsc/Controllers/HomeController.cs +++ b/src/Yavsc/Controllers/HomeController.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc.Localization; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Diagnostics; using Microsoft.Extensions.Options; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/IT/GitController.cs b/src/Yavsc/Controllers/IT/GitController.cs index 2e83bfe4..f093934c 100644 --- a/src/Yavsc/Controllers/IT/GitController.cs +++ b/src/Yavsc/Controllers/IT/GitController.cs @@ -5,6 +5,7 @@ using Yavsc.Models; using Yavsc.Server.Models.IT.SourceCode; using Yavsc.Helpers; using Microsoft.EntityFrameworkCore; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Musical/InstrumentationController.cs b/src/Yavsc/Controllers/Musical/InstrumentationController.cs index d84cf31c..256637c4 100644 --- a/src/Yavsc/Controllers/Musical/InstrumentationController.cs +++ b/src/Yavsc/Controllers/Musical/InstrumentationController.cs @@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore; using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Musical.Profiles; +using Yavsc.Server.Helpers; namespace Yavsc.Controllers { diff --git a/src/Yavsc/Controllers/Musical/InstrumentsController.cs b/src/Yavsc/Controllers/Musical/InstrumentsController.cs index 4f6e457c..7c0d6cb3 100644 --- a/src/Yavsc/Controllers/Musical/InstrumentsController.cs +++ b/src/Yavsc/Controllers/Musical/InstrumentsController.cs @@ -7,6 +7,7 @@ namespace Yavsc.Controllers using Models; using Models.Musical; using Yavsc.Helpers; + using Yavsc.Server.Helpers; public class InstrumentsController : Controller { diff --git a/src/Yavsc/Extensions/PermissionHandler.cs b/src/Yavsc/Extensions/PermissionHandler.cs index 4bee4f4c..b97832ff 100644 --- a/src/Yavsc/Extensions/PermissionHandler.cs +++ b/src/Yavsc/Extensions/PermissionHandler.cs @@ -6,6 +6,7 @@ using Yavsc.Helpers; using Yavsc.Migrations; using Yavsc.Models; using Yavsc.Models.Blog; +using Yavsc.Server.Helpers; using Yavsc.ViewModels.Auth; namespace Yavsc.Extensions; diff --git a/src/Yavsc/Helpers/UserHelpers.cs b/src/Yavsc/Helpers/UserHelpers.cs index ade8cac0..ca3d9ec3 100644 --- a/src/Yavsc/Helpers/UserHelpers.cs +++ b/src/Yavsc/Helpers/UserHelpers.cs @@ -1,10 +1,32 @@ -using System.Security.Claims; +using Microsoft.EntityFrameworkCore; +using Yavsc.Models; +using Yavsc.Models.Blog; namespace Yavsc.Helpers { public static class UserHelpers { - - + public static IEnumerable UserPosts(this ApplicationDbContext dbContext, string posterId, string? readerId) + { + if (readerId == null) + { + var userPosts = dbContext.blogSpotPublications.Include( + b => b.BlogPost + ).Where(x => x.BlogPost.AuthorId == posterId) + .Select(x => x.BlogPost).ToArray(); + return userPosts; + } + else + { + long[] readerCirclesMemberships = + dbContext.Circle.Include(c => c.Members) + .Where(c => c.Members.Any(m => m.MemberId == readerId)) + .Select(c => c.Id).ToArray(); + return dbContext.BlogSpot.Include( + b => b.Author + ).Include(p => p.ACL).Where(x => x.Author.Id == posterId && + (x.ACL.Count == 0 || x.ACL.Any(a => readerCirclesMemberships.Contains(a.CircleId)))); + } + } } } diff --git a/src/Yavsc.Server/Migrations/2016/20160315144017_init.Designer.cs b/src/Yavsc/Migrations/2016/20160315144017_init.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160315144017_init.Designer.cs rename to src/Yavsc/Migrations/2016/20160315144017_init.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160315144017_init.cs b/src/Yavsc/Migrations/2016/20160315144017_init.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160315144017_init.cs rename to src/Yavsc/Migrations/2016/20160315144017_init.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160317215718_command.Designer.cs b/src/Yavsc/Migrations/2016/20160317215718_command.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160317215718_command.Designer.cs rename to src/Yavsc/Migrations/2016/20160317215718_command.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160317215718_command.cs b/src/Yavsc/Migrations/2016/20160317215718_command.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160317215718_command.cs rename to src/Yavsc/Migrations/2016/20160317215718_command.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160320170252_bank.Designer.cs b/src/Yavsc/Migrations/2016/20160320170252_bank.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160320170252_bank.Designer.cs rename to src/Yavsc/Migrations/2016/20160320170252_bank.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160320170252_bank.cs b/src/Yavsc/Migrations/2016/20160320170252_bank.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160320170252_bank.cs rename to src/Yavsc/Migrations/2016/20160320170252_bank.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160322144500_contact.Designer.cs b/src/Yavsc/Migrations/2016/20160322144500_contact.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160322144500_contact.Designer.cs rename to src/Yavsc/Migrations/2016/20160322144500_contact.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160322144500_contact.cs b/src/Yavsc/Migrations/2016/20160322144500_contact.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160322144500_contact.cs rename to src/Yavsc/Migrations/2016/20160322144500_contact.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160322152206_balance.Designer.cs b/src/Yavsc/Migrations/2016/20160322152206_balance.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160322152206_balance.Designer.cs rename to src/Yavsc/Migrations/2016/20160322152206_balance.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160322152206_balance.cs b/src/Yavsc/Migrations/2016/20160322152206_balance.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160322152206_balance.cs rename to src/Yavsc/Migrations/2016/20160322152206_balance.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160401233357_circle.Designer.cs b/src/Yavsc/Migrations/2016/20160401233357_circle.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160401233357_circle.Designer.cs rename to src/Yavsc/Migrations/2016/20160401233357_circle.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160401233357_circle.cs b/src/Yavsc/Migrations/2016/20160401233357_circle.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160401233357_circle.cs rename to src/Yavsc/Migrations/2016/20160401233357_circle.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160402135146_calendar.Designer.cs b/src/Yavsc/Migrations/2016/20160402135146_calendar.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160402135146_calendar.Designer.cs rename to src/Yavsc/Migrations/2016/20160402135146_calendar.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160402135146_calendar.cs b/src/Yavsc/Migrations/2016/20160402135146_calendar.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160402135146_calendar.cs rename to src/Yavsc/Migrations/2016/20160402135146_calendar.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160404110708_files.Designer.cs b/src/Yavsc/Migrations/2016/20160404110708_files.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160404110708_files.Designer.cs rename to src/Yavsc/Migrations/2016/20160404110708_files.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160404110708_files.cs b/src/Yavsc/Migrations/2016/20160404110708_files.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160404110708_files.cs rename to src/Yavsc/Migrations/2016/20160404110708_files.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160404121446_estimate.Designer.cs b/src/Yavsc/Migrations/2016/20160404121446_estimate.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160404121446_estimate.Designer.cs rename to src/Yavsc/Migrations/2016/20160404121446_estimate.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160404121446_estimate.cs b/src/Yavsc/Migrations/2016/20160404121446_estimate.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160404121446_estimate.cs rename to src/Yavsc/Migrations/2016/20160404121446_estimate.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.Designer.cs b/src/Yavsc/Migrations/2016/20160404130359_estimateCommand.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.Designer.cs rename to src/Yavsc/Migrations/2016/20160404130359_estimateCommand.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.cs b/src/Yavsc/Migrations/2016/20160404130359_estimateCommand.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.cs rename to src/Yavsc/Migrations/2016/20160404130359_estimateCommand.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160405091432_booking.Designer.cs b/src/Yavsc/Migrations/2016/20160405091432_booking.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160405091432_booking.Designer.cs rename to src/Yavsc/Migrations/2016/20160405091432_booking.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160405091432_booking.cs b/src/Yavsc/Migrations/2016/20160405091432_booking.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160405091432_booking.cs rename to src/Yavsc/Migrations/2016/20160405091432_booking.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.Designer.cs b/src/Yavsc/Migrations/2016/20160407112403_dailycost.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.Designer.cs rename to src/Yavsc/Migrations/2016/20160407112403_dailycost.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.cs b/src/Yavsc/Migrations/2016/20160407112403_dailycost.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.cs rename to src/Yavsc/Migrations/2016/20160407112403_dailycost.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.Designer.cs b/src/Yavsc/Migrations/2016/20160418114001_commandCreation.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.Designer.cs rename to src/Yavsc/Migrations/2016/20160418114001_commandCreation.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.cs b/src/Yavsc/Migrations/2016/20160418114001_commandCreation.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.cs rename to src/Yavsc/Migrations/2016/20160418114001_commandCreation.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.Designer.cs b/src/Yavsc/Migrations/2016/20160427123737_perfoffer.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.Designer.cs rename to src/Yavsc/Migrations/2016/20160427123737_perfoffer.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.cs b/src/Yavsc/Migrations/2016/20160427123737_perfoffer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.cs rename to src/Yavsc/Migrations/2016/20160427123737_perfoffer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160506154628_siren.Designer.cs b/src/Yavsc/Migrations/2016/20160506154628_siren.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160506154628_siren.Designer.cs rename to src/Yavsc/Migrations/2016/20160506154628_siren.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160506154628_siren.cs b/src/Yavsc/Migrations/2016/20160506154628_siren.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160506154628_siren.cs rename to src/Yavsc/Migrations/2016/20160506154628_siren.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs b/src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs rename to src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.cs b/src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.cs rename to src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs b/src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs rename to src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.cs b/src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.cs rename to src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160610153353_client.Designer.cs b/src/Yavsc/Migrations/2016/20160610153353_client.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160610153353_client.Designer.cs rename to src/Yavsc/Migrations/2016/20160610153353_client.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160610153353_client.cs b/src/Yavsc/Migrations/2016/20160610153353_client.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160610153353_client.cs rename to src/Yavsc/Migrations/2016/20160610153353_client.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160613142037_devices.Designer.cs b/src/Yavsc/Migrations/2016/20160613142037_devices.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160613142037_devices.Designer.cs rename to src/Yavsc/Migrations/2016/20160613142037_devices.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160613142037_devices.cs b/src/Yavsc/Migrations/2016/20160613142037_devices.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160613142037_devices.cs rename to src/Yavsc/Migrations/2016/20160613142037_devices.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.Designer.cs b/src/Yavsc/Migrations/2016/20160614010545_bookquery.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.Designer.cs rename to src/Yavsc/Migrations/2016/20160614010545_bookquery.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.cs b/src/Yavsc/Migrations/2016/20160614010545_bookquery.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.cs rename to src/Yavsc/Migrations/2016/20160614010545_bookquery.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.Designer.cs b/src/Yavsc/Migrations/2016/20160702195348_GCMinfos.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.Designer.cs rename to src/Yavsc/Migrations/2016/20160702195348_GCMinfos.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.cs b/src/Yavsc/Migrations/2016/20160702195348_GCMinfos.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.cs rename to src/Yavsc/Migrations/2016/20160702195348_GCMinfos.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.Designer.cs b/src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.Designer.cs rename to src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.cs b/src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.cs rename to src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160725145306_estimates.Designer.cs b/src/Yavsc/Migrations/2016/20160725145306_estimates.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160725145306_estimates.Designer.cs rename to src/Yavsc/Migrations/2016/20160725145306_estimates.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160725145306_estimates.cs b/src/Yavsc/Migrations/2016/20160725145306_estimates.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160725145306_estimates.cs rename to src/Yavsc/Migrations/2016/20160725145306_estimates.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.Designer.cs b/src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.Designer.cs rename to src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.cs b/src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.cs rename to src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.Designer.cs b/src/Yavsc/Migrations/2016/20160726133002_otherOrtho.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.Designer.cs rename to src/Yavsc/Migrations/2016/20160726133002_otherOrtho.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.cs b/src/Yavsc/Migrations/2016/20160726133002_otherOrtho.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.cs rename to src/Yavsc/Migrations/2016/20160726133002_otherOrtho.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs b/src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs rename to src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.cs b/src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.cs rename to src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.Designer.cs b/src/Yavsc/Migrations/2016/20160802143258_bcontentornot.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.Designer.cs rename to src/Yavsc/Migrations/2016/20160802143258_bcontentornot.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.cs b/src/Yavsc/Migrations/2016/20160802143258_bcontentornot.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.cs rename to src/Yavsc/Migrations/2016/20160802143258_bcontentornot.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs b/src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs rename to src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.cs b/src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.cs rename to src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160901145646_products.Designer.cs b/src/Yavsc/Migrations/2016/20160901145646_products.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160901145646_products.Designer.cs rename to src/Yavsc/Migrations/2016/20160901145646_products.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160901145646_products.cs b/src/Yavsc/Migrations/2016/20160901145646_products.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160901145646_products.cs rename to src/Yavsc/Migrations/2016/20160901145646_products.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160905095708_tags.Designer.cs b/src/Yavsc/Migrations/2016/20160905095708_tags.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160905095708_tags.Designer.cs rename to src/Yavsc/Migrations/2016/20160905095708_tags.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160905095708_tags.cs b/src/Yavsc/Migrations/2016/20160905095708_tags.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160905095708_tags.cs rename to src/Yavsc/Migrations/2016/20160905095708_tags.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs b/src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs rename to src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs b/src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs rename to src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160917010249_yaev.Designer.cs b/src/Yavsc/Migrations/2016/20160917010249_yaev.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160917010249_yaev.Designer.cs rename to src/Yavsc/Migrations/2016/20160917010249_yaev.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160917010249_yaev.cs b/src/Yavsc/Migrations/2016/20160917010249_yaev.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160917010249_yaev.cs rename to src/Yavsc/Migrations/2016/20160917010249_yaev.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160920215459_avatar.Designer.cs b/src/Yavsc/Migrations/2016/20160920215459_avatar.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160920215459_avatar.Designer.cs rename to src/Yavsc/Migrations/2016/20160920215459_avatar.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20160920215459_avatar.cs b/src/Yavsc/Migrations/2016/20160920215459_avatar.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20160920215459_avatar.cs rename to src/Yavsc/Migrations/2016/20160920215459_avatar.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161010102616_recontact.Designer.cs b/src/Yavsc/Migrations/2016/20161010102616_recontact.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161010102616_recontact.Designer.cs rename to src/Yavsc/Migrations/2016/20161010102616_recontact.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161010102616_recontact.cs b/src/Yavsc/Migrations/2016/20161010102616_recontact.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161010102616_recontact.cs rename to src/Yavsc/Migrations/2016/20161010102616_recontact.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs b/src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs rename to src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.cs b/src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.cs rename to src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.Designer.cs b/src/Yavsc/Migrations/2016/20161020212947_userAddress.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.Designer.cs rename to src/Yavsc/Migrations/2016/20161020212947_userAddress.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.cs b/src/Yavsc/Migrations/2016/20161020212947_userAddress.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.cs rename to src/Yavsc/Migrations/2016/20161020212947_userAddress.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.Designer.cs b/src/Yavsc/Migrations/2016/20161021153306_estimateLines.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.Designer.cs rename to src/Yavsc/Migrations/2016/20161021153306_estimateLines.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.cs b/src/Yavsc/Migrations/2016/20161021153306_estimateLines.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.cs rename to src/Yavsc/Migrations/2016/20161021153306_estimateLines.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.Designer.cs b/src/Yavsc/Migrations/2016/20161101234703_chatConnection.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.Designer.cs rename to src/Yavsc/Migrations/2016/20161101234703_chatConnection.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.cs b/src/Yavsc/Migrations/2016/20161101234703_chatConnection.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.cs rename to src/Yavsc/Migrations/2016/20161101234703_chatConnection.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.Designer.cs b/src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.Designer.cs rename to src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.cs b/src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.cs rename to src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs b/src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs rename to src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.cs b/src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.cs rename to src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.Designer.cs b/src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.Designer.cs rename to src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.cs b/src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.cs rename to src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs b/src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs rename to src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.cs b/src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.cs rename to src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.Designer.cs b/src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.Designer.cs rename to src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.cs b/src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.cs rename to src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.Designer.cs b/src/Yavsc/Migrations/2016/20161130084909_diskQuota.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.Designer.cs rename to src/Yavsc/Migrations/2016/20161130084909_diskQuota.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.cs b/src/Yavsc/Migrations/2016/20161130084909_diskQuota.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.cs rename to src/Yavsc/Migrations/2016/20161130084909_diskQuota.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.Designer.cs b/src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.Designer.cs rename to src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.cs b/src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.cs rename to src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.Designer.cs b/src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.Designer.cs rename to src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.cs b/src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.cs rename to src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.Designer.cs b/src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.Designer.cs rename to src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.cs b/src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.cs rename to src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.Designer.cs b/src/Yavsc/Migrations/2017/20170102152745_locationTypes.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.Designer.cs rename to src/Yavsc/Migrations/2017/20170102152745_locationTypes.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.cs b/src/Yavsc/Migrations/2017/20170102152745_locationTypes.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.cs rename to src/Yavsc/Migrations/2017/20170102152745_locationTypes.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs b/src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs rename to src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs b/src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs rename to src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.Designer.cs b/src/Yavsc/Migrations/2017/20170106113614_ownerProfile.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.Designer.cs rename to src/Yavsc/Migrations/2017/20170106113614_ownerProfile.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.cs b/src/Yavsc/Migrations/2017/20170106113614_ownerProfile.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.cs rename to src/Yavsc/Migrations/2017/20170106113614_ownerProfile.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.Designer.cs b/src/Yavsc/Migrations/2017/20170106122307_Instruments.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.Designer.cs rename to src/Yavsc/Migrations/2017/20170106122307_Instruments.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.cs b/src/Yavsc/Migrations/2017/20170106122307_Instruments.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.cs rename to src/Yavsc/Migrations/2017/20170106122307_Instruments.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.Designer.cs b/src/Yavsc/Migrations/2017/20170106124548_instrumentation.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.Designer.cs rename to src/Yavsc/Migrations/2017/20170106124548_instrumentation.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.cs b/src/Yavsc/Migrations/2017/20170106124548_instrumentation.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.cs rename to src/Yavsc/Migrations/2017/20170106124548_instrumentation.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.Designer.cs b/src/Yavsc/Migrations/2017/20170106144035_activityRate.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.Designer.cs rename to src/Yavsc/Migrations/2017/20170106144035_activityRate.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.cs b/src/Yavsc/Migrations/2017/20170106144035_activityRate.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.cs rename to src/Yavsc/Migrations/2017/20170106144035_activityRate.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106235954_weight.Designer.cs b/src/Yavsc/Migrations/2017/20170106235954_weight.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106235954_weight.Designer.cs rename to src/Yavsc/Migrations/2017/20170106235954_weight.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170106235954_weight.cs b/src/Yavsc/Migrations/2017/20170106235954_weight.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170106235954_weight.cs rename to src/Yavsc/Migrations/2017/20170106235954_weight.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs b/src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs rename to src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.cs b/src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.cs rename to src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.Designer.cs b/src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.Designer.cs rename to src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.cs b/src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.cs rename to src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs b/src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs rename to src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.cs b/src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.cs rename to src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs b/src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs rename to src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.cs b/src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.cs rename to src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs b/src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs rename to src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.cs b/src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.cs rename to src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.Designer.cs b/src/Yavsc/Migrations/2017/20170117134339_entityTracking.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.Designer.cs rename to src/Yavsc/Migrations/2017/20170117134339_entityTracking.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.cs b/src/Yavsc/Migrations/2017/20170117134339_entityTracking.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.cs rename to src/Yavsc/Migrations/2017/20170117134339_entityTracking.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.Designer.cs b/src/Yavsc/Migrations/2017/20170120095258_blogAcl.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.Designer.cs rename to src/Yavsc/Migrations/2017/20170120095258_blogAcl.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.cs b/src/Yavsc/Migrations/2017/20170120095258_blogAcl.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.cs rename to src/Yavsc/Migrations/2017/20170120095258_blogAcl.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.Designer.cs b/src/Yavsc/Migrations/2017/20170120122324_queryTraking.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.Designer.cs rename to src/Yavsc/Migrations/2017/20170120122324_queryTraking.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.cs b/src/Yavsc/Migrations/2017/20170120122324_queryTraking.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.cs rename to src/Yavsc/Migrations/2017/20170120122324_queryTraking.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs b/src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs rename to src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.cs b/src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.cs rename to src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.Designer.cs b/src/Yavsc/Migrations/2017/20170124090324_commandForms.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.Designer.cs rename to src/Yavsc/Migrations/2017/20170124090324_commandForms.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.cs b/src/Yavsc/Migrations/2017/20170124090324_commandForms.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.cs rename to src/Yavsc/Migrations/2017/20170124090324_commandForms.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.Designer.cs b/src/Yavsc/Migrations/2017/20170126152454_trackActivity.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.Designer.cs rename to src/Yavsc/Migrations/2017/20170126152454_trackActivity.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.cs b/src/Yavsc/Migrations/2017/20170126152454_trackActivity.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.cs rename to src/Yavsc/Migrations/2017/20170126152454_trackActivity.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs b/src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs rename to src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.cs b/src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.cs rename to src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.Designer.cs b/src/Yavsc/Migrations/2017/20170201002133_blacklisted.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.Designer.cs rename to src/Yavsc/Migrations/2017/20170201002133_blacklisted.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.cs b/src/Yavsc/Migrations/2017/20170201002133_blacklisted.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.cs rename to src/Yavsc/Migrations/2017/20170201002133_blacklisted.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.Designer.cs b/src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.Designer.cs rename to src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.cs b/src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.cs rename to src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs b/src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs rename to src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.cs b/src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.cs rename to src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170212005346_haircut.Designer.cs b/src/Yavsc/Migrations/2017/20170212005346_haircut.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170212005346_haircut.Designer.cs rename to src/Yavsc/Migrations/2017/20170212005346_haircut.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170212005346_haircut.cs b/src/Yavsc/Migrations/2017/20170212005346_haircut.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170212005346_haircut.cs rename to src/Yavsc/Migrations/2017/20170212005346_haircut.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs b/src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs rename to src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.cs b/src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.cs rename to src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170220102125_notifications.Designer.cs b/src/Yavsc/Migrations/2017/20170220102125_notifications.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170220102125_notifications.Designer.cs rename to src/Yavsc/Migrations/2017/20170220102125_notifications.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170220102125_notifications.cs b/src/Yavsc/Migrations/2017/20170220102125_notifications.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170220102125_notifications.cs rename to src/Yavsc/Migrations/2017/20170220102125_notifications.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.Designer.cs b/src/Yavsc/Migrations/2017/20170220125518_dimissclick.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.Designer.cs rename to src/Yavsc/Migrations/2017/20170220125518_dimissclick.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.cs b/src/Yavsc/Migrations/2017/20170220125518_dimissclick.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.cs rename to src/Yavsc/Migrations/2017/20170220125518_dimissclick.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.Designer.cs b/src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.Designer.cs rename to src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.cs b/src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.cs rename to src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.Designer.cs b/src/Yavsc/Migrations/2017/20170227151759_hairPrestations.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.Designer.cs rename to src/Yavsc/Migrations/2017/20170227151759_hairPrestations.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.cs b/src/Yavsc/Migrations/2017/20170227151759_hairPrestations.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.cs rename to src/Yavsc/Migrations/2017/20170227151759_hairPrestations.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.Designer.cs b/src/Yavsc/Migrations/2017/20170228115359_brusherProfile.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.Designer.cs rename to src/Yavsc/Migrations/2017/20170228115359_brusherProfile.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.cs b/src/Yavsc/Migrations/2017/20170228115359_brusherProfile.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.cs rename to src/Yavsc/Migrations/2017/20170228115359_brusherProfile.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170228145057_actionName.Designer.cs b/src/Yavsc/Migrations/2017/20170228145057_actionName.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170228145057_actionName.Designer.cs rename to src/Yavsc/Migrations/2017/20170228145057_actionName.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170228145057_actionName.cs b/src/Yavsc/Migrations/2017/20170228145057_actionName.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170228145057_actionName.cs rename to src/Yavsc/Migrations/2017/20170228145057_actionName.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs b/src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs rename to src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.cs b/src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.cs rename to src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.Designer.cs b/src/Yavsc/Migrations/2017/20170301132531_manbrushing.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.Designer.cs rename to src/Yavsc/Migrations/2017/20170301132531_manbrushing.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.cs b/src/Yavsc/Migrations/2017/20170301132531_manbrushing.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.cs rename to src/Yavsc/Migrations/2017/20170301132531_manbrushing.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170301211317_folding.Designer.cs b/src/Yavsc/Migrations/2017/20170301211317_folding.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170301211317_folding.Designer.cs rename to src/Yavsc/Migrations/2017/20170301211317_folding.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170301211317_folding.cs b/src/Yavsc/Migrations/2017/20170301211317_folding.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170301211317_folding.cs rename to src/Yavsc/Migrations/2017/20170301211317_folding.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs b/src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs rename to src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.cs b/src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.cs rename to src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs b/src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs rename to src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.cs b/src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.cs rename to src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs b/src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs rename to src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.cs b/src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.cs rename to src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs b/src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs rename to src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.cs b/src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.cs rename to src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs b/src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs rename to src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs b/src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs rename to src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs b/src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs rename to src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs b/src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs rename to src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs b/src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs rename to src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.cs b/src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.cs rename to src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170507200834_paypal.Designer.cs b/src/Yavsc/Migrations/2017/20170507200834_paypal.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170507200834_paypal.Designer.cs rename to src/Yavsc/Migrations/2017/20170507200834_paypal.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170507200834_paypal.cs b/src/Yavsc/Migrations/2017/20170507200834_paypal.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170507200834_paypal.cs rename to src/Yavsc/Migrations/2017/20170507200834_paypal.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs b/src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs rename to src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.cs b/src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.cs rename to src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.Designer.cs b/src/Yavsc/Migrations/2017/20170512102508_hairCutBill.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.Designer.cs rename to src/Yavsc/Migrations/2017/20170512102508_hairCutBill.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.cs b/src/Yavsc/Migrations/2017/20170512102508_hairCutBill.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.cs rename to src/Yavsc/Migrations/2017/20170512102508_hairCutBill.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.Designer.cs b/src/Yavsc/Migrations/2017/20170513213829_paypalids.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.Designer.cs rename to src/Yavsc/Migrations/2017/20170513213829_paypalids.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.cs b/src/Yavsc/Migrations/2017/20170513213829_paypalids.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.cs rename to src/Yavsc/Migrations/2017/20170513213829_paypalids.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170514123122_links.Designer.cs b/src/Yavsc/Migrations/2017/20170514123122_links.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170514123122_links.Designer.cs rename to src/Yavsc/Migrations/2017/20170514123122_links.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170514123122_links.cs b/src/Yavsc/Migrations/2017/20170514123122_links.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170514123122_links.cs rename to src/Yavsc/Migrations/2017/20170514123122_links.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.Designer.cs b/src/Yavsc/Migrations/2017/20170516181745_paymentConsent.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.Designer.cs rename to src/Yavsc/Migrations/2017/20170516181745_paymentConsent.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.cs b/src/Yavsc/Migrations/2017/20170516181745_paymentConsent.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.cs rename to src/Yavsc/Migrations/2017/20170516181745_paymentConsent.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs b/src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs rename to src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.cs b/src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.cs rename to src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs b/src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs rename to src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.cs b/src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.cs rename to src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.Designer.cs b/src/Yavsc/Migrations/2017/20170526020220_rdvPayment.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.Designer.cs rename to src/Yavsc/Migrations/2017/20170526020220_rdvPayment.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.cs b/src/Yavsc/Migrations/2017/20170526020220_rdvPayment.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.cs rename to src/Yavsc/Migrations/2017/20170526020220_rdvPayment.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170601115553_period.Designer.cs b/src/Yavsc/Migrations/2017/20170601115553_period.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170601115553_period.Designer.cs rename to src/Yavsc/Migrations/2017/20170601115553_period.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170601115553_period.cs b/src/Yavsc/Migrations/2017/20170601115553_period.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170601115553_period.cs rename to src/Yavsc/Migrations/2017/20170601115553_period.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs b/src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs rename to src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.cs b/src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.cs rename to src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171002023107_Features.Designer.cs b/src/Yavsc/Migrations/2017/20171002023107_Features.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171002023107_Features.Designer.cs rename to src/Yavsc/Migrations/2017/20171002023107_Features.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171002023107_Features.cs b/src/Yavsc/Migrations/2017/20171002023107_Features.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171002023107_Features.cs rename to src/Yavsc/Migrations/2017/20171002023107_Features.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171002023835_bugs.Designer.cs b/src/Yavsc/Migrations/2017/20171002023835_bugs.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171002023835_bugs.Designer.cs rename to src/Yavsc/Migrations/2017/20171002023835_bugs.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171002023835_bugs.cs b/src/Yavsc/Migrations/2017/20171002023835_bugs.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171002023835_bugs.cs rename to src/Yavsc/Migrations/2017/20171002023835_bugs.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.Designer.cs b/src/Yavsc/Migrations/2017/20171003195221_BlogRename.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.Designer.cs rename to src/Yavsc/Migrations/2017/20171003195221_BlogRename.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.cs b/src/Yavsc/Migrations/2017/20171003195221_BlogRename.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.cs rename to src/Yavsc/Migrations/2017/20171003195221_BlogRename.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.Designer.cs b/src/Yavsc/Migrations/2017/20171003203721_BlogComment.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.Designer.cs rename to src/Yavsc/Migrations/2017/20171003203721_BlogComment.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.cs b/src/Yavsc/Migrations/2017/20171003203721_BlogComment.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.cs rename to src/Yavsc/Migrations/2017/20171003203721_BlogComment.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171008184908_annouce.Designer.cs b/src/Yavsc/Migrations/2017/20171008184908_annouce.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171008184908_annouce.Designer.cs rename to src/Yavsc/Migrations/2017/20171008184908_annouce.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171008184908_annouce.cs b/src/Yavsc/Migrations/2017/20171008184908_annouce.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171008184908_annouce.cs rename to src/Yavsc/Migrations/2017/20171008184908_annouce.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.Designer.cs b/src/Yavsc/Migrations/2017/20171008190234_announceAnwer.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.Designer.cs rename to src/Yavsc/Migrations/2017/20171008190234_announceAnwer.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.cs b/src/Yavsc/Migrations/2017/20171008190234_announceAnwer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.cs rename to src/Yavsc/Migrations/2017/20171008190234_announceAnwer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.Designer.cs b/src/Yavsc/Migrations/2017/20171016090837_bugDescription.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.Designer.cs rename to src/Yavsc/Migrations/2017/20171016090837_bugDescription.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.cs b/src/Yavsc/Migrations/2017/20171016090837_bugDescription.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.cs rename to src/Yavsc/Migrations/2017/20171016090837_bugDescription.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171019130120_subComment.Designer.cs b/src/Yavsc/Migrations/2017/20171019130120_subComment.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171019130120_subComment.Designer.cs rename to src/Yavsc/Migrations/2017/20171019130120_subComment.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171019130120_subComment.cs b/src/Yavsc/Migrations/2017/20171019130120_subComment.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171019130120_subComment.cs rename to src/Yavsc/Migrations/2017/20171019130120_subComment.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.Designer.cs b/src/Yavsc/Migrations/2017/20171020090944_commentAuthor.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.Designer.cs rename to src/Yavsc/Migrations/2017/20171020090944_commentAuthor.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.cs b/src/Yavsc/Migrations/2017/20171020090944_commentAuthor.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.cs rename to src/Yavsc/Migrations/2017/20171020090944_commentAuthor.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.Designer.cs b/src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.Designer.cs rename to src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.cs b/src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.cs rename to src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.Designer.cs b/src/Yavsc/Migrations/2018/20180102153009_chatRooms.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.Designer.cs rename to src/Yavsc/Migrations/2018/20180102153009_chatRooms.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.cs b/src/Yavsc/Migrations/2018/20180102153009_chatRooms.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.cs rename to src/Yavsc/Migrations/2018/20180102153009_chatRooms.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.Designer.cs b/src/Yavsc/Migrations/2018/20180209144114_rejectQuery.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.Designer.cs rename to src/Yavsc/Migrations/2018/20180209144114_rejectQuery.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.cs b/src/Yavsc/Migrations/2018/20180209144114_rejectQuery.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.cs rename to src/Yavsc/Migrations/2018/20180209144114_rejectQuery.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.Designer.cs b/src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.Designer.cs rename to src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.cs b/src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.cs rename to src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs b/src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs rename to src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs b/src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs rename to src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180625113528_Git.Designer.cs b/src/Yavsc/Migrations/2018/20180625113528_Git.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180625113528_Git.Designer.cs rename to src/Yavsc/Migrations/2018/20180625113528_Git.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180625113528_Git.cs b/src/Yavsc/Migrations/2018/20180625113528_Git.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180625113528_Git.cs rename to src/Yavsc/Migrations/2018/20180625113528_Git.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs b/src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs rename to src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs b/src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs rename to src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs b/src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs rename to src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs b/src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs rename to src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.Designer.cs b/src/Yavsc/Migrations/2018/20180805122812_gitprojectref.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.Designer.cs rename to src/Yavsc/Migrations/2018/20180805122812_gitprojectref.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.cs b/src/Yavsc/Migrations/2018/20180805122812_gitprojectref.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.cs rename to src/Yavsc/Migrations/2018/20180805122812_gitprojectref.cs diff --git a/src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.Designer.cs b/src/Yavsc/Migrations/2018/20181212103501_blogLang.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.Designer.cs rename to src/Yavsc/Migrations/2018/20181212103501_blogLang.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.cs b/src/Yavsc/Migrations/2018/20181212103501_blogLang.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.cs rename to src/Yavsc/Migrations/2018/20181212103501_blogLang.cs diff --git a/src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.Designer.cs b/src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.Designer.cs rename to src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.cs b/src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.cs rename to src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.cs diff --git a/src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.Designer.cs b/src/Yavsc/Migrations/2018/20181231153224_bugTitles.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.Designer.cs rename to src/Yavsc/Migrations/2018/20181231153224_bugTitles.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.cs b/src/Yavsc/Migrations/2018/20181231153224_bugTitles.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.cs rename to src/Yavsc/Migrations/2018/20181231153224_bugTitles.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.Designer.cs b/src/Yavsc/Migrations/2019/20190730164137_publicCircle.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.Designer.cs rename to src/Yavsc/Migrations/2019/20190730164137_publicCircle.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.cs b/src/Yavsc/Migrations/2019/20190730164137_publicCircle.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.cs rename to src/Yavsc/Migrations/2019/20190730164137_publicCircle.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.Designer.cs b/src/Yavsc/Migrations/2019/20190803204448_fileCircle.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.Designer.cs rename to src/Yavsc/Migrations/2019/20190803204448_fileCircle.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.cs b/src/Yavsc/Migrations/2019/20190803204448_fileCircle.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.cs rename to src/Yavsc/Migrations/2019/20190803204448_fileCircle.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.Designer.cs b/src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.Designer.cs rename to src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.cs b/src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.cs rename to src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs b/src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs rename to src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.cs b/src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.cs rename to src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.Designer.cs b/src/Yavsc/Migrations/2019/20190819221632_instRateWInst.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.Designer.cs rename to src/Yavsc/Migrations/2019/20190819221632_instRateWInst.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.cs b/src/Yavsc/Migrations/2019/20190819221632_instRateWInst.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.cs rename to src/Yavsc/Migrations/2019/20190819221632_instRateWInst.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs b/src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs rename to src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.cs b/src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.cs rename to src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs b/src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs rename to src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.cs b/src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.cs rename to src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.Designer.cs b/src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.Designer.cs rename to src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.cs b/src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.cs rename to src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.Designer.cs b/src/Yavsc/Migrations/2019/T1/20190127105601_banReason.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.Designer.cs rename to src/Yavsc/Migrations/2019/T1/20190127105601_banReason.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.cs b/src/Yavsc/Migrations/2019/T1/20190127105601_banReason.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.cs rename to src/Yavsc/Migrations/2019/T1/20190127105601_banReason.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs b/src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs rename to src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs b/src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs rename to src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs b/src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs rename to src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.cs b/src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.cs rename to src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs b/src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs rename to src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.cs b/src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.cs rename to src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.Designer.cs b/src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.Designer.cs rename to src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.cs b/src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.cs rename to src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.Designer.cs b/src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.Designer.cs rename to src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.cs b/src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.cs rename to src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.cs diff --git a/src/Yavsc.Server/Migrations/2021/20210530122042_template-key.Designer.cs b/src/Yavsc/Migrations/2021/20210530122042_template-key.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2021/20210530122042_template-key.Designer.cs rename to src/Yavsc/Migrations/2021/20210530122042_template-key.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2021/20210530122042_template-key.cs b/src/Yavsc/Migrations/2021/20210530122042_template-key.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2021/20210530122042_template-key.cs rename to src/Yavsc/Migrations/2021/20210530122042_template-key.cs diff --git a/src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs b/src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs rename to src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs b/src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs rename to src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs diff --git a/src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs b/src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs rename to src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs diff --git a/src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs b/src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs similarity index 100% rename from src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs rename to src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs diff --git a/src/Yavsc.Server/Migrations/20230326173049_net7.Designer.cs b/src/Yavsc/Migrations/20230326173049_net7.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20230326173049_net7.Designer.cs rename to src/Yavsc/Migrations/20230326173049_net7.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20230326173049_net7.cs b/src/Yavsc/Migrations/20230326173049_net7.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20230326173049_net7.cs rename to src/Yavsc/Migrations/20230326173049_net7.cs diff --git a/src/Yavsc.Server/Migrations/20230405203545_userreload.Designer.cs b/src/Yavsc/Migrations/20230405203545_userreload.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20230405203545_userreload.Designer.cs rename to src/Yavsc/Migrations/20230405203545_userreload.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20230405203545_userreload.cs b/src/Yavsc/Migrations/20230405203545_userreload.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20230405203545_userreload.cs rename to src/Yavsc/Migrations/20230405203545_userreload.cs diff --git a/src/Yavsc.Server/Migrations/20230405210700_nullableFullname.Designer.cs b/src/Yavsc/Migrations/20230405210700_nullableFullname.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20230405210700_nullableFullname.Designer.cs rename to src/Yavsc/Migrations/20230405210700_nullableFullname.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20230405210700_nullableFullname.cs b/src/Yavsc/Migrations/20230405210700_nullableFullname.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20230405210700_nullableFullname.cs rename to src/Yavsc/Migrations/20230405210700_nullableFullname.cs diff --git a/src/Yavsc.Server/Migrations/20241106133541_dismiss.Designer.cs b/src/Yavsc/Migrations/20241106133541_dismiss.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20241106133541_dismiss.Designer.cs rename to src/Yavsc/Migrations/20241106133541_dismiss.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20241106133541_dismiss.cs b/src/Yavsc/Migrations/20241106133541_dismiss.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20241106133541_dismiss.cs rename to src/Yavsc/Migrations/20241106133541_dismiss.cs diff --git a/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs b/src/Yavsc/Migrations/20241214154207_commentReceiver.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs rename to src/Yavsc/Migrations/20241214154207_commentReceiver.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.cs b/src/Yavsc/Migrations/20241214154207_commentReceiver.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20241214154207_commentReceiver.cs rename to src/Yavsc/Migrations/20241214154207_commentReceiver.cs diff --git a/src/Yavsc.Server/Migrations/20241214201053_commentParent.Designer.cs b/src/Yavsc/Migrations/20241214201053_commentParent.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20241214201053_commentParent.Designer.cs rename to src/Yavsc/Migrations/20241214201053_commentParent.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20241214201053_commentParent.cs b/src/Yavsc/Migrations/20241214201053_commentParent.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20241214201053_commentParent.cs rename to src/Yavsc/Migrations/20241214201053_commentParent.cs diff --git a/src/Yavsc.Server/Migrations/20250208001037_blogspotcase.Designer.cs b/src/Yavsc/Migrations/20250208001037_blogspotcase.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250208001037_blogspotcase.Designer.cs rename to src/Yavsc/Migrations/20250208001037_blogspotcase.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250208001037_blogspotcase.cs b/src/Yavsc/Migrations/20250208001037_blogspotcase.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250208001037_blogspotcase.cs rename to src/Yavsc/Migrations/20250208001037_blogspotcase.cs diff --git a/src/Yavsc.Server/Migrations/20250613122253_notificationTarget.Designer.cs b/src/Yavsc/Migrations/20250613122253_notificationTarget.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613122253_notificationTarget.Designer.cs rename to src/Yavsc/Migrations/20250613122253_notificationTarget.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250613122253_notificationTarget.cs b/src/Yavsc/Migrations/20250613122253_notificationTarget.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613122253_notificationTarget.cs rename to src/Yavsc/Migrations/20250613122253_notificationTarget.cs diff --git a/src/Yavsc.Server/Migrations/20250613123306_notificationNulls.Designer.cs b/src/Yavsc/Migrations/20250613123306_notificationNulls.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613123306_notificationNulls.Designer.cs rename to src/Yavsc/Migrations/20250613123306_notificationNulls.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250613123306_notificationNulls.cs b/src/Yavsc/Migrations/20250613123306_notificationNulls.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613123306_notificationNulls.cs rename to src/Yavsc/Migrations/20250613123306_notificationNulls.cs diff --git a/src/Yavsc.Server/Migrations/20250613131533_trackedNulls.Designer.cs b/src/Yavsc/Migrations/20250613131533_trackedNulls.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613131533_trackedNulls.Designer.cs rename to src/Yavsc/Migrations/20250613131533_trackedNulls.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250613131533_trackedNulls.cs b/src/Yavsc/Migrations/20250613131533_trackedNulls.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613131533_trackedNulls.cs rename to src/Yavsc/Migrations/20250613131533_trackedNulls.cs diff --git a/src/Yavsc.Server/Migrations/20250613131836_blogNulls.Designer.cs b/src/Yavsc/Migrations/20250613131836_blogNulls.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613131836_blogNulls.Designer.cs rename to src/Yavsc/Migrations/20250613131836_blogNulls.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250613131836_blogNulls.cs b/src/Yavsc/Migrations/20250613131836_blogNulls.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613131836_blogNulls.cs rename to src/Yavsc/Migrations/20250613131836_blogNulls.cs diff --git a/src/Yavsc.Server/Migrations/20250613132139_BlogPostInputViewModelNulls.Designer.cs b/src/Yavsc/Migrations/20250613132139_BlogPostInputViewModelNulls.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613132139_BlogPostInputViewModelNulls.Designer.cs rename to src/Yavsc/Migrations/20250613132139_BlogPostInputViewModelNulls.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250613132139_BlogPostInputViewModelNulls.cs b/src/Yavsc/Migrations/20250613132139_BlogPostInputViewModelNulls.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613132139_BlogPostInputViewModelNulls.cs rename to src/Yavsc/Migrations/20250613132139_BlogPostInputViewModelNulls.cs diff --git a/src/Yavsc.Server/Migrations/20250613181510_ActivityNulls.Designer.cs b/src/Yavsc/Migrations/20250613181510_ActivityNulls.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613181510_ActivityNulls.Designer.cs rename to src/Yavsc/Migrations/20250613181510_ActivityNulls.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250613181510_ActivityNulls.cs b/src/Yavsc/Migrations/20250613181510_ActivityNulls.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250613181510_ActivityNulls.cs rename to src/Yavsc/Migrations/20250613181510_ActivityNulls.cs diff --git a/src/Yavsc.Server/Migrations/20250620185047_BrusherProfileSchedulerId.Designer.cs b/src/Yavsc/Migrations/20250620185047_BrusherProfileSchedulerId.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250620185047_BrusherProfileSchedulerId.Designer.cs rename to src/Yavsc/Migrations/20250620185047_BrusherProfileSchedulerId.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250620185047_BrusherProfileSchedulerId.cs b/src/Yavsc/Migrations/20250620185047_BrusherProfileSchedulerId.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250620185047_BrusherProfileSchedulerId.cs rename to src/Yavsc/Migrations/20250620185047_BrusherProfileSchedulerId.cs diff --git a/src/Yavsc.Server/Migrations/20250628150549_blogPostPub.Designer.cs b/src/Yavsc/Migrations/20250628150549_blogPostPub.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250628150549_blogPostPub.Designer.cs rename to src/Yavsc/Migrations/20250628150549_blogPostPub.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250628150549_blogPostPub.cs b/src/Yavsc/Migrations/20250628150549_blogPostPub.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250628150549_blogPostPub.cs rename to src/Yavsc/Migrations/20250628150549_blogPostPub.cs diff --git a/src/Yavsc.Server/Migrations/20250629174955_blogPusb2.Designer.cs b/src/Yavsc/Migrations/20250629174955_blogPusb2.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250629174955_blogPusb2.Designer.cs rename to src/Yavsc/Migrations/20250629174955_blogPusb2.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250629174955_blogPusb2.cs b/src/Yavsc/Migrations/20250629174955_blogPusb2.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250629174955_blogPusb2.cs rename to src/Yavsc/Migrations/20250629174955_blogPusb2.cs diff --git a/src/Yavsc.Server/Migrations/20250629175034_blogPub2.Designer.cs b/src/Yavsc/Migrations/20250629175034_blogPub2.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250629175034_blogPub2.Designer.cs rename to src/Yavsc/Migrations/20250629175034_blogPub2.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250629175034_blogPub2.cs b/src/Yavsc/Migrations/20250629175034_blogPub2.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250629175034_blogPub2.cs rename to src/Yavsc/Migrations/20250629175034_blogPub2.cs diff --git a/src/Yavsc.Server/Migrations/20250705112955_commentAllowed.Designer.cs b/src/Yavsc/Migrations/20250705112955_commentAllowed.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250705112955_commentAllowed.Designer.cs rename to src/Yavsc/Migrations/20250705112955_commentAllowed.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250705112955_commentAllowed.cs b/src/Yavsc/Migrations/20250705112955_commentAllowed.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250705112955_commentAllowed.cs rename to src/Yavsc/Migrations/20250705112955_commentAllowed.cs diff --git a/src/Yavsc.Server/Migrations/20250709123810_noPublishColumn.Designer.cs b/src/Yavsc/Migrations/20250709123810_noPublishColumn.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250709123810_noPublishColumn.Designer.cs rename to src/Yavsc/Migrations/20250709123810_noPublishColumn.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250709123810_noPublishColumn.cs b/src/Yavsc/Migrations/20250709123810_noPublishColumn.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250709123810_noPublishColumn.cs rename to src/Yavsc/Migrations/20250709123810_noPublishColumn.cs diff --git a/src/Yavsc.Server/Migrations/20250715143821_nullPaimentIdOnQuery.Designer.cs b/src/Yavsc/Migrations/20250715143821_nullPaimentIdOnQuery.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250715143821_nullPaimentIdOnQuery.Designer.cs rename to src/Yavsc/Migrations/20250715143821_nullPaimentIdOnQuery.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250715143821_nullPaimentIdOnQuery.cs b/src/Yavsc/Migrations/20250715143821_nullPaimentIdOnQuery.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250715143821_nullPaimentIdOnQuery.cs rename to src/Yavsc/Migrations/20250715143821_nullPaimentIdOnQuery.cs diff --git a/src/Yavsc.Server/Migrations/20250715144838_dbCleanup.Designer.cs b/src/Yavsc/Migrations/20250715144838_dbCleanup.Designer.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250715144838_dbCleanup.Designer.cs rename to src/Yavsc/Migrations/20250715144838_dbCleanup.Designer.cs diff --git a/src/Yavsc.Server/Migrations/20250715144838_dbCleanup.cs b/src/Yavsc/Migrations/20250715144838_dbCleanup.cs similarity index 100% rename from src/Yavsc.Server/Migrations/20250715144838_dbCleanup.cs rename to src/Yavsc/Migrations/20250715144838_dbCleanup.cs diff --git a/src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Yavsc.Server/Services/BlogSpotService.cs b/src/Yavsc/Services/BlogSpotService.cs similarity index 99% rename from src/Yavsc.Server/Services/BlogSpotService.cs rename to src/Yavsc/Services/BlogSpotService.cs index 78d6932a..ceebdaa7 100644 --- a/src/Yavsc.Server/Services/BlogSpotService.cs +++ b/src/Yavsc/Services/BlogSpotService.cs @@ -9,6 +9,7 @@ using Yavsc.Helpers; using Yavsc.Models; using Yavsc.Models.Blog; using Yavsc.Server.Exceptions; +using Yavsc.Server.Helpers; using Yavsc.ViewModels.Auth; using Yavsc.ViewModels.Blog; diff --git a/src/Yavsc.Server/Services/ChatHubConnexionManager.cs b/src/Yavsc/Services/ChatHubConnexionManager.cs similarity index 99% rename from src/Yavsc.Server/Services/ChatHubConnexionManager.cs rename to src/Yavsc/Services/ChatHubConnexionManager.cs index d47c7af8..a17abed9 100644 --- a/src/Yavsc.Server/Services/ChatHubConnexionManager.cs +++ b/src/Yavsc/Services/ChatHubConnexionManager.cs @@ -49,10 +49,8 @@ namespace Yavsc.Services public static ConcurrentDictionary Channels = new ConcurrentDictionary(); readonly ApplicationDbContext _dbContext; readonly IStringLocalizer _localizer; - public HubConnectionManager(IServiceScopeFactory ssf ) { - var scope = ssf.CreateScope(); _dbContext = scope.ServiceProvider.GetService(); var loggerFactory = scope.ServiceProvider.GetService(); diff --git a/src/Yavsc/Services/ClientStore.cs b/src/Yavsc/Services/ClientStore.cs index f54d07d5..a9ef06ee 100644 --- a/src/Yavsc/Services/ClientStore.cs +++ b/src/Yavsc/Services/ClientStore.cs @@ -23,8 +23,15 @@ public class ClientStore : IClientStore ClientId = clientFromDb.Id, ClientName = clientFromDb.DisplayName, ClientSecrets = { new Secret(clientFromDb.Secret.Sha256()) }, - AllowedGrantTypes =[ GrantType.ClientCredentials, GrantType.DeviceFlow], - AllowedScopes = ["openid", "profile", "scope1"] + AllowedGrantTypes = + [ + GrantType.AuthorizationCode, + GrantType.DeviceFlow, + GrantType.ClientCredentials + ], + AllowedScopes = ["openid", "profile", "scope1"], + AbsoluteRefreshTokenLifetime = clientFromDb.RefreshTokenLifeTime, + AccessTokenLifetime = clientFromDb.AccessTokenLifetime }; } } diff --git a/src/Yavsc.Server/Services/DiskUsageTracker.cs b/src/Yavsc/Services/DiskUsageTracker.cs similarity index 100% rename from src/Yavsc.Server/Services/DiskUsageTracker.cs rename to src/Yavsc/Services/DiskUsageTracker.cs diff --git a/src/Yavsc.Server/Services/YavscTemplateEngine.cs b/src/Yavsc/Services/YavscTemplateEngine.cs similarity index 100% rename from src/Yavsc.Server/Services/YavscTemplateEngine.cs rename to src/Yavsc/Services/YavscTemplateEngine.cs diff --git a/src/Yavsc/Views/_ViewImports.cshtml b/src/Yavsc/Views/_ViewImports.cshtml index 64f07170..d6e55ca8 100755 --- a/src/Yavsc/Views/_ViewImports.cshtml +++ b/src/Yavsc/Views/_ViewImports.cshtml @@ -29,6 +29,7 @@ @using Microsoft.AspNetCore.Html; @using Microsoft.AspNetCore.Identity; @using Yavsc.Helpers; +@using Yavsc.Server.Helpers; @using PayPal.PayPalAPIInterfaceService.Model; @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/test/yavscTests/Mandatory/Remoting.cs b/test/yavscTests/Mandatory/Remoting.cs index 1d87879c..2199785a 100644 --- a/test/yavscTests/Mandatory/Remoting.cs +++ b/test/yavscTests/Mandatory/Remoting.cs @@ -30,10 +30,13 @@ namespace yavscTests { try { + var serverUrl = _serverFixture.Addresses.FirstOrDefault(); + String auth = _serverFixture.SiteSettings.Authority; - var oauthor = new OAuthenticator(clientId, clientSecret, scope, - new Uri(authorizeUrl), new Uri(redirectUrl), new Uri(accessTokenUrl)); + var oauthor = new OAuthenticator(_serverFixture.TestClientId, _serverFixture.TestClientSecret, + "profile", + new Uri(serverUrl), new Uri(serverUrl), new Uri(serverUrl+"/connect/token")); var query = new Dictionary { ["Username"] = userName, diff --git a/test/yavscTests/WebServerFixture.cs b/test/yavscTests/WebServerFixture.cs index f1dd87e9..f43ae25e 100644 --- a/test/yavscTests/WebServerFixture.cs +++ b/test/yavscTests/WebServerFixture.cs @@ -17,6 +17,7 @@ using yavscTests.Settings; using Yavsc.Extensions; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; +using Yavsc.Models.Auth; namespace isnd.tests { @@ -32,6 +33,7 @@ namespace isnd.tests public IConfigurationRoot Configuration { get; private set; } private WebApplication app; + public string TestClientId { get; private set; } public IServiceProvider Services { get; private set; } public string TestingUserName { get; private set; } @@ -41,6 +43,7 @@ namespace isnd.tests public SiteSettings SiteSettings { get => siteSettings; set => siteSettings = value; } public MailSender MailSender { get; internal set; } public TestingSetup? TestingSetup { get; internal set; } + public string TestClientSecret { get; private set; } = "TestClientSecret"; public WebServerFixture() { @@ -56,14 +59,14 @@ namespace isnd.tests public async Task SetupHost() { var builder = WebApplication.CreateBuilder(); - + Configuration = builder.Configuration .AddJsonFile("appsettings.json") .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true) .AddEnvironmentVariables() .Build(); - this.app = builder.ConfigureWebAppServices(); + this.app = builder.ConfigureWebAppServices(); Services = app.Services; using (var migrationScope = app.Services.CreateScope()) { @@ -73,8 +76,8 @@ namespace isnd.tests await app.ConfigurePipeline(); app.UseSession(); await app.StartAsync(); - - + + var logFactory = app.Services.GetRequiredService(); Logger = logFactory.CreateLogger(); @@ -94,14 +97,28 @@ namespace isnd.tests scope.ServiceProvider.GetRequiredService(); //dbContext.Database.EnsureCreated(); dbContext.Database.Migrate(); - - TestingUserName = "Tester"; - TestingUser = dbContext.Users.FirstOrDefault(u => u.UserName == TestingUserName); - EnsureUser(TestingUserName); - - ServicePointManager.ServerCertificateValidationCallback = - (sender, cert, chain, sslPolicyErrors) => true; + TestingUserName = "Tester"; + TestClientId = "testClientId"; + TestingUser = await dbContext.Users.FirstOrDefaultAsync(u => u.UserName == TestingUserName); + EnsureUser(TestingUserName); + // ensure a client + var testClient = await dbContext.Client.FirstOrDefaultAsync((c) => c.Id == TestClientId); + if (testClient == null) + { + testClient = new Yavsc.Models.Auth.Client + { + Id = TestClientId, + DisplayName = "Testing Client", + Secret = TestClientSecret, + Active = true, + Type = ApplicationTypes.NativeConfidential, + AccessTokenLifetime = 900, + RefreshTokenLifeTime = 15000 + }; + dbContext.Client.Add(testClient); + dbContext.SaveChanges(); + } } public void EnsureUser(string testingUserName) @@ -113,7 +130,6 @@ namespace isnd.tests var userManager = scope.ServiceProvider.GetRequiredService>(); - TestingUser = new ApplicationUser { UserName = testingUserName, @@ -130,7 +146,5 @@ namespace isnd.tests TestingUser = dbContext.Users.FirstOrDefault(u => u.UserName == testingUserName); } } - - } }