Skip to content

Commit

Permalink
Use WebLibServer
Browse files Browse the repository at this point in the history
  • Loading branch information
atas committed Oct 13, 2024
1 parent 6127e68 commit 6e56d95
Show file tree
Hide file tree
Showing 138 changed files with 292 additions and 292 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -97,7 +97,7 @@ jobs:
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: swpapp
name: swpserver

- name: Set next version
run: |
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/AppDefaults.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging;
using WebAppShared.Types;
using WebLibServer.Types;

namespace SwipetorApp;

Expand Down
4 changes: 2 additions & 2 deletions SwipetorApp/Areas/Admin/HubsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Admin/ViewModels/HubsAddEditViewModel.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions SwipetorApp/Areas/Api/AuthApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions SwipetorApp/Areas/Api/CommentsApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Api/EmailApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions SwipetorApp/Areas/Api/MediasApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Api/Models/AuthEmailLoginCodeModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations;
using WebAppShared.WebSys.MvcAttributes;
using WebLibServer.WebSys.MvcAttributes;

namespace SwipetorApp.Areas.Api.Models;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Api/Models/AuthEnterLoginCodeReqModel.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.ComponentModel.DataAnnotations;
using WebAppShared.WebSys.MvcAttributes;
using WebLibServer.WebSys.MvcAttributes;

namespace SwipetorApp.Areas.Api.Models;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Api/Models/DraftPostAddPhotoViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using JetBrains.Annotations;
using Microsoft.AspNetCore.Http;
using WebAppShared.WebSys.MvcAttributes;
using WebLibServer.WebSys.MvcAttributes;

namespace SwipetorApp.Areas.Api.Models;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Api/Models/MyApiCustomDomainReqModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations;
using WebAppShared.WebSys.MvcAttributes;
using WebLibServer.WebSys.MvcAttributes;

namespace SwipetorApp.Areas.Api.Models;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Areas/Api/Models/MyApiProfileDescReqModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations;
using WebAppShared.WebSys.MvcAttributes;
using WebLibServer.WebSys.MvcAttributes;

namespace SwipetorApp.Areas.Api.Models;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations;
using WebAppShared.WebSys.MvcAttributes;
using WebLibServer.WebSys.MvcAttributes;

namespace SwipetorApp.Areas.Api.Models;

Expand Down
8 changes: 4 additions & 4 deletions SwipetorApp/Areas/Api/MyApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions SwipetorApp/Areas/Api/PhotosApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions SwipetorApp/Areas/Api/PmApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions SwipetorApp/Areas/Api/PostsApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions SwipetorApp/Areas/Api/UsersApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions SwipetorApp/Areas/HostMaster/BatchController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Controllers/FallbackController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions SwipetorApp/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions SwipetorApp/Controllers/PostsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DTOs/PhotoDto.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DTOs/SubPlanDto.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using WebAppShared.SharedLogic.Fx;
using WebLibServer.SharedLogic.Fx;

namespace SwipetorApp.Models.DTOs;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DTOs/VideoDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/AuditLog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/Comment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions SwipetorApp/Models/DbEntities/DbCx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/FavPost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/Hub.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/KeyValue.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations;
using JetBrains.Annotations;
using WebAppShared.Types;
using WebLibServer.Types;

namespace SwipetorApp.Models.DbEntities;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/Location.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion SwipetorApp/Models/DbEntities/Notif.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions SwipetorApp/Models/DbEntities/Photo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading

0 comments on commit 6e56d95

Please sign in to comment.