From 0082a6f219895d590d6c17b6a01d1039ae2d852b Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 7 Sep 2024 20:31:54 -0500 Subject: [PATCH] Rearranged repo to make room for additional projects --- .gitignore | 2 +- ComiServ.csproj => ComiServ/ComiServ.csproj | 0 ComicsContext.cs => ComiServ/ComicsContext.cs | 0 .../Controllers}/ComicController.cs | 0 .../Controllers}/MiscController.cs | 0 .../Controllers}/TaskController.cs | 0 .../Controllers}/UserController.cs | 0 .../Controllers}/WebappController.cs | 0 {Entities => ComiServ/Entities}/Author.cs | 0 {Entities => ComiServ/Entities}/Comic.cs | 0 .../Entities}/ComicAuthor.cs | 0 {Entities => ComiServ/Entities}/ComicRead.cs | 0 {Entities => ComiServ/Entities}/ComicTag.cs | 0 {Entities => ComiServ/Entities}/Cover.cs | 0 .../Entities}/EntitySwaggerFilter.cs | 0 {Entities => ComiServ/Entities}/Tag.cs | 0 {Entities => ComiServ/Entities}/User.cs | 0 {Entities => ComiServ/Entities}/UserType.cs | 0 .../Extensions}/DatabaseExtensions.cs | 0 .../Extensions}/StreamExtentions.cs | 0 LICENSE => ComiServ/LICENSE | 0 {Logging => ComiServ/Logging}/Events.cs | 0 .../BasicAuthenticationMiddleware.cs | 0 {Models => ComiServ/Models}/AuthorResponse.cs | 0 {Models => ComiServ/Models}/ComicData.cs | 0 .../Models}/ComicDeleteRequest.cs | 0 .../Models}/ComicDuplicateList.cs | 0 .../Models}/ComicMetadataUpdateRequest.cs | 0 .../Models}/LibraryResponse.cs | 0 {Models => ComiServ/Models}/Paginated.cs | 0 {Models => ComiServ/Models}/RequestError.cs | 0 {Models => ComiServ/Models}/TagResponse.cs | 0 {Models => ComiServ/Models}/Truncated.cs | 0 .../Models}/UserCreateRequest.cs | 0 .../Models}/UserDescription.cs | 0 .../Models}/UserModifyRequest.cs | 0 Program.cs => ComiServ/Program.cs | 0 ComiServ/Properties/launchSettings.json | 41 +++++++++++++++++ README.md => ComiServ/README.md | 0 .../Services}/AuthenticationService.cs | 0 .../Services}/ComicAnalyzer.cs | 0 .../Services}/ComicScanner.cs | 0 .../Services}/JsonConfigService.cs | 0 .../Services}/PictureConverter.cs | 0 .../Services}/TaskManager.cs | 0 .../appsettings.Development.json | 0 appsettings.json => ComiServ/appsettings.json | 0 config.json => ComiServ/config.json | 0 ComiServ/package-lock.json | 44 +++++++++++++++++++ ComiServ/package.json | 6 +++ 50 files changed, 92 insertions(+), 1 deletion(-) rename ComiServ.csproj => ComiServ/ComiServ.csproj (100%) rename ComicsContext.cs => ComiServ/ComicsContext.cs (100%) rename {Controllers => ComiServ/Controllers}/ComicController.cs (100%) rename {Controllers => ComiServ/Controllers}/MiscController.cs (100%) rename {Controllers => ComiServ/Controllers}/TaskController.cs (100%) rename {Controllers => ComiServ/Controllers}/UserController.cs (100%) rename {Controllers => ComiServ/Controllers}/WebappController.cs (100%) rename {Entities => ComiServ/Entities}/Author.cs (100%) rename {Entities => ComiServ/Entities}/Comic.cs (100%) rename {Entities => ComiServ/Entities}/ComicAuthor.cs (100%) rename {Entities => ComiServ/Entities}/ComicRead.cs (100%) rename {Entities => ComiServ/Entities}/ComicTag.cs (100%) rename {Entities => ComiServ/Entities}/Cover.cs (100%) rename {Entities => ComiServ/Entities}/EntitySwaggerFilter.cs (100%) rename {Entities => ComiServ/Entities}/Tag.cs (100%) rename {Entities => ComiServ/Entities}/User.cs (100%) rename {Entities => ComiServ/Entities}/UserType.cs (100%) rename {Extensions => ComiServ/Extensions}/DatabaseExtensions.cs (100%) rename {Extensions => ComiServ/Extensions}/StreamExtentions.cs (100%) rename LICENSE => ComiServ/LICENSE (100%) rename {Logging => ComiServ/Logging}/Events.cs (100%) rename {Middleware => ComiServ/Middleware}/BasicAuthenticationMiddleware.cs (100%) rename {Models => ComiServ/Models}/AuthorResponse.cs (100%) rename {Models => ComiServ/Models}/ComicData.cs (100%) rename {Models => ComiServ/Models}/ComicDeleteRequest.cs (100%) rename {Models => ComiServ/Models}/ComicDuplicateList.cs (100%) rename {Models => ComiServ/Models}/ComicMetadataUpdateRequest.cs (100%) rename {Models => ComiServ/Models}/LibraryResponse.cs (100%) rename {Models => ComiServ/Models}/Paginated.cs (100%) rename {Models => ComiServ/Models}/RequestError.cs (100%) rename {Models => ComiServ/Models}/TagResponse.cs (100%) rename {Models => ComiServ/Models}/Truncated.cs (100%) rename {Models => ComiServ/Models}/UserCreateRequest.cs (100%) rename {Models => ComiServ/Models}/UserDescription.cs (100%) rename {Models => ComiServ/Models}/UserModifyRequest.cs (100%) rename Program.cs => ComiServ/Program.cs (100%) create mode 100644 ComiServ/Properties/launchSettings.json rename README.md => ComiServ/README.md (100%) rename {Services => ComiServ/Services}/AuthenticationService.cs (100%) rename {Services => ComiServ/Services}/ComicAnalyzer.cs (100%) rename {Services => ComiServ/Services}/ComicScanner.cs (100%) rename {Services => ComiServ/Services}/JsonConfigService.cs (100%) rename {Services => ComiServ/Services}/PictureConverter.cs (100%) rename {Services => ComiServ/Services}/TaskManager.cs (100%) rename appsettings.Development.json => ComiServ/appsettings.Development.json (100%) rename appsettings.json => ComiServ/appsettings.json (100%) rename config.json => ComiServ/config.json (100%) create mode 100644 ComiServ/package-lock.json create mode 100644 ComiServ/package.json diff --git a/.gitignore b/.gitignore index e8cb0b0..ff9875a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +*.sln #SQLite files *.db diff --git a/ComiServ.csproj b/ComiServ/ComiServ.csproj similarity index 100% rename from ComiServ.csproj rename to ComiServ/ComiServ.csproj diff --git a/ComicsContext.cs b/ComiServ/ComicsContext.cs similarity index 100% rename from ComicsContext.cs rename to ComiServ/ComicsContext.cs diff --git a/Controllers/ComicController.cs b/ComiServ/Controllers/ComicController.cs similarity index 100% rename from Controllers/ComicController.cs rename to ComiServ/Controllers/ComicController.cs diff --git a/Controllers/MiscController.cs b/ComiServ/Controllers/MiscController.cs similarity index 100% rename from Controllers/MiscController.cs rename to ComiServ/Controllers/MiscController.cs diff --git a/Controllers/TaskController.cs b/ComiServ/Controllers/TaskController.cs similarity index 100% rename from Controllers/TaskController.cs rename to ComiServ/Controllers/TaskController.cs diff --git a/Controllers/UserController.cs b/ComiServ/Controllers/UserController.cs similarity index 100% rename from Controllers/UserController.cs rename to ComiServ/Controllers/UserController.cs diff --git a/Controllers/WebappController.cs b/ComiServ/Controllers/WebappController.cs similarity index 100% rename from Controllers/WebappController.cs rename to ComiServ/Controllers/WebappController.cs diff --git a/Entities/Author.cs b/ComiServ/Entities/Author.cs similarity index 100% rename from Entities/Author.cs rename to ComiServ/Entities/Author.cs diff --git a/Entities/Comic.cs b/ComiServ/Entities/Comic.cs similarity index 100% rename from Entities/Comic.cs rename to ComiServ/Entities/Comic.cs diff --git a/Entities/ComicAuthor.cs b/ComiServ/Entities/ComicAuthor.cs similarity index 100% rename from Entities/ComicAuthor.cs rename to ComiServ/Entities/ComicAuthor.cs diff --git a/Entities/ComicRead.cs b/ComiServ/Entities/ComicRead.cs similarity index 100% rename from Entities/ComicRead.cs rename to ComiServ/Entities/ComicRead.cs diff --git a/Entities/ComicTag.cs b/ComiServ/Entities/ComicTag.cs similarity index 100% rename from Entities/ComicTag.cs rename to ComiServ/Entities/ComicTag.cs diff --git a/Entities/Cover.cs b/ComiServ/Entities/Cover.cs similarity index 100% rename from Entities/Cover.cs rename to ComiServ/Entities/Cover.cs diff --git a/Entities/EntitySwaggerFilter.cs b/ComiServ/Entities/EntitySwaggerFilter.cs similarity index 100% rename from Entities/EntitySwaggerFilter.cs rename to ComiServ/Entities/EntitySwaggerFilter.cs diff --git a/Entities/Tag.cs b/ComiServ/Entities/Tag.cs similarity index 100% rename from Entities/Tag.cs rename to ComiServ/Entities/Tag.cs diff --git a/Entities/User.cs b/ComiServ/Entities/User.cs similarity index 100% rename from Entities/User.cs rename to ComiServ/Entities/User.cs diff --git a/Entities/UserType.cs b/ComiServ/Entities/UserType.cs similarity index 100% rename from Entities/UserType.cs rename to ComiServ/Entities/UserType.cs diff --git a/Extensions/DatabaseExtensions.cs b/ComiServ/Extensions/DatabaseExtensions.cs similarity index 100% rename from Extensions/DatabaseExtensions.cs rename to ComiServ/Extensions/DatabaseExtensions.cs diff --git a/Extensions/StreamExtentions.cs b/ComiServ/Extensions/StreamExtentions.cs similarity index 100% rename from Extensions/StreamExtentions.cs rename to ComiServ/Extensions/StreamExtentions.cs diff --git a/LICENSE b/ComiServ/LICENSE similarity index 100% rename from LICENSE rename to ComiServ/LICENSE diff --git a/Logging/Events.cs b/ComiServ/Logging/Events.cs similarity index 100% rename from Logging/Events.cs rename to ComiServ/Logging/Events.cs diff --git a/Middleware/BasicAuthenticationMiddleware.cs b/ComiServ/Middleware/BasicAuthenticationMiddleware.cs similarity index 100% rename from Middleware/BasicAuthenticationMiddleware.cs rename to ComiServ/Middleware/BasicAuthenticationMiddleware.cs diff --git a/Models/AuthorResponse.cs b/ComiServ/Models/AuthorResponse.cs similarity index 100% rename from Models/AuthorResponse.cs rename to ComiServ/Models/AuthorResponse.cs diff --git a/Models/ComicData.cs b/ComiServ/Models/ComicData.cs similarity index 100% rename from Models/ComicData.cs rename to ComiServ/Models/ComicData.cs diff --git a/Models/ComicDeleteRequest.cs b/ComiServ/Models/ComicDeleteRequest.cs similarity index 100% rename from Models/ComicDeleteRequest.cs rename to ComiServ/Models/ComicDeleteRequest.cs diff --git a/Models/ComicDuplicateList.cs b/ComiServ/Models/ComicDuplicateList.cs similarity index 100% rename from Models/ComicDuplicateList.cs rename to ComiServ/Models/ComicDuplicateList.cs diff --git a/Models/ComicMetadataUpdateRequest.cs b/ComiServ/Models/ComicMetadataUpdateRequest.cs similarity index 100% rename from Models/ComicMetadataUpdateRequest.cs rename to ComiServ/Models/ComicMetadataUpdateRequest.cs diff --git a/Models/LibraryResponse.cs b/ComiServ/Models/LibraryResponse.cs similarity index 100% rename from Models/LibraryResponse.cs rename to ComiServ/Models/LibraryResponse.cs diff --git a/Models/Paginated.cs b/ComiServ/Models/Paginated.cs similarity index 100% rename from Models/Paginated.cs rename to ComiServ/Models/Paginated.cs diff --git a/Models/RequestError.cs b/ComiServ/Models/RequestError.cs similarity index 100% rename from Models/RequestError.cs rename to ComiServ/Models/RequestError.cs diff --git a/Models/TagResponse.cs b/ComiServ/Models/TagResponse.cs similarity index 100% rename from Models/TagResponse.cs rename to ComiServ/Models/TagResponse.cs diff --git a/Models/Truncated.cs b/ComiServ/Models/Truncated.cs similarity index 100% rename from Models/Truncated.cs rename to ComiServ/Models/Truncated.cs diff --git a/Models/UserCreateRequest.cs b/ComiServ/Models/UserCreateRequest.cs similarity index 100% rename from Models/UserCreateRequest.cs rename to ComiServ/Models/UserCreateRequest.cs diff --git a/Models/UserDescription.cs b/ComiServ/Models/UserDescription.cs similarity index 100% rename from Models/UserDescription.cs rename to ComiServ/Models/UserDescription.cs diff --git a/Models/UserModifyRequest.cs b/ComiServ/Models/UserModifyRequest.cs similarity index 100% rename from Models/UserModifyRequest.cs rename to ComiServ/Models/UserModifyRequest.cs diff --git a/Program.cs b/ComiServ/Program.cs similarity index 100% rename from Program.cs rename to ComiServ/Program.cs diff --git a/ComiServ/Properties/launchSettings.json b/ComiServ/Properties/launchSettings.json new file mode 100644 index 0000000..fe89761 --- /dev/null +++ b/ComiServ/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:32904", + "sslPort": 44308 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5265", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7020;http://localhost:5265", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/README.md b/ComiServ/README.md similarity index 100% rename from README.md rename to ComiServ/README.md diff --git a/Services/AuthenticationService.cs b/ComiServ/Services/AuthenticationService.cs similarity index 100% rename from Services/AuthenticationService.cs rename to ComiServ/Services/AuthenticationService.cs diff --git a/Services/ComicAnalyzer.cs b/ComiServ/Services/ComicAnalyzer.cs similarity index 100% rename from Services/ComicAnalyzer.cs rename to ComiServ/Services/ComicAnalyzer.cs diff --git a/Services/ComicScanner.cs b/ComiServ/Services/ComicScanner.cs similarity index 100% rename from Services/ComicScanner.cs rename to ComiServ/Services/ComicScanner.cs diff --git a/Services/JsonConfigService.cs b/ComiServ/Services/JsonConfigService.cs similarity index 100% rename from Services/JsonConfigService.cs rename to ComiServ/Services/JsonConfigService.cs diff --git a/Services/PictureConverter.cs b/ComiServ/Services/PictureConverter.cs similarity index 100% rename from Services/PictureConverter.cs rename to ComiServ/Services/PictureConverter.cs diff --git a/Services/TaskManager.cs b/ComiServ/Services/TaskManager.cs similarity index 100% rename from Services/TaskManager.cs rename to ComiServ/Services/TaskManager.cs diff --git a/appsettings.Development.json b/ComiServ/appsettings.Development.json similarity index 100% rename from appsettings.Development.json rename to ComiServ/appsettings.Development.json diff --git a/appsettings.json b/ComiServ/appsettings.json similarity index 100% rename from appsettings.json rename to ComiServ/appsettings.json diff --git a/config.json b/ComiServ/config.json similarity index 100% rename from config.json rename to ComiServ/config.json diff --git a/ComiServ/package-lock.json b/ComiServ/package-lock.json new file mode 100644 index 0000000..1a7a885 --- /dev/null +++ b/ComiServ/package-lock.json @@ -0,0 +1,44 @@ +{ + "name": "ComiServ", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "@types/react": "^18.3.4", + "@types/react-dom": "^18.3.0" + } + }, + "node_modules/@types/prop-types": { + "version": "15.7.12", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==", + "license": "MIT" + }, + "node_modules/@types/react": { + "version": "18.3.4", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.4.tgz", + "integrity": "sha512-J7W30FTdfCxDDjmfRM+/JqLHBIyl7xUIp9kwK637FGmY7+mkSFSe6L4jpZzhj5QMfLssSDP4/i75AKkrdC7/Jw==", + "license": "MIT", + "dependencies": { + "@types/prop-types": "*", + "csstype": "^3.0.2" + } + }, + "node_modules/@types/react-dom": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz", + "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", + "license": "MIT", + "dependencies": { + "@types/react": "*" + } + }, + "node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "license": "MIT" + } + } +} diff --git a/ComiServ/package.json b/ComiServ/package.json new file mode 100644 index 0000000..180b2c3 --- /dev/null +++ b/ComiServ/package.json @@ -0,0 +1,6 @@ +{ + "dependencies": { + "@types/react": "^18.3.4", + "@types/react-dom": "^18.3.0" + } +}