From 6e56d9560f104c7151c6a167fa909dfa5bdf69ab Mon Sep 17 00:00:00 2001 From: AtaS Date: Sun, 13 Oct 2024 20:13:17 +0100 Subject: [PATCH] Use WebLibServer --- .github/workflows/build-and-publish.yml | 12 ++-- SwipetorApp/AppDefaults.cs | 2 +- SwipetorApp/Areas/Admin/HubsController.cs | 4 +- .../Admin/ViewModels/HubsAddEditViewModel.cs | 2 +- SwipetorApp/Areas/Api/AuthApi.cs | 6 +- SwipetorApp/Areas/Api/CommentsApi.cs | 4 +- SwipetorApp/Areas/Api/EmailApi.cs | 2 +- SwipetorApp/Areas/Api/MediasApi.cs | 8 +-- .../Api/Models/AuthEmailLoginCodeModel.cs | 2 +- .../Api/Models/AuthEnterLoginCodeReqModel.cs | 2 +- .../Api/Models/DraftPostAddPhotoViewModel.cs | 2 +- .../Api/Models/MyApiCustomDomainReqModel.cs | 2 +- .../Api/Models/MyApiProfileDescReqModel.cs | 2 +- .../Models/UserApiBecomeCreatorReqModel.cs | 2 +- SwipetorApp/Areas/Api/MyApi.cs | 8 +-- SwipetorApp/Areas/Api/PhotosApi.cs | 6 +- SwipetorApp/Areas/Api/PmApi.cs | 4 +- SwipetorApp/Areas/Api/PostsApi.cs | 6 +- SwipetorApp/Areas/Api/UsersApi.cs | 6 +- .../Areas/HostMaster/BatchController.cs | 6 +- .../Models/ScraperSaveUserReqModel.cs | 2 +- SwipetorApp/Controllers/FallbackController.cs | 2 +- SwipetorApp/Controllers/HomeController.cs | 8 +-- SwipetorApp/Controllers/PostsController.cs | 6 +- SwipetorApp/Models/DTOs/PhotoDto.cs | 2 +- SwipetorApp/Models/DTOs/SubPlanDto.cs | 2 +- SwipetorApp/Models/DTOs/VideoDto.cs | 2 +- SwipetorApp/Models/DbEntities/AuditLog.cs | 2 +- SwipetorApp/Models/DbEntities/Comment.cs | 2 +- SwipetorApp/Models/DbEntities/DbCx.cs | 8 +-- SwipetorApp/Models/DbEntities/FavPost.cs | 2 +- SwipetorApp/Models/DbEntities/Hub.cs | 2 +- SwipetorApp/Models/DbEntities/KeyValue.cs | 2 +- SwipetorApp/Models/DbEntities/Location.cs | 2 +- SwipetorApp/Models/DbEntities/Notif.cs | 2 +- SwipetorApp/Models/DbEntities/Photo.cs | 4 +- SwipetorApp/Models/DbEntities/PmMsg.cs | 2 +- SwipetorApp/Models/DbEntities/PmPermission.cs | 2 +- SwipetorApp/Models/DbEntities/PmThread.cs | 2 +- SwipetorApp/Models/DbEntities/PmThreadUser.cs | 2 +- SwipetorApp/Models/DbEntities/Post.cs | 2 +- SwipetorApp/Models/DbEntities/PostHub.cs | 2 +- SwipetorApp/Models/DbEntities/PostMedia.cs | 2 +- SwipetorApp/Models/DbEntities/PostView.cs | 2 +- SwipetorApp/Models/DbEntities/PushDevice.cs | 4 +- SwipetorApp/Models/DbEntities/Sprite.cs | 2 +- SwipetorApp/Models/DbEntities/SubPlan.cs | 2 +- SwipetorApp/Models/DbEntities/User.cs | 2 +- SwipetorApp/Models/DbEntities/UserFollow.cs | 2 +- SwipetorApp/Models/DbEntities/Video.cs | 4 +- .../Models/DbEntities/VideoPostMedia.cs | 2 +- SwipetorApp/Models/Enums/AppEvent.cs | 2 +- .../Models/Enums/RemoteVideoInfoAction.cs | 2 +- .../Models/Extensions/PostExtensions.cs | 2 +- .../Models/ViewModels/AppshellViewModel.cs | 2 +- .../ViewModels/PhotoPartialViewModel.cs | 2 +- SwipetorApp/Program.cs | 36 +++++------ SwipetorApp/Services/AuditSvc.cs | 4 +- .../Services/Auth/AuthProtectionSvc.cs | 6 +- SwipetorApp/Services/Auth/AuthSvc.cs | 8 +-- SwipetorApp/Services/Auth/LoginCodeSvc.cs | 8 +-- .../BackgroundTasks/NotifWebPushBgSvc.cs | 6 +- .../BackgroundTasks/NotificationEmailBgSvc.cs | 4 +- .../Services/BackgroundTasks/PmEmailBgSvc.cs | 8 +-- .../BackgroundTasks/PostNotifCreatorBgSvc.cs | 6 +- SwipetorApp/Services/Config/AppConfig.cs | 2 +- .../Services/Config/RecaptchaConfig.cs | 2 +- SwipetorApp/Services/Config/SiteConfig.cs | 2 +- SwipetorApp/Services/Config/StorageConfig.cs | 2 +- SwipetorApp/Services/Contexts/DbProvider.cs | 4 +- SwipetorApp/Services/Contexts/RootCx.cs | 4 +- SwipetorApp/Services/Contexts/UserCx.cs | 4 +- SwipetorApp/Services/Contexts/UserIdCx.cs | 4 +- .../Services/Emailing/EmailerProvider.cs | 8 +-- .../Services/Emailing/OutgoingEmailType.cs | 2 +- .../Services/GeoLocation/GeoLocationSvc.cs | 4 +- SwipetorApp/Services/HubSvc.cs | 2 +- SwipetorApp/Services/KVStore/KeyValueKey.cs | 2 +- SwipetorApp/Services/KVStore/KeyValueStore.cs | 4 +- SwipetorApp/Services/LocationSvc.cs | 2 +- SwipetorApp/Services/Medias/MediaSvc.cs | 2 +- SwipetorApp/Services/Medias/PhotoMediaSvc.cs | 10 +-- SwipetorApp/Services/Notifs/NotifSvc.cs | 2 +- SwipetorApp/Services/Permissions/PostPerms.cs | 2 +- .../Services/PhotoServices/PhotoDeleterSvc.cs | 6 +- .../Services/PhotoServices/PhotoSaverSvc.cs | 4 +- .../PhotoServices/UploadedPhotoResizerSvc.cs | 6 +- .../Services/Pm/PmInstantWebPushSvc.cs | 4 +- SwipetorApp/Services/Pm/PmMsgSenderSvc.cs | 4 +- SwipetorApp/Services/Pm/PmThreadSvc.cs | 4 +- SwipetorApp/Services/PostSvc.cs | 2 +- .../Services/RateLimiter/RateLimiterBase.cs | 4 +- .../RateLimiter/Rules/CommentRateLimiter.cs | 4 +- .../Rules/CreatePostRateLimiter.cs | 4 +- .../Rules/PhotoUploadRateLimiter.cs | 4 +- .../Rules/VideoUploadRateLimiter.cs | 4 +- SwipetorApp/Services/Referring/ReferrerSvc.cs | 4 +- .../Services/Security/RecaptchaCredsSvc.cs | 4 +- SwipetorApp/Services/Storage/StorageBucket.cs | 4 +- SwipetorApp/Services/UIConfigFactorySvc.cs | 8 +-- SwipetorApp/Services/Users/RobotUserSvc.cs | 2 +- SwipetorApp/Services/Users/UserFollowSvc.cs | 2 +- .../Services/Users/UsernameCheckerSvc.cs | 4 +- .../VideoDownload/VideoDownloaderSvc.cs | 6 +- .../VideoServices/MediaPreviewSaverSvc.cs | 8 +-- .../VideoServices/VideoClipGenerator.cs | 6 +- .../VideoServices/VideoMediaSaverSvc.cs | 6 +- .../VideoServices/VideoMediaUpdaterSvc.cs | 10 +-- .../WebPush/Notifs/NotifWebPushQuerier.cs | 2 +- .../Services/WebPush/WebPushPayload.cs | 2 +- SwipetorApp/Services/WebPush/WebPushSvc.cs | 4 +- SwipetorApp/Services/WebPush/WebPushTag.cs | 2 +- SwipetorApp/SwipetorApp.csproj | 64 +++++++++---------- .../System/Binders/CurrencyModelBinder.cs | 2 +- .../Binders/CurrencyModelBinderProvider.cs | 2 +- SwipetorApp/System/Binders/MapperConfig.cs | 6 +- .../System/Extensions/VideoExtensions.cs | 2 +- SwipetorApp/System/HostnameCx.cs | 4 +- .../UpdateLastOnlineActionFilter.cs | 2 +- .../WhitelistCountryAccessFilter.cs | 2 +- .../UserRoleAuth/UserRoleAuthAttribute.cs | 2 +- .../EmailTemplates/LoginCodeEmail.cshtml | 4 +- .../Views/EmailTemplates/PmEmail.cshtml | 2 +- .../EmailTemplates/UnsubscribePartial.cshtml | 2 +- .../Views/Errors/GlobalErrorException.cshtml | 2 +- SwipetorApp/Views/Home/Appshell.cshtml | 2 +- SwipetorApp/Views/Home/RobotsTxt.cshtml | 2 +- SwipetorApp/Views/Shared/Error.cshtml | 2 +- SwipetorApp/Views/Shared/OpenGraphTags.cshtml | 2 +- SwipetorApp/Views/Shared/PhotoPartial.cshtml | 2 +- SwipetorApp/Views/Shared/Recaptcha.cshtml | 2 +- SwipetorApp/appsettings.json | 2 +- .../System/Extensions/VideoExtensionTest.cs | 4 +- SwipetorAppTest/TestLibs/Globals.cs | 4 +- SwipetorAppTest/VideoPreviewTest.cs | 2 +- SwipetorAppTest/VideoResolutionTest.cs | 2 +- .../VideoServices/VideoClipGeneratorTest.cs | 4 +- SwipetorAppTest/VideoSpriteGeneratorTest.cs | 2 +- 138 files changed, 292 insertions(+), 292 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index bee6404..4faff74 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -74,13 +74,13 @@ jobs: run: dotnet publish --configuration Release --output ./publish - name: Archive Published App - run: tar -czf swpapp.tar.gz -C ./publish . + run: tar -czf swpserver.tar.gz -C ./publish . - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: swpapp - path: swpapp.tar.gz + name: swpserver + path: swpserver.tar.gz release: runs-on: ubuntu-latest @@ -97,7 +97,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v3 with: - name: swpapp + name: swpserver - name: Set next version run: | @@ -114,8 +114,8 @@ jobs: - name: Create GitHub Release run: | - mv swpapp.tar.gz swpapp-$next_version.tar.gz - gh release create "v$next_version" swpapp-$next_version.tar.gz\ + mv swpserver.tar.gz swpserver-$next_version.tar.gz + gh release create "v$next_version" swpserver-$next_version.tar.gz\ --title "Release v$next_version" \ --notes "$commit_msg" env: diff --git a/SwipetorApp/AppDefaults.cs b/SwipetorApp/AppDefaults.cs index 6e13120..f928d7d 100644 --- a/SwipetorApp/AppDefaults.cs +++ b/SwipetorApp/AppDefaults.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Logging; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp; diff --git a/SwipetorApp/Areas/Admin/HubsController.cs b/SwipetorApp/Areas/Admin/HubsController.cs index 51d0c43..ce803d7 100644 --- a/SwipetorApp/Areas/Admin/HubsController.cs +++ b/SwipetorApp/Areas/Admin/HubsController.cs @@ -10,8 +10,8 @@ using SwipetorApp.Services.Contexts; using SwipetorApp.Services.PhotoServices; using SwipetorApp.System.UserRoleAuth; -using WebAppShared.DI; -using WebAppShared.Photos; +using WebLibServer.DI; +using WebLibServer.Photos; namespace SwipetorApp.Areas.Admin; diff --git a/SwipetorApp/Areas/Admin/ViewModels/HubsAddEditViewModel.cs b/SwipetorApp/Areas/Admin/ViewModels/HubsAddEditViewModel.cs index ec6825a..e22360d 100644 --- a/SwipetorApp/Areas/Admin/ViewModels/HubsAddEditViewModel.cs +++ b/SwipetorApp/Areas/Admin/ViewModels/HubsAddEditViewModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Microsoft.AspNetCore.Http; using SwipetorApp.Models.DbEntities; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Admin.ViewModels; diff --git a/SwipetorApp/Areas/Api/AuthApi.cs b/SwipetorApp/Areas/Api/AuthApi.cs index 5b229d7..8f53f83 100644 --- a/SwipetorApp/Areas/Api/AuthApi.cs +++ b/SwipetorApp/Areas/Api/AuthApi.cs @@ -10,9 +10,9 @@ using SwipetorApp.Services.Auth; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Users; -using WebAppShared.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.Utils; +using WebLibServer.Contexts; +using WebLibServer.Exceptions; +using WebLibServer.Utils; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/CommentsApi.cs b/SwipetorApp/Areas/Api/CommentsApi.cs index 2ead894..1c85f59 100644 --- a/SwipetorApp/Areas/Api/CommentsApi.cs +++ b/SwipetorApp/Areas/Api/CommentsApi.cs @@ -13,8 +13,8 @@ using SwipetorApp.Services.RateLimiter; using SwipetorApp.Services.RateLimiter.Rules; using SwipetorApp.Services.SqlQueries; -using WebAppShared.Exceptions; -using WebAppShared.Security; +using WebLibServer.Exceptions; +using WebLibServer.Security; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/EmailApi.cs b/SwipetorApp/Areas/Api/EmailApi.cs index 565e576..9d3b9de 100644 --- a/SwipetorApp/Areas/Api/EmailApi.cs +++ b/SwipetorApp/Areas/Api/EmailApi.cs @@ -6,7 +6,7 @@ using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Emailing; using SwipetorApp.System.UserRoleAuth; -using WebAppShared.Metrics; +using WebLibServer.Metrics; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/MediasApi.cs b/SwipetorApp/Areas/Api/MediasApi.cs index 6de8b29..ad59e3b 100644 --- a/SwipetorApp/Areas/Api/MediasApi.cs +++ b/SwipetorApp/Areas/Api/MediasApi.cs @@ -21,10 +21,10 @@ using SwipetorApp.Services.VideoServices; using SwipetorApp.Services.WebPush; using SwipetorApp.System; -using WebAppShared.DI; -using WebAppShared.Disk; -using WebAppShared.Exceptions; -using WebAppShared.Uploaders; +using WebLibServer.DI; +using WebLibServer.Disk; +using WebLibServer.Exceptions; +using WebLibServer.Uploaders; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/Models/AuthEmailLoginCodeModel.cs b/SwipetorApp/Areas/Api/Models/AuthEmailLoginCodeModel.cs index fef1fb4..1be7d84 100644 --- a/SwipetorApp/Areas/Api/Models/AuthEmailLoginCodeModel.cs +++ b/SwipetorApp/Areas/Api/Models/AuthEmailLoginCodeModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api.Models; diff --git a/SwipetorApp/Areas/Api/Models/AuthEnterLoginCodeReqModel.cs b/SwipetorApp/Areas/Api/Models/AuthEnterLoginCodeReqModel.cs index 8642e52..28287be 100644 --- a/SwipetorApp/Areas/Api/Models/AuthEnterLoginCodeReqModel.cs +++ b/SwipetorApp/Areas/Api/Models/AuthEnterLoginCodeReqModel.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel.DataAnnotations; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api.Models; diff --git a/SwipetorApp/Areas/Api/Models/DraftPostAddPhotoViewModel.cs b/SwipetorApp/Areas/Api/Models/DraftPostAddPhotoViewModel.cs index 7eed739..dfe9c16 100644 --- a/SwipetorApp/Areas/Api/Models/DraftPostAddPhotoViewModel.cs +++ b/SwipetorApp/Areas/Api/Models/DraftPostAddPhotoViewModel.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Http; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api.Models; diff --git a/SwipetorApp/Areas/Api/Models/MyApiCustomDomainReqModel.cs b/SwipetorApp/Areas/Api/Models/MyApiCustomDomainReqModel.cs index 0082261..5863ad5 100644 --- a/SwipetorApp/Areas/Api/Models/MyApiCustomDomainReqModel.cs +++ b/SwipetorApp/Areas/Api/Models/MyApiCustomDomainReqModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api.Models; diff --git a/SwipetorApp/Areas/Api/Models/MyApiProfileDescReqModel.cs b/SwipetorApp/Areas/Api/Models/MyApiProfileDescReqModel.cs index 6ba3359..8756f7f 100644 --- a/SwipetorApp/Areas/Api/Models/MyApiProfileDescReqModel.cs +++ b/SwipetorApp/Areas/Api/Models/MyApiProfileDescReqModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api.Models; diff --git a/SwipetorApp/Areas/Api/Models/UserApiBecomeCreatorReqModel.cs b/SwipetorApp/Areas/Api/Models/UserApiBecomeCreatorReqModel.cs index cfa9f2f..158dfcb 100644 --- a/SwipetorApp/Areas/Api/Models/UserApiBecomeCreatorReqModel.cs +++ b/SwipetorApp/Areas/Api/Models/UserApiBecomeCreatorReqModel.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api.Models; diff --git a/SwipetorApp/Areas/Api/MyApi.cs b/SwipetorApp/Areas/Api/MyApi.cs index 2fa5270..c88e1cc 100644 --- a/SwipetorApp/Areas/Api/MyApi.cs +++ b/SwipetorApp/Areas/Api/MyApi.cs @@ -16,10 +16,10 @@ using SwipetorApp.Services.PhotoServices; using SwipetorApp.Services.Users; using SwipetorApp.System; -using WebAppShared.DI; -using WebAppShared.Exceptions; -using WebAppShared.WebSys; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.DI; +using WebLibServer.Exceptions; +using WebLibServer.WebSys; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/PhotosApi.cs b/SwipetorApp/Areas/Api/PhotosApi.cs index 9c6c526..46b0b8c 100644 --- a/SwipetorApp/Areas/Api/PhotosApi.cs +++ b/SwipetorApp/Areas/Api/PhotosApi.cs @@ -8,9 +8,9 @@ using SwipetorApp.Services.Config; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.PhotoServices; -using WebAppShared.Exceptions; -using WebAppShared.Photos; -using WebAppShared.Uploaders; +using WebLibServer.Exceptions; +using WebLibServer.Photos; +using WebLibServer.Uploaders; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/PmApi.cs b/SwipetorApp/Areas/Api/PmApi.cs index d6943ee..36ba994 100644 --- a/SwipetorApp/Areas/Api/PmApi.cs +++ b/SwipetorApp/Areas/Api/PmApi.cs @@ -17,8 +17,8 @@ using SwipetorApp.Services.Pm; using SwipetorApp.Services.SqlQueries; using SwipetorApp.Services.SqlQueries.Models; -using WebAppShared.Exceptions; -using WebAppShared.Metrics; +using WebLibServer.Exceptions; +using WebLibServer.Metrics; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/PostsApi.cs b/SwipetorApp/Areas/Api/PostsApi.cs index 364829c..7829ebe 100644 --- a/SwipetorApp/Areas/Api/PostsApi.cs +++ b/SwipetorApp/Areas/Api/PostsApi.cs @@ -20,9 +20,9 @@ using SwipetorApp.Services.SqlQueries; using SwipetorApp.Services.VideoServices; using SwipetorApp.System; -using WebAppShared.DI; -using WebAppShared.Exceptions; -using WebAppShared.Metrics; +using WebLibServer.DI; +using WebLibServer.Exceptions; +using WebLibServer.Metrics; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/Api/UsersApi.cs b/SwipetorApp/Areas/Api/UsersApi.cs index 8186ad5..96587c0 100644 --- a/SwipetorApp/Areas/Api/UsersApi.cs +++ b/SwipetorApp/Areas/Api/UsersApi.cs @@ -20,9 +20,9 @@ using SwipetorApp.Services.SqlQueries; using SwipetorApp.Services.Users; using SwipetorApp.System; -using WebAppShared.Exceptions; -using WebAppShared.Extensions; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.Exceptions; +using WebLibServer.Extensions; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.Api; diff --git a/SwipetorApp/Areas/HostMaster/BatchController.cs b/SwipetorApp/Areas/HostMaster/BatchController.cs index ccfb69e..5308125 100644 --- a/SwipetorApp/Areas/HostMaster/BatchController.cs +++ b/SwipetorApp/Areas/HostMaster/BatchController.cs @@ -6,9 +6,9 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Models.Extensions; using SwipetorApp.Services.Contexts; -using WebAppShared.DI; -using WebAppShared.SharedLogic.Sitemaps; -using WebAppShared.Types; +using WebLibServer.DI; +using WebLibServer.SharedLogic.Sitemaps; +using WebLibServer.Types; namespace SwipetorApp.Areas.HostMaster; diff --git a/SwipetorApp/Areas/HostMaster/Models/ScraperSaveUserReqModel.cs b/SwipetorApp/Areas/HostMaster/Models/ScraperSaveUserReqModel.cs index f5ecf9a..2db22c3 100644 --- a/SwipetorApp/Areas/HostMaster/Models/ScraperSaveUserReqModel.cs +++ b/SwipetorApp/Areas/HostMaster/Models/ScraperSaveUserReqModel.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using WebAppShared.WebSys.MvcAttributes; +using WebLibServer.WebSys.MvcAttributes; namespace SwipetorApp.Areas.HostMaster.Models; diff --git a/SwipetorApp/Controllers/FallbackController.cs b/SwipetorApp/Controllers/FallbackController.cs index 5496060..166fd92 100644 --- a/SwipetorApp/Controllers/FallbackController.cs +++ b/SwipetorApp/Controllers/FallbackController.cs @@ -7,7 +7,7 @@ using SwipetorApp.Models.ViewModels; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Users; -using WebAppShared.Photos; +using WebLibServer.Photos; namespace SwipetorApp.Controllers; diff --git a/SwipetorApp/Controllers/HomeController.cs b/SwipetorApp/Controllers/HomeController.cs index 643dd8b..26872d2 100644 --- a/SwipetorApp/Controllers/HomeController.cs +++ b/SwipetorApp/Controllers/HomeController.cs @@ -13,10 +13,10 @@ using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Emailing; using SwipetorApp.System.MvcFilters; -using WebAppShared.Contexts; -using WebAppShared.Photos; -using WebAppShared.Types; -using WebAppShared.Utils; +using WebLibServer.Contexts; +using WebLibServer.Photos; +using WebLibServer.Types; +using WebLibServer.Utils; namespace SwipetorApp.Controllers; diff --git a/SwipetorApp/Controllers/PostsController.cs b/SwipetorApp/Controllers/PostsController.cs index e5b43d7..f10b2cb 100644 --- a/SwipetorApp/Controllers/PostsController.cs +++ b/SwipetorApp/Controllers/PostsController.cs @@ -7,9 +7,9 @@ using SwipetorApp.Models.Extensions; using SwipetorApp.Models.ViewModels; using SwipetorApp.Services.Contexts; -using WebAppShared.Photos; -using WebAppShared.Types; -using WebAppShared.Utils; +using WebLibServer.Photos; +using WebLibServer.Types; +using WebLibServer.Utils; namespace SwipetorApp.Controllers; diff --git a/SwipetorApp/Models/DTOs/PhotoDto.cs b/SwipetorApp/Models/DTOs/PhotoDto.cs index a81712b..3eff85e 100644 --- a/SwipetorApp/Models/DTOs/PhotoDto.cs +++ b/SwipetorApp/Models/DTOs/PhotoDto.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using SwipetorApp.Services.Config.UIConfigs; -using WebAppShared.Photos; +using WebLibServer.Photos; namespace SwipetorApp.Models.DTOs; diff --git a/SwipetorApp/Models/DTOs/SubPlanDto.cs b/SwipetorApp/Models/DTOs/SubPlanDto.cs index 2cfbf99..5558258 100644 --- a/SwipetorApp/Models/DTOs/SubPlanDto.cs +++ b/SwipetorApp/Models/DTOs/SubPlanDto.cs @@ -1,4 +1,4 @@ -using WebAppShared.SharedLogic.Fx; +using WebLibServer.SharedLogic.Fx; namespace SwipetorApp.Models.DTOs; diff --git a/SwipetorApp/Models/DTOs/VideoDto.cs b/SwipetorApp/Models/DTOs/VideoDto.cs index 4a4986e..995a786 100644 --- a/SwipetorApp/Models/DTOs/VideoDto.cs +++ b/SwipetorApp/Models/DTOs/VideoDto.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using SwipetorApp.Models.DbEntities; -using WebAppShared.Videos; +using WebLibServer.Videos; namespace SwipetorApp.Models.DTOs; diff --git a/SwipetorApp/Models/DbEntities/AuditLog.cs b/SwipetorApp/Models/DbEntities/AuditLog.cs index b416737..86e209e 100644 --- a/SwipetorApp/Models/DbEntities/AuditLog.cs +++ b/SwipetorApp/Models/DbEntities/AuditLog.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.Enums; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Comment.cs b/SwipetorApp/Models/DbEntities/Comment.cs index c347a6b..a60499c 100644 --- a/SwipetorApp/Models/DbEntities/Comment.cs +++ b/SwipetorApp/Models/DbEntities/Comment.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/DbCx.cs b/SwipetorApp/Models/DbEntities/DbCx.cs index b5b07ed..432c367 100644 --- a/SwipetorApp/Models/DbEntities/DbCx.cs +++ b/SwipetorApp/Models/DbEntities/DbCx.cs @@ -13,10 +13,10 @@ using Newtonsoft.Json; using SwipetorApp.Models.Enums; using Toolbelt.ComponentModel.DataAnnotations; -using WebAppShared.Contexts; -using WebAppShared.SharedLogic.Fx; -using WebAppShared.Videos; -using WebAppShared.WebSys; +using WebLibServer.Contexts; +using WebLibServer.SharedLogic.Fx; +using WebLibServer.Videos; +using WebLibServer.WebSys; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/FavPost.cs b/SwipetorApp/Models/DbEntities/FavPost.cs index f1ffedd..d0e0075 100644 --- a/SwipetorApp/Models/DbEntities/FavPost.cs +++ b/SwipetorApp/Models/DbEntities/FavPost.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Hub.cs b/SwipetorApp/Models/DbEntities/Hub.cs index eb905f6..998f1b0 100644 --- a/SwipetorApp/Models/DbEntities/Hub.cs +++ b/SwipetorApp/Models/DbEntities/Hub.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/KeyValue.cs b/SwipetorApp/Models/DbEntities/KeyValue.cs index 073aae7..db55f84 100644 --- a/SwipetorApp/Models/DbEntities/KeyValue.cs +++ b/SwipetorApp/Models/DbEntities/KeyValue.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Location.cs b/SwipetorApp/Models/DbEntities/Location.cs index c60b3fd..ff440f4 100644 --- a/SwipetorApp/Models/DbEntities/Location.cs +++ b/SwipetorApp/Models/DbEntities/Location.cs @@ -4,7 +4,7 @@ using NpgsqlTypes; using SwipetorApp.Models.Enums; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Notif.cs b/SwipetorApp/Models/DbEntities/Notif.cs index cfd3cda..e4605fd 100644 --- a/SwipetorApp/Models/DbEntities/Notif.cs +++ b/SwipetorApp/Models/DbEntities/Notif.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.Enums; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Photo.cs b/SwipetorApp/Models/DbEntities/Photo.cs index f8f559c..d47e9c2 100644 --- a/SwipetorApp/Models/DbEntities/Photo.cs +++ b/SwipetorApp/Models/DbEntities/Photo.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; -using WebAppShared.Photos; -using WebAppShared.Types; +using WebLibServer.Photos; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PmMsg.cs b/SwipetorApp/Models/DbEntities/PmMsg.cs index 2cfef07..3482f56 100644 --- a/SwipetorApp/Models/DbEntities/PmMsg.cs +++ b/SwipetorApp/Models/DbEntities/PmMsg.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; using System.Runtime.Intrinsics.X86; using JetBrains.Annotations; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PmPermission.cs b/SwipetorApp/Models/DbEntities/PmPermission.cs index 424cc4f..b7e8b54 100644 --- a/SwipetorApp/Models/DbEntities/PmPermission.cs +++ b/SwipetorApp/Models/DbEntities/PmPermission.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PmThread.cs b/SwipetorApp/Models/DbEntities/PmThread.cs index 1141981..7ea9043 100644 --- a/SwipetorApp/Models/DbEntities/PmThread.cs +++ b/SwipetorApp/Models/DbEntities/PmThread.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PmThreadUser.cs b/SwipetorApp/Models/DbEntities/PmThreadUser.cs index 1de4567..10efb95 100644 --- a/SwipetorApp/Models/DbEntities/PmThreadUser.cs +++ b/SwipetorApp/Models/DbEntities/PmThreadUser.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Post.cs b/SwipetorApp/Models/DbEntities/Post.cs index c4b3485..8a1eb3f 100644 --- a/SwipetorApp/Models/DbEntities/Post.cs +++ b/SwipetorApp/Models/DbEntities/Post.cs @@ -4,7 +4,7 @@ using System.Runtime.Intrinsics.X86; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PostHub.cs b/SwipetorApp/Models/DbEntities/PostHub.cs index be9e208..3f41390 100644 --- a/SwipetorApp/Models/DbEntities/PostHub.cs +++ b/SwipetorApp/Models/DbEntities/PostHub.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PostMedia.cs b/SwipetorApp/Models/DbEntities/PostMedia.cs index 450b9c9..912ff30 100644 --- a/SwipetorApp/Models/DbEntities/PostMedia.cs +++ b/SwipetorApp/Models/DbEntities/PostMedia.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.Enums; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PostView.cs b/SwipetorApp/Models/DbEntities/PostView.cs index 8f87b76..27b2440 100644 --- a/SwipetorApp/Models/DbEntities/PostView.cs +++ b/SwipetorApp/Models/DbEntities/PostView.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/PushDevice.cs b/SwipetorApp/Models/DbEntities/PushDevice.cs index 9e0876b..fa99236 100644 --- a/SwipetorApp/Models/DbEntities/PushDevice.cs +++ b/SwipetorApp/Models/DbEntities/PushDevice.cs @@ -2,8 +2,8 @@ using System.ComponentModel.DataAnnotations; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; -using WebAppShared.WebPush; +using WebLibServer.Types; +using WebLibServer.WebPush; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Sprite.cs b/SwipetorApp/Models/DbEntities/Sprite.cs index f8c4a23..ccab585 100644 --- a/SwipetorApp/Models/DbEntities/Sprite.cs +++ b/SwipetorApp/Models/DbEntities/Sprite.cs @@ -1,6 +1,6 @@ using System; using JetBrains.Annotations; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/SubPlan.cs b/SwipetorApp/Models/DbEntities/SubPlan.cs index 22964b7..dec9792 100644 --- a/SwipetorApp/Models/DbEntities/SubPlan.cs +++ b/SwipetorApp/Models/DbEntities/SubPlan.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using JetBrains.Annotations; -using WebAppShared.SharedLogic.Fx; +using WebLibServer.SharedLogic.Fx; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/User.cs b/SwipetorApp/Models/DbEntities/User.cs index ea911db..a227a7c 100644 --- a/SwipetorApp/Models/DbEntities/User.cs +++ b/SwipetorApp/Models/DbEntities/User.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using SwipetorApp.Services.Auth; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/UserFollow.cs b/SwipetorApp/Models/DbEntities/UserFollow.cs index 41f3ecf..fd91ff9 100644 --- a/SwipetorApp/Models/DbEntities/UserFollow.cs +++ b/SwipetorApp/Models/DbEntities/UserFollow.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/Video.cs b/SwipetorApp/Models/DbEntities/Video.cs index 295cda2..d089828 100644 --- a/SwipetorApp/Models/DbEntities/Video.cs +++ b/SwipetorApp/Models/DbEntities/Video.cs @@ -4,8 +4,8 @@ using System.ComponentModel.DataAnnotations.Schema; using JetBrains.Annotations; using Toolbelt.ComponentModel.DataAnnotations.Schema.V5; -using WebAppShared.Types; -using WebAppShared.Videos; +using WebLibServer.Types; +using WebLibServer.Videos; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/DbEntities/VideoPostMedia.cs b/SwipetorApp/Models/DbEntities/VideoPostMedia.cs index 1d84cdd..c10ea0d 100644 --- a/SwipetorApp/Models/DbEntities/VideoPostMedia.cs +++ b/SwipetorApp/Models/DbEntities/VideoPostMedia.cs @@ -1,4 +1,4 @@ -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.DbEntities; diff --git a/SwipetorApp/Models/Enums/AppEvent.cs b/SwipetorApp/Models/Enums/AppEvent.cs index 4bf481b..84ccc1b 100644 --- a/SwipetorApp/Models/Enums/AppEvent.cs +++ b/SwipetorApp/Models/Enums/AppEvent.cs @@ -1,4 +1,4 @@ -using WebAppShared.Metrics; +using WebLibServer.Metrics; namespace SwipetorApp.Models.Enums; diff --git a/SwipetorApp/Models/Enums/RemoteVideoInfoAction.cs b/SwipetorApp/Models/Enums/RemoteVideoInfoAction.cs index aed1112..8219d24 100644 --- a/SwipetorApp/Models/Enums/RemoteVideoInfoAction.cs +++ b/SwipetorApp/Models/Enums/RemoteVideoInfoAction.cs @@ -1,4 +1,4 @@ -using WebAppShared.Types; +using WebLibServer.Types; namespace SwipetorApp.Models.Enums; diff --git a/SwipetorApp/Models/Extensions/PostExtensions.cs b/SwipetorApp/Models/Extensions/PostExtensions.cs index ae91d2c..03bf2cc 100644 --- a/SwipetorApp/Models/Extensions/PostExtensions.cs +++ b/SwipetorApp/Models/Extensions/PostExtensions.cs @@ -1,5 +1,5 @@ using SwipetorApp.Models.DbEntities; -using WebAppShared.Http; +using WebLibServer.Http; namespace SwipetorApp.Models.Extensions; diff --git a/SwipetorApp/Models/ViewModels/AppshellViewModel.cs b/SwipetorApp/Models/ViewModels/AppshellViewModel.cs index b1c1e1b..68075ee 100644 --- a/SwipetorApp/Models/ViewModels/AppshellViewModel.cs +++ b/SwipetorApp/Models/ViewModels/AppshellViewModel.cs @@ -1,5 +1,5 @@ using SwipetorApp.Models.Enums; -using WebAppShared.WebSys; +using WebLibServer.WebSys; namespace SwipetorApp.Models.ViewModels; diff --git a/SwipetorApp/Models/ViewModels/PhotoPartialViewModel.cs b/SwipetorApp/Models/ViewModels/PhotoPartialViewModel.cs index d16f729..db23670 100644 --- a/SwipetorApp/Models/ViewModels/PhotoPartialViewModel.cs +++ b/SwipetorApp/Models/ViewModels/PhotoPartialViewModel.cs @@ -1,7 +1,7 @@ using AutoMapper; using SwipetorApp.Models.DbEntities; using SwipetorApp.Models.DTOs; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Models.ViewModels; diff --git a/SwipetorApp/Program.cs b/SwipetorApp/Program.cs index 10e4895..fa15858 100644 --- a/SwipetorApp/Program.cs +++ b/SwipetorApp/Program.cs @@ -37,22 +37,22 @@ using SwipetorApp.System.Binders; using SwipetorApp.System.MvcFilters; using SwipetorApp.System.UserRoleAuth; -using WebAppShared.Config; -using WebAppShared.Contexts; -using WebAppShared.DI; -using WebAppShared.Exceptions; -using WebAppShared.Http; -using WebAppShared.Internal; -using WebAppShared.SharedLogic.Recaptcha; -using WebAppShared.Types; -using WebAppShared.Uploaders; -using WebAppShared.Uploaders.R2; -using WebAppShared.Videos; -using WebAppShared.WebPush; -using WebAppShared.WebSys; -using WebAppShared.WebSys.DI; -using WebAppShared.WebSys.MvcFilters; -using WebAppShared.WebSys.MvcRouting; +using WebLibServer.Config; +using WebLibServer.Contexts; +using WebLibServer.DI; +using WebLibServer.Exceptions; +using WebLibServer.Http; +using WebLibServer.Internal; +using WebLibServer.SharedLogic.Recaptcha; +using WebLibServer.Types; +using WebLibServer.Uploaders; +using WebLibServer.Uploaders.R2; +using WebLibServer.Videos; +using WebLibServer.WebPush; +using WebLibServer.WebSys; +using WebLibServer.WebSys.DI; +using WebLibServer.WebSys.MvcFilters; +using WebLibServer.WebSys.MvcRouting; var builder = WebApplication.CreateBuilder(args); @@ -176,7 +176,7 @@ // Register services through ServiceAttribute ServiceAttribute.RegisterServices(Assembly.GetExecutingAssembly(), s); -ServiceAttribute.RegisterServices(Assembly.Load("WebAppShared"), s); +ServiceAttribute.RegisterServices(Assembly.Load("WebLibServer"), s); // services.TryAddEnumerable(ServiceDescriptor.Singleton()); // AutoMapperConfiguration.Configure(); @@ -224,7 +224,7 @@ ServiceLocator.SetLocatorProvider(app.Services); var loggerFactory = app.Services.GetService(); -WebAppSharedDefaults.SetLoggerFactory(loggerFactory); +WebLibServerDefaults.SetLoggerFactory(loggerFactory); loggerFactory.AddFile("/var/log/swipetor/app.log", fileSizeLimitBytes: 104857600, isJson: false, minimumLevel: LogLevel.Information, retainedFileCountLimit: 3); diff --git a/SwipetorApp/Services/AuditSvc.cs b/SwipetorApp/Services/AuditSvc.cs index ec6a203..151704f 100644 --- a/SwipetorApp/Services/AuditSvc.cs +++ b/SwipetorApp/Services/AuditSvc.cs @@ -1,8 +1,8 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; -using WebAppShared.Types; -using WebAppShared.WebSys.DI; +using WebLibServer.Types; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services; diff --git a/SwipetorApp/Services/Auth/AuthProtectionSvc.cs b/SwipetorApp/Services/Auth/AuthProtectionSvc.cs index 601ecae..393bf1c 100644 --- a/SwipetorApp/Services/Auth/AuthProtectionSvc.cs +++ b/SwipetorApp/Services/Auth/AuthProtectionSvc.cs @@ -2,9 +2,9 @@ using System.Linq; using JetBrains.Annotations; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.Exceptions; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Auth; diff --git a/SwipetorApp/Services/Auth/AuthSvc.cs b/SwipetorApp/Services/Auth/AuthSvc.cs index daecaa5..c639a07 100644 --- a/SwipetorApp/Services/Auth/AuthSvc.cs +++ b/SwipetorApp/Services/Auth/AuthSvc.cs @@ -15,10 +15,10 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Services.Config; using SwipetorApp.Services.Contexts; -using WebAppShared.Metrics; -using WebAppShared.Utils; -using WebAppShared.WebSys.DI; -using WebAppShared.WebSys.Exceptions; +using WebLibServer.Metrics; +using WebLibServer.Utils; +using WebLibServer.WebSys.DI; +using WebLibServer.WebSys.Exceptions; namespace SwipetorApp.Services.Auth; diff --git a/SwipetorApp/Services/Auth/LoginCodeSvc.cs b/SwipetorApp/Services/Auth/LoginCodeSvc.cs index 13e7d29..08f2942 100644 --- a/SwipetorApp/Services/Auth/LoginCodeSvc.cs +++ b/SwipetorApp/Services/Auth/LoginCodeSvc.cs @@ -6,10 +6,10 @@ using SwipetorApp.Models.EmailViewModels; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Emailing; -using WebAppShared.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.Metrics; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.Exceptions; +using WebLibServer.Metrics; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Auth; diff --git a/SwipetorApp/Services/BackgroundTasks/NotifWebPushBgSvc.cs b/SwipetorApp/Services/BackgroundTasks/NotifWebPushBgSvc.cs index d774d91..dcee12d 100644 --- a/SwipetorApp/Services/BackgroundTasks/NotifWebPushBgSvc.cs +++ b/SwipetorApp/Services/BackgroundTasks/NotifWebPushBgSvc.cs @@ -9,9 +9,9 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Services.WebPush; using SwipetorApp.Services.WebPush.Notifs; -using WebAppShared.BackgroundTasks; -using WebAppShared.DI; -using WebAppShared.Metrics; +using WebLibServer.BackgroundTasks; +using WebLibServer.DI; +using WebLibServer.Metrics; namespace SwipetorApp.Services.BackgroundTasks; diff --git a/SwipetorApp/Services/BackgroundTasks/NotificationEmailBgSvc.cs b/SwipetorApp/Services/BackgroundTasks/NotificationEmailBgSvc.cs index d57f586..50f88a8 100644 --- a/SwipetorApp/Services/BackgroundTasks/NotificationEmailBgSvc.cs +++ b/SwipetorApp/Services/BackgroundTasks/NotificationEmailBgSvc.cs @@ -8,8 +8,8 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Emailing; -using WebAppShared.BackgroundTasks; -using WebAppShared.Metrics; +using WebLibServer.BackgroundTasks; +using WebLibServer.Metrics; using User = SwipetorApp.Models.DbEntities.User; namespace SwipetorApp.Services.BackgroundTasks; diff --git a/SwipetorApp/Services/BackgroundTasks/PmEmailBgSvc.cs b/SwipetorApp/Services/BackgroundTasks/PmEmailBgSvc.cs index d4513b9..5642f3f 100644 --- a/SwipetorApp/Services/BackgroundTasks/PmEmailBgSvc.cs +++ b/SwipetorApp/Services/BackgroundTasks/PmEmailBgSvc.cs @@ -10,10 +10,10 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Emailing; -using WebAppShared.BackgroundTasks; -using WebAppShared.Metrics; -using WebAppShared.Utils; -using WebAppShared.WebSys.DI; +using WebLibServer.BackgroundTasks; +using WebLibServer.Metrics; +using WebLibServer.Utils; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.BackgroundTasks; diff --git a/SwipetorApp/Services/BackgroundTasks/PostNotifCreatorBgSvc.cs b/SwipetorApp/Services/BackgroundTasks/PostNotifCreatorBgSvc.cs index 3fba8ff..24e21b7 100644 --- a/SwipetorApp/Services/BackgroundTasks/PostNotifCreatorBgSvc.cs +++ b/SwipetorApp/Services/BackgroundTasks/PostNotifCreatorBgSvc.cs @@ -8,9 +8,9 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Notifs; -using WebAppShared.BackgroundTasks; -using WebAppShared.DI; -using WebAppShared.Metrics; +using WebLibServer.BackgroundTasks; +using WebLibServer.DI; +using WebLibServer.Metrics; namespace SwipetorApp.Services.BackgroundTasks; diff --git a/SwipetorApp/Services/Config/AppConfig.cs b/SwipetorApp/Services/Config/AppConfig.cs index 35f110b..9f5a603 100644 --- a/SwipetorApp/Services/Config/AppConfig.cs +++ b/SwipetorApp/Services/Config/AppConfig.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; using SwipetorApp.Services.Config.UIConfigs; -using WebAppShared.Config; +using WebLibServer.Config; namespace SwipetorApp.Services.Config; diff --git a/SwipetorApp/Services/Config/RecaptchaConfig.cs b/SwipetorApp/Services/Config/RecaptchaConfig.cs index 263f88e..e77e125 100644 --- a/SwipetorApp/Services/Config/RecaptchaConfig.cs +++ b/SwipetorApp/Services/Config/RecaptchaConfig.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; using SwipetorApp.Services.Config.UIConfigs; -using WebAppShared.SharedLogic.Recaptcha; +using WebLibServer.SharedLogic.Recaptcha; namespace SwipetorApp.Services.Config; diff --git a/SwipetorApp/Services/Config/SiteConfig.cs b/SwipetorApp/Services/Config/SiteConfig.cs index cabf108..ef2dd78 100644 --- a/SwipetorApp/Services/Config/SiteConfig.cs +++ b/SwipetorApp/Services/Config/SiteConfig.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.Enums; using SwipetorApp.Services.Config.UIConfigs; -using WebAppShared.SharedLogic.Fx; +using WebLibServer.SharedLogic.Fx; namespace SwipetorApp.Services.Config; diff --git a/SwipetorApp/Services/Config/StorageConfig.cs b/SwipetorApp/Services/Config/StorageConfig.cs index 32cb40e..4256949 100644 --- a/SwipetorApp/Services/Config/StorageConfig.cs +++ b/SwipetorApp/Services/Config/StorageConfig.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; using SwipetorApp.Services.Config.UIConfigs; -using WebAppShared.Uploaders; +using WebLibServer.Uploaders; namespace SwipetorApp.Services.Config; diff --git a/SwipetorApp/Services/Contexts/DbProvider.cs b/SwipetorApp/Services/Contexts/DbProvider.cs index 0eed5d4..270924d 100644 --- a/SwipetorApp/Services/Contexts/DbProvider.cs +++ b/SwipetorApp/Services/Contexts/DbProvider.cs @@ -1,8 +1,8 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; using SwipetorApp.Models.DbEntities; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Contexts; diff --git a/SwipetorApp/Services/Contexts/RootCx.cs b/SwipetorApp/Services/Contexts/RootCx.cs index ff895a4..f6359a2 100644 --- a/SwipetorApp/Services/Contexts/RootCx.cs +++ b/SwipetorApp/Services/Contexts/RootCx.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.DbEntities; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Contexts; diff --git a/SwipetorApp/Services/Contexts/UserCx.cs b/SwipetorApp/Services/Contexts/UserCx.cs index 4e40858..fa8ad0c 100644 --- a/SwipetorApp/Services/Contexts/UserCx.cs +++ b/SwipetorApp/Services/Contexts/UserCx.cs @@ -7,8 +7,8 @@ using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using SwipetorApp.Models.DbEntities; -using WebAppShared.Exceptions; -using WebAppShared.WebSys.DI; +using WebLibServer.Exceptions; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Contexts; diff --git a/SwipetorApp/Services/Contexts/UserIdCx.cs b/SwipetorApp/Services/Contexts/UserIdCx.cs index 56e19cd..ec42ffb 100644 --- a/SwipetorApp/Services/Contexts/UserIdCx.cs +++ b/SwipetorApp/Services/Contexts/UserIdCx.cs @@ -1,7 +1,7 @@ using System.Net; using JetBrains.Annotations; -using WebAppShared.Exceptions; -using WebAppShared.WebSys.DI; +using WebLibServer.Exceptions; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Contexts; diff --git a/SwipetorApp/Services/Emailing/EmailerProvider.cs b/SwipetorApp/Services/Emailing/EmailerProvider.cs index 973e5a7..205a4b1 100644 --- a/SwipetorApp/Services/Emailing/EmailerProvider.cs +++ b/SwipetorApp/Services/Emailing/EmailerProvider.cs @@ -5,10 +5,10 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Models.EmailViewModels; using SwipetorApp.Services.Config; -using WebAppShared.Emailing; -using WebAppShared.Metrics; -using WebAppShared.MVC; -using WebAppShared.WebSys.DI; +using WebLibServer.Emailing; +using WebLibServer.Metrics; +using WebLibServer.MVC; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Emailing; diff --git a/SwipetorApp/Services/Emailing/OutgoingEmailType.cs b/SwipetorApp/Services/Emailing/OutgoingEmailType.cs index 3d74863..1f7129a 100644 --- a/SwipetorApp/Services/Emailing/OutgoingEmailType.cs +++ b/SwipetorApp/Services/Emailing/OutgoingEmailType.cs @@ -1,4 +1,4 @@ -using WebAppShared.Emailing; +using WebLibServer.Emailing; namespace SwipetorApp.Services.Emailing; diff --git a/SwipetorApp/Services/GeoLocation/GeoLocationSvc.cs b/SwipetorApp/Services/GeoLocation/GeoLocationSvc.cs index f5b311f..30d36a9 100644 --- a/SwipetorApp/Services/GeoLocation/GeoLocationSvc.cs +++ b/SwipetorApp/Services/GeoLocation/GeoLocationSvc.cs @@ -3,8 +3,8 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.GeoLocation; diff --git a/SwipetorApp/Services/HubSvc.cs b/SwipetorApp/Services/HubSvc.cs index 3a111af..b777bd5 100644 --- a/SwipetorApp/Services/HubSvc.cs +++ b/SwipetorApp/Services/HubSvc.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services; diff --git a/SwipetorApp/Services/KVStore/KeyValueKey.cs b/SwipetorApp/Services/KVStore/KeyValueKey.cs index 0961a27..2f07901 100644 --- a/SwipetorApp/Services/KVStore/KeyValueKey.cs +++ b/SwipetorApp/Services/KVStore/KeyValueKey.cs @@ -1,4 +1,4 @@ -using WebAppShared.SharedLogic.KVStore; +using WebLibServer.SharedLogic.KVStore; namespace SwipetorApp.Services.KVStore; diff --git a/SwipetorApp/Services/KVStore/KeyValueStore.cs b/SwipetorApp/Services/KVStore/KeyValueStore.cs index 2708bec..41fbf1e 100644 --- a/SwipetorApp/Services/KVStore/KeyValueStore.cs +++ b/SwipetorApp/Services/KVStore/KeyValueStore.cs @@ -5,8 +5,8 @@ using Microsoft.Extensions.Logging; using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; -using WebAppShared.SharedLogic.KVStore; -using WebAppShared.WebSys.DI; +using WebLibServer.SharedLogic.KVStore; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.KVStore; diff --git a/SwipetorApp/Services/LocationSvc.cs b/SwipetorApp/Services/LocationSvc.cs index 46c1215..980b7e9 100644 --- a/SwipetorApp/Services/LocationSvc.cs +++ b/SwipetorApp/Services/LocationSvc.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services; diff --git a/SwipetorApp/Services/Medias/MediaSvc.cs b/SwipetorApp/Services/Medias/MediaSvc.cs index 88f77b2..ee52c84 100644 --- a/SwipetorApp/Services/Medias/MediaSvc.cs +++ b/SwipetorApp/Services/Medias/MediaSvc.cs @@ -4,7 +4,7 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Permissions; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Medias; diff --git a/SwipetorApp/Services/Medias/PhotoMediaSvc.cs b/SwipetorApp/Services/Medias/PhotoMediaSvc.cs index 59df925..c065257 100644 --- a/SwipetorApp/Services/Medias/PhotoMediaSvc.cs +++ b/SwipetorApp/Services/Medias/PhotoMediaSvc.cs @@ -11,11 +11,11 @@ using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.PhotoServices; -using WebAppShared.DI; -using WebAppShared.Exceptions; -using WebAppShared.Http; -using WebAppShared.Photos; -using WebAppShared.WebSys.DI; +using WebLibServer.DI; +using WebLibServer.Exceptions; +using WebLibServer.Http; +using WebLibServer.Photos; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Medias; diff --git a/SwipetorApp/Services/Notifs/NotifSvc.cs b/SwipetorApp/Services/Notifs/NotifSvc.cs index 8e4578c..268f791 100644 --- a/SwipetorApp/Services/Notifs/NotifSvc.cs +++ b/SwipetorApp/Services/Notifs/NotifSvc.cs @@ -8,7 +8,7 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Notifs; diff --git a/SwipetorApp/Services/Permissions/PostPerms.cs b/SwipetorApp/Services/Permissions/PostPerms.cs index 2b570d6..a654aed 100644 --- a/SwipetorApp/Services/Permissions/PostPerms.cs +++ b/SwipetorApp/Services/Permissions/PostPerms.cs @@ -1,6 +1,6 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Auth; -using WebAppShared.Exceptions; +using WebLibServer.Exceptions; namespace SwipetorApp.Services.Permissions; diff --git a/SwipetorApp/Services/PhotoServices/PhotoDeleterSvc.cs b/SwipetorApp/Services/PhotoServices/PhotoDeleterSvc.cs index 617e5aa..58af944 100644 --- a/SwipetorApp/Services/PhotoServices/PhotoDeleterSvc.cs +++ b/SwipetorApp/Services/PhotoServices/PhotoDeleterSvc.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using JetBrains.Annotations; using SwipetorApp.Services.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.Photos; -using WebAppShared.WebSys.DI; +using WebLibServer.Exceptions; +using WebLibServer.Photos; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.PhotoServices; diff --git a/SwipetorApp/Services/PhotoServices/PhotoSaverSvc.cs b/SwipetorApp/Services/PhotoServices/PhotoSaverSvc.cs index d9c41d8..2c55598 100644 --- a/SwipetorApp/Services/PhotoServices/PhotoSaverSvc.cs +++ b/SwipetorApp/Services/PhotoServices/PhotoSaverSvc.cs @@ -8,8 +8,8 @@ using Microsoft.Extensions.Logging; using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; -using WebAppShared.Photos; -using WebAppShared.WebSys.DI; +using WebLibServer.Photos; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.PhotoServices; diff --git a/SwipetorApp/Services/PhotoServices/UploadedPhotoResizerSvc.cs b/SwipetorApp/Services/PhotoServices/UploadedPhotoResizerSvc.cs index 01781a6..354ff96 100644 --- a/SwipetorApp/Services/PhotoServices/UploadedPhotoResizerSvc.cs +++ b/SwipetorApp/Services/PhotoServices/UploadedPhotoResizerSvc.cs @@ -8,9 +8,9 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Config; using SwipetorApp.Services.Contexts; -using WebAppShared.Photos; -using WebAppShared.Uploaders; -using WebAppShared.WebSys.DI; +using WebLibServer.Photos; +using WebLibServer.Uploaders; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.PhotoServices; diff --git a/SwipetorApp/Services/Pm/PmInstantWebPushSvc.cs b/SwipetorApp/Services/Pm/PmInstantWebPushSvc.cs index cc794e2..d63e73c 100644 --- a/SwipetorApp/Services/Pm/PmInstantWebPushSvc.cs +++ b/SwipetorApp/Services/Pm/PmInstantWebPushSvc.cs @@ -6,8 +6,8 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.WebPush; -using WebAppShared.Utils; -using WebAppShared.WebSys.DI; +using WebLibServer.Utils; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Pm; diff --git a/SwipetorApp/Services/Pm/PmMsgSenderSvc.cs b/SwipetorApp/Services/Pm/PmMsgSenderSvc.cs index ea47870..e6e5685 100644 --- a/SwipetorApp/Services/Pm/PmMsgSenderSvc.cs +++ b/SwipetorApp/Services/Pm/PmMsgSenderSvc.cs @@ -7,8 +7,8 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Config; using SwipetorApp.Services.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.WebSys.DI; +using WebLibServer.Exceptions; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Pm; diff --git a/SwipetorApp/Services/Pm/PmThreadSvc.cs b/SwipetorApp/Services/Pm/PmThreadSvc.cs index bb2539a..946750d 100644 --- a/SwipetorApp/Services/Pm/PmThreadSvc.cs +++ b/SwipetorApp/Services/Pm/PmThreadSvc.cs @@ -7,8 +7,8 @@ using Microsoft.Extensions.Options; using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.WebSys.DI; +using WebLibServer.Exceptions; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Pm; diff --git a/SwipetorApp/Services/PostSvc.cs b/SwipetorApp/Services/PostSvc.cs index 82cb32c..6f1cb2e 100644 --- a/SwipetorApp/Services/PostSvc.cs +++ b/SwipetorApp/Services/PostSvc.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services; diff --git a/SwipetorApp/Services/RateLimiter/RateLimiterBase.cs b/SwipetorApp/Services/RateLimiter/RateLimiterBase.cs index b562074..e983ea7 100644 --- a/SwipetorApp/Services/RateLimiter/RateLimiterBase.cs +++ b/SwipetorApp/Services/RateLimiter/RateLimiterBase.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging; -using WebAppShared.Contexts; -using WebAppShared.Exceptions; +using WebLibServer.Contexts; +using WebLibServer.Exceptions; using NotImplementedException = System.NotImplementedException; namespace SwipetorApp.Services.RateLimiter; diff --git a/SwipetorApp/Services/RateLimiter/Rules/CommentRateLimiter.cs b/SwipetorApp/Services/RateLimiter/Rules/CommentRateLimiter.cs index 6d069cf..a1b4bf3 100644 --- a/SwipetorApp/Services/RateLimiter/Rules/CommentRateLimiter.cs +++ b/SwipetorApp/Services/RateLimiter/Rules/CommentRateLimiter.cs @@ -4,8 +4,8 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.RateLimiter.Rules; diff --git a/SwipetorApp/Services/RateLimiter/Rules/CreatePostRateLimiter.cs b/SwipetorApp/Services/RateLimiter/Rules/CreatePostRateLimiter.cs index 4b6b216..b616cc4 100644 --- a/SwipetorApp/Services/RateLimiter/Rules/CreatePostRateLimiter.cs +++ b/SwipetorApp/Services/RateLimiter/Rules/CreatePostRateLimiter.cs @@ -4,8 +4,8 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.RateLimiter.Rules; diff --git a/SwipetorApp/Services/RateLimiter/Rules/PhotoUploadRateLimiter.cs b/SwipetorApp/Services/RateLimiter/Rules/PhotoUploadRateLimiter.cs index adaf7ee..8bddff3 100644 --- a/SwipetorApp/Services/RateLimiter/Rules/PhotoUploadRateLimiter.cs +++ b/SwipetorApp/Services/RateLimiter/Rules/PhotoUploadRateLimiter.cs @@ -4,8 +4,8 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.RateLimiter.Rules; diff --git a/SwipetorApp/Services/RateLimiter/Rules/VideoUploadRateLimiter.cs b/SwipetorApp/Services/RateLimiter/Rules/VideoUploadRateLimiter.cs index 0709679..357db58 100644 --- a/SwipetorApp/Services/RateLimiter/Rules/VideoUploadRateLimiter.cs +++ b/SwipetorApp/Services/RateLimiter/Rules/VideoUploadRateLimiter.cs @@ -4,8 +4,8 @@ using JetBrains.Annotations; using Microsoft.Extensions.Logging; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.RateLimiter.Rules; diff --git a/SwipetorApp/Services/Referring/ReferrerSvc.cs b/SwipetorApp/Services/Referring/ReferrerSvc.cs index fbef9b7..4a5bb7d 100644 --- a/SwipetorApp/Services/Referring/ReferrerSvc.cs +++ b/SwipetorApp/Services/Referring/ReferrerSvc.cs @@ -3,8 +3,8 @@ using JetBrains.Annotations; using SwipetorApp.Services.Contexts; using SwipetorApp.Services.Notifs; -using WebAppShared.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.Contexts; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Referring; diff --git a/SwipetorApp/Services/Security/RecaptchaCredsSvc.cs b/SwipetorApp/Services/Security/RecaptchaCredsSvc.cs index 1d9cff0..d9a020b 100644 --- a/SwipetorApp/Services/Security/RecaptchaCredsSvc.cs +++ b/SwipetorApp/Services/Security/RecaptchaCredsSvc.cs @@ -2,8 +2,8 @@ using Microsoft.Extensions.Options; using SwipetorApp.Services.Config; using SwipetorApp.Services.Users; -using WebAppShared.SharedLogic.Recaptcha; -using WebAppShared.WebSys.DI; +using WebLibServer.SharedLogic.Recaptcha; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Security; diff --git a/SwipetorApp/Services/Storage/StorageBucket.cs b/SwipetorApp/Services/Storage/StorageBucket.cs index 42936b6..8f7591f 100644 --- a/SwipetorApp/Services/Storage/StorageBucket.cs +++ b/SwipetorApp/Services/Storage/StorageBucket.cs @@ -1,8 +1,8 @@ using JetBrains.Annotations; using Microsoft.Extensions.Options; using SwipetorApp.Services.Config; -using WebAppShared.Uploaders; -using WebAppShared.WebSys.DI; +using WebLibServer.Uploaders; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Storage; diff --git a/SwipetorApp/Services/UIConfigFactorySvc.cs b/SwipetorApp/Services/UIConfigFactorySvc.cs index 4c7800b..4a8d624 100644 --- a/SwipetorApp/Services/UIConfigFactorySvc.cs +++ b/SwipetorApp/Services/UIConfigFactorySvc.cs @@ -7,10 +7,10 @@ using SwipetorApp.Services.Config.UIConfigs; using SwipetorApp.Services.Security; using SwipetorApp.Services.Users; -using WebAppShared.SharedLogic.Fx; -using WebAppShared.SharedLogic.Recaptcha; -using WebAppShared.Utils; -using WebAppShared.WebSys.DI; +using WebLibServer.SharedLogic.Fx; +using WebLibServer.SharedLogic.Recaptcha; +using WebLibServer.Utils; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services; diff --git a/SwipetorApp/Services/Users/RobotUserSvc.cs b/SwipetorApp/Services/Users/RobotUserSvc.cs index 88a404d..775a3d1 100644 --- a/SwipetorApp/Services/Users/RobotUserSvc.cs +++ b/SwipetorApp/Services/Users/RobotUserSvc.cs @@ -4,7 +4,7 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Auth; using SwipetorApp.Services.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Users; diff --git a/SwipetorApp/Services/Users/UserFollowSvc.cs b/SwipetorApp/Services/Users/UserFollowSvc.cs index e90fedf..2542877 100644 --- a/SwipetorApp/Services/Users/UserFollowSvc.cs +++ b/SwipetorApp/Services/Users/UserFollowSvc.cs @@ -1,7 +1,7 @@ using System.Linq; using JetBrains.Annotations; using SwipetorApp.Services.Contexts; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Users; diff --git a/SwipetorApp/Services/Users/UsernameCheckerSvc.cs b/SwipetorApp/Services/Users/UsernameCheckerSvc.cs index 44c5ab8..7de2e35 100644 --- a/SwipetorApp/Services/Users/UsernameCheckerSvc.cs +++ b/SwipetorApp/Services/Users/UsernameCheckerSvc.cs @@ -2,8 +2,8 @@ using System.Text.RegularExpressions; using JetBrains.Annotations; using SwipetorApp.Services.Contexts; -using WebAppShared.Exceptions; -using WebAppShared.WebSys.DI; +using WebLibServer.Exceptions; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.Users; diff --git a/SwipetorApp/Services/VideoDownload/VideoDownloaderSvc.cs b/SwipetorApp/Services/VideoDownload/VideoDownloaderSvc.cs index 7c3db68..2cd06ee 100644 --- a/SwipetorApp/Services/VideoDownload/VideoDownloaderSvc.cs +++ b/SwipetorApp/Services/VideoDownload/VideoDownloaderSvc.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using JetBrains.Annotations; using Microsoft.Extensions.Logging; -using WebAppShared.Disk; -using WebAppShared.Utils; -using WebAppShared.WebSys.DI; +using WebLibServer.Disk; +using WebLibServer.Utils; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.VideoDownload; diff --git a/SwipetorApp/Services/VideoServices/MediaPreviewSaverSvc.cs b/SwipetorApp/Services/VideoServices/MediaPreviewSaverSvc.cs index 9f13ec1..82ff28f 100644 --- a/SwipetorApp/Services/VideoServices/MediaPreviewSaverSvc.cs +++ b/SwipetorApp/Services/VideoServices/MediaPreviewSaverSvc.cs @@ -7,10 +7,10 @@ using SwipetorApp.Services.Contexts; using SwipetorApp.Services.PhotoServices; using SwipetorApp.System.Extensions; -using WebAppShared.DI; -using WebAppShared.Uploaders; -using WebAppShared.Videos; -using WebAppShared.WebSys.DI; +using WebLibServer.DI; +using WebLibServer.Uploaders; +using WebLibServer.Videos; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.VideoServices; diff --git a/SwipetorApp/Services/VideoServices/VideoClipGenerator.cs b/SwipetorApp/Services/VideoServices/VideoClipGenerator.cs index 7942efd..8eebfdd 100644 --- a/SwipetorApp/Services/VideoServices/VideoClipGenerator.cs +++ b/SwipetorApp/Services/VideoServices/VideoClipGenerator.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using WebAppShared.Disk; -using WebAppShared.Utils; -using WebAppShared.Videos; +using WebLibServer.Disk; +using WebLibServer.Utils; +using WebLibServer.Videos; namespace SwipetorApp.Services.VideoServices; diff --git a/SwipetorApp/Services/VideoServices/VideoMediaSaverSvc.cs b/SwipetorApp/Services/VideoServices/VideoMediaSaverSvc.cs index 8ff81e1..e310391 100644 --- a/SwipetorApp/Services/VideoServices/VideoMediaSaverSvc.cs +++ b/SwipetorApp/Services/VideoServices/VideoMediaSaverSvc.cs @@ -8,9 +8,9 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Models.Enums; using SwipetorApp.Services.Contexts; -using WebAppShared.DI; -using WebAppShared.Videos; -using WebAppShared.WebSys.DI; +using WebLibServer.DI; +using WebLibServer.Videos; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.VideoServices; diff --git a/SwipetorApp/Services/VideoServices/VideoMediaUpdaterSvc.cs b/SwipetorApp/Services/VideoServices/VideoMediaUpdaterSvc.cs index 1a1137d..ae8a457 100644 --- a/SwipetorApp/Services/VideoServices/VideoMediaUpdaterSvc.cs +++ b/SwipetorApp/Services/VideoServices/VideoMediaUpdaterSvc.cs @@ -10,11 +10,11 @@ using SwipetorApp.Services.Contexts; using SwipetorApp.System.Extensions; using SwipetorApp.Utils; -using WebAppShared.DI; -using WebAppShared.Disk; -using WebAppShared.Uploaders; -using WebAppShared.Videos; -using WebAppShared.WebSys.DI; +using WebLibServer.DI; +using WebLibServer.Disk; +using WebLibServer.Uploaders; +using WebLibServer.Videos; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.VideoServices; diff --git a/SwipetorApp/Services/WebPush/Notifs/NotifWebPushQuerier.cs b/SwipetorApp/Services/WebPush/Notifs/NotifWebPushQuerier.cs index 3937532..39d989a 100644 --- a/SwipetorApp/Services/WebPush/Notifs/NotifWebPushQuerier.cs +++ b/SwipetorApp/Services/WebPush/Notifs/NotifWebPushQuerier.cs @@ -7,7 +7,7 @@ using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; using SwipetorApp.Utils; -using WebAppShared.WebSys.DI; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.WebPush.Notifs; diff --git a/SwipetorApp/Services/WebPush/WebPushPayload.cs b/SwipetorApp/Services/WebPush/WebPushPayload.cs index f4c39af..63803ef 100644 --- a/SwipetorApp/Services/WebPush/WebPushPayload.cs +++ b/SwipetorApp/Services/WebPush/WebPushPayload.cs @@ -1,4 +1,4 @@ -using WebAppShared.WebPush; +using WebLibServer.WebPush; namespace SwipetorApp.Services.WebPush; diff --git a/SwipetorApp/Services/WebPush/WebPushSvc.cs b/SwipetorApp/Services/WebPush/WebPushSvc.cs index 5134cca..ad2a064 100644 --- a/SwipetorApp/Services/WebPush/WebPushSvc.cs +++ b/SwipetorApp/Services/WebPush/WebPushSvc.cs @@ -6,8 +6,8 @@ using MoreLinq; using SwipetorApp.Models.DbEntities; using SwipetorApp.Services.Contexts; -using WebAppShared.WebPush; -using WebAppShared.WebSys.DI; +using WebLibServer.WebPush; +using WebLibServer.WebSys.DI; namespace SwipetorApp.Services.WebPush; diff --git a/SwipetorApp/Services/WebPush/WebPushTag.cs b/SwipetorApp/Services/WebPush/WebPushTag.cs index e8359ea..0004ba5 100644 --- a/SwipetorApp/Services/WebPush/WebPushTag.cs +++ b/SwipetorApp/Services/WebPush/WebPushTag.cs @@ -1,4 +1,4 @@ -using WebAppShared.WebPush; +using WebLibServer.WebPush; namespace SwipetorApp.Services.WebPush; diff --git a/SwipetorApp/SwipetorApp.csproj b/SwipetorApp/SwipetorApp.csproj index 7a92ac2..3762af6 100644 --- a/SwipetorApp/SwipetorApp.csproj +++ b/SwipetorApp/SwipetorApp.csproj @@ -10,47 +10,47 @@ - - + + - - - + + + - + - + - - - - - - - - + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - + + + + + + + - - + + - - - - - + + + + + @@ -68,12 +68,12 @@ - + - <_ContentIncludedByDefault Remove="Areas\Admin\Views\Settings\Index.cshtml"/> - <_ContentIncludedByDefault Remove="Areas\Admin\Views\Settings\SettingsIndividualConfig.cshtml"/> + <_ContentIncludedByDefault Remove="Areas\Admin\Views\Settings\Index.cshtml" /> + <_ContentIncludedByDefault Remove="Areas\Admin\Views\Settings\SettingsIndividualConfig.cshtml" /> <_ContentIncludedByDefault Remove="wwwroot\public\images\medals\10k.gif" /> <_ContentIncludedByDefault Remove="wwwroot\public\images\medals\1k.gif" /> <_ContentIncludedByDefault Remove="wwwroot\public\images\medals\5k.gif" /> diff --git a/SwipetorApp/System/Binders/CurrencyModelBinder.cs b/SwipetorApp/System/Binders/CurrencyModelBinder.cs index 414d93a..9853a46 100644 --- a/SwipetorApp/System/Binders/CurrencyModelBinder.cs +++ b/SwipetorApp/System/Binders/CurrencyModelBinder.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; -using WebAppShared.SharedLogic.Fx; +using WebLibServer.SharedLogic.Fx; namespace SwipetorApp.System.Binders; diff --git a/SwipetorApp/System/Binders/CurrencyModelBinderProvider.cs b/SwipetorApp/System/Binders/CurrencyModelBinderProvider.cs index 588fd3b..f0c2a9f 100644 --- a/SwipetorApp/System/Binders/CurrencyModelBinderProvider.cs +++ b/SwipetorApp/System/Binders/CurrencyModelBinderProvider.cs @@ -1,6 +1,6 @@ using System; using Microsoft.AspNetCore.Mvc.ModelBinding; -using WebAppShared.SharedLogic.Fx; +using WebLibServer.SharedLogic.Fx; namespace SwipetorApp.System.Binders; diff --git a/SwipetorApp/System/Binders/MapperConfig.cs b/SwipetorApp/System/Binders/MapperConfig.cs index 358b0b5..43353d1 100644 --- a/SwipetorApp/System/Binders/MapperConfig.cs +++ b/SwipetorApp/System/Binders/MapperConfig.cs @@ -6,9 +6,9 @@ using SwipetorApp.Models.DTOs; using SwipetorApp.Services.Config; using SwipetorApp.Services.SqlQueries.Models; -using WebAppShared.Extensions; -using WebAppShared.SharedLogic.Fx; -using WebAppShared.Uploaders.R2; +using WebLibServer.Extensions; +using WebLibServer.SharedLogic.Fx; +using WebLibServer.Uploaders.R2; namespace SwipetorApp.System.Binders; diff --git a/SwipetorApp/System/Extensions/VideoExtensions.cs b/SwipetorApp/System/Extensions/VideoExtensions.cs index 951384c..309bc42 100644 --- a/SwipetorApp/System/Extensions/VideoExtensions.cs +++ b/SwipetorApp/System/Extensions/VideoExtensions.cs @@ -1,6 +1,6 @@ using System.Linq; using SwipetorApp.Models.DbEntities; -using WebAppShared.Uploaders; +using WebLibServer.Uploaders; namespace SwipetorApp.System.Extensions; diff --git a/SwipetorApp/System/HostnameCx.cs b/SwipetorApp/System/HostnameCx.cs index 7451041..9b4cc46 100644 --- a/SwipetorApp/System/HostnameCx.cs +++ b/SwipetorApp/System/HostnameCx.cs @@ -4,8 +4,8 @@ using Microsoft.Extensions.Options; using SwipetorApp.Services.Config; using SwipetorApp.Services.Contexts; -using WebAppShared.Types; -using WebAppShared.WebSys.DI; +using WebLibServer.Types; +using WebLibServer.WebSys.DI; namespace SwipetorApp.System; diff --git a/SwipetorApp/System/MvcFilters/UpdateLastOnlineActionFilter.cs b/SwipetorApp/System/MvcFilters/UpdateLastOnlineActionFilter.cs index fa2a597..e973962 100644 --- a/SwipetorApp/System/MvcFilters/UpdateLastOnlineActionFilter.cs +++ b/SwipetorApp/System/MvcFilters/UpdateLastOnlineActionFilter.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Mvc.Filters; using SwipetorApp.Services.Contexts; -using WebAppShared.Contexts; +using WebLibServer.Contexts; namespace SwipetorApp.System.MvcFilters; diff --git a/SwipetorApp/System/MvcFilters/WhitelistCountryAccessFilter.cs b/SwipetorApp/System/MvcFilters/WhitelistCountryAccessFilter.cs index 9f48ea7..460ef3b 100644 --- a/SwipetorApp/System/MvcFilters/WhitelistCountryAccessFilter.cs +++ b/SwipetorApp/System/MvcFilters/WhitelistCountryAccessFilter.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; using SwipetorApp.Services.Config; -using WebAppShared.Contexts; +using WebLibServer.Contexts; namespace SwipetorApp.System.MvcFilters; diff --git a/SwipetorApp/System/UserRoleAuth/UserRoleAuthAttribute.cs b/SwipetorApp/System/UserRoleAuth/UserRoleAuthAttribute.cs index 167dd8a..d53dfca 100644 --- a/SwipetorApp/System/UserRoleAuth/UserRoleAuthAttribute.cs +++ b/SwipetorApp/System/UserRoleAuth/UserRoleAuthAttribute.cs @@ -7,7 +7,7 @@ using SwipetorApp.Services.Auth; using SwipetorApp.Services.Config; using SwipetorApp.Services.Contexts; -using WebAppShared.Utils; +using WebLibServer.Utils; namespace SwipetorApp.System.UserRoleAuth; diff --git a/SwipetorApp/Views/EmailTemplates/LoginCodeEmail.cshtml b/SwipetorApp/Views/EmailTemplates/LoginCodeEmail.cshtml index e2d28a5..2a82205 100644 --- a/SwipetorApp/Views/EmailTemplates/LoginCodeEmail.cshtml +++ b/SwipetorApp/Views/EmailTemplates/LoginCodeEmail.cshtml @@ -3,8 +3,8 @@ @inject IConnectionCx ConnectionCx @using Microsoft.Extensions.Options @using SwipetorApp.Services.Config -@using WebAppShared.Contexts -@using WebAppShared.Types +@using WebLibServer.Contexts +@using WebLibServer.Types @model SwipetorApp.Models.EmailViewModels.LoginCodeEmailVM @{ diff --git a/SwipetorApp/Views/EmailTemplates/PmEmail.cshtml b/SwipetorApp/Views/EmailTemplates/PmEmail.cshtml index 85d1657..1e84214 100644 --- a/SwipetorApp/Views/EmailTemplates/PmEmail.cshtml +++ b/SwipetorApp/Views/EmailTemplates/PmEmail.cshtml @@ -3,7 +3,7 @@ @using SwipetorApp.Models.EmailViewModels @using SwipetorApp.Services.Config @using SwipetorApp.Services.Emailing -@using WebAppShared.Utils +@using WebLibServer.Utils @model SwipetorApp.Models.EmailViewModels.PmEmailVM @inject IOptions SiteConfig diff --git a/SwipetorApp/Views/EmailTemplates/UnsubscribePartial.cshtml b/SwipetorApp/Views/EmailTemplates/UnsubscribePartial.cshtml index c9977a9..e29708b 100644 --- a/SwipetorApp/Views/EmailTemplates/UnsubscribePartial.cshtml +++ b/SwipetorApp/Views/EmailTemplates/UnsubscribePartial.cshtml @@ -2,7 +2,7 @@ @inject IHostnameCx HostnameCx @using Microsoft.Extensions.Options @using SwipetorApp.Services.Config -@using WebAppShared.Types +@using WebLibServer.Types @model SwipetorApp.Models.EmailViewModels.UnsubscribePartialEmailVM @{ diff --git a/SwipetorApp/Views/Errors/GlobalErrorException.cshtml b/SwipetorApp/Views/Errors/GlobalErrorException.cshtml index 01068e6..c7bf46e 100644 --- a/SwipetorApp/Views/Errors/GlobalErrorException.cshtml +++ b/SwipetorApp/Views/Errors/GlobalErrorException.cshtml @@ -1,4 +1,4 @@ -@model WebAppShared.WebSys.Exceptions.ErrorViewModel +@model WebLibServer.WebSys.Exceptions.ErrorViewModel

Error Happened!

diff --git a/SwipetorApp/Views/Home/Appshell.cshtml b/SwipetorApp/Views/Home/Appshell.cshtml index cb68795..6a29e3b 100644 --- a/SwipetorApp/Views/Home/Appshell.cshtml +++ b/SwipetorApp/Views/Home/Appshell.cshtml @@ -2,7 +2,7 @@ @using Microsoft.Extensions.Options @using SwipetorApp.Services @using SwipetorApp.Services.Config -@using WebAppShared.WebSys +@using WebLibServer.WebSys @model SwipetorApp.Models.ViewModels.AppshellViewModel @inject UIConfigFactorySvc UIConfigFactorySvc @inject UserDeviceSvc UserDeviceSvc diff --git a/SwipetorApp/Views/Home/RobotsTxt.cshtml b/SwipetorApp/Views/Home/RobotsTxt.cshtml index 5c32a50..97d207d 100644 --- a/SwipetorApp/Views/Home/RobotsTxt.cshtml +++ b/SwipetorApp/Views/Home/RobotsTxt.cshtml @@ -1,4 +1,4 @@ -@using WebAppShared.Types +@using WebLibServer.Types @inject IHostnameCx HostnameCx @{ Layout = null; diff --git a/SwipetorApp/Views/Shared/Error.cshtml b/SwipetorApp/Views/Shared/Error.cshtml index 37300aa..ba42048 100644 --- a/SwipetorApp/Views/Shared/Error.cshtml +++ b/SwipetorApp/Views/Shared/Error.cshtml @@ -1,4 +1,4 @@ -@model WebAppShared.WebSys.Exceptions.ErrorViewModel +@model WebLibServer.WebSys.Exceptions.ErrorViewModel @{ ViewData["Title"] = "Error"; } diff --git a/SwipetorApp/Views/Shared/OpenGraphTags.cshtml b/SwipetorApp/Views/Shared/OpenGraphTags.cshtml index 068ee12..acd51e2 100644 --- a/SwipetorApp/Views/Shared/OpenGraphTags.cshtml +++ b/SwipetorApp/Views/Shared/OpenGraphTags.cshtml @@ -1,4 +1,4 @@ -@using WebAppShared.Utils +@using WebLibServer.Utils @model SwipetorApp.Models.ViewModels.AppshellViewModel diff --git a/SwipetorApp/Views/Shared/PhotoPartial.cshtml b/SwipetorApp/Views/Shared/PhotoPartial.cshtml index 4db2543..4f44b30 100644 --- a/SwipetorApp/Views/Shared/PhotoPartial.cshtml +++ b/SwipetorApp/Views/Shared/PhotoPartial.cshtml @@ -1,5 +1,5 @@ @inject PhotoUrlBuilderSvc PhotoUrlBuilderSvc -@using WebAppShared.Photos +@using WebLibServer.Photos @model SwipetorApp.Models.ViewModels.PhotoPartialViewModel @{ diff --git a/SwipetorApp/Views/Shared/Recaptcha.cshtml b/SwipetorApp/Views/Shared/Recaptcha.cshtml index 7fa48c2..0d6a017 100644 --- a/SwipetorApp/Views/Shared/Recaptcha.cshtml +++ b/SwipetorApp/Views/Shared/Recaptcha.cshtml @@ -1,5 +1,5 @@ @using SwipetorApp.Services.Security -@using WebAppShared.SharedLogic.Recaptcha +@using WebLibServer.SharedLogic.Recaptcha @inject IRecaptchaConfig RecaptchaConfig diff --git a/SwipetorApp/appsettings.json b/SwipetorApp/appsettings.json index 526bfa9..a1605c7 100644 --- a/SwipetorApp/appsettings.json +++ b/SwipetorApp/appsettings.json @@ -62,7 +62,7 @@ "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information", "SwipetorApp.System.Routing": "Warning", - "WebAppShared.WebSys.MvcRouting": "Warning", + "WebLibServer.WebSys.MvcRouting": "Warning", "SwipetorApp.System": "Information" } }, diff --git a/SwipetorAppTest/System/Extensions/VideoExtensionTest.cs b/SwipetorAppTest/System/Extensions/VideoExtensionTest.cs index 1bc0115..03d9552 100644 --- a/SwipetorAppTest/System/Extensions/VideoExtensionTest.cs +++ b/SwipetorAppTest/System/Extensions/VideoExtensionTest.cs @@ -2,8 +2,8 @@ using Moq; using SwipetorApp.Models.DbEntities; using SwipetorApp.System.Extensions; -using WebAppShared.Uploaders; -using WebAppShared.Videos; +using WebLibServer.Uploaders; +using WebLibServer.Videos; using Xunit; namespace SwipetorAppTest.System.Extensions; diff --git a/SwipetorAppTest/TestLibs/Globals.cs b/SwipetorAppTest/TestLibs/Globals.cs index 6fc32c3..d5caee4 100644 --- a/SwipetorAppTest/TestLibs/Globals.cs +++ b/SwipetorAppTest/TestLibs/Globals.cs @@ -2,7 +2,7 @@ using Divergic.Logging.Xunit; using Microsoft.Extensions.Logging; using SwipetorApp; -using WebAppShared.Internal; +using WebLibServer.Internal; using Xunit.Abstractions; namespace SwipetorAppTest.TestLibs; @@ -17,7 +17,7 @@ public static void Initialize(ITestOutputHelper outputHelper) }); var loggerFactory = new LoggerFactory(new List { loggerProvider }); - WebAppSharedDefaults.SetLoggerFactory(loggerFactory); + WebLibServerDefaults.SetLoggerFactory(loggerFactory); AppDefaults.LoggerFactory.Value = loggerFactory; } } \ No newline at end of file diff --git a/SwipetorAppTest/VideoPreviewTest.cs b/SwipetorAppTest/VideoPreviewTest.cs index a29b15f..204e903 100644 --- a/SwipetorAppTest/VideoPreviewTest.cs +++ b/SwipetorAppTest/VideoPreviewTest.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using FFMpegCore; using SwipetorAppTest.TestLibs; -using WebAppShared.Videos; +using WebLibServer.Videos; using Xunit; using Xunit.Abstractions; diff --git a/SwipetorAppTest/VideoResolutionTest.cs b/SwipetorAppTest/VideoResolutionTest.cs index 628f9d6..912ad70 100644 --- a/SwipetorAppTest/VideoResolutionTest.cs +++ b/SwipetorAppTest/VideoResolutionTest.cs @@ -1,4 +1,4 @@ -using WebAppShared.Videos; +using WebLibServer.Videos; using Xunit; namespace SwipetorAppTest; diff --git a/SwipetorAppTest/VideoServices/VideoClipGeneratorTest.cs b/SwipetorAppTest/VideoServices/VideoClipGeneratorTest.cs index 0e04bb1..7815fe0 100644 --- a/SwipetorAppTest/VideoServices/VideoClipGeneratorTest.cs +++ b/SwipetorAppTest/VideoServices/VideoClipGeneratorTest.cs @@ -4,8 +4,8 @@ using System.Threading.Tasks; using SwipetorApp.Services.VideoServices; using SwipetorAppTest.TestLibs; -using WebAppShared.Disk; -using WebAppShared.Videos; +using WebLibServer.Disk; +using WebLibServer.Videos; using Xunit; using Xunit.Abstractions; diff --git a/SwipetorAppTest/VideoSpriteGeneratorTest.cs b/SwipetorAppTest/VideoSpriteGeneratorTest.cs index 1e5aba9..c5618b2 100644 --- a/SwipetorAppTest/VideoSpriteGeneratorTest.cs +++ b/SwipetorAppTest/VideoSpriteGeneratorTest.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using SixLabors.ImageSharp; using SwipetorAppTest.TestLibs; -using WebAppShared.Videos; +using WebLibServer.Videos; using Xunit; using Xunit.Abstractions;