diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index 28597015..b1e26b9c 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -6,6 +6,6 @@ - + diff --git a/src/Api/Controllers/Blogspot/FileSystemApiController.cs b/src/Api/Controllers/Blogspot/FileSystemApiController.cs index 5a7f2251..e7b40dfe 100644 --- a/src/Api/Controllers/Blogspot/FileSystemApiController.cs +++ b/src/Api/Controllers/Blogspot/FileSystemApiController.cs @@ -9,11 +9,11 @@ namespace Yavsc.ApiControllers using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Yavsc.Helpers; - using Yavsc.Exceptions; using Yavsc.Models.FileSystem; using System.ComponentModel.DataAnnotations; using Yavsc.Attributes.Validation; using System.IO; + using Yavsc.Exceptions; [Authorize,Route("api/fs")] public partial class FileSystemApiController : Controller diff --git a/src/Api/Controllers/Business/BillingController.cs b/src/Api/Controllers/Business/BillingController.cs index 2a27f418..041359a2 100644 --- a/src/Api/Controllers/Business/BillingController.cs +++ b/src/Api/Controllers/Business/BillingController.cs @@ -12,9 +12,9 @@ namespace Yavsc.ApiControllers using Services; using Models.Messaging; - using ViewModels.Auth; using Microsoft.Extensions.Options; using Microsoft.EntityFrameworkCore; + using Yavsc.ViewModels.Auth; [Route("api/bill"), Authorize] public class BillingController : Controller diff --git a/src/Api/Program.cs b/src/Api/Program.cs index c98df80f..d774988d 100644 --- a/src/Api/Program.cs +++ b/src/Api/Program.cs @@ -10,7 +10,10 @@ copies or substantial portions of the Software. */ +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using Yavsc.Models; internal class Program { @@ -55,7 +58,16 @@ internal class Program options.TokenValidationParameters = new() { ValidateAudience = false }; }); - + services.AddDbContext(options => + options.UseNpgsql(builder.Configuration.GetConnectionString("Default"))); + services.AddScoped>(); + + builder.Services.AddSession(); + + /*services.AddTransient() + .AddTransient() + .AddTransient() + .AddTransient();*/ using (var app = builder.Build()) { if (app.Environment.IsDevelopment()) @@ -66,20 +78,21 @@ internal class Program .UseAuthentication() .UseAuthorization().UseCors("default") .UseEndpoints(endpoints => - { - endpoints.MapDefaultControllerRoute() - .RequireAuthorization(); - }); - + { + endpoints.MapDefaultControllerRoute() + .RequireAuthorization(); + }); + app.MapGet("/identity", (HttpContext context) => new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value })) ).RequireAuthorization("ApiScope"); - + + app.UseSession(); await app.RunAsync(); }; - - - + + + } } diff --git a/src/Api/tempkey.jwk b/src/Api/tempkey.jwk new file mode 100644 index 00000000..690a14ae --- /dev/null +++ b/src/Api/tempkey.jwk @@ -0,0 +1 @@ +{"AdditionalData":{},"Alg":"RS256","Crv":null,"D":"V1qxZgyKyWNi8FbeueGjfOae22fnDa0dU8YpTohrjn89bk9B8kvIzFJP9IPYThTLMaKCTFN09A3aVy_zhL5Cv2ebEqkZIpXkPmtvRavAYxoSQWUfN2czMok216KI7csVVk79csLnnO6i3pf0B9OgGwsuEsLR40_X4MTy5iTejZfwEVobN7H6_uylw5dEUjcJlR-RtuXAZz48stOLt8-y9it7rvowv8eHEsAFSaiV-g92rKZdvMdxVqW5dvHkqF4-h1gdp9VvStZYsqfnR8hrObSxom5yWFnpmxZKmaFaFxbF-k9T8YX1izuPzESPyKCUb-GX5_4sLB6vOiUO4drHiQ","DP":"7Vz77Jz00YuT87QDAEHuBl-GInvI2VT1Fg0HsUEUhBN_o1ZwqlgX6U_3yGUgYYvoWQZZQeLTxRiQSzymPxXiikKnmGt97zMypIllEOar284Ddypa4fraXSJwgKR-1UPYGZg1adjN3KDruLok3ahyUcD9375tCXmQ3Cs0QC1_ATs","DQ":"B5qgaCcQGleo-zZqWIjMCtyEyB4JBbPFtKk3uZ5KAV8lO-TQPJkohraRxInOUHoSS1O2hj1bUO1r-C29XJqrkhi2APGs2hu6V11cmAtwwhj5XPTnL_TNx314dK5ECEQ231gxidfod-6PknG20Qim7sacsj5OrJHfp9RnMZ2p4fk","E":"AQAB","K":null,"KeyId":"E7139A7A77AEA502B0482C026DCE5C59","KeyOps":[],"Kid":"E7139A7A77AEA502B0482C026DCE5C59","Kty":"RSA","N":"tL1q9Mon5IGTGYvBg_FmDoxy0HWQ0ceo6iZmDMzAkjYZ06KKdWoR7Up2ZJ7NrBnGpyrb1uR9qAJAAJm19SLKDKSrEUn5QcnTDMqVQLBurtXYw-eY2DL4cO0bbetc5_z8hyKUzikf6jJRRGfDSR2nEfXwUf3riYfYXtNgSmr_CsBwPUcH12JGad0bwsqJy7z9Tg2_pWvNR36Ba5qd_6VmkLQRGQuDTcHzwbagd3bl4Ma1bzxPULBiBENfj6srAxV-6gQhCJr3mIr1ZsJcZsrYuUnnBNgzYCZvkOkmyB68PlrV9C9xQO8aQfla2s42Uc12-UhBbreI0uBP_k8PXXXjXw","Oth":[],"P":"_jaZkNClDqxS8nddu2t6pgP596qJdzMAq11JVWAoDJV_9JRUZH2Qbq2CrDRUjRF9nxR2bVTglfzZ-bho-Iy9PqcWeVekLObiyR30zmUzoWCdUhmi-BRd3FF3uSteNPc7ohtuX4SrbbCoUR4BpcBAgHas8KKj80sIPpoYo10xK-s","Q":"tgKedcJQilsxEzRRbs8_XD4MxnsmrxqvccfvzzHkqqZMNI0CMGA41ddHiWdNcYsyzqIc-vCf6OGabD6Z7mzZXPbYsr1o4rIQXveUy3Ty3fD9YCRKgWbS9gTbXNGBFAglu3iyNl1XUCGc_DF8PImgk99pu9byPoIr6rAPhciaDV0","QI":"2wtLbwL9kODL6HoF5R8CFmf0Fz3gqoEetrq_I7wuK1pL2vmpZlzmURjvERhi5T6lD2L8SC1vY4AJ7NGzAncwn5ozpnos2s0YIxHYUixj5RuTWQLPKqk5r1bEORuju8KwfW6Nzc4K6Rhk3Lb3TXDvKi6BSf1URjLtiI8DUB_enxw","Use":null,"X":null,"X5c":[],"X5t":null,"X5tS256":null,"X5u":null,"Y":null,"KeySize":2048,"HasPrivateKey":true,"CryptoProviderFactory":{"CryptoProviderCache":{},"CustomCryptoProvider":null,"CacheSignatureProviders":true,"SignatureProviderObjectPoolCacheSize":16}} \ No newline at end of file diff --git a/src/Yavsc.Abstract/Constants.cs b/src/Yavsc.Abstract/Constants.cs index 8a37bd29..c84eabaf 100644 --- a/src/Yavsc.Abstract/Constants.cs +++ b/src/Yavsc.Abstract/Constants.cs @@ -37,7 +37,7 @@ namespace Yavsc public const string FrontOfficeGroupName = "FrontOffice"; public const string DefaultAvatar = "/images/Users/icon_user.png"; public const string AnonAvatar = "/images/Users/icon_anon_user.png"; - public const string YavscConnectionStringEnvName = "YAVSC_DB_CONNECTION"; + public const string YavscConnectionStringEnvName = "DEFAULTCONNECTION_CONNECTIONSTRING"; // at the end, let 4*4 bytes in peace public const int WebSocketsMaxBufLen = 4096; diff --git a/src/Yavsc.Abstract/MarkdownParser.y b/src/Yavsc.Abstract/MarkdownParser.y deleted file mode 100644 index 5f282702..00000000 --- a/src/Yavsc.Abstract/MarkdownParser.y +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/Yavsc.Abstract/app.config b/src/Yavsc.Abstract/app.config deleted file mode 100644 index 8460dd43..00000000 --- a/src/Yavsc.Abstract/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Yavsc.Abstract/packages.config b/src/Yavsc.Abstract/packages.config deleted file mode 100644 index 569e1bea..00000000 --- a/src/Yavsc.Abstract/packages.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Yavsc/Config.cs b/src/Yavsc.Server/Config.cs similarity index 97% rename from src/Yavsc/Config.cs rename to src/Yavsc.Server/Config.cs index 68d95685..9b7091c0 100644 --- a/src/Yavsc/Config.cs +++ b/src/Yavsc.Server/Config.cs @@ -1,6 +1,8 @@  using IdentityServer8; using IdentityServer8.Models; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; using Yavsc.Settings; namespace Yavsc; diff --git a/src/Yavsc/Exceptions/InvalidActivityModelException.cs b/src/Yavsc.Server/Exceptions/InvalidActivityModelException.cs similarity index 100% rename from src/Yavsc/Exceptions/InvalidActivityModelException.cs rename to src/Yavsc.Server/Exceptions/InvalidActivityModelException.cs diff --git a/src/Yavsc/Exceptions/InvalidPathException.cs b/src/Yavsc.Server/Exceptions/InvalidPathException.cs similarity index 100% rename from src/Yavsc/Exceptions/InvalidPathException.cs rename to src/Yavsc.Server/Exceptions/InvalidPathException.cs diff --git a/src/Yavsc/Helpers/FileSystemHelpers.cs b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs similarity index 97% rename from src/Yavsc/Helpers/FileSystemHelpers.cs rename to src/Yavsc.Server/Helpers/FileSystemHelpers.cs index 06117345..28721815 100644 --- a/src/Yavsc/Helpers/FileSystemHelpers.cs +++ b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs @@ -3,18 +3,27 @@ using System.Security.Claims; using Microsoft.AspNetCore.Html; using Microsoft.Extensions.FileProviders; -using Yavsc.Exceptions; using Yavsc.Models; using Yavsc.Models.FileSystem; using Yavsc.Models.Streaming; using Yavsc.ViewModels; using SixLabors.ImageSharp; using SixLabors.ImageSharp.Processing; +using Microsoft.AspNetCore.Http; +using Yavsc.Exceptions; namespace Yavsc.Helpers { public static class FileSystemHelpers { + public static async Task SaveAsAsync(this IFormFile formFile, string path) + { + if (formFile.Length > 0) { + using (Stream fileStream = new FileStream(path, FileMode.Create)) { + await formFile.CopyToAsync(fileStream); + } + } + } public static FileRecievedInfo ReceiveProSignature(this ClaimsPrincipal user, string billingCode, long estimateId, IFormFile formFile, string signtype) { var item = new FileRecievedInfo @@ -258,9 +267,5 @@ namespace Yavsc.Helpers return $"{basename}-{flow.SequenceNumber}{ext}"; } - public static void SaveAs(this IFormFile file, string destFileName) - { - throw new NotImplementedException(); - } } } diff --git a/src/Yavsc/Helpers/HtmlHelpers.cs b/src/Yavsc.Server/Helpers/HtmlHelpers.cs similarity index 95% rename from src/Yavsc/Helpers/HtmlHelpers.cs rename to src/Yavsc.Server/Helpers/HtmlHelpers.cs index 57d77b3e..213ea369 100644 --- a/src/Yavsc/Helpers/HtmlHelpers.cs +++ b/src/Yavsc.Server/Helpers/HtmlHelpers.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Html; +using Microsoft.AspNetCore.Http; using Yavsc.Models.Drawing; namespace Yavsc.Helpers diff --git a/src/Yavsc/Helpers/PayPalHelpers.cs b/src/Yavsc.Server/Helpers/PayPalHelpers.cs similarity index 100% rename from src/Yavsc/Helpers/PayPalHelpers.cs rename to src/Yavsc.Server/Helpers/PayPalHelpers.cs diff --git a/src/Yavsc/Helpers/RequestHelpers.cs b/src/Yavsc.Server/Helpers/RequestHelpers.cs similarity index 100% rename from src/Yavsc/Helpers/RequestHelpers.cs rename to src/Yavsc.Server/Helpers/RequestHelpers.cs diff --git a/src/Yavsc/Helpers/UserHelpers.cs b/src/Yavsc.Server/Helpers/UserHelpers.cs similarity index 100% rename from src/Yavsc/Helpers/UserHelpers.cs rename to src/Yavsc.Server/Helpers/UserHelpers.cs diff --git a/src/Yavsc/Helpers/WorkflowHelpers.cs b/src/Yavsc.Server/Helpers/WorkflowHelpers.cs similarity index 100% rename from src/Yavsc/Helpers/WorkflowHelpers.cs rename to src/Yavsc.Server/Helpers/WorkflowHelpers.cs diff --git a/src/Yavsc/Hubs/ChatHub.cs b/src/Yavsc.Server/Hubs/ChatHub.cs similarity index 100% rename from src/Yavsc/Hubs/ChatHub.cs rename to src/Yavsc.Server/Hubs/ChatHub.cs diff --git a/src/Yavsc/Interfaces/IConnexionManager.cs b/src/Yavsc.Server/Interfaces/IConnexionManager.cs similarity index 100% rename from src/Yavsc/Interfaces/IConnexionManager.cs rename to src/Yavsc.Server/Interfaces/IConnexionManager.cs diff --git a/src/Yavsc/Interfaces/IDiskUsageTracker.cs b/src/Yavsc.Server/Interfaces/IDiskUsageTracker.cs similarity index 100% rename from src/Yavsc/Interfaces/IDiskUsageTracker.cs rename to src/Yavsc.Server/Interfaces/IDiskUsageTracker.cs diff --git a/src/Yavsc/Interfaces/ILiveProcessor.cs b/src/Yavsc.Server/Interfaces/ILiveProcessor.cs similarity index 100% rename from src/Yavsc/Interfaces/ILiveProcessor.cs rename to src/Yavsc.Server/Interfaces/ILiveProcessor.cs diff --git a/src/Yavsc/Interfaces/ITrueEmailSender.cs b/src/Yavsc.Server/Interfaces/ITrueEmailSender.cs similarity index 100% rename from src/Yavsc/Interfaces/ITrueEmailSender.cs rename to src/Yavsc.Server/Interfaces/ITrueEmailSender.cs diff --git a/src/Yavsc/Migrations/2016/20160315144017_init.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160315144017_init.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160315144017_init.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160315144017_init.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160315144017_init.cs b/src/Yavsc.Server/Migrations/2016/20160315144017_init.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160315144017_init.cs rename to src/Yavsc.Server/Migrations/2016/20160315144017_init.cs diff --git a/src/Yavsc/Migrations/2016/20160317215718_command.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160317215718_command.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160317215718_command.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160317215718_command.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160317215718_command.cs b/src/Yavsc.Server/Migrations/2016/20160317215718_command.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160317215718_command.cs rename to src/Yavsc.Server/Migrations/2016/20160317215718_command.cs diff --git a/src/Yavsc/Migrations/2016/20160320170252_bank.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160320170252_bank.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160320170252_bank.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160320170252_bank.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160320170252_bank.cs b/src/Yavsc.Server/Migrations/2016/20160320170252_bank.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160320170252_bank.cs rename to src/Yavsc.Server/Migrations/2016/20160320170252_bank.cs diff --git a/src/Yavsc/Migrations/2016/20160322144500_contact.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160322144500_contact.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160322144500_contact.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160322144500_contact.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160322144500_contact.cs b/src/Yavsc.Server/Migrations/2016/20160322144500_contact.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160322144500_contact.cs rename to src/Yavsc.Server/Migrations/2016/20160322144500_contact.cs diff --git a/src/Yavsc/Migrations/2016/20160322152206_balance.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160322152206_balance.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160322152206_balance.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160322152206_balance.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160322152206_balance.cs b/src/Yavsc.Server/Migrations/2016/20160322152206_balance.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160322152206_balance.cs rename to src/Yavsc.Server/Migrations/2016/20160322152206_balance.cs diff --git a/src/Yavsc/Migrations/2016/20160401233357_circle.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160401233357_circle.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160401233357_circle.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160401233357_circle.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160401233357_circle.cs b/src/Yavsc.Server/Migrations/2016/20160401233357_circle.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160401233357_circle.cs rename to src/Yavsc.Server/Migrations/2016/20160401233357_circle.cs diff --git a/src/Yavsc/Migrations/2016/20160402135146_calendar.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160402135146_calendar.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160402135146_calendar.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160402135146_calendar.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160402135146_calendar.cs b/src/Yavsc.Server/Migrations/2016/20160402135146_calendar.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160402135146_calendar.cs rename to src/Yavsc.Server/Migrations/2016/20160402135146_calendar.cs diff --git a/src/Yavsc/Migrations/2016/20160404110708_files.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160404110708_files.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160404110708_files.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160404110708_files.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160404110708_files.cs b/src/Yavsc.Server/Migrations/2016/20160404110708_files.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160404110708_files.cs rename to src/Yavsc.Server/Migrations/2016/20160404110708_files.cs diff --git a/src/Yavsc/Migrations/2016/20160404121446_estimate.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160404121446_estimate.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160404121446_estimate.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160404121446_estimate.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160404121446_estimate.cs b/src/Yavsc.Server/Migrations/2016/20160404121446_estimate.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160404121446_estimate.cs rename to src/Yavsc.Server/Migrations/2016/20160404121446_estimate.cs diff --git a/src/Yavsc/Migrations/2016/20160404130359_estimateCommand.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160404130359_estimateCommand.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160404130359_estimateCommand.cs b/src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160404130359_estimateCommand.cs rename to src/Yavsc.Server/Migrations/2016/20160404130359_estimateCommand.cs diff --git a/src/Yavsc/Migrations/2016/20160405091432_booking.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160405091432_booking.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160405091432_booking.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160405091432_booking.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160405091432_booking.cs b/src/Yavsc.Server/Migrations/2016/20160405091432_booking.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160405091432_booking.cs rename to src/Yavsc.Server/Migrations/2016/20160405091432_booking.cs diff --git a/src/Yavsc/Migrations/2016/20160407112403_dailycost.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160407112403_dailycost.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160407112403_dailycost.cs b/src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160407112403_dailycost.cs rename to src/Yavsc.Server/Migrations/2016/20160407112403_dailycost.cs diff --git a/src/Yavsc/Migrations/2016/20160418114001_commandCreation.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160418114001_commandCreation.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160418114001_commandCreation.cs b/src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160418114001_commandCreation.cs rename to src/Yavsc.Server/Migrations/2016/20160418114001_commandCreation.cs diff --git a/src/Yavsc/Migrations/2016/20160427123737_perfoffer.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160427123737_perfoffer.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160427123737_perfoffer.cs b/src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160427123737_perfoffer.cs rename to src/Yavsc.Server/Migrations/2016/20160427123737_perfoffer.cs diff --git a/src/Yavsc/Migrations/2016/20160506154628_siren.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160506154628_siren.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160506154628_siren.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160506154628_siren.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160506154628_siren.cs b/src/Yavsc.Server/Migrations/2016/20160506154628_siren.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160506154628_siren.cs rename to src/Yavsc.Server/Migrations/2016/20160506154628_siren.cs diff --git a/src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.cs b/src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160515142434_tokenExpiresIn.cs rename to src/Yavsc.Server/Migrations/2016/20160515142434_tokenExpiresIn.cs diff --git a/src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.cs b/src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160529205859_ModeratorGroupName.cs rename to src/Yavsc.Server/Migrations/2016/20160529205859_ModeratorGroupName.cs diff --git a/src/Yavsc/Migrations/2016/20160610153353_client.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160610153353_client.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160610153353_client.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160610153353_client.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160610153353_client.cs b/src/Yavsc.Server/Migrations/2016/20160610153353_client.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160610153353_client.cs rename to src/Yavsc.Server/Migrations/2016/20160610153353_client.cs diff --git a/src/Yavsc/Migrations/2016/20160613142037_devices.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160613142037_devices.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160613142037_devices.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160613142037_devices.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160613142037_devices.cs b/src/Yavsc.Server/Migrations/2016/20160613142037_devices.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160613142037_devices.cs rename to src/Yavsc.Server/Migrations/2016/20160613142037_devices.cs diff --git a/src/Yavsc/Migrations/2016/20160614010545_bookquery.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160614010545_bookquery.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160614010545_bookquery.cs b/src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160614010545_bookquery.cs rename to src/Yavsc.Server/Migrations/2016/20160614010545_bookquery.cs diff --git a/src/Yavsc/Migrations/2016/20160702195348_GCMinfos.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160702195348_GCMinfos.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160702195348_GCMinfos.cs b/src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160702195348_GCMinfos.cs rename to src/Yavsc.Server/Migrations/2016/20160702195348_GCMinfos.cs diff --git a/src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.cs b/src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160723164231_GCMRedDate.cs rename to src/Yavsc.Server/Migrations/2016/20160723164231_GCMRedDate.cs diff --git a/src/Yavsc/Migrations/2016/20160725145306_estimates.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160725145306_estimates.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160725145306_estimates.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160725145306_estimates.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160725145306_estimates.cs b/src/Yavsc.Server/Migrations/2016/20160725145306_estimates.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160725145306_estimates.cs rename to src/Yavsc.Server/Migrations/2016/20160725145306_estimates.cs diff --git a/src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.cs b/src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160726131331_performerIdTypo.cs rename to src/Yavsc.Server/Migrations/2016/20160726131331_performerIdTypo.cs diff --git a/src/Yavsc/Migrations/2016/20160726133002_otherOrtho.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160726133002_otherOrtho.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160726133002_otherOrtho.cs b/src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160726133002_otherOrtho.cs rename to src/Yavsc.Server/Migrations/2016/20160726133002_otherOrtho.cs diff --git a/src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.cs b/src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160726161530_ExceptionsSIREN.cs rename to src/Yavsc.Server/Migrations/2016/20160726161530_ExceptionsSIREN.cs diff --git a/src/Yavsc/Migrations/2016/20160802143258_bcontentornot.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160802143258_bcontentornot.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160802143258_bcontentornot.cs b/src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160802143258_bcontentornot.cs rename to src/Yavsc.Server/Migrations/2016/20160802143258_bcontentornot.cs diff --git a/src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.cs b/src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160802145351_camelCaseBlog.cs rename to src/Yavsc.Server/Migrations/2016/20160802145351_camelCaseBlog.cs diff --git a/src/Yavsc/Migrations/2016/20160901145646_products.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160901145646_products.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160901145646_products.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160901145646_products.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160901145646_products.cs b/src/Yavsc.Server/Migrations/2016/20160901145646_products.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160901145646_products.cs rename to src/Yavsc.Server/Migrations/2016/20160901145646_products.cs diff --git a/src/Yavsc/Migrations/2016/20160905095708_tags.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160905095708_tags.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160905095708_tags.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160905095708_tags.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160905095708_tags.cs b/src/Yavsc.Server/Migrations/2016/20160905095708_tags.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160905095708_tags.cs rename to src/Yavsc.Server/Migrations/2016/20160905095708_tags.cs diff --git a/src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs b/src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs rename to src/Yavsc.Server/Migrations/2016/20160916075415_estimateFreeFromCatalog.cs diff --git a/src/Yavsc/Migrations/2016/20160917010249_yaev.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160917010249_yaev.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160917010249_yaev.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160917010249_yaev.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160917010249_yaev.cs b/src/Yavsc.Server/Migrations/2016/20160917010249_yaev.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160917010249_yaev.cs rename to src/Yavsc.Server/Migrations/2016/20160917010249_yaev.cs diff --git a/src/Yavsc/Migrations/2016/20160920215459_avatar.Designer.cs b/src/Yavsc.Server/Migrations/2016/20160920215459_avatar.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160920215459_avatar.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20160920215459_avatar.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20160920215459_avatar.cs b/src/Yavsc.Server/Migrations/2016/20160920215459_avatar.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20160920215459_avatar.cs rename to src/Yavsc.Server/Migrations/2016/20160920215459_avatar.cs diff --git a/src/Yavsc/Migrations/2016/20161010102616_recontact.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161010102616_recontact.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161010102616_recontact.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161010102616_recontact.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161010102616_recontact.cs b/src/Yavsc.Server/Migrations/2016/20161010102616_recontact.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161010102616_recontact.cs rename to src/Yavsc.Server/Migrations/2016/20161010102616_recontact.cs diff --git a/src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.cs b/src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161020143022_estimateClientApprouval.cs rename to src/Yavsc.Server/Migrations/2016/20161020143022_estimateClientApprouval.cs diff --git a/src/Yavsc/Migrations/2016/20161020212947_userAddress.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161020212947_userAddress.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161020212947_userAddress.cs b/src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161020212947_userAddress.cs rename to src/Yavsc.Server/Migrations/2016/20161020212947_userAddress.cs diff --git a/src/Yavsc/Migrations/2016/20161021153306_estimateLines.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161021153306_estimateLines.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161021153306_estimateLines.cs b/src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161021153306_estimateLines.cs rename to src/Yavsc.Server/Migrations/2016/20161021153306_estimateLines.cs diff --git a/src/Yavsc/Migrations/2016/20161101234703_chatConnection.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161101234703_chatConnection.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161101234703_chatConnection.cs b/src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161101234703_chatConnection.cs rename to src/Yavsc.Server/Migrations/2016/20161101234703_chatConnection.cs diff --git a/src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.cs b/src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161102132129_fixCxOwner.cs rename to src/Yavsc.Server/Migrations/2016/20161102132129_fixCxOwner.cs diff --git a/src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.cs b/src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161102133253_fix2CxOwner.cs rename to src/Yavsc.Server/Migrations/2016/20161102133253_fix2CxOwner.cs diff --git a/src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.cs b/src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161104090806_bankUserProfile.cs rename to src/Yavsc.Server/Migrations/2016/20161104090806_bankUserProfile.cs diff --git a/src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.cs b/src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161104164949_dropEstimateStatus.cs rename to src/Yavsc.Server/Migrations/2016/20161104164949_dropEstimateStatus.cs diff --git a/src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.cs b/src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161123235323_estimatesignatures.cs rename to src/Yavsc.Server/Migrations/2016/20161123235323_estimatesignatures.cs diff --git a/src/Yavsc/Migrations/2016/20161130084909_diskQuota.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161130084909_diskQuota.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161130084909_diskQuota.cs b/src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161130084909_diskQuota.cs rename to src/Yavsc.Server/Migrations/2016/20161130084909_diskQuota.cs diff --git a/src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.cs b/src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161209121035_bookQueryReason.cs rename to src/Yavsc.Server/Migrations/2016/20161209121035_bookQueryReason.cs diff --git a/src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.Designer.cs b/src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.Designer.cs rename to src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.Designer.cs diff --git a/src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.cs b/src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.cs similarity index 100% rename from src/Yavsc/Migrations/2016/20161231163016_musicalPreferences.cs rename to src/Yavsc.Server/Migrations/2016/20161231163016_musicalPreferences.cs diff --git a/src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.cs b/src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170102140332_musicalTendencies.cs rename to src/Yavsc.Server/Migrations/2017/20170102140332_musicalTendencies.cs diff --git a/src/Yavsc/Migrations/2017/20170102152745_locationTypes.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170102152745_locationTypes.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170102152745_locationTypes.cs b/src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170102152745_locationTypes.cs rename to src/Yavsc.Server/Migrations/2017/20170102152745_locationTypes.cs diff --git a/src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs b/src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs rename to src/Yavsc.Server/Migrations/2017/20170106092028_WFActivityParentAndProfiles.cs diff --git a/src/Yavsc/Migrations/2017/20170106113614_ownerProfile.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106113614_ownerProfile.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170106113614_ownerProfile.cs b/src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106113614_ownerProfile.cs rename to src/Yavsc.Server/Migrations/2017/20170106113614_ownerProfile.cs diff --git a/src/Yavsc/Migrations/2017/20170106122307_Instruments.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106122307_Instruments.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170106122307_Instruments.cs b/src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106122307_Instruments.cs rename to src/Yavsc.Server/Migrations/2017/20170106122307_Instruments.cs diff --git a/src/Yavsc/Migrations/2017/20170106124548_instrumentation.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106124548_instrumentation.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170106124548_instrumentation.cs b/src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106124548_instrumentation.cs rename to src/Yavsc.Server/Migrations/2017/20170106124548_instrumentation.cs diff --git a/src/Yavsc/Migrations/2017/20170106144035_activityRate.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106144035_activityRate.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170106144035_activityRate.cs b/src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106144035_activityRate.cs rename to src/Yavsc.Server/Migrations/2017/20170106144035_activityRate.cs diff --git a/src/Yavsc/Migrations/2017/20170106235954_weight.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170106235954_weight.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106235954_weight.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170106235954_weight.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170106235954_weight.cs b/src/Yavsc.Server/Migrations/2017/20170106235954_weight.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170106235954_weight.cs rename to src/Yavsc.Server/Migrations/2017/20170106235954_weight.cs diff --git a/src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.cs b/src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170107004233_userActivitiesValidity.cs rename to src/Yavsc.Server/Migrations/2017/20170107004233_userActivitiesValidity.cs diff --git a/src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.cs b/src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170113022807_SettingsClassName.cs rename to src/Yavsc.Server/Migrations/2017/20170113022807_SettingsClassName.cs diff --git a/src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.cs b/src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170113150714_instrumentationReloaded.cs rename to src/Yavsc.Server/Migrations/2017/20170113150714_instrumentationReloaded.cs diff --git a/src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.cs b/src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170116002541_bookQueryActivityCode.cs rename to src/Yavsc.Server/Migrations/2017/20170116002541_bookQueryActivityCode.cs diff --git a/src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.cs b/src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170116154735_refactPrproAllowGeo.cs rename to src/Yavsc.Server/Migrations/2017/20170116154735_refactPrproAllowGeo.cs diff --git a/src/Yavsc/Migrations/2017/20170117134339_entityTracking.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170117134339_entityTracking.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170117134339_entityTracking.cs b/src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170117134339_entityTracking.cs rename to src/Yavsc.Server/Migrations/2017/20170117134339_entityTracking.cs diff --git a/src/Yavsc/Migrations/2017/20170120095258_blogAcl.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170120095258_blogAcl.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170120095258_blogAcl.cs b/src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170120095258_blogAcl.cs rename to src/Yavsc.Server/Migrations/2017/20170120095258_blogAcl.cs diff --git a/src/Yavsc/Migrations/2017/20170120122324_queryTraking.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170120122324_queryTraking.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170120122324_queryTraking.cs b/src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170120122324_queryTraking.cs rename to src/Yavsc.Server/Migrations/2017/20170120122324_queryTraking.cs diff --git a/src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.cs b/src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170122160343_circlesMemberRefact.cs rename to src/Yavsc.Server/Migrations/2017/20170122160343_circlesMemberRefact.cs diff --git a/src/Yavsc/Migrations/2017/20170124090324_commandForms.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170124090324_commandForms.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170124090324_commandForms.cs b/src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170124090324_commandForms.cs rename to src/Yavsc.Server/Migrations/2017/20170124090324_commandForms.cs diff --git a/src/Yavsc/Migrations/2017/20170126152454_trackActivity.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170126152454_trackActivity.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170126152454_trackActivity.cs b/src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170126152454_trackActivity.cs rename to src/Yavsc.Server/Migrations/2017/20170126152454_trackActivity.cs diff --git a/src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.cs b/src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170126152651_renameActViewNameToAction.cs rename to src/Yavsc.Server/Migrations/2017/20170126152651_renameActViewNameToAction.cs diff --git a/src/Yavsc/Migrations/2017/20170201002133_blacklisted.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170201002133_blacklisted.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170201002133_blacklisted.cs b/src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170201002133_blacklisted.cs rename to src/Yavsc.Server/Migrations/2017/20170201002133_blacklisted.cs diff --git a/src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.cs b/src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170201162847_defaultAvatar.cs rename to src/Yavsc.Server/Migrations/2017/20170201162847_defaultAvatar.cs diff --git a/src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.cs b/src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170202102936_defaultDiskQuota.cs rename to src/Yavsc.Server/Migrations/2017/20170202102936_defaultDiskQuota.cs diff --git a/src/Yavsc/Migrations/2017/20170212005346_haircut.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170212005346_haircut.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170212005346_haircut.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170212005346_haircut.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170212005346_haircut.cs b/src/Yavsc.Server/Migrations/2017/20170212005346_haircut.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170212005346_haircut.cs rename to src/Yavsc.Server/Migrations/2017/20170212005346_haircut.cs diff --git a/src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.cs b/src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170217221646_bookQueryStatus.cs rename to src/Yavsc.Server/Migrations/2017/20170217221646_bookQueryStatus.cs diff --git a/src/Yavsc/Migrations/2017/20170220102125_notifications.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170220102125_notifications.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170220102125_notifications.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170220102125_notifications.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170220102125_notifications.cs b/src/Yavsc.Server/Migrations/2017/20170220102125_notifications.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170220102125_notifications.cs rename to src/Yavsc.Server/Migrations/2017/20170220102125_notifications.cs diff --git a/src/Yavsc/Migrations/2017/20170220125518_dimissclick.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170220125518_dimissclick.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170220125518_dimissclick.cs b/src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170220125518_dimissclick.cs rename to src/Yavsc.Server/Migrations/2017/20170220125518_dimissclick.cs diff --git a/src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.cs b/src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170220144141_hiddenActivity.cs rename to src/Yavsc.Server/Migrations/2017/20170220144141_hiddenActivity.cs diff --git a/src/Yavsc/Migrations/2017/20170227151759_hairPrestations.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170227151759_hairPrestations.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170227151759_hairPrestations.cs b/src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170227151759_hairPrestations.cs rename to src/Yavsc.Server/Migrations/2017/20170227151759_hairPrestations.cs diff --git a/src/Yavsc/Migrations/2017/20170228115359_brusherProfile.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170228115359_brusherProfile.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170228115359_brusherProfile.cs b/src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170228115359_brusherProfile.cs rename to src/Yavsc.Server/Migrations/2017/20170228115359_brusherProfile.cs diff --git a/src/Yavsc/Migrations/2017/20170228145057_actionName.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170228145057_actionName.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170228145057_actionName.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170228145057_actionName.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170228145057_actionName.cs b/src/Yavsc.Server/Migrations/2017/20170228145057_actionName.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170228145057_actionName.cs rename to src/Yavsc.Server/Migrations/2017/20170228145057_actionName.cs diff --git a/src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.cs b/src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170301124608_brusherActiondistance.cs rename to src/Yavsc.Server/Migrations/2017/20170301124608_brusherActiondistance.cs diff --git a/src/Yavsc/Migrations/2017/20170301132531_manbrushing.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170301132531_manbrushing.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170301132531_manbrushing.cs b/src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170301132531_manbrushing.cs rename to src/Yavsc.Server/Migrations/2017/20170301132531_manbrushing.cs diff --git a/src/Yavsc/Migrations/2017/20170301211317_folding.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170301211317_folding.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170301211317_folding.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170301211317_folding.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170301211317_folding.cs b/src/Yavsc.Server/Migrations/2017/20170301211317_folding.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170301211317_folding.cs rename to src/Yavsc.Server/Migrations/2017/20170301211317_folding.cs diff --git a/src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.cs b/src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170302122929_brusherProfileDiscount.cs rename to src/Yavsc.Server/Migrations/2017/20170302122929_brusherProfileDiscount.cs diff --git a/src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.cs b/src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170303000800_estimateRequireCommandType.cs rename to src/Yavsc.Server/Migrations/2017/20170303000800_estimateRequireCommandType.cs diff --git a/src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.cs b/src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170317213255_cxRequiresUserName.cs rename to src/Yavsc.Server/Migrations/2017/20170317213255_cxRequiresUserName.cs diff --git a/src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.cs b/src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170329075249_avatarMayBeNull.cs rename to src/Yavsc.Server/Migrations/2017/20170329075249_avatarMayBeNull.cs diff --git a/src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs b/src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs rename to src/Yavsc.Server/Migrations/2017/20170331214327_rdvqueryAndNoLocationNorDate.cs diff --git a/src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs b/src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs rename to src/Yavsc.Server/Migrations/2017/20170408055642_haircutqueryAdditionalInfo.cs diff --git a/src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.cs b/src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170409004555_haircutCommandTaints.cs rename to src/Yavsc.Server/Migrations/2017/20170409004555_haircutCommandTaints.cs diff --git a/src/Yavsc/Migrations/2017/20170507200834_paypal.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170507200834_paypal.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170507200834_paypal.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170507200834_paypal.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170507200834_paypal.cs b/src/Yavsc.Server/Migrations/2017/20170507200834_paypal.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170507200834_paypal.cs rename to src/Yavsc.Server/Migrations/2017/20170507200834_paypal.cs diff --git a/src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.cs b/src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170510121057_hairCutPaypalPayment.cs rename to src/Yavsc.Server/Migrations/2017/20170510121057_hairCutPaypalPayment.cs diff --git a/src/Yavsc/Migrations/2017/20170512102508_hairCutBill.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170512102508_hairCutBill.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170512102508_hairCutBill.cs b/src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170512102508_hairCutBill.cs rename to src/Yavsc.Server/Migrations/2017/20170512102508_hairCutBill.cs diff --git a/src/Yavsc/Migrations/2017/20170513213829_paypalids.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170513213829_paypalids.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170513213829_paypalids.cs b/src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170513213829_paypalids.cs rename to src/Yavsc.Server/Migrations/2017/20170513213829_paypalids.cs diff --git a/src/Yavsc/Migrations/2017/20170514123122_links.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170514123122_links.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170514123122_links.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170514123122_links.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170514123122_links.cs b/src/Yavsc.Server/Migrations/2017/20170514123122_links.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170514123122_links.cs rename to src/Yavsc.Server/Migrations/2017/20170514123122_links.cs diff --git a/src/Yavsc/Migrations/2017/20170516181745_paymentConsent.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170516181745_paymentConsent.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170516181745_paymentConsent.cs b/src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170516181745_paymentConsent.cs rename to src/Yavsc.Server/Migrations/2017/20170516181745_paymentConsent.cs diff --git a/src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.cs b/src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170517001340_notificatioinTarget.cs rename to src/Yavsc.Server/Migrations/2017/20170517001340_notificatioinTarget.cs diff --git a/src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.cs b/src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170524210924_paypalToDeprecated.cs rename to src/Yavsc.Server/Migrations/2017/20170524210924_paypalToDeprecated.cs diff --git a/src/Yavsc/Migrations/2017/20170526020220_rdvPayment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170526020220_rdvPayment.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170526020220_rdvPayment.cs b/src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170526020220_rdvPayment.cs rename to src/Yavsc.Server/Migrations/2017/20170526020220_rdvPayment.cs diff --git a/src/Yavsc/Migrations/2017/20170601115553_period.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170601115553_period.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170601115553_period.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170601115553_period.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170601115553_period.cs b/src/Yavsc.Server/Migrations/2017/20170601115553_period.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170601115553_period.cs rename to src/Yavsc.Server/Migrations/2017/20170601115553_period.cs diff --git a/src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs b/src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.cs b/src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20170611141231_BrusherCalendarModel.cs rename to src/Yavsc.Server/Migrations/2017/20170611141231_BrusherCalendarModel.cs diff --git a/src/Yavsc/Migrations/2017/20171002023107_Features.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171002023107_Features.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171002023107_Features.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171002023107_Features.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171002023107_Features.cs b/src/Yavsc.Server/Migrations/2017/20171002023107_Features.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171002023107_Features.cs rename to src/Yavsc.Server/Migrations/2017/20171002023107_Features.cs diff --git a/src/Yavsc/Migrations/2017/20171002023835_bugs.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171002023835_bugs.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171002023835_bugs.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171002023835_bugs.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171002023835_bugs.cs b/src/Yavsc.Server/Migrations/2017/20171002023835_bugs.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171002023835_bugs.cs rename to src/Yavsc.Server/Migrations/2017/20171002023835_bugs.cs diff --git a/src/Yavsc/Migrations/2017/20171003195221_BlogRename.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171003195221_BlogRename.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171003195221_BlogRename.cs b/src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171003195221_BlogRename.cs rename to src/Yavsc.Server/Migrations/2017/20171003195221_BlogRename.cs diff --git a/src/Yavsc/Migrations/2017/20171003203721_BlogComment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171003203721_BlogComment.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171003203721_BlogComment.cs b/src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171003203721_BlogComment.cs rename to src/Yavsc.Server/Migrations/2017/20171003203721_BlogComment.cs diff --git a/src/Yavsc/Migrations/2017/20171008184908_annouce.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171008184908_annouce.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171008184908_annouce.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171008184908_annouce.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171008184908_annouce.cs b/src/Yavsc.Server/Migrations/2017/20171008184908_annouce.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171008184908_annouce.cs rename to src/Yavsc.Server/Migrations/2017/20171008184908_annouce.cs diff --git a/src/Yavsc/Migrations/2017/20171008190234_announceAnwer.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171008190234_announceAnwer.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171008190234_announceAnwer.cs b/src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171008190234_announceAnwer.cs rename to src/Yavsc.Server/Migrations/2017/20171008190234_announceAnwer.cs diff --git a/src/Yavsc/Migrations/2017/20171016090837_bugDescription.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171016090837_bugDescription.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171016090837_bugDescription.cs b/src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171016090837_bugDescription.cs rename to src/Yavsc.Server/Migrations/2017/20171016090837_bugDescription.cs diff --git a/src/Yavsc/Migrations/2017/20171019130120_subComment.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171019130120_subComment.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171019130120_subComment.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171019130120_subComment.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171019130120_subComment.cs b/src/Yavsc.Server/Migrations/2017/20171019130120_subComment.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171019130120_subComment.cs rename to src/Yavsc.Server/Migrations/2017/20171019130120_subComment.cs diff --git a/src/Yavsc/Migrations/2017/20171020090944_commentAuthor.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171020090944_commentAuthor.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171020090944_commentAuthor.cs b/src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171020090944_commentAuthor.cs rename to src/Yavsc.Server/Migrations/2017/20171020090944_commentAuthor.cs diff --git a/src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.Designer.cs b/src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.Designer.cs rename to src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.Designer.cs diff --git a/src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.cs b/src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.cs similarity index 100% rename from src/Yavsc/Migrations/2017/20171020173835_commentAuthorId.cs rename to src/Yavsc.Server/Migrations/2017/20171020173835_commentAuthorId.cs diff --git a/src/Yavsc/Migrations/2018/20180102153009_chatRooms.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180102153009_chatRooms.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180102153009_chatRooms.cs b/src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180102153009_chatRooms.cs rename to src/Yavsc.Server/Migrations/2018/20180102153009_chatRooms.cs diff --git a/src/Yavsc/Migrations/2018/20180209144114_rejectQuery.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180209144114_rejectQuery.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180209144114_rejectQuery.cs b/src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180209144114_rejectQuery.cs rename to src/Yavsc.Server/Migrations/2018/20180209144114_rejectQuery.cs diff --git a/src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.cs b/src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180420213912_mailingTemplates.cs rename to src/Yavsc.Server/Migrations/2018/20180420213912_mailingTemplates.cs diff --git a/src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs b/src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs rename to src/Yavsc.Server/Migrations/2018/20180503100246_userAllowMonthlyEmail.cs diff --git a/src/Yavsc/Migrations/2018/20180625113528_Git.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180625113528_Git.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180625113528_Git.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180625113528_Git.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180625113528_Git.cs b/src/Yavsc.Server/Migrations/2018/20180625113528_Git.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180625113528_Git.cs rename to src/Yavsc.Server/Migrations/2018/20180625113528_Git.cs diff --git a/src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs b/src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs rename to src/Yavsc.Server/Migrations/2018/20180703224638_wrongProjectConfigForeignKey.cs diff --git a/src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs b/src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs rename to src/Yavsc.Server/Migrations/2018/20180703231814_wrongProjectConfigForeignKeyBis.cs diff --git a/src/Yavsc/Migrations/2018/20180805122812_gitprojectref.Designer.cs b/src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180805122812_gitprojectref.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20180805122812_gitprojectref.cs b/src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20180805122812_gitprojectref.cs rename to src/Yavsc.Server/Migrations/2018/20180805122812_gitprojectref.cs diff --git a/src/Yavsc/Migrations/2018/20181212103501_blogLang.Designer.cs b/src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20181212103501_blogLang.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20181212103501_blogLang.cs b/src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20181212103501_blogLang.cs rename to src/Yavsc.Server/Migrations/2018/20181212103501_blogLang.cs diff --git a/src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.Designer.cs b/src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.cs b/src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20181218152420_BlogTradModel.cs rename to src/Yavsc.Server/Migrations/2018/20181218152420_BlogTradModel.cs diff --git a/src/Yavsc/Migrations/2018/20181231153224_bugTitles.Designer.cs b/src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20181231153224_bugTitles.Designer.cs rename to src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.Designer.cs diff --git a/src/Yavsc/Migrations/2018/20181231153224_bugTitles.cs b/src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.cs similarity index 100% rename from src/Yavsc/Migrations/2018/20181231153224_bugTitles.cs rename to src/Yavsc.Server/Migrations/2018/20181231153224_bugTitles.cs diff --git a/src/Yavsc/Migrations/2019/20190730164137_publicCircle.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190730164137_publicCircle.Designer.cs rename to src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.Designer.cs diff --git a/src/Yavsc/Migrations/2019/20190730164137_publicCircle.cs b/src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190730164137_publicCircle.cs rename to src/Yavsc.Server/Migrations/2019/20190730164137_publicCircle.cs diff --git a/src/Yavsc/Migrations/2019/20190803204448_fileCircle.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190803204448_fileCircle.Designer.cs rename to src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.Designer.cs diff --git a/src/Yavsc/Migrations/2019/20190803204448_fileCircle.cs b/src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190803204448_fileCircle.cs rename to src/Yavsc.Server/Migrations/2019/20190803204448_fileCircle.cs diff --git a/src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.Designer.cs rename to src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.Designer.cs diff --git a/src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.cs b/src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190804232432_circleAnnotations.cs rename to src/Yavsc.Server/Migrations/2019/20190804232432_circleAnnotations.cs diff --git a/src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs rename to src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.Designer.cs diff --git a/src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.cs b/src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190819220343_intrumentRatingConstraint.cs rename to src/Yavsc.Server/Migrations/2019/20190819220343_intrumentRatingConstraint.cs diff --git a/src/Yavsc/Migrations/2019/20190819221632_instRateWInst.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190819221632_instRateWInst.Designer.cs rename to src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.Designer.cs diff --git a/src/Yavsc/Migrations/2019/20190819221632_instRateWInst.cs b/src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190819221632_instRateWInst.cs rename to src/Yavsc.Server/Migrations/2019/20190819221632_instRateWInst.cs diff --git a/src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs b/src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs rename to src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.Designer.cs diff --git a/src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.cs b/src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.cs similarity index 100% rename from src/Yavsc/Migrations/2019/20190826132314_bugDescriptionLength.cs rename to src/Yavsc.Server/Migrations/2019/20190826132314_bugDescriptionLength.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.cs b/src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190103110008_liveSetup.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190103110008_liveSetup.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.cs b/src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190126133339_banTarget.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190126133339_banTarget.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190127105601_banReason.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190127105601_banReason.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190127105601_banReason.cs b/src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190127105601_banReason.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190127105601_banReason.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs b/src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs b/src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs rename to src/Yavsc.Server/Migrations/2019/T1/20190204162909_liveFlowSeqnum.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.cs b/src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190507142752_chatAccess.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190507142752_chatAccess.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.cs b/src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190508004238_dropGCM.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190508004238_dropGCM.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.cs b/src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190510021107_chanDates.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190510021107_chanDates.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.Designer.cs b/src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.Designer.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.Designer.cs diff --git a/src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.cs b/src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.cs similarity index 100% rename from src/Yavsc/Migrations/2019/T2/20190622172941_userTrack.cs rename to src/Yavsc.Server/Migrations/2019/T2/20190622172941_userTrack.cs diff --git a/src/Yavsc/Migrations/2021/20210530122042_template-key.Designer.cs b/src/Yavsc.Server/Migrations/2021/20210530122042_template-key.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2021/20210530122042_template-key.Designer.cs rename to src/Yavsc.Server/Migrations/2021/20210530122042_template-key.Designer.cs diff --git a/src/Yavsc/Migrations/2021/20210530122042_template-key.cs b/src/Yavsc.Server/Migrations/2021/20210530122042_template-key.cs similarity index 100% rename from src/Yavsc/Migrations/2021/20210530122042_template-key.cs rename to src/Yavsc.Server/Migrations/2021/20210530122042_template-key.cs diff --git a/src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs b/src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs rename to src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.Designer.cs diff --git a/src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs b/src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs similarity index 100% rename from src/Yavsc/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs rename to src/Yavsc.Server/Migrations/2021/20210530213408_mailling-not-mailling-lists.cs diff --git a/src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs b/src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs rename to src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.Designer.cs diff --git a/src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs b/src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs similarity index 100% rename from src/Yavsc/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs rename to src/Yavsc.Server/Migrations/2021/20210603172023_no-more-circle-autorisation-to-file.cs diff --git a/src/Yavsc/Migrations/20230326173049_net7.Designer.cs b/src/Yavsc.Server/Migrations/20230326173049_net7.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20230326173049_net7.Designer.cs rename to src/Yavsc.Server/Migrations/20230326173049_net7.Designer.cs diff --git a/src/Yavsc/Migrations/20230326173049_net7.cs b/src/Yavsc.Server/Migrations/20230326173049_net7.cs similarity index 100% rename from src/Yavsc/Migrations/20230326173049_net7.cs rename to src/Yavsc.Server/Migrations/20230326173049_net7.cs diff --git a/src/Yavsc/Migrations/20230405203545_userreload.Designer.cs b/src/Yavsc.Server/Migrations/20230405203545_userreload.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20230405203545_userreload.Designer.cs rename to src/Yavsc.Server/Migrations/20230405203545_userreload.Designer.cs diff --git a/src/Yavsc/Migrations/20230405203545_userreload.cs b/src/Yavsc.Server/Migrations/20230405203545_userreload.cs similarity index 100% rename from src/Yavsc/Migrations/20230405203545_userreload.cs rename to src/Yavsc.Server/Migrations/20230405203545_userreload.cs diff --git a/src/Yavsc/Migrations/20230405210700_nullableFullname.Designer.cs b/src/Yavsc.Server/Migrations/20230405210700_nullableFullname.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20230405210700_nullableFullname.Designer.cs rename to src/Yavsc.Server/Migrations/20230405210700_nullableFullname.Designer.cs diff --git a/src/Yavsc/Migrations/20230405210700_nullableFullname.cs b/src/Yavsc.Server/Migrations/20230405210700_nullableFullname.cs similarity index 100% rename from src/Yavsc/Migrations/20230405210700_nullableFullname.cs rename to src/Yavsc.Server/Migrations/20230405210700_nullableFullname.cs diff --git a/src/Yavsc/Migrations/20241106133541_dismiss.Designer.cs b/src/Yavsc.Server/Migrations/20241106133541_dismiss.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20241106133541_dismiss.Designer.cs rename to src/Yavsc.Server/Migrations/20241106133541_dismiss.Designer.cs diff --git a/src/Yavsc/Migrations/20241106133541_dismiss.cs b/src/Yavsc.Server/Migrations/20241106133541_dismiss.cs similarity index 100% rename from src/Yavsc/Migrations/20241106133541_dismiss.cs rename to src/Yavsc.Server/Migrations/20241106133541_dismiss.cs diff --git a/src/Yavsc/Migrations/20241214154207_commentReceiver.Designer.cs b/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20241214154207_commentReceiver.Designer.cs rename to src/Yavsc.Server/Migrations/20241214154207_commentReceiver.Designer.cs diff --git a/src/Yavsc/Migrations/20241214154207_commentReceiver.cs b/src/Yavsc.Server/Migrations/20241214154207_commentReceiver.cs similarity index 100% rename from src/Yavsc/Migrations/20241214154207_commentReceiver.cs rename to src/Yavsc.Server/Migrations/20241214154207_commentReceiver.cs diff --git a/src/Yavsc/Migrations/20241214201053_commentParent.Designer.cs b/src/Yavsc.Server/Migrations/20241214201053_commentParent.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20241214201053_commentParent.Designer.cs rename to src/Yavsc.Server/Migrations/20241214201053_commentParent.Designer.cs diff --git a/src/Yavsc/Migrations/20241214201053_commentParent.cs b/src/Yavsc.Server/Migrations/20241214201053_commentParent.cs similarity index 100% rename from src/Yavsc/Migrations/20241214201053_commentParent.cs rename to src/Yavsc.Server/Migrations/20241214201053_commentParent.cs diff --git a/src/Yavsc/Migrations/20250208001037_blogspotcase.Designer.cs b/src/Yavsc.Server/Migrations/20250208001037_blogspotcase.Designer.cs similarity index 100% rename from src/Yavsc/Migrations/20250208001037_blogspotcase.Designer.cs rename to src/Yavsc.Server/Migrations/20250208001037_blogspotcase.Designer.cs diff --git a/src/Yavsc/Migrations/20250208001037_blogspotcase.cs b/src/Yavsc.Server/Migrations/20250208001037_blogspotcase.cs similarity index 100% rename from src/Yavsc/Migrations/20250208001037_blogspotcase.cs rename to src/Yavsc.Server/Migrations/20250208001037_blogspotcase.cs diff --git a/src/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from src/Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs rename to src/Yavsc.Server/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/src/Yavsc/Models/Access/AccountOptions.cs b/src/Yavsc.Server/Models/Access/AccountOptions.cs similarity index 100% rename from src/Yavsc/Models/Access/AccountOptions.cs rename to src/Yavsc.Server/Models/Access/AccountOptions.cs diff --git a/src/Yavsc/Models/Access/ConsentInputModel.cs b/src/Yavsc.Server/Models/Access/ConsentInputModel.cs similarity index 100% rename from src/Yavsc/Models/Access/ConsentInputModel.cs rename to src/Yavsc.Server/Models/Access/ConsentInputModel.cs diff --git a/src/Yavsc/Models/Access/ConsentViewModel.cs b/src/Yavsc.Server/Models/Access/ConsentViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/ConsentViewModel.cs rename to src/Yavsc.Server/Models/Access/ConsentViewModel.cs diff --git a/src/Yavsc/Models/Access/DeviceAuthorizationInputModel.cs b/src/Yavsc.Server/Models/Access/DeviceAuthorizationInputModel.cs similarity index 100% rename from src/Yavsc/Models/Access/DeviceAuthorizationInputModel.cs rename to src/Yavsc.Server/Models/Access/DeviceAuthorizationInputModel.cs diff --git a/src/Yavsc/Models/Access/DeviceAuthorizationViewModel.cs b/src/Yavsc.Server/Models/Access/DeviceAuthorizationViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/DeviceAuthorizationViewModel.cs rename to src/Yavsc.Server/Models/Access/DeviceAuthorizationViewModel.cs diff --git a/src/Yavsc/Models/Access/GrantViewModel.cs b/src/Yavsc.Server/Models/Access/GrantViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/GrantViewModel.cs rename to src/Yavsc.Server/Models/Access/GrantViewModel.cs diff --git a/src/Yavsc/Models/Access/GrantsViewModel.cs b/src/Yavsc.Server/Models/Access/GrantsViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/GrantsViewModel.cs rename to src/Yavsc.Server/Models/Access/GrantsViewModel.cs diff --git a/src/Yavsc/Models/Access/LoggedOutViewModel.cs b/src/Yavsc.Server/Models/Access/LoggedOutViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/LoggedOutViewModel.cs rename to src/Yavsc.Server/Models/Access/LoggedOutViewModel.cs diff --git a/src/Yavsc/Models/Access/LogoutInputModel.cs b/src/Yavsc.Server/Models/Access/LogoutInputModel.cs similarity index 100% rename from src/Yavsc/Models/Access/LogoutInputModel.cs rename to src/Yavsc.Server/Models/Access/LogoutInputModel.cs diff --git a/src/Yavsc/Models/Access/ProcessConsentResult.cs b/src/Yavsc.Server/Models/Access/ProcessConsentResult.cs similarity index 100% rename from src/Yavsc/Models/Access/ProcessConsentResult.cs rename to src/Yavsc.Server/Models/Access/ProcessConsentResult.cs diff --git a/src/Yavsc/Models/Access/RedirectViewModel.cs b/src/Yavsc.Server/Models/Access/RedirectViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/RedirectViewModel.cs rename to src/Yavsc.Server/Models/Access/RedirectViewModel.cs diff --git a/src/Yavsc/Models/Access/Rule.cs b/src/Yavsc.Server/Models/Access/Rule.cs similarity index 100% rename from src/Yavsc/Models/Access/Rule.cs rename to src/Yavsc.Server/Models/Access/Rule.cs diff --git a/src/Yavsc/Models/Access/RuleSet.cs b/src/Yavsc.Server/Models/Access/RuleSet.cs similarity index 100% rename from src/Yavsc/Models/Access/RuleSet.cs rename to src/Yavsc.Server/Models/Access/RuleSet.cs diff --git a/src/Yavsc/Models/Access/ScopeViewModel.cs b/src/Yavsc.Server/Models/Access/ScopeViewModel.cs similarity index 100% rename from src/Yavsc/Models/Access/ScopeViewModel.cs rename to src/Yavsc.Server/Models/Access/ScopeViewModel.cs diff --git a/src/Yavsc/Models/ApplicationDbContext.cs b/src/Yavsc.Server/Models/ApplicationDbContext.cs similarity index 99% rename from src/Yavsc/Models/ApplicationDbContext.cs rename to src/Yavsc.Server/Models/ApplicationDbContext.cs index 7da36095..a4199896 100644 --- a/src/Yavsc/Models/ApplicationDbContext.cs +++ b/src/Yavsc.Server/Models/ApplicationDbContext.cs @@ -38,7 +38,7 @@ namespace Yavsc.Models using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Yavsc.Server.Models.Calendar; - using Yavsc.Controllers; + using Microsoft.EntityFrameworkCore.ChangeTracking; public class ApplicationDbContext : IdentityDbContext @@ -106,6 +106,7 @@ namespace Yavsc.Models var envSetup = Environment.GetEnvironmentVariable(Constants.YavscConnectionStringEnvName); if (envSetup!=null) optionsBuilder.UseNpgsql(envSetup); + else optionsBuilder.UseNpgsql(); } public DbSet Applications { get; set; } diff --git a/src/Yavsc/Models/ConsentOptions.cs b/src/Yavsc.Server/Models/ConsentOptions.cs similarity index 100% rename from src/Yavsc/Models/ConsentOptions.cs rename to src/Yavsc.Server/Models/ConsentOptions.cs diff --git a/src/Yavsc/Models/ErrorViewModel.cs b/src/Yavsc.Server/Models/ErrorViewModel.cs similarity index 100% rename from src/Yavsc/Models/ErrorViewModel.cs rename to src/Yavsc.Server/Models/ErrorViewModel.cs diff --git a/src/Yavsc/Resources/Yavsc.AnnouncesController.resx b/src/Yavsc.Server/Resources/Yavsc.AnnouncesController.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.AnnouncesController.resx rename to src/Yavsc.Server/Resources/Yavsc.AnnouncesController.resx diff --git a/src/Yavsc/Resources/Yavsc.BugController.resx b/src/Yavsc.Server/Resources/Yavsc.BugController.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.BugController.resx rename to src/Yavsc.Server/Resources/Yavsc.BugController.resx diff --git a/src/Yavsc/Resources/Yavsc.Models.Billing.NominativeServiceCommand.resx b/src/Yavsc.Server/Resources/Yavsc.Models.Billing.NominativeServiceCommand.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.Models.Billing.NominativeServiceCommand.resx rename to src/Yavsc.Server/Resources/Yavsc.Models.Billing.NominativeServiceCommand.resx diff --git a/src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.resx b/src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Resources.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.Models.IT.Fixing.Resources.resx rename to src/Yavsc.Server/Resources/Yavsc.Models.IT.Fixing.Resources.resx diff --git a/src/Yavsc/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx b/src/Yavsc.Server/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx rename to src/Yavsc.Server/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx diff --git a/src/Yavsc/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs b/src/Yavsc.Server/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs similarity index 100% rename from src/Yavsc/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs rename to src/Yavsc.Server/Resources/Yavsc.Resources.EnrolerViewModel.Designer.cs diff --git a/src/Yavsc/Resources/Yavsc.Resources.Resources.Designer.cs b/src/Yavsc.Server/Resources/Yavsc.Resources.Resources.Designer.cs similarity index 100% rename from src/Yavsc/Resources/Yavsc.Resources.Resources.Designer.cs rename to src/Yavsc.Server/Resources/Yavsc.Resources.Resources.Designer.cs diff --git a/src/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.Designer.cs b/src/Yavsc.Server/Resources/Yavsc.Resources.YavscLocalisation.Designer.cs similarity index 100% rename from src/Yavsc/Resources/Yavsc.Resources.YavscLocalisation.Designer.cs rename to src/Yavsc.Server/Resources/Yavsc.Resources.YavscLocalisation.Designer.cs diff --git a/src/Yavsc/Resources/Yavsc.Services.ChatHubConnectionManager.resx b/src/Yavsc.Server/Resources/Yavsc.Services.ChatHubConnectionManager.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.Services.ChatHubConnectionManager.resx rename to src/Yavsc.Server/Resources/Yavsc.Services.ChatHubConnectionManager.resx diff --git a/src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.en.resx b/src/Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.en.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.en.resx rename to src/Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.en.resx diff --git a/src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.resx b/src/Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.ViewComponents.CommentViewComponent.resx rename to src/Yavsc.Server/Resources/Yavsc.ViewComponents.CommentViewComponent.resx diff --git a/src/Yavsc/Resources/Yavsc.ViewComponents.TaggerViewComponent.resx b/src/Yavsc.Server/Resources/Yavsc.ViewComponents.TaggerViewComponent.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.ViewComponents.TaggerViewComponent.resx rename to src/Yavsc.Server/Resources/Yavsc.ViewComponents.TaggerViewComponent.resx diff --git a/src/Yavsc/Resources/Yavsc.ViewModels.EnrolerViewModel.resx b/src/Yavsc.Server/Resources/Yavsc.ViewModels.EnrolerViewModel.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.ViewModels.EnrolerViewModel.resx rename to src/Yavsc.Server/Resources/Yavsc.ViewModels.EnrolerViewModel.resx diff --git a/src/Yavsc/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.resx b/src/Yavsc.Server/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.resx rename to src/Yavsc.Server/Resources/Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel.resx diff --git a/src/Yavsc/Resources/Yavsc.YavscLocalisation.en.resx b/src/Yavsc.Server/Resources/Yavsc.YavscLocalisation.en.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.YavscLocalisation.en.resx rename to src/Yavsc.Server/Resources/Yavsc.YavscLocalisation.en.resx diff --git a/src/Yavsc/Resources/Yavsc.YavscLocalisation.pt.resx b/src/Yavsc.Server/Resources/Yavsc.YavscLocalisation.pt.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.YavscLocalisation.pt.resx rename to src/Yavsc.Server/Resources/Yavsc.YavscLocalisation.pt.resx diff --git a/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx b/src/Yavsc.Server/Resources/Yavsc.YavscLocalisation.resx similarity index 100% rename from src/Yavsc/Resources/Yavsc.YavscLocalisation.resx rename to src/Yavsc.Server/Resources/Yavsc.YavscLocalisation.resx diff --git a/src/Yavsc/Services/BillingService.cs b/src/Yavsc.Server/Services/BillingService.cs similarity index 100% rename from src/Yavsc/Services/BillingService.cs rename to src/Yavsc.Server/Services/BillingService.cs diff --git a/src/Yavsc/Settings/DataProtectionSettings.cs b/src/Yavsc.Server/Settings/DataProtectionSettings.cs similarity index 100% rename from src/Yavsc/Settings/DataProtectionSettings.cs rename to src/Yavsc.Server/Settings/DataProtectionSettings.cs diff --git a/src/Yavsc/Settings/SmtpSettings.cs b/src/Yavsc.Server/Settings/SmtpSettings.cs similarity index 100% rename from src/Yavsc/Settings/SmtpSettings.cs rename to src/Yavsc.Server/Settings/SmtpSettings.cs diff --git a/src/Yavsc/ViewModels/Auth/EditRequirement.cs b/src/Yavsc.Server/ViewModels/Auth/EditRequirement.cs similarity index 100% rename from src/Yavsc/ViewModels/Auth/EditRequirement.cs rename to src/Yavsc.Server/ViewModels/Auth/EditRequirement.cs diff --git a/src/Yavsc/ViewModels/Auth/FileSpotInfo.cs b/src/Yavsc.Server/ViewModels/Auth/FileSpotInfo.cs similarity index 100% rename from src/Yavsc/ViewModels/Auth/FileSpotInfo.cs rename to src/Yavsc.Server/ViewModels/Auth/FileSpotInfo.cs diff --git a/src/Yavsc/ViewModels/Auth/ModerationRequirement.cs b/src/Yavsc.Server/ViewModels/Auth/ModerationRequirement.cs similarity index 100% rename from src/Yavsc/ViewModels/Auth/ModerationRequirement.cs rename to src/Yavsc.Server/ViewModels/Auth/ModerationRequirement.cs diff --git a/src/Yavsc/ViewModels/Auth/PrivateChatEntryRequirement.cs b/src/Yavsc.Server/ViewModels/Auth/PrivateChatEntryRequirement.cs similarity index 100% rename from src/Yavsc/ViewModels/Auth/PrivateChatEntryRequirement.cs rename to src/Yavsc.Server/ViewModels/Auth/PrivateChatEntryRequirement.cs diff --git a/src/Yavsc/ViewModels/Auth/ViewFileContext.cs b/src/Yavsc.Server/ViewModels/Auth/ViewFileContext.cs similarity index 100% rename from src/Yavsc/ViewModels/Auth/ViewFileContext.cs rename to src/Yavsc.Server/ViewModels/Auth/ViewFileContext.cs diff --git a/src/Yavsc/ViewModels/Auth/ViewRequirement.cs b/src/Yavsc.Server/ViewModels/Auth/ViewRequirement.cs similarity index 100% rename from src/Yavsc/ViewModels/Auth/ViewRequirement.cs rename to src/Yavsc.Server/ViewModels/Auth/ViewRequirement.cs diff --git a/src/Yavsc/Hubs/ChatRoomInfo.cs b/src/Yavsc.Server/ViewModels/Chat/ChatRoomInfo.cs similarity index 100% rename from src/Yavsc/Hubs/ChatRoomInfo.cs rename to src/Yavsc.Server/ViewModels/Chat/ChatRoomInfo.cs diff --git a/src/Yavsc/ViewModels/FrontOffice/PerformerProfileViewModel.cs b/src/Yavsc.Server/ViewModels/FrontOffice/PerformerProfileViewModel.cs similarity index 100% rename from src/Yavsc/ViewModels/FrontOffice/PerformerProfileViewModel.cs rename to src/Yavsc.Server/ViewModels/FrontOffice/PerformerProfileViewModel.cs diff --git a/src/Yavsc/ViewModels/Streaming/LiveCastHandler.cs b/src/Yavsc.Server/ViewModels/LiveCastHandler.cs similarity index 100% rename from src/Yavsc/ViewModels/Streaming/LiveCastHandler.cs rename to src/Yavsc.Server/ViewModels/LiveCastHandler.cs diff --git a/src/Yavsc.Server/Yavsc.Server.csproj b/src/Yavsc.Server/Yavsc.Server.csproj index f8a1ef6a..ccad4972 100644 --- a/src/Yavsc.Server/Yavsc.Server.csproj +++ b/src/Yavsc.Server/Yavsc.Server.csproj @@ -1,20 +1,26 @@ - + net8.0 enable enable + 53bd70e8-ff81-497a-847f-a15fd8ea7a09 + + + runtime; build; native; contentfiles; analyzers; buildtransitive all + + diff --git a/src/Yavsc.Server/project.json b/src/Yavsc.Server/project.json deleted file mode 100644 index 472c4a95..00000000 --- a/src/Yavsc.Server/project.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "version": "1.0.5-*", - "description": "Yavsc server common library", - "authors": [ - "Paul Schneider " - ], - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/pazof/yavsc" - }, - "licenseUrl": "https://github.com/pazof/yavsc/blob/vnext/LICENSE", - "requireLicenseAcceptance": true, - "owners": [ - "Paul Schneider " - ], - "summary": "Yet another very small company", - "projectUrl": "http://yavsc.pschneider.fr", - "tags": [ - "Blog", - "PoS", - "Chat" - ] - }, - "userSecretsId": "aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f", - "buildOptions": { - "debugType": "full", - "emitEntryPoint": false, - "outputName": "Yavsc.Server", - "compile": { - "include": "*.cs", - "exclude": [ - "wwwroot", - "node_modules", - "bower_components", - "contrib" - ] - }, - "embed": [ - "Resources/**/*.resx" - ], - "publicSign": false, - "keyFile": "../../../sgKey.snk", - "nowarn": ["IDE1006"] - }, - "tooling": { - "defaultNamespace": "Yavsc" - }, - "dependencies": { - "EntityFramework.Commands": "7.0.0-rc1-final", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", - "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final", - "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final", - "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", - "Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final", - "Microsoft.Extensions.Options": "0.0.1-alpha", - "Microsoft.Extensions.Localization": "1.0.0-rc1-final", - "Newtonsoft.Json": "7.0.1", - "Gapi.net45": "1.0.1", - "PayPalMerchant-net451": "2.7.109", - "MailKit": "1.12.0", - "Microsoft.CodeAnalysis.CSharp": "1.1.0-rc1-20151109-01", - "Yavsc.Abstract": { - "type": "build" - } - }, - "frameworks": { - "dnx451": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0", - "System.Linq": "4.0.0", - "System.Net": "4.0.0.0", - "System.Net.Http": "4.0.0", - "System.Xml": "4.0.0" - } - }, - "net451": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0", - "System.Net": "4.0.0.0", - "System.Net.Http": "4.0.0", - "System.Xml": "4.0.0", - "System": "4.0.0" - } - }, - "net452": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0", - "System.Net": "4.0.0.0", - "System.Net.Http": "4.0.0", - "System.Xml": "4.0.0", - "System": "4.0.0" - } - }, - "net46": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0", - "System.Net": "4.0.0.0", - "System.Net.Http": "4.0.0", - "System.Xml": "4.0.0", - "System": "4.0.0" - } - }, - "net461": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0", - "System.Net": "4.0.0.0", - "System.Net.Http": "4.0.0", - "System.Xml": "4.0.0", - "System": "4.0.0" - } - } - }, - "commands": { - "ef": "EntityFramework.Commands", - "gen": "Microsoft.Extensions.CodeGeneration" - }, - "scripts": { - "postrestore": [ - "grep -v '\\.\\.dll' project.lock.json > new.project.lock.json", - "mv new.project.lock.json project.lock.json" - ] - } -} diff --git a/src/Yavsc/Controllers/Contracting/CommandController.cs b/src/Yavsc/Controllers/Contracting/CommandController.cs index 270eac7e..5332a64e 100644 --- a/src/Yavsc/Controllers/Contracting/CommandController.cs +++ b/src/Yavsc/Controllers/Contracting/CommandController.cs @@ -35,7 +35,7 @@ namespace Yavsc.Controllers IYavscMessageSender messageSender, UserManager userManager, ICalendarManager calendarManager, - IStringLocalizer localizer, + IStringLocalizer localizer, ITrueEmailSender emailSender, IOptions smtpSettings, IOptions siteSettings, diff --git a/src/Yavsc/Controllers/Contracting/EstimateController.cs b/src/Yavsc/Controllers/Contracting/EstimateController.cs index a9040362..d68c3656 100644 --- a/src/Yavsc/Controllers/Contracting/EstimateController.cs +++ b/src/Yavsc/Controllers/Contracting/EstimateController.cs @@ -87,7 +87,7 @@ namespace Yavsc.Controllers // POST: Estimate/Create [HttpPost] [ValidateAntiForgeryToken] - public IActionResult Create(Estimate estimate, + public async Task Create(Estimate estimate, ICollection newGraphics, ICollection newFiles ) @@ -118,7 +118,7 @@ namespace Yavsc.Controllers foreach (var gr in newGraphics) { ContentDisposition contentDisposition = new ContentDisposition(gr.ContentDisposition); - gr.SaveAs( + await gr.SaveAsAsync( Path.Combine( Path.Combine(billsdir, estimate.Id.ToString()), contentDisposition.FileName)); @@ -126,7 +126,7 @@ namespace Yavsc.Controllers foreach (var formFile in newFiles) { ContentDisposition contentDisposition = new ContentDisposition(formFile.ContentDisposition); - formFile.SaveAs( + await formFile.SaveAsAsync( Path.Combine( Path.Combine(billsdir, estimate.Id.ToString()), contentDisposition.FileName)); diff --git a/src/Yavsc/Extensions/HostingExtensions.cs b/src/Yavsc/Extensions/HostingExtensions.cs index cf472bc5..7d4e4ac4 100644 --- a/src/Yavsc/Extensions/HostingExtensions.cs +++ b/src/Yavsc/Extensions/HostingExtensions.cs @@ -2,7 +2,6 @@ using System.Globalization; using System.Security.Cryptography.X509Certificates; using Google.Apis.Util.Store; using IdentityServer8; -using IdentityServer8.Hosting; using IdentityServer8.Services; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; @@ -15,7 +14,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.Tokens; using Microsoft.Net.Http.Headers; using Newtonsoft.Json; using Yavsc.Abstract.Workflow; @@ -33,7 +31,7 @@ using Yavsc.ViewModels.Auth; namespace Yavsc.Extensions; -internal static class HostingExtensions +public static class HostingExtensions { #region files config public static IApplicationBuilder ConfigureFileServerApp(this IApplicationBuilder app, @@ -135,10 +133,138 @@ internal static class HostingExtensions BillingService.GlobalBillingMap.Add(typeof(T).Name, code); } - public static WebApplication ConfigureServices(this WebApplicationBuilder builder) + internal static WebApplication ConfigureWebAppServices(this WebApplicationBuilder builder) { + IServiceCollection services = LoadConfiguration(builder); + + services.AddRazorPages(); + + services.AddSignalR(o => + { + o.EnableDetailedErrors = true; + }); + + AddIdentityDBAndStores(builder).AddDefaultTokenProviders();; + + AddIdentityServer(builder); + //services.AddScoped(); + + services.AddSession(); + + // TODO .AddServerSideSessionStore() + + AddAuthentication(services, builder.Configuration); + + // Add the system clock service + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddSingleton(); + _ = services.AddTransient(); + + services.AddMvc(config => + { + /* var policy = new AuthorizationPolicyBuilder() + .RequireAuthenticatedUser() + .Build(); + config.Filters.Add(new AuthorizeFilter(policy)); */ + config.Filters.Add(new ProducesAttribute("application/json")); + // config.ModelBinders.Insert(0,new MyDateTimeModelBinder()); + // config.ModelBinders.Insert(0,new MyDecimalModelBinder()); + config.EnableEndpointRouting = true; + }).AddFormatterMappings( + config => config.SetMediaTypeMappingForFormat("text/pdf", + new MediaTypeHeaderValue("text/pdf")) + ).AddFormatterMappings( + config => config.SetMediaTypeMappingForFormat("text/x-tex", + new MediaTypeHeaderValue("text/x-tex")) + ) + .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix, + options => + { + options.ResourcesPath = "Resources"; + }).AddDataAnnotationsLocalization(); + + services.AddTransient() + .AddTransient() + .AddTransient() + .AddTransient() + .AddTransient((sp) => new FileDataStore("googledatastore", false)) + .AddTransient(); + + // TODO for SMS: services.AddTransient(); + + _ = services.AddLocalization(options => + { + options.ResourcesPath = "Resources"; + }); + var dataDirConfig = builder.Configuration["Site:DataDir"] ?? "DataDir"; + + var dataDir = new DirectoryInfo(dataDirConfig); + // Add session related services. + + services.AddDataProtection().PersistKeysToFileSystem(dataDir); + AddYavscPolicies(services); + + services.AddSingleton(); + // accepts any access token issued by identity server + + return builder.Build(); + } + + public static IdentityBuilder AddIdentityDBAndStores(this WebApplicationBuilder builder) + { + IServiceCollection services = builder.Services; + services.AddDbContext(options => + options.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"))); + + return services.AddIdentity() + .AddEntityFrameworkStores(); + + } + + private static void AddYavscPolicies(IServiceCollection services) + { + services.AddAuthorization(options => + { + options.AddPolicy("ApiScope", policy => + { + policy.RequireAuthenticatedUser() + .RequireClaim("scope", "scope2"); + }); + options.AddPolicy("Performer", policy => + { + policy + .RequireAuthenticatedUser() + .RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", "Performer"); + }); + options.AddPolicy("AdministratorOnly", policy => + { + _ = policy.RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", Constants.AdminGroupName); + }); + + options.AddPolicy("FrontOffice", policy => policy.RequireRole(Constants.FrontOfficeGroupName)); + + // options.AddPolicy("EmployeeId", policy => policy.RequireClaim("EmployeeId", "123", "456")); + // options.AddPolicy("BuildingEntry", policy => policy.Requirements.Add(new OfficeEntryRequirement())); + options.AddPolicy("Authenticated", policy => policy.RequireAuthenticatedUser()); + options.AddPolicy("IsTheAuthor", policy => policy.Requirements.Add(new EditPermission())); + }) + .AddCors(options => + { + options.AddPolicy("default", builder => + { + _ = builder.WithOrigins("*") + .AllowAnyHeader() + .AllowAnyMethod(); + }); + + }); + } + + public static IServiceCollection LoadConfiguration(this WebApplicationBuilder builder) + { var siteSection = builder.Configuration.GetSection("Site"); var smtpSection = builder.Configuration.GetSection("Smtp"); var paypalSection = builder.Configuration.GetSection("Authentication:PayPal"); @@ -157,8 +283,6 @@ internal static class HostingExtensions FileInfo safile = new FileInfo(googleServiceAccountJsonFile); Config.GServiceAccount = JsonConvert.DeserializeObject(safile.OpenText().ReadToEnd()); } - string? googleClientId = builder.Configuration["Authentication:Google:ClientId"]; - string? googleClientSecret = builder.Configuration["Authentication:Google:ClientSecret"]; var services = builder.Services; _ = services.AddControllersWithViews() .AddNewtonsoftJson(); @@ -168,30 +292,19 @@ internal static class HostingExtensions services.Configure(smtpSection); services.Configure(paypalSection); services.Configure(googleAuthSettings); + ConfigureRequestLocalization(services); + return services; + } - services.AddRazorPages(); - services.AddSignalR(o => - { - o.EnableDetailedErrors = true; - }); - - services.AddDbContext(options => - options.UseNpgsql(builder.Configuration.GetConnectionString("Default"))); - - services.AddIdentity() - .AddEntityFrameworkStores() - .AddDefaultTokenProviders(); - - var identityServerBuilder = services.AddIdentityServer() + private static IIdentityServerBuilder AddIdentityServer(WebApplicationBuilder builder) + { + var identityServerBuilder = builder.Services.AddIdentityServer() .AddInMemoryIdentityResources(Config.IdentityResources) .AddInMemoryClients(Config.Clients) .AddInMemoryApiScopes(Config.ApiScopes) .AddAspNetIdentity() - .AddJwtBearerClientAuthentication() - ; - //services.AddScoped(); - + .AddJwtBearerClientAuthentication(); if (builder.Environment.IsDevelopment()) { identityServerBuilder.AddDeveloperSigningCredential(); @@ -203,33 +316,11 @@ internal static class HostingExtensions var cert = new X509Certificate2(pfxBytes, (string)null, X509KeyStorageFlags.MachineKeySet); identityServerBuilder.AddSigningCredential(cert); } - services.AddSession(); - - - // TODO .AddServerSideSessionStore() - - - - var authenticationBuilder = services.AddAuthentication() - .AddJwtBearer("Bearer", options => - { - options.IncludeErrorDetails=true; - options.Authority = "https://localhost:5001"; - options.TokenValidationParameters = - new() { ValidateAudience = false }; - }); - - authenticationBuilder.AddGoogle(options => - { - options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme; - - // register your IdentityServer with Google at https://console.developers.google.com - // enable the Google+ API - // set the redirect URI to https://localhost:5001/signin-google - options.ClientId = googleClientId; - options.ClientSecret = googleClientSecret; - }); + return identityServerBuilder; + } + private static void ConfigureRequestLocalization(IServiceCollection services) + { services.Configure(options => { CultureInfo[] supportedCultures = new[] @@ -260,103 +351,34 @@ internal static class HostingExtensions new AcceptLanguageHeaderRequestCultureProvider { Options = options } }; }); - - - - - // Add the system clock service - _ = services.AddSingleton(); - - _ = services.AddSingleton(); - _ = services.AddSingleton(); - _ = services.AddTransient(); - - services.AddMvc(config => - { - /* var policy = new AuthorizationPolicyBuilder() - .RequireAuthenticatedUser() - .Build(); - config.Filters.Add(new AuthorizeFilter(policy)); */ - config.Filters.Add(new ProducesAttribute("application/json")); - // config.ModelBinders.Insert(0,new MyDateTimeModelBinder()); - // config.ModelBinders.Insert(0,new MyDecimalModelBinder()); - config.EnableEndpointRouting = true; - }).AddFormatterMappings( - config => config.SetMediaTypeMappingForFormat("text/pdf", - new MediaTypeHeaderValue("text/pdf")) - ).AddFormatterMappings( - config => config.SetMediaTypeMappingForFormat("text/x-tex", - new MediaTypeHeaderValue("text/x-tex")) - ) - .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix, - options => - { - options.ResourcesPath = "Resources"; - }).AddDataAnnotationsLocalization(); - - - _ = services.AddTransient(); - _ = services.AddTransient(); - _ = services.AddTransient(); - _ = services.AddTransient(); - _ = services.AddTransient((sp) => new FileDataStore("googledatastore", false)); - _ = services.AddTransient(); - //services.AddTransient(); - - - // TODO for SMS: services.AddTransient(); - - _ = services.AddLocalization(options => - { - options.ResourcesPath = "Resources"; - }); - var dataDir = new DirectoryInfo(builder.Configuration["Site:DataDir"]); - // Add session related services. - - services.AddDataProtection().PersistKeysToFileSystem(dataDir); - services.AddAuthorization(options => - { - options.AddPolicy("ApiScope", policy => - { - policy.RequireAuthenticatedUser() - .RequireClaim("scope", "scope2"); - }); - options.AddPolicy("Performer", policy => - { - policy - .RequireAuthenticatedUser() - .RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", "Performer"); - }); - options.AddPolicy("AdministratorOnly", policy => - { - _ = policy.RequireClaim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", Constants.AdminGroupName); - }); - - options.AddPolicy("FrontOffice", policy => policy.RequireRole(Constants.FrontOfficeGroupName)); - - // options.AddPolicy("EmployeeId", policy => policy.RequireClaim("EmployeeId", "123", "456")); - // options.AddPolicy("BuildingEntry", policy => policy.Requirements.Add(new OfficeEntryRequirement())); - options.AddPolicy("Authenticated", policy => policy.RequireAuthenticatedUser()); - options.AddPolicy("IsTheAuthor", policy => policy.Requirements.Add(new EditPermission())); - }) - .AddCors(options => - { - options.AddPolicy("default", builder => - { - _ = builder.WithOrigins("*") - .AllowAnyHeader() - .AllowAnyMethod(); - }); - - }); - - services.AddSingleton(); - - -// accepts any access token issued by identity server - - return builder.Build(); } + + private static void AddAuthentication(IServiceCollection services, IConfigurationRoot configurationRoot) + { + string? googleClientId = configurationRoot["Authentication:Google:ClientId"]; + string? googleClientSecret = configurationRoot["Authentication:Google:ClientSecret"]; + + var authenticationBuilder = services.AddAuthentication() + .AddJwtBearer("Bearer", options => + { + options.IncludeErrorDetails = true; + options.Authority = "https://localhost:5001"; + options.TokenValidationParameters = + new() { ValidateAudience = false }; + }); + + authenticationBuilder.AddGoogle(options => + { + options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme; + + // register your IdentityServer with Google at https://console.developers.google.com + // enable the Google+ API + // set the redirect URI to https://localhost:5001/signin-google + options.ClientId = googleClientId; + options.ClientSecret = googleClientSecret; + }); + } + public static WebApplication ConfigurePipeline(this WebApplication app) { diff --git a/src/Yavsc/Program.cs b/src/Yavsc/Program.cs index d0318a55..0337fc8c 100644 --- a/src/Yavsc/Program.cs +++ b/src/Yavsc/Program.cs @@ -15,8 +15,7 @@ namespace Yavsc .AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true) .AddEnvironmentVariables() .Build(); - - var app = builder.ConfigureServices().ConfigurePipeline(); + var app = builder.ConfigureWebAppServices().ConfigurePipeline(); app.UseSession(); app.Run(); } diff --git a/src/Yavsc/Resources/Yavsc.Resources.PerformerProfileViewModel.Designer.cs b/src/Yavsc/Resources/Yavsc.Resources.PerformerProfileViewModel.Designer.cs deleted file mode 100644 index 511dbf5b..00000000 --- a/src/Yavsc/Resources/Yavsc.Resources.PerformerProfileViewModel.Designer.cs +++ /dev/null @@ -1,52 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Yavsc.ViewModels.FrontOffice { - using System; - using System.Reflection; - - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [System.Diagnostics.DebuggerNonUserCodeAttribute()] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public partial class PerformerProfileViewModel { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - public static System.Resources.ResourceManager ResourceManager { - get { - if (object.Equals(null, resourceMan)) { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager(("Yavsc.Resources." + "Yavsc.ViewModels.FrontOffice.PerformerProfileViewModel"), typeof(PerformerProfileViewModel).GetTypeInfo().Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - public static System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - public static string PerformerIdLabel { - get { - return ResourceManager.GetString("PerformerIdLabel", resourceCulture); - } - } - } -} diff --git a/src/Yavsc/Views/_ViewImports.cshtml b/src/Yavsc/Views/_ViewImports.cshtml index 8b6f0199..170f5786 100755 --- a/src/Yavsc/Views/_ViewImports.cshtml +++ b/src/Yavsc/Views/_ViewImports.cshtml @@ -29,7 +29,6 @@ @using Yavsc.Helpers; @using PayPal.PayPalAPIInterfaceService.Model; -@using Yavsc.Models.Access; @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Yavsc diff --git a/src/Yavsc/Yavsc.csproj b/src/Yavsc/Yavsc.csproj index 8b5af2ad..ac8acbee 100644 --- a/src/Yavsc/Yavsc.csproj +++ b/src/Yavsc/Yavsc.csproj @@ -1,22 +1,21 @@ - + net8.0 enable enable WTFPL + 76e56fc2-1619-40d8-8393-365258b7a21d - + all - + all - - @@ -43,8 +42,8 @@ - + diff --git a/src/Yavsc/appsettings.json b/src/Yavsc/appsettings.json index eb9b890f..0a6d4832 100644 --- a/src/Yavsc/appsettings.json +++ b/src/Yavsc/appsettings.json @@ -9,7 +9,7 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "Default": "Server=[YOURSERVERNAME];Port=5432;Database=[YOURDBNAME];Username=[YOURDBUSERNAME];Password=[YOURDBPASSW];" + "DefaultConnection": "Server=[YOURSERVERNAME];Port=5432;Database=[YOURDBNAME];Username=[YOURDBUSERNAME];Password=[YOURDBPASSW];" }, "Site": { "Title": "Yavsc", diff --git a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs index e5c03da0..46ea870b 100755 --- a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs +++ b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs @@ -44,7 +44,7 @@ namespace testOauthClient.Controllers var client = new HttpClient(); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken); - var content = await client.GetStringAsync("https://localhost:5001/api/account/me"); + var content = await client.GetStringAsync("https://localhost:6001/api/account/me"); ViewBag.Json = content; return View("json"); @@ -53,10 +53,11 @@ namespace testOauthClient.Controllers [HttpPost] public async Task GetUserInfo(CancellationToken cancellationToken) { + var accessToken = await HttpContext.GetTokenAsync("access_token"); var client = new HttpClient(new HttpClientHandler(){ AllowAutoRedirect=false }); client.DefaultRequestHeaders.Add("Accept", "application/json"); - client.SetBearerToken(accessToken); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken); var content = await client.GetAsync("https://localhost:6001/api/account/me"); content.EnsureSuccessStatusCode(); var json = await content.Content.ReadAsStreamAsync();