diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln index f4e40d35..690f8b9b 100644 --- a/BootstrapAdmin.sln +++ b/BootstrapAdmin.sln @@ -5,68 +5,65 @@ VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SQLServer", "SQLServer", "{87319AF5-7C40-4362-B67C-35F9DD737DB4}" ProjectSection(SolutionItems) = preProject - DatabaseScripts\SqlServer\InitData.sql = DatabaseScripts\SqlServer\InitData.sql - DatabaseScripts\SqlServer\install.ps1 = DatabaseScripts\SqlServer\install.ps1 - DatabaseScripts\SqlServer\Install.sql = DatabaseScripts\SqlServer\Install.sql + scripts\SqlServer\InitData.sql = scripts\SqlServer\InitData.sql + scripts\SqlServer\install.ps1 = scripts\SqlServer\install.ps1 + scripts\SqlServer\Install.sql = scripts\SqlServer\Install.sql EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Admin", "Bootstrap.Admin\Bootstrap.Admin.csproj", "{7B2B7043-3CB2-4C5A-BDF2-8C47F1A5471A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Admin", "src\admin\Bootstrap.Admin\Bootstrap.Admin.csproj", "{7B2B7043-3CB2-4C5A-BDF2-8C47F1A5471A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{792A0B12-3F41-4BC4-A768-7D8D91C213B2}" - ProjectSection(SolutionItems) = preProject - appveyor.build.ps1 = appveyor.build.ps1 - appveyor.test.ps1 = appveyor.test.ps1 - appveyor.yml = appveyor.yml - README.md = README.md - README.zh-CN.md = README.zh-CN.md - EndProjectSection +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{586410F2-C1F0-47CD-AB28-2CF506DED2C8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{586410F2-C1F0-47CD-AB28-2CF506DED2C8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Client", "src\client\Bootstrap.Client\Bootstrap.Client.csproj", "{C82A6E45-AB90-43D1-8429-5CBE953D8151}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Client", "Bootstrap.Client\Bootstrap.Client.csproj", "{C82A6E45-AB90-43D1-8429-5CBE953D8151}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{C7F51A14-2D89-4D1F-AD78-C42B79AB0BF0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{C7F51A14-2D89-4D1F-AD78-C42B79AB0BF0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.DataAccess", "Bootstrap.DataAccess\Bootstrap.DataAccess.csproj", "{8D62BE79-BE13-43C8-969B-C9B00B3C84B7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.DataAccess", "src\admin\Bootstrap.DataAccess\Bootstrap.DataAccess.csproj", "{8D62BE79-BE13-43C8-969B-C9B00B3C84B7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SQLite", "SQLite", "{523515EC-2AD7-4282-9AF4-9D20371183B0}" ProjectSection(SolutionItems) = preProject - DatabaseScripts\SQLite\InitData.sql = DatabaseScripts\SQLite\InitData.sql - DatabaseScripts\SQLite\Install.sql = DatabaseScripts\SQLite\Install.sql + scripts\SQLite\InitData.sql = scripts\SQLite\InitData.sql + scripts\SQLite\Install.sql = scripts\SQLite\Install.sql EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.DataAccess.MongoDB", "Bootstrap.DataAccess.MongoDB\Bootstrap.DataAccess.MongoDB.csproj", "{8336F096-4B4A-4710-A1FA-0F5E44CD8D26}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.DataAccess.MongoDB", "src\admin\Bootstrap.DataAccess.MongoDB\Bootstrap.DataAccess.MongoDB.csproj", "{8336F096-4B4A-4710-A1FA-0F5E44CD8D26}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MongoDB", "MongoDB", "{A06A0AD8-A246-4329-B024-7174AE4A3EDE}" ProjectSection(SolutionItems) = preProject - DatabaseScripts\MongoDB\Dicts.js = DatabaseScripts\MongoDB\Dicts.js - DatabaseScripts\MongoDB\Groups.js = DatabaseScripts\MongoDB\Groups.js - DatabaseScripts\MongoDB\init.js = DatabaseScripts\MongoDB\init.js - DatabaseScripts\MongoDB\install.sh = DatabaseScripts\MongoDB\install.sh - DatabaseScripts\MongoDB\Navigations.js = DatabaseScripts\MongoDB\Navigations.js - DatabaseScripts\MongoDB\Roles.js = DatabaseScripts\MongoDB\Roles.js - DatabaseScripts\MongoDB\Users.js = DatabaseScripts\MongoDB\Users.js + scripts\MongoDB\Dicts.js = scripts\MongoDB\Dicts.js + scripts\MongoDB\Groups.js = scripts\MongoDB\Groups.js + scripts\MongoDB\init.js = scripts\MongoDB\init.js + scripts\MongoDB\install.sh = scripts\MongoDB\install.sh + scripts\MongoDB\Navigations.js = scripts\MongoDB\Navigations.js + scripts\MongoDB\Roles.js = scripts\MongoDB\Roles.js + scripts\MongoDB\Users.js = scripts\MongoDB\Users.js EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MySQL", "MySQL", "{084E2E94-6B7D-4D3E-9BF1-6972427FBF80}" ProjectSection(SolutionItems) = preProject - DatabaseScripts\MySQL\initData.sql = DatabaseScripts\MySQL\initData.sql - DatabaseScripts\MySQL\install.sh = DatabaseScripts\MySQL\install.sh - DatabaseScripts\MySQL\install.sql = DatabaseScripts\MySQL\install.sql - DatabaseScripts\MySQL\my.ini = DatabaseScripts\MySQL\my.ini + scripts\MySQL\initData.sql = scripts\MySQL\initData.sql + scripts\MySQL\install.sh = scripts\MySQL\install.sh + scripts\MySQL\install.sql = scripts\MySQL\install.sql + scripts\MySQL\my.ini = scripts\MySQL\my.ini EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "UnitTest\UnitTest.csproj", "{CFE75C48-F9D5-403A-8419-D07939BBD769}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest", "test\UnitTest\UnitTest.csproj", "{CFE75C48-F9D5-403A-8419-D07939BBD769}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Postgresql", "Postgresql", "{6F61C2AC-84D4-48A9-8A48-680657CC8175}" ProjectSection(SolutionItems) = preProject - DatabaseScripts\Postgresql\initData.sql = DatabaseScripts\Postgresql\initData.sql - DatabaseScripts\Postgresql\install.sql = DatabaseScripts\Postgresql\install.sql + scripts\Postgresql\initData.sql = scripts\Postgresql\initData.sql + scripts\Postgresql\install.sql = scripts\Postgresql\install.sql EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bootstrap.Client.DataAccess", "Bootstrap.Client.DataAccess\Bootstrap.Client.DataAccess.csproj", "{843811A2-FE49-410F-BF9F-9F1FB14A1DEE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Client.DataAccess", "src\client\Bootstrap.Client.DataAccess\Bootstrap.Client.DataAccess.csproj", "{843811A2-FE49-410F-BF9F-9F1FB14A1DEE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bootstrap.Client.DataAccess.MongoDB", "Bootstrap.Client.DataAccess.MongoDB\Bootstrap.Client.DataAccess.MongoDB.csproj", "{BC1C6D63-ADA9-4C3B-89F0-CEB191A86BF5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap.Client.DataAccess.MongoDB", "src\client\Bootstrap.Client.DataAccess.MongoDB\Bootstrap.Client.DataAccess.MongoDB.csproj", "{BC1C6D63-ADA9-4C3B-89F0-CEB191A86BF5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6AD32A76-F3AA-423E-96EA-E5CC679934D1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41B6D37A-5E5E-42B3-85E4-D81A81E3D757}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "admin", "admin", "{E03B7391-B52F-4449-B400-5CD9DE01F085}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -108,13 +105,19 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {87319AF5-7C40-4362-B67C-35F9DD737DB4} = {586410F2-C1F0-47CD-AB28-2CF506DED2C8} + {7B2B7043-3CB2-4C5A-BDF2-8C47F1A5471A} = {E03B7391-B52F-4449-B400-5CD9DE01F085} {C82A6E45-AB90-43D1-8429-5CBE953D8151} = {C7F51A14-2D89-4D1F-AD78-C42B79AB0BF0} + {C7F51A14-2D89-4D1F-AD78-C42B79AB0BF0} = {41B6D37A-5E5E-42B3-85E4-D81A81E3D757} + {8D62BE79-BE13-43C8-969B-C9B00B3C84B7} = {E03B7391-B52F-4449-B400-5CD9DE01F085} {523515EC-2AD7-4282-9AF4-9D20371183B0} = {586410F2-C1F0-47CD-AB28-2CF506DED2C8} + {8336F096-4B4A-4710-A1FA-0F5E44CD8D26} = {E03B7391-B52F-4449-B400-5CD9DE01F085} {A06A0AD8-A246-4329-B024-7174AE4A3EDE} = {586410F2-C1F0-47CD-AB28-2CF506DED2C8} {084E2E94-6B7D-4D3E-9BF1-6972427FBF80} = {586410F2-C1F0-47CD-AB28-2CF506DED2C8} + {CFE75C48-F9D5-403A-8419-D07939BBD769} = {6AD32A76-F3AA-423E-96EA-E5CC679934D1} {6F61C2AC-84D4-48A9-8A48-680657CC8175} = {586410F2-C1F0-47CD-AB28-2CF506DED2C8} {843811A2-FE49-410F-BF9F-9F1FB14A1DEE} = {C7F51A14-2D89-4D1F-AD78-C42B79AB0BF0} {BC1C6D63-ADA9-4C3B-89F0-CEB191A86BF5} = {C7F51A14-2D89-4D1F-AD78-C42B79AB0BF0} + {E03B7391-B52F-4449-B400-5CD9DE01F085} = {41B6D37A-5E5E-42B3-85E4-D81A81E3D757} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {221EAE38-5F75-4391-9A48-E462A9F3B8FC} diff --git a/Directory.Build.props b/Directory.Build.props index 97134acf..278091a6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,28 +1,21 @@  - true - ..\Keys\Longbow.Utility.snk Longbow Argo Zhang(argo@163.com) Longbow - - - latest + true + $(MSBuildThisFileDirectory)src\Keys\Longbow.Utility.snk true - - - - - - + + \ No newline at end of file diff --git a/appveyor.build.ps1 b/appveyor.build.ps1 index 8aa7b505..8e3de630 100644 --- a/appveyor.build.ps1 +++ b/appveyor.build.ps1 @@ -1,15 +1,15 @@ -function runCmd ($cmd) { +function runCmd ($cmd) { write-host $cmd -ForegroundColor Cyan cmd.exe /c $cmd } -runCmd "dotnet build" -runCmd "dotnet publish Bootstrap.Admin --configuration Release --no-restore" +runCmd "dotnet build src\admin\Bootstrap.Admin" +runCmd "dotnet publish src\admin\Bootstrap.Admin --configuration Release --no-restore" -$publishFolder = "$($env:appveyor_build_folder)\Bootstrap.Admin\bin\Release\netcoreapp2.2\publish" -$licFile = "$($env:appveyor_build_folder)\Scripts\Longbow.lic" +$publishFolder = "$($env:appveyor_build_folder)\src\admin\Bootstrap.Admin\bin\Release\netcoreapp2.2\publish" +$licFile = "$($env:appveyor_build_folder)\scripts\Longbow.lic" write-host "copy file $licFile" -ForegroundColor Cyan xcopy $licFile $publishFolder /y -$dbFile = "$($env:appveyor_build_folder)\Bootstrap.Admin\BootstrapAdmin.db" +$dbFile = "$($env:appveyor_build_folder)\src\admin\Bootstrap.Admin\BootstrapAdmin.db" write-host "copy file $dbFile" -ForegroundColor Cyan xcopy $dbFile $publishFolder /y \ No newline at end of file diff --git a/appveyor.test.ps1 b/appveyor.test.ps1 index 16ae39c5..4b57f40f 100644 --- a/appveyor.test.ps1 +++ b/appveyor.test.ps1 @@ -1,6 +1,6 @@ -function installDB() { +function installDB() { write-host "init sqlserver database..." -ForegroundColor Cyan - $startPath = "$($env:appveyor_build_folder)\DatabaseScripts\SqlServer" + $startPath = "$($env:appveyor_build_folder)\scripts\SqlServer" $sqlInstance = "(local)\SQL2014" $outFile = join-path $startPath "output.log" $sqlFile = join-path $startPath "Install.sql" @@ -14,7 +14,7 @@ function installDB() { $cmd = $mysql + ' -e "create database BootstrapAdmin;" -uroot' cmd.exe /c $cmd - $startPath = "$($env:appveyor_build_folder)\DatabaseScripts\MySQL" + $startPath = "$($env:appveyor_build_folder)\scripts\MySQL" $para = ' -hlocalhost -uroot -DBootstrapAdmin < ' $sqlFile = join-path $startPath "Install.sql" $cmd = $mysql + $para + $sqlFile @@ -25,7 +25,7 @@ function installDB() { cmd.exe /c $cmd write-host "init mongodb data..." -ForegroundColor Cyan - $initFolder = "$($env:appveyor_build_folder)\DatabaseScripts\MongoDB" + $initFolder = "$($env:appveyor_build_folder)\scripts\MongoDB" cd $initFolder cmd.exe /c "C:\mongodb\bin\mongo init.js" @@ -37,13 +37,13 @@ function installDB() { } function runUnitTest() { - write-host "dotnet test UnitTest" -ForegroundColor Cyan - dotnet test UnitTest --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include="[Bootstrap*]*" /p:ExcludeByFile="../Bootstrap.Admin/Program.cs%2c../Bootstrap.Admin/Startup.cs%2c../Bootstrap.Admin/HttpHeaderOperation.cs" /p:CoverletOutput=../ + write-host "dotnet test test\UnitTest" -ForegroundColor Cyan + dotnet test test\UnitTest /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include="[Bootstrap*]*" /p:ExcludeByFile="..\..\src\admin\Bootstrap.Admin\Program.cs%2c..\..\src\admin\Bootstrap.Admin\Startup.cs%2c..\..\src\admin\Bootstrap.Admin\HttpHeaderOperation.cs" /p:CoverletOutput=..\..\ } function coverallUnitTest() { write-host "install coveralls.net tools" -ForegroundColor Cyan - dotnet tool install coveralls.net --version 1.0.0 --tool-path "./tools" + dotnet tool install coveralls.net --version 1.0.0 --tool-path ".\tools" runUnitTest write-host "report UnitTest with Coveralls" -ForegroundColor Cyan cmd.exe /c ".\tools\csmacnz.Coveralls.exe --opencover -i coverage.opencover.xml --useRelativePaths" diff --git a/appveyor.yml b/appveyor.yml index 586ae026..319b245c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ install: dotnet --version - xcopy "$($env:appveyor_build_folder)\DatabaseScripts\MySQL\my.ini" "C:\Program Files\MySQL\MySQL Server 5.7" /y + xcopy "$($env:appveyor_build_folder)\scripts\MySQL\my.ini" "C:\Program Files\MySQL\MySQL Server 5.7" /y build_script: - ps: >- ./appveyor.build.ps1 @@ -35,7 +35,7 @@ test_script: - ps: >- ./appveyor.test.ps1 artifacts: -- path: Bootstrap.Admin\bin\release\netcoreapp2.2\publish\ +- path: src\admin\Bootstrap.Admin\bin\release\netcoreapp2.2\publish\ name: BootstrapAdmin type: WebDeployPackage deploy: diff --git a/Scripts/Longbow.lic b/scripts/Longbow.lic similarity index 100% rename from Scripts/Longbow.lic rename to scripts/Longbow.lic diff --git a/DatabaseScripts/MongoDB/Dicts.js b/scripts/MongoDB/Dicts.js similarity index 100% rename from DatabaseScripts/MongoDB/Dicts.js rename to scripts/MongoDB/Dicts.js diff --git a/DatabaseScripts/MongoDB/Groups.js b/scripts/MongoDB/Groups.js similarity index 100% rename from DatabaseScripts/MongoDB/Groups.js rename to scripts/MongoDB/Groups.js diff --git a/DatabaseScripts/MongoDB/Navigations.js b/scripts/MongoDB/Navigations.js similarity index 100% rename from DatabaseScripts/MongoDB/Navigations.js rename to scripts/MongoDB/Navigations.js diff --git a/DatabaseScripts/MongoDB/Roles.js b/scripts/MongoDB/Roles.js similarity index 100% rename from DatabaseScripts/MongoDB/Roles.js rename to scripts/MongoDB/Roles.js diff --git a/DatabaseScripts/MongoDB/Users.js b/scripts/MongoDB/Users.js similarity index 100% rename from DatabaseScripts/MongoDB/Users.js rename to scripts/MongoDB/Users.js diff --git a/DatabaseScripts/MongoDB/init.js b/scripts/MongoDB/init.js similarity index 100% rename from DatabaseScripts/MongoDB/init.js rename to scripts/MongoDB/init.js diff --git a/DatabaseScripts/MongoDB/install.sh b/scripts/MongoDB/install.sh similarity index 100% rename from DatabaseScripts/MongoDB/install.sh rename to scripts/MongoDB/install.sh diff --git a/DatabaseScripts/MySQL/initData.sql b/scripts/MySQL/initData.sql similarity index 100% rename from DatabaseScripts/MySQL/initData.sql rename to scripts/MySQL/initData.sql diff --git a/DatabaseScripts/MySQL/install.sh b/scripts/MySQL/install.sh similarity index 100% rename from DatabaseScripts/MySQL/install.sh rename to scripts/MySQL/install.sh diff --git a/DatabaseScripts/MySQL/install.sql b/scripts/MySQL/install.sql similarity index 100% rename from DatabaseScripts/MySQL/install.sql rename to scripts/MySQL/install.sql diff --git a/DatabaseScripts/MySQL/my.ini b/scripts/MySQL/my.ini similarity index 100% rename from DatabaseScripts/MySQL/my.ini rename to scripts/MySQL/my.ini diff --git a/DatabaseScripts/Postgresql/initData.sql b/scripts/Postgresql/initData.sql similarity index 100% rename from DatabaseScripts/Postgresql/initData.sql rename to scripts/Postgresql/initData.sql diff --git a/DatabaseScripts/Postgresql/install.ps1 b/scripts/Postgresql/install.ps1 similarity index 100% rename from DatabaseScripts/Postgresql/install.ps1 rename to scripts/Postgresql/install.ps1 diff --git a/DatabaseScripts/Postgresql/install.sql b/scripts/Postgresql/install.sql similarity index 100% rename from DatabaseScripts/Postgresql/install.sql rename to scripts/Postgresql/install.sql diff --git a/DatabaseScripts/SQLite/InitData.sql b/scripts/SQLite/InitData.sql similarity index 100% rename from DatabaseScripts/SQLite/InitData.sql rename to scripts/SQLite/InitData.sql diff --git a/DatabaseScripts/SQLite/Install.sql b/scripts/SQLite/Install.sql similarity index 100% rename from DatabaseScripts/SQLite/Install.sql rename to scripts/SQLite/Install.sql diff --git a/DatabaseScripts/SqlServer/InitData.sql b/scripts/SqlServer/InitData.sql similarity index 100% rename from DatabaseScripts/SqlServer/InitData.sql rename to scripts/SqlServer/InitData.sql diff --git a/DatabaseScripts/SqlServer/Install.sql b/scripts/SqlServer/Install.sql similarity index 100% rename from DatabaseScripts/SqlServer/Install.sql rename to scripts/SqlServer/Install.sql diff --git a/DatabaseScripts/SqlServer/install.ps1 b/scripts/SqlServer/install.ps1 similarity index 100% rename from DatabaseScripts/SqlServer/install.ps1 rename to scripts/SqlServer/install.ps1 diff --git a/scripts/admin.sh b/scripts/admin.sh new file mode 100644 index 00000000..00fe27b0 --- /dev/null +++ b/scripts/admin.sh @@ -0,0 +1,11 @@ +#! /bin/bash + +cd ~/BootstrapAdmin +git pull +dotnet publish src/admin/Bootstrap.Admin -c Release + +rm -f ~/BootstrapAdmin/src/admin/Bootstrap.Admin/bin/Release/netcoreapp2.2/publish/appsettings*.json +systemctl stop ba.admin +\cp -fr ~/BootstrapAdmin/src/admin/Bootstrap.Admin/bin/Release/netcoreapp2.2/publish/* /usr/local/ba/admin/ +systemctl start ba.admin +systemctl status ba.admin diff --git a/scripts/client.sh b/scripts/client.sh new file mode 100644 index 00000000..ad926b27 --- /dev/null +++ b/scripts/client.sh @@ -0,0 +1,11 @@ +#! /bin/bash + +cd ~/BootstrapAdmin +git pull +dotnet publish src/client/Bootstrap.Client -c Release + +rm -f ~/BootstrapAdmin/src/client/Bootstrap.Client/bin/Release/netcoreapp2.2/publish/appsettings*.json +systemctl stop ba.client +\cp -fr ~/BootstrapAdmin/src/client/Bootstrap.Client/bin/Release/netcoreapp2.2/publish/* /usr/local/ba/client/ +systemctl start ba.client +systemctl status ba.client diff --git a/Keys/Longbow.Utility.snk b/src/Keys/Longbow.Utility.snk similarity index 100% rename from Keys/Longbow.Utility.snk rename to src/Keys/Longbow.Utility.snk diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj similarity index 100% rename from Bootstrap.Admin/Bootstrap.Admin.csproj rename to src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj diff --git a/Bootstrap.Admin/BootstrapAdmin.db b/src/admin/Bootstrap.Admin/BootstrapAdmin.db similarity index 87% rename from Bootstrap.Admin/BootstrapAdmin.db rename to src/admin/Bootstrap.Admin/BootstrapAdmin.db index f3022eec..dcb4bafb 100644 Binary files a/Bootstrap.Admin/BootstrapAdmin.db and b/src/admin/Bootstrap.Admin/BootstrapAdmin.db differ diff --git a/Bootstrap.Admin/Controllers/AccountController.cs b/src/admin/Bootstrap.Admin/Controllers/AccountController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/AccountController.cs rename to src/admin/Bootstrap.Admin/Controllers/AccountController.cs diff --git a/Bootstrap.Admin/Controllers/AdminController.cs b/src/admin/Bootstrap.Admin/Controllers/AdminController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/AdminController.cs rename to src/admin/Bootstrap.Admin/Controllers/AdminController.cs diff --git a/Bootstrap.Admin/Controllers/Api/AnalyseController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/AnalyseController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/AnalyseController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/AnalyseController.cs diff --git a/Bootstrap.Admin/Controllers/Api/AppsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/AppsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/AppsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/AppsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/CategoryController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/CategoryController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/CategoryController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/CategoryController.cs diff --git a/Bootstrap.Admin/Controllers/Api/DictsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/DictsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/DictsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/DictsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/ExceptionsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/ExceptionsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/ExceptionsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/ExceptionsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/GiteeController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/GiteeController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/GiteeController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/GiteeController.cs diff --git a/Bootstrap.Admin/Controllers/Api/GroupsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/GroupsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/GroupsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/GroupsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/InterfaceController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/InterfaceController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/InterfaceController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/InterfaceController.cs diff --git a/Bootstrap.Admin/Controllers/Api/LoginController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/LoginController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/LoginController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/LoginController.cs diff --git a/Bootstrap.Admin/Controllers/Api/LogsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/LogsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/LogsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/LogsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/MenusController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/MenusController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/MenusController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/MenusController.cs diff --git a/Bootstrap.Admin/Controllers/Api/MessagesController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/MessagesController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/MessagesController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/MessagesController.cs diff --git a/Bootstrap.Admin/Controllers/Api/NewController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/NewController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/NewController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/NewController.cs diff --git a/Bootstrap.Admin/Controllers/Api/NotificationsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/NotificationsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/NotificationsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/NotificationsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/OnlineUsersController.cs diff --git a/Bootstrap.Admin/Controllers/Api/ProfilesController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/ProfilesController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/ProfilesController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/ProfilesController.cs diff --git a/Bootstrap.Admin/Controllers/Api/RegisterController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/RegisterController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/RegisterController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/RegisterController.cs diff --git a/Bootstrap.Admin/Controllers/Api/RolesController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/RolesController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/RolesController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/RolesController.cs diff --git a/Bootstrap.Admin/Controllers/Api/SettingsController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/SettingsController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/SettingsController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/SettingsController.cs diff --git a/Bootstrap.Admin/Controllers/Api/TasksController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/TasksController.cs similarity index 94% rename from Bootstrap.Admin/Controllers/Api/TasksController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/TasksController.cs index 58e0e4c2..2f62fddb 100644 --- a/Bootstrap.Admin/Controllers/Api/TasksController.cs +++ b/src/admin/Bootstrap.Admin/Controllers/Api/TasksController.cs @@ -1,9 +1,7 @@ using Longbow.Tasks; using Microsoft.AspNetCore.Mvc; -using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; namespace Bootstrap.Admin.Controllers.Api { diff --git a/Bootstrap.Admin/Controllers/Api/TasksLogController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/TasksLogController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/TasksLogController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/TasksLogController.cs diff --git a/Bootstrap.Admin/Controllers/Api/TracesController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/TracesController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/TracesController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/TracesController.cs diff --git a/Bootstrap.Admin/Controllers/Api/UsersController.cs b/src/admin/Bootstrap.Admin/Controllers/Api/UsersController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/Api/UsersController.cs rename to src/admin/Bootstrap.Admin/Controllers/Api/UsersController.cs diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/src/admin/Bootstrap.Admin/Controllers/HomeController.cs similarity index 100% rename from Bootstrap.Admin/Controllers/HomeController.cs rename to src/admin/Bootstrap.Admin/Controllers/HomeController.cs diff --git a/Bootstrap.Admin/Dockerfile b/src/admin/Bootstrap.Admin/Dockerfile similarity index 100% rename from Bootstrap.Admin/Dockerfile rename to src/admin/Bootstrap.Admin/Dockerfile diff --git a/Bootstrap.Admin/HealthChecks/DBHealthCheck.cs b/src/admin/Bootstrap.Admin/HealthChecks/DBHealthCheck.cs similarity index 100% rename from Bootstrap.Admin/HealthChecks/DBHealthCheck.cs rename to src/admin/Bootstrap.Admin/HealthChecks/DBHealthCheck.cs diff --git a/Bootstrap.Admin/HealthChecks/GiteeHttpClient.cs b/src/admin/Bootstrap.Admin/HealthChecks/GiteeHttpClient.cs similarity index 100% rename from Bootstrap.Admin/HealthChecks/GiteeHttpClient.cs rename to src/admin/Bootstrap.Admin/HealthChecks/GiteeHttpClient.cs diff --git a/Bootstrap.Admin/HealthChecks/GiteeHttpHealthCheck.cs b/src/admin/Bootstrap.Admin/HealthChecks/GiteeHttpHealthCheck.cs similarity index 100% rename from Bootstrap.Admin/HealthChecks/GiteeHttpHealthCheck.cs rename to src/admin/Bootstrap.Admin/HealthChecks/GiteeHttpHealthCheck.cs diff --git a/Bootstrap.Admin/HealthChecks/HealthChecksBuilderExtensions.cs b/src/admin/Bootstrap.Admin/HealthChecks/HealthChecksBuilderExtensions.cs similarity index 100% rename from Bootstrap.Admin/HealthChecks/HealthChecksBuilderExtensions.cs rename to src/admin/Bootstrap.Admin/HealthChecks/HealthChecksBuilderExtensions.cs diff --git a/Bootstrap.Admin/HttpHeaderOperation.cs b/src/admin/Bootstrap.Admin/HttpHeaderOperation.cs similarity index 100% rename from Bootstrap.Admin/HttpHeaderOperation.cs rename to src/admin/Bootstrap.Admin/HttpHeaderOperation.cs diff --git a/Bootstrap.Admin/Linux.Dockerfile b/src/admin/Bootstrap.Admin/Linux.Dockerfile similarity index 100% rename from Bootstrap.Admin/Linux.Dockerfile rename to src/admin/Bootstrap.Admin/Linux.Dockerfile diff --git a/Bootstrap.Admin/Models/ErrorModel.cs b/src/admin/Bootstrap.Admin/Models/ErrorModel.cs similarity index 100% rename from Bootstrap.Admin/Models/ErrorModel.cs rename to src/admin/Bootstrap.Admin/Models/ErrorModel.cs diff --git a/Bootstrap.Admin/Models/HeaderBarModel.cs b/src/admin/Bootstrap.Admin/Models/HeaderBarModel.cs similarity index 100% rename from Bootstrap.Admin/Models/HeaderBarModel.cs rename to src/admin/Bootstrap.Admin/Models/HeaderBarModel.cs diff --git a/Bootstrap.Admin/Models/LockModel.cs b/src/admin/Bootstrap.Admin/Models/LockModel.cs similarity index 100% rename from Bootstrap.Admin/Models/LockModel.cs rename to src/admin/Bootstrap.Admin/Models/LockModel.cs diff --git a/Bootstrap.Admin/Models/LoginModel.cs b/src/admin/Bootstrap.Admin/Models/LoginModel.cs similarity index 100% rename from Bootstrap.Admin/Models/LoginModel.cs rename to src/admin/Bootstrap.Admin/Models/LoginModel.cs diff --git a/Bootstrap.Admin/Models/MessageCountModel.cs b/src/admin/Bootstrap.Admin/Models/MessageCountModel.cs similarity index 100% rename from Bootstrap.Admin/Models/MessageCountModel.cs rename to src/admin/Bootstrap.Admin/Models/MessageCountModel.cs diff --git a/Bootstrap.Admin/Models/ModelBase.cs b/src/admin/Bootstrap.Admin/Models/ModelBase.cs similarity index 100% rename from Bootstrap.Admin/Models/ModelBase.cs rename to src/admin/Bootstrap.Admin/Models/ModelBase.cs diff --git a/Bootstrap.Admin/Models/NavigatorBarModel.cs b/src/admin/Bootstrap.Admin/Models/NavigatorBarModel.cs similarity index 100% rename from Bootstrap.Admin/Models/NavigatorBarModel.cs rename to src/admin/Bootstrap.Admin/Models/NavigatorBarModel.cs diff --git a/Bootstrap.Admin/Models/ProfilesModel.cs b/src/admin/Bootstrap.Admin/Models/ProfilesModel.cs similarity index 100% rename from Bootstrap.Admin/Models/ProfilesModel.cs rename to src/admin/Bootstrap.Admin/Models/ProfilesModel.cs diff --git a/Bootstrap.Admin/Models/TaskModel.cs b/src/admin/Bootstrap.Admin/Models/TaskModel.cs similarity index 100% rename from Bootstrap.Admin/Models/TaskModel.cs rename to src/admin/Bootstrap.Admin/Models/TaskModel.cs diff --git a/Bootstrap.Admin/Models/ThemeModel.cs b/src/admin/Bootstrap.Admin/Models/ThemeModel.cs similarity index 100% rename from Bootstrap.Admin/Models/ThemeModel.cs rename to src/admin/Bootstrap.Admin/Models/ThemeModel.cs diff --git a/Bootstrap.Admin/Program.cs b/src/admin/Bootstrap.Admin/Program.cs similarity index 100% rename from Bootstrap.Admin/Program.cs rename to src/admin/Bootstrap.Admin/Program.cs diff --git a/Bootstrap.Admin/Properties/launchSettings.json b/src/admin/Bootstrap.Admin/Properties/launchSettings.json similarity index 100% rename from Bootstrap.Admin/Properties/launchSettings.json rename to src/admin/Bootstrap.Admin/Properties/launchSettings.json diff --git a/Bootstrap.Admin/Query/QueryDictOption.cs b/src/admin/Bootstrap.Admin/Query/QueryDictOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryDictOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryDictOption.cs diff --git a/Bootstrap.Admin/Query/QueryExceptionOption.cs b/src/admin/Bootstrap.Admin/Query/QueryExceptionOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryExceptionOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryExceptionOption.cs diff --git a/Bootstrap.Admin/Query/QueryGroupOption.cs b/src/admin/Bootstrap.Admin/Query/QueryGroupOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryGroupOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryGroupOption.cs diff --git a/Bootstrap.Admin/Query/QueryLogOption.cs b/src/admin/Bootstrap.Admin/Query/QueryLogOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryLogOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryLogOption.cs diff --git a/Bootstrap.Admin/Query/QueryLoginOption.cs b/src/admin/Bootstrap.Admin/Query/QueryLoginOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryLoginOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryLoginOption.cs diff --git a/Bootstrap.Admin/Query/QueryMenuOption.cs b/src/admin/Bootstrap.Admin/Query/QueryMenuOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryMenuOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryMenuOption.cs diff --git a/Bootstrap.Admin/Query/QueryRoleOption.cs b/src/admin/Bootstrap.Admin/Query/QueryRoleOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryRoleOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryRoleOption.cs diff --git a/Bootstrap.Admin/Query/QueryTraceOptions.cs b/src/admin/Bootstrap.Admin/Query/QueryTraceOptions.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryTraceOptions.cs rename to src/admin/Bootstrap.Admin/Query/QueryTraceOptions.cs diff --git a/Bootstrap.Admin/Query/QueryUserOption.cs b/src/admin/Bootstrap.Admin/Query/QueryUserOption.cs similarity index 100% rename from Bootstrap.Admin/Query/QueryUserOption.cs rename to src/admin/Bootstrap.Admin/Query/QueryUserOption.cs diff --git a/Bootstrap.Admin/SignalRExtensions.cs b/src/admin/Bootstrap.Admin/SignalRExtensions.cs similarity index 100% rename from Bootstrap.Admin/SignalRExtensions.cs rename to src/admin/Bootstrap.Admin/SignalRExtensions.cs diff --git a/Bootstrap.Admin/Startup.cs b/src/admin/Bootstrap.Admin/Startup.cs similarity index 100% rename from Bootstrap.Admin/Startup.cs rename to src/admin/Bootstrap.Admin/Startup.cs diff --git a/Bootstrap.Admin/SwaggerExtensions.cs b/src/admin/Bootstrap.Admin/SwaggerExtensions.cs similarity index 100% rename from Bootstrap.Admin/SwaggerExtensions.cs rename to src/admin/Bootstrap.Admin/SwaggerExtensions.cs diff --git a/Bootstrap.Admin/TaskLogHub.cs b/src/admin/Bootstrap.Admin/TaskLogHub.cs similarity index 100% rename from Bootstrap.Admin/TaskLogHub.cs rename to src/admin/Bootstrap.Admin/TaskLogHub.cs diff --git a/Bootstrap.Admin/Tasks/TasksExtensions.cs b/src/admin/Bootstrap.Admin/Tasks/TasksExtensions.cs similarity index 100% rename from Bootstrap.Admin/Tasks/TasksExtensions.cs rename to src/admin/Bootstrap.Admin/Tasks/TasksExtensions.cs diff --git a/Bootstrap.Admin/Views/Account/Lock.cshtml b/src/admin/Bootstrap.Admin/Views/Account/Lock.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Account/Lock.cshtml rename to src/admin/Bootstrap.Admin/Views/Account/Lock.cshtml diff --git a/Bootstrap.Admin/Views/Account/Login.cshtml b/src/admin/Bootstrap.Admin/Views/Account/Login.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Account/Login.cshtml rename to src/admin/Bootstrap.Admin/Views/Account/Login.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Analyse.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Analyse.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Analyse.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Analyse.cshtml diff --git a/Bootstrap.Admin/Views/Admin/AwesomeIcon.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/AwesomeIcon.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/AwesomeIcon.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/AwesomeIcon.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Dicts.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Dicts.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Dicts.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Exceptions.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Exceptions.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Exceptions.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Exceptions.cshtml diff --git a/Bootstrap.Admin/Views/Admin/FAIcon.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/FAIcon.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/FAIcon.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/FAIcon.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Groups.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Groups.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Groups.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Groups.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Healths.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Healths.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Healths.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Healths.cshtml diff --git a/Bootstrap.Admin/Views/Admin/IconView.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/IconView.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/IconView.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/IconView.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Index.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Index.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Index.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Index.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Logins.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Logins.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Logins.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Logins.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Logs.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Logs.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Logs.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Logs.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Menus.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Menus.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Menus.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Messages.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Messages.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Messages.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Messages.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Mobile.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Mobile.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Mobile.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Mobile.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Notifications.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Notifications.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Notifications.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Notifications.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Online.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Online.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Online.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Online.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Profiles.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Profiles.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Profiles.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Profiles.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Roles.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Roles.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Roles.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Roles.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Settings.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Settings.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Settings.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Tasks.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Tasks.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Tasks.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Tasks.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Traces.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Traces.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Traces.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Traces.cshtml diff --git a/Bootstrap.Admin/Views/Admin/Users.cshtml b/src/admin/Bootstrap.Admin/Views/Admin/Users.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Admin/Users.cshtml rename to src/admin/Bootstrap.Admin/Views/Admin/Users.cshtml diff --git a/Bootstrap.Admin/Views/Home/Index.cshtml b/src/admin/Bootstrap.Admin/Views/Home/Index.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Home/Index.cshtml rename to src/admin/Bootstrap.Admin/Views/Home/Index.cshtml diff --git a/Bootstrap.Admin/Views/Shared/AppConfig.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/AppConfig.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/AppConfig.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/AppConfig.cshtml diff --git a/Bootstrap.Admin/Views/Shared/Error.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/Error.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/Error.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/Error.cshtml diff --git a/Bootstrap.Admin/Views/Shared/Footer.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/Footer.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/Footer.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/Footer.cshtml diff --git a/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/GroupConfig.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/GroupConfig.cshtml diff --git a/Bootstrap.Admin/Views/Shared/Header.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/Header.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml diff --git a/Bootstrap.Admin/Views/Shared/Navigator.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/Navigator.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/Navigator.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/Navigator.cshtml diff --git a/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml diff --git a/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/RoleConfig.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/RoleConfig.cshtml diff --git a/Bootstrap.Admin/Views/Shared/SubNavItem.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/SubNavItem.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/SubNavItem.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/SubNavItem.cshtml diff --git a/Bootstrap.Admin/Views/Shared/SubNavigation.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/SubNavigation.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/SubNavigation.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/SubNavigation.cshtml diff --git a/Bootstrap.Admin/Views/Shared/UserConfig.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/UserConfig.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/UserConfig.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/UserConfig.cshtml diff --git a/Bootstrap.Admin/Views/Shared/_Admin.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/_Admin.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/_Admin.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/_Admin.cshtml diff --git a/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/_Bootstrap.cshtml diff --git a/Bootstrap.Admin/Views/Shared/_Default.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/_Default.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/_Default.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/_Default.cshtml diff --git a/Bootstrap.Admin/Views/Shared/_Layout.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml similarity index 100% rename from Bootstrap.Admin/Views/Shared/_Layout.cshtml rename to src/admin/Bootstrap.Admin/Views/Shared/_Layout.cshtml diff --git a/Bootstrap.Admin/Views/_ViewImports.cshtml b/src/admin/Bootstrap.Admin/Views/_ViewImports.cshtml similarity index 60% rename from Bootstrap.Admin/Views/_ViewImports.cshtml rename to src/admin/Bootstrap.Admin/Views/_ViewImports.cshtml index ec573688..c33b8959 100644 --- a/Bootstrap.Admin/Views/_ViewImports.cshtml +++ b/src/admin/Bootstrap.Admin/Views/_ViewImports.cshtml @@ -1,4 +1,4 @@ -@using Bootstrap.Admin.Models +@using Bootstrap.Admin.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Bootstrap.Security.Mvc @addTagHelper *, Longbow.Web \ No newline at end of file diff --git a/Bootstrap.Admin/Views/_ViewStart.cshtml b/src/admin/Bootstrap.Admin/Views/_ViewStart.cshtml similarity index 100% rename from Bootstrap.Admin/Views/_ViewStart.cshtml rename to src/admin/Bootstrap.Admin/Views/_ViewStart.cshtml diff --git a/Bootstrap.Admin/appsettings.Development.json b/src/admin/Bootstrap.Admin/appsettings.Development.json similarity index 100% rename from Bootstrap.Admin/appsettings.Development.json rename to src/admin/Bootstrap.Admin/appsettings.Development.json diff --git a/Bootstrap.Admin/appsettings.json b/src/admin/Bootstrap.Admin/appsettings.json similarity index 100% rename from Bootstrap.Admin/appsettings.json rename to src/admin/Bootstrap.Admin/appsettings.json diff --git a/Bootstrap.Admin/libman.json b/src/admin/Bootstrap.Admin/libman.json similarity index 100% rename from Bootstrap.Admin/libman.json rename to src/admin/Bootstrap.Admin/libman.json diff --git a/Bootstrap.Admin/wwwroot/browser/readme.txt b/src/admin/Bootstrap.Admin/wwwroot/browser/readme.txt similarity index 100% rename from Bootstrap.Admin/wwwroot/browser/readme.txt rename to src/admin/Bootstrap.Admin/wwwroot/browser/readme.txt diff --git a/Bootstrap.Admin/wwwroot/css/IE8.css b/src/admin/Bootstrap.Admin/wwwroot/css/IE8.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/IE8.css rename to src/admin/Bootstrap.Admin/wwwroot/css/IE8.css diff --git a/Bootstrap.Admin/wwwroot/css/black.css b/src/admin/Bootstrap.Admin/wwwroot/css/black.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/black.css rename to src/admin/Bootstrap.Admin/wwwroot/css/black.css diff --git a/Bootstrap.Admin/wwwroot/css/blue.css b/src/admin/Bootstrap.Admin/wwwroot/css/blue.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/blue.css rename to src/admin/Bootstrap.Admin/wwwroot/css/blue.css diff --git a/Bootstrap.Admin/wwwroot/css/error.css b/src/admin/Bootstrap.Admin/wwwroot/css/error.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/error.css rename to src/admin/Bootstrap.Admin/wwwroot/css/error.css diff --git a/Bootstrap.Admin/wwwroot/css/fa.css b/src/admin/Bootstrap.Admin/wwwroot/css/fa.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/fa.css rename to src/admin/Bootstrap.Admin/wwwroot/css/fa.css diff --git a/Bootstrap.Admin/wwwroot/css/lock.css b/src/admin/Bootstrap.Admin/wwwroot/css/lock.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/lock.css rename to src/admin/Bootstrap.Admin/wwwroot/css/lock.css diff --git a/Bootstrap.Admin/wwwroot/css/login-responsive.css b/src/admin/Bootstrap.Admin/wwwroot/css/login-responsive.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/login-responsive.css rename to src/admin/Bootstrap.Admin/wwwroot/css/login-responsive.css diff --git a/Bootstrap.Admin/wwwroot/css/login.css b/src/admin/Bootstrap.Admin/wwwroot/css/login.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/login.css rename to src/admin/Bootstrap.Admin/wwwroot/css/login.css diff --git a/Bootstrap.Admin/wwwroot/css/lte.css b/src/admin/Bootstrap.Admin/wwwroot/css/lte.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/lte.css rename to src/admin/Bootstrap.Admin/wwwroot/css/lte.css diff --git a/Bootstrap.Admin/wwwroot/css/site-responsive.css b/src/admin/Bootstrap.Admin/wwwroot/css/site-responsive.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/site-responsive.css rename to src/admin/Bootstrap.Admin/wwwroot/css/site-responsive.css diff --git a/Bootstrap.Admin/wwwroot/css/site.css b/src/admin/Bootstrap.Admin/wwwroot/css/site.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/site.css rename to src/admin/Bootstrap.Admin/wwwroot/css/site.css diff --git a/Bootstrap.Admin/wwwroot/css/tasks.css b/src/admin/Bootstrap.Admin/wwwroot/css/tasks.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/tasks.css rename to src/admin/Bootstrap.Admin/wwwroot/css/tasks.css diff --git a/Bootstrap.Admin/wwwroot/css/theme-responsive.css b/src/admin/Bootstrap.Admin/wwwroot/css/theme-responsive.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/theme-responsive.css rename to src/admin/Bootstrap.Admin/wwwroot/css/theme-responsive.css diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/src/admin/Bootstrap.Admin/wwwroot/css/theme.css similarity index 100% rename from Bootstrap.Admin/wwwroot/css/theme.css rename to src/admin/Bootstrap.Admin/wwwroot/css/theme.css diff --git a/Bootstrap.Admin/wwwroot/favicon.ico b/src/admin/Bootstrap.Admin/wwwroot/favicon.ico similarity index 100% rename from Bootstrap.Admin/wwwroot/favicon.ico rename to src/admin/Bootstrap.Admin/wwwroot/favicon.ico diff --git a/Bootstrap.Admin/wwwroot/favicon.png b/src/admin/Bootstrap.Admin/wwwroot/favicon.png similarity index 100% rename from Bootstrap.Admin/wwwroot/favicon.png rename to src/admin/Bootstrap.Admin/wwwroot/favicon.png diff --git a/Bootstrap.Admin/wwwroot/html/Healths-UI.html b/src/admin/Bootstrap.Admin/wwwroot/html/Healths-UI.html similarity index 100% rename from Bootstrap.Admin/wwwroot/html/Healths-UI.html rename to src/admin/Bootstrap.Admin/wwwroot/html/Healths-UI.html diff --git a/Bootstrap.Admin/wwwroot/html/index.html b/src/admin/Bootstrap.Admin/wwwroot/html/index.html similarity index 100% rename from Bootstrap.Admin/wwwroot/html/index.html rename to src/admin/Bootstrap.Admin/wwwroot/html/index.html diff --git a/Bootstrap.Admin/wwwroot/images/404_icon.png b/src/admin/Bootstrap.Admin/wwwroot/images/404_icon.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/404_icon.png rename to src/admin/Bootstrap.Admin/wwwroot/images/404_icon.png diff --git a/Bootstrap.Admin/wwwroot/images/bg.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/bg.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/bg.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/bg.jpg diff --git a/Bootstrap.Admin/wwwroot/images/bg2.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/bg2.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/bg2.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/bg2.jpg diff --git a/Bootstrap.Admin/wwwroot/images/bg3.png b/src/admin/Bootstrap.Admin/wwwroot/images/bg3.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/bg3.png rename to src/admin/Bootstrap.Admin/wwwroot/images/bg3.png diff --git a/Bootstrap.Admin/wwwroot/images/bg4.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/bg4.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/bg4.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/bg4.jpg diff --git a/Bootstrap.Admin/wwwroot/images/error.png b/src/admin/Bootstrap.Admin/wwwroot/images/error.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/error.png rename to src/admin/Bootstrap.Admin/wwwroot/images/error.png diff --git a/Bootstrap.Admin/wwwroot/images/error_icon.png b/src/admin/Bootstrap.Admin/wwwroot/images/error_icon.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/error_icon.png rename to src/admin/Bootstrap.Admin/wwwroot/images/error_icon.png diff --git a/Bootstrap.Admin/wwwroot/images/loading-sm.gif b/src/admin/Bootstrap.Admin/wwwroot/images/loading-sm.gif similarity index 100% rename from Bootstrap.Admin/wwwroot/images/loading-sm.gif rename to src/admin/Bootstrap.Admin/wwwroot/images/loading-sm.gif diff --git a/Bootstrap.Admin/wwwroot/images/lock-bg.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/lock-bg.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/lock-bg.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/lock-bg.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo1.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo1.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo1.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo1.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo2.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo2.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo2.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo2.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo3.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo3.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo3.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo3.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo4.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo4.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo4.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo4.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo5.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo5.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo5.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo5.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo6.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/logo6.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo6.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/logo6.jpg diff --git a/Bootstrap.Admin/wwwroot/images/logo7.png b/src/admin/Bootstrap.Admin/wwwroot/images/logo7.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/logo7.png rename to src/admin/Bootstrap.Admin/wwwroot/images/logo7.png diff --git a/Bootstrap.Admin/wwwroot/images/nav-expand.png b/src/admin/Bootstrap.Admin/wwwroot/images/nav-expand.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/nav-expand.png rename to src/admin/Bootstrap.Admin/wwwroot/images/nav-expand.png diff --git a/Bootstrap.Admin/wwwroot/images/success.png b/src/admin/Bootstrap.Admin/wwwroot/images/success.png similarity index 100% rename from Bootstrap.Admin/wwwroot/images/success.png rename to src/admin/Bootstrap.Admin/wwwroot/images/success.png diff --git a/Bootstrap.Admin/wwwroot/images/uploader/default.jpg b/src/admin/Bootstrap.Admin/wwwroot/images/uploader/default.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/images/uploader/default.jpg rename to src/admin/Bootstrap.Admin/wwwroot/images/uploader/default.jpg diff --git a/Bootstrap.Admin/wwwroot/js/analyse.js b/src/admin/Bootstrap.Admin/wwwroot/js/analyse.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/analyse.js rename to src/admin/Bootstrap.Admin/wwwroot/js/analyse.js diff --git a/Bootstrap.Admin/wwwroot/js/common-scripts.js b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/common-scripts.js rename to src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js diff --git a/Bootstrap.Admin/wwwroot/js/dicts.js b/src/admin/Bootstrap.Admin/wwwroot/js/dicts.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/dicts.js rename to src/admin/Bootstrap.Admin/wwwroot/js/dicts.js diff --git a/Bootstrap.Admin/wwwroot/js/error.js b/src/admin/Bootstrap.Admin/wwwroot/js/error.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/error.js rename to src/admin/Bootstrap.Admin/wwwroot/js/error.js diff --git a/Bootstrap.Admin/wwwroot/js/exceptions.js b/src/admin/Bootstrap.Admin/wwwroot/js/exceptions.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/exceptions.js rename to src/admin/Bootstrap.Admin/wwwroot/js/exceptions.js diff --git a/Bootstrap.Admin/wwwroot/js/groups.js b/src/admin/Bootstrap.Admin/wwwroot/js/groups.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/groups.js rename to src/admin/Bootstrap.Admin/wwwroot/js/groups.js diff --git a/Bootstrap.Admin/wwwroot/js/healths.js b/src/admin/Bootstrap.Admin/wwwroot/js/healths.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/healths.js rename to src/admin/Bootstrap.Admin/wwwroot/js/healths.js diff --git a/Bootstrap.Admin/wwwroot/js/icon.js b/src/admin/Bootstrap.Admin/wwwroot/js/icon.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/icon.js rename to src/admin/Bootstrap.Admin/wwwroot/js/icon.js diff --git a/Bootstrap.Admin/wwwroot/js/lock.js b/src/admin/Bootstrap.Admin/wwwroot/js/lock.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/lock.js rename to src/admin/Bootstrap.Admin/wwwroot/js/lock.js diff --git a/Bootstrap.Admin/wwwroot/js/log.js b/src/admin/Bootstrap.Admin/wwwroot/js/log.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/log.js rename to src/admin/Bootstrap.Admin/wwwroot/js/log.js diff --git a/Bootstrap.Admin/wwwroot/js/login.js b/src/admin/Bootstrap.Admin/wwwroot/js/login.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/login.js rename to src/admin/Bootstrap.Admin/wwwroot/js/login.js diff --git a/Bootstrap.Admin/wwwroot/js/logins.js b/src/admin/Bootstrap.Admin/wwwroot/js/logins.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/logins.js rename to src/admin/Bootstrap.Admin/wwwroot/js/logins.js diff --git a/Bootstrap.Admin/wwwroot/js/logs.js b/src/admin/Bootstrap.Admin/wwwroot/js/logs.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/logs.js rename to src/admin/Bootstrap.Admin/wwwroot/js/logs.js diff --git a/Bootstrap.Admin/wwwroot/js/menus.js b/src/admin/Bootstrap.Admin/wwwroot/js/menus.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/menus.js rename to src/admin/Bootstrap.Admin/wwwroot/js/menus.js diff --git a/Bootstrap.Admin/wwwroot/js/message.js b/src/admin/Bootstrap.Admin/wwwroot/js/message.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/message.js rename to src/admin/Bootstrap.Admin/wwwroot/js/message.js diff --git a/Bootstrap.Admin/wwwroot/js/noti.js b/src/admin/Bootstrap.Admin/wwwroot/js/noti.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/noti.js rename to src/admin/Bootstrap.Admin/wwwroot/js/noti.js diff --git a/Bootstrap.Admin/wwwroot/js/online.js b/src/admin/Bootstrap.Admin/wwwroot/js/online.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/online.js rename to src/admin/Bootstrap.Admin/wwwroot/js/online.js diff --git a/Bootstrap.Admin/wwwroot/js/profiles.js b/src/admin/Bootstrap.Admin/wwwroot/js/profiles.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/profiles.js rename to src/admin/Bootstrap.Admin/wwwroot/js/profiles.js diff --git a/Bootstrap.Admin/wwwroot/js/roles.js b/src/admin/Bootstrap.Admin/wwwroot/js/roles.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/roles.js rename to src/admin/Bootstrap.Admin/wwwroot/js/roles.js diff --git a/Bootstrap.Admin/wwwroot/js/settings.js b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/settings.js rename to src/admin/Bootstrap.Admin/wwwroot/js/settings.js diff --git a/Bootstrap.Admin/wwwroot/js/tasks.js b/src/admin/Bootstrap.Admin/wwwroot/js/tasks.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/tasks.js rename to src/admin/Bootstrap.Admin/wwwroot/js/tasks.js diff --git a/Bootstrap.Admin/wwwroot/js/traces.js b/src/admin/Bootstrap.Admin/wwwroot/js/traces.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/traces.js rename to src/admin/Bootstrap.Admin/wwwroot/js/traces.js diff --git a/Bootstrap.Admin/wwwroot/js/users.js b/src/admin/Bootstrap.Admin/wwwroot/js/users.js similarity index 100% rename from Bootstrap.Admin/wwwroot/js/users.js rename to src/admin/Bootstrap.Admin/wwwroot/js/users.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-3-typeahead/bootstrap3-typeahead.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.css b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.css diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/css/fileinput.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading-sm.gif b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading-sm.gif similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading-sm.gif rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading-sm.gif diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading.gif b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading.gif similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading.gif rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/img/loading.gif diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/fileinput.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js.map b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/js/locales/zh.min.js.map diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-fileinput/themes/fa/theme.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.css b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.css diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/bootstrap-table.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js diff --git a/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic0.jpg b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic0.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/images/Pic0.jpg rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic0.jpg diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic1.jpg b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic1.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/images/Pic1.jpg rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic1.jpg diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic2.jpg b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic2.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/images/Pic2.jpg rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic2.jpg diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic3.jpg b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic3.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/images/Pic3.jpg rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic3.jpg diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic4.jpg b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic4.jpg similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/images/Pic4.jpg rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/images/Pic4.jpg diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js diff --git a/Bootstrap.Admin/wwwroot/lib/captcha/slidercaptcha.css b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/slidercaptcha.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/captcha/slidercaptcha.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/captcha/slidercaptcha.css diff --git a/Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css b/src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css diff --git a/Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js b/src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js diff --git a/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js b/src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js diff --git a/Bootstrap.Admin/wwwroot/lib/echart/echarts-all.js b/src/admin/Bootstrap.Admin/wwwroot/lib/echart/echarts-all.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/echart/echarts-all.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/echart/echarts-all.js diff --git a/Bootstrap.Admin/wwwroot/lib/echart/echarts-all.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/echart/echarts-all.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/echart/echarts-all.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/echart/echarts-all.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css.map b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.css.map diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/css/font-awesome.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/FontAwesome.otf b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/FontAwesome.otf rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/FontAwesome.otf diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff diff --git a/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 b/src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 rename to src/admin/Bootstrap.Admin/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/Bootstrap.Admin/wwwroot/lib/jquery/jquery.js b/src/admin/Bootstrap.Admin/wwwroot/lib/jquery/jquery.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/jquery/jquery.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/jquery/jquery.js diff --git a/Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.map b/src/admin/Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/jquery/jquery.min.map diff --git a/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css diff --git a/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.js b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.js diff --git a/Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.css b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.css diff --git a/Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.js b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow-select/longbow-select.js diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.dataentity.js diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.validate.js b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.validate.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/longbow/longbow.validate.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.validate.js diff --git a/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.css b/src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.css diff --git a/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.js b/src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.js diff --git a/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/nestable2/jquery.nestable.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.css b/src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.css diff --git a/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.js b/src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.js diff --git a/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/nprogress/nprogress.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css b/src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css diff --git a/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js b/src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js diff --git a/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js b/src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js diff --git a/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js.map b/src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.js.map diff --git a/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js.map b/src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/signalr/dist/browser/signalr.min.js.map diff --git a/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.css b/src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.css diff --git a/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.js b/src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.js diff --git a/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/sweetalert/sweetalert2.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.js b/src/admin/Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.js diff --git a/Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/tablexport/tableExport.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.css b/src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.css diff --git a/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.js.map b/src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.js.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.js.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.js.map diff --git a/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/toastr.js/toastr.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/treegrid/css/jquery.treegrid.css b/src/admin/Bootstrap.Admin/wwwroot/lib/treegrid/css/jquery.treegrid.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/treegrid/css/jquery.treegrid.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/treegrid/css/jquery.treegrid.css diff --git a/Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.js b/src/admin/Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.js diff --git a/Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/treegrid/js/jquery.treegrid.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map b/src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map rename to src/admin/Bootstrap.Admin/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map diff --git a/Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.js b/src/admin/Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.js diff --git a/Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/validate/jquery.validate.min.js diff --git a/Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.js b/src/admin/Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.js diff --git a/Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.min.js b/src/admin/Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.min.js similarity index 100% rename from Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.min.js rename to src/admin/Bootstrap.Admin/wwwroot/lib/validate/localization/messages_zh.min.js diff --git a/Bootstrap.DataAccess.MongoDB/App.cs b/src/admin/Bootstrap.DataAccess.MongoDB/App.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/App.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/App.cs diff --git a/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj b/src/admin/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj rename to src/admin/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj diff --git a/Bootstrap.DataAccess.MongoDB/DbManager.cs b/src/admin/Bootstrap.DataAccess.MongoDB/DbManager.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/DbManager.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/DbManager.cs diff --git a/Bootstrap.DataAccess.MongoDB/Dict.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Dict.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Dict.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Dict.cs diff --git a/Bootstrap.DataAccess.MongoDB/Exceptions.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Exceptions.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Exceptions.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Exceptions.cs diff --git a/Bootstrap.DataAccess.MongoDB/Group.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Group.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Group.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Group.cs diff --git a/Bootstrap.DataAccess.MongoDB/Log.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Log.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Log.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Log.cs diff --git a/Bootstrap.DataAccess.MongoDB/LoginUser.cs b/src/admin/Bootstrap.DataAccess.MongoDB/LoginUser.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/LoginUser.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/LoginUser.cs diff --git a/Bootstrap.DataAccess.MongoDB/Menu.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Menu.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Menu.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Menu.cs diff --git a/Bootstrap.DataAccess.MongoDB/Message.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Message.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Message.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Message.cs diff --git a/Bootstrap.DataAccess.MongoDB/RejectUser.cs b/src/admin/Bootstrap.DataAccess.MongoDB/RejectUser.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/RejectUser.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/RejectUser.cs diff --git a/Bootstrap.DataAccess.MongoDB/ResetUser.cs b/src/admin/Bootstrap.DataAccess.MongoDB/ResetUser.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/ResetUser.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/ResetUser.cs diff --git a/Bootstrap.DataAccess.MongoDB/Role.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Role.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Role.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Role.cs diff --git a/Bootstrap.DataAccess.MongoDB/Task.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Task.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Task.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Task.cs diff --git a/Bootstrap.DataAccess.MongoDB/Trace.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Trace.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/Trace.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/Trace.cs diff --git a/Bootstrap.DataAccess.MongoDB/User.cs b/src/admin/Bootstrap.DataAccess.MongoDB/User.cs similarity index 100% rename from Bootstrap.DataAccess.MongoDB/User.cs rename to src/admin/Bootstrap.DataAccess.MongoDB/User.cs diff --git a/Bootstrap.DataAccess/App.cs b/src/admin/Bootstrap.DataAccess/App.cs similarity index 100% rename from Bootstrap.DataAccess/App.cs rename to src/admin/Bootstrap.DataAccess/App.cs diff --git a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj similarity index 100% rename from Bootstrap.DataAccess/Bootstrap.DataAccess.csproj rename to src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj diff --git a/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs b/src/admin/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs similarity index 100% rename from Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs rename to src/admin/Bootstrap.DataAccess/BootstrapDataAccessConventionMapper.cs diff --git a/Bootstrap.DataAccess/CacheCleanUtility.cs b/src/admin/Bootstrap.DataAccess/CacheCleanUtility.cs similarity index 100% rename from Bootstrap.DataAccess/CacheCleanUtility.cs rename to src/admin/Bootstrap.DataAccess/CacheCleanUtility.cs diff --git a/Bootstrap.DataAccess/DbContextManager.cs b/src/admin/Bootstrap.DataAccess/DbContextManager.cs similarity index 100% rename from Bootstrap.DataAccess/DbContextManager.cs rename to src/admin/Bootstrap.DataAccess/DbContextManager.cs diff --git a/Bootstrap.DataAccess/DbManager.cs b/src/admin/Bootstrap.DataAccess/DbManager.cs similarity index 100% rename from Bootstrap.DataAccess/DbManager.cs rename to src/admin/Bootstrap.DataAccess/DbManager.cs diff --git a/Bootstrap.DataAccess/Dict.cs b/src/admin/Bootstrap.DataAccess/Dict.cs similarity index 100% rename from Bootstrap.DataAccess/Dict.cs rename to src/admin/Bootstrap.DataAccess/Dict.cs diff --git a/Bootstrap.DataAccess/Exceptions.cs b/src/admin/Bootstrap.DataAccess/Exceptions.cs similarity index 100% rename from Bootstrap.DataAccess/Exceptions.cs rename to src/admin/Bootstrap.DataAccess/Exceptions.cs diff --git a/Bootstrap.DataAccess/Group.cs b/src/admin/Bootstrap.DataAccess/Group.cs similarity index 100% rename from Bootstrap.DataAccess/Group.cs rename to src/admin/Bootstrap.DataAccess/Group.cs diff --git a/Bootstrap.DataAccess/Helper/AppHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/AppHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/AppHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/AppHelper.cs diff --git a/Bootstrap.DataAccess/Helper/DictHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/DictHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/DictHelper.cs diff --git a/Bootstrap.DataAccess/Helper/ExceptionsHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/ExceptionsHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/ExceptionsHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/ExceptionsHelper.cs diff --git a/Bootstrap.DataAccess/Helper/GroupHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/GroupHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/GroupHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/GroupHelper.cs diff --git a/Bootstrap.DataAccess/Helper/LogHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/LogHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/LogHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/LogHelper.cs diff --git a/Bootstrap.DataAccess/Helper/LoginHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/LoginHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/LoginHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/LoginHelper.cs diff --git a/Bootstrap.DataAccess/Helper/MenuHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/MenuHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/MenuHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/MenuHelper.cs diff --git a/Bootstrap.DataAccess/Helper/MessageHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/MessageHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/MessageHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/MessageHelper.cs diff --git a/Bootstrap.DataAccess/Helper/ResetUserHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/ResetUserHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/ResetUserHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/ResetUserHelper.cs diff --git a/Bootstrap.DataAccess/Helper/RoleHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/RoleHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/RoleHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/RoleHelper.cs diff --git a/Bootstrap.DataAccess/Helper/TaskHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/TaskHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/TaskHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/TaskHelper.cs diff --git a/Bootstrap.DataAccess/Helper/TraceHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/TraceHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/TraceHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/TraceHelper.cs diff --git a/Bootstrap.DataAccess/Helper/UserHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/UserHelper.cs similarity index 100% rename from Bootstrap.DataAccess/Helper/UserHelper.cs rename to src/admin/Bootstrap.DataAccess/Helper/UserHelper.cs diff --git a/Bootstrap.DataAccess/Log.cs b/src/admin/Bootstrap.DataAccess/Log.cs similarity index 100% rename from Bootstrap.DataAccess/Log.cs rename to src/admin/Bootstrap.DataAccess/Log.cs diff --git a/Bootstrap.DataAccess/LoginUser.cs b/src/admin/Bootstrap.DataAccess/LoginUser.cs similarity index 100% rename from Bootstrap.DataAccess/LoginUser.cs rename to src/admin/Bootstrap.DataAccess/LoginUser.cs diff --git a/Bootstrap.DataAccess/Menu.cs b/src/admin/Bootstrap.DataAccess/Menu.cs similarity index 100% rename from Bootstrap.DataAccess/Menu.cs rename to src/admin/Bootstrap.DataAccess/Menu.cs diff --git a/Bootstrap.DataAccess/Message.cs b/src/admin/Bootstrap.DataAccess/Message.cs similarity index 100% rename from Bootstrap.DataAccess/Message.cs rename to src/admin/Bootstrap.DataAccess/Message.cs diff --git a/Bootstrap.DataAccess/MessageBody.cs b/src/admin/Bootstrap.DataAccess/MessageBody.cs similarity index 100% rename from Bootstrap.DataAccess/MessageBody.cs rename to src/admin/Bootstrap.DataAccess/MessageBody.cs diff --git a/Bootstrap.DataAccess/ResetUsers.cs b/src/admin/Bootstrap.DataAccess/ResetUsers.cs similarity index 100% rename from Bootstrap.DataAccess/ResetUsers.cs rename to src/admin/Bootstrap.DataAccess/ResetUsers.cs diff --git a/Bootstrap.DataAccess/Role.cs b/src/admin/Bootstrap.DataAccess/Role.cs similarity index 100% rename from Bootstrap.DataAccess/Role.cs rename to src/admin/Bootstrap.DataAccess/Role.cs diff --git a/Bootstrap.DataAccess/Task.cs b/src/admin/Bootstrap.DataAccess/Task.cs similarity index 100% rename from Bootstrap.DataAccess/Task.cs rename to src/admin/Bootstrap.DataAccess/Task.cs diff --git a/Bootstrap.DataAccess/Trace.cs b/src/admin/Bootstrap.DataAccess/Trace.cs similarity index 100% rename from Bootstrap.DataAccess/Trace.cs rename to src/admin/Bootstrap.DataAccess/Trace.cs diff --git a/Bootstrap.DataAccess/User.cs b/src/admin/Bootstrap.DataAccess/User.cs similarity index 100% rename from Bootstrap.DataAccess/User.cs rename to src/admin/Bootstrap.DataAccess/User.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/App.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/App.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/App.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/App.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/Bootstrap.Client.DataAccess.MongoDB.csproj b/src/client/Bootstrap.Client.DataAccess.MongoDB/Bootstrap.Client.DataAccess.MongoDB.csproj similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/Bootstrap.Client.DataAccess.MongoDB.csproj rename to src/client/Bootstrap.Client.DataAccess.MongoDB/Bootstrap.Client.DataAccess.MongoDB.csproj diff --git a/Bootstrap.Client.DataAccess.MongoDB/DbManager.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/DbManager.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/DbManager.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/DbManager.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/Dict.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/Dict.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/Dict.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/Dict.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/Group.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/Group.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/Group.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/Group.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/Helper/RoleHelper.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/Helper/RoleHelper.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/Helper/RoleHelper.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/Helper/RoleHelper.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/Menu.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/Menu.cs similarity index 98% rename from Bootstrap.Client.DataAccess.MongoDB/Menu.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/Menu.cs index 6c6a421c..6bbbf32b 100644 --- a/Bootstrap.Client.DataAccess.MongoDB/Menu.cs +++ b/src/client/Bootstrap.Client.DataAccess.MongoDB/Menu.cs @@ -1,5 +1,4 @@ using Bootstrap.Security; -using Longbow.Cache; using MongoDB.Driver; using System; using System.Collections.Generic; diff --git a/Bootstrap.Client.DataAccess.MongoDB/Role.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/Role.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/Role.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/Role.cs diff --git a/Bootstrap.Client.DataAccess.MongoDB/User.cs b/src/client/Bootstrap.Client.DataAccess.MongoDB/User.cs similarity index 100% rename from Bootstrap.Client.DataAccess.MongoDB/User.cs rename to src/client/Bootstrap.Client.DataAccess.MongoDB/User.cs diff --git a/Bootstrap.Client.DataAccess/App.cs b/src/client/Bootstrap.Client.DataAccess/App.cs similarity index 100% rename from Bootstrap.Client.DataAccess/App.cs rename to src/client/Bootstrap.Client.DataAccess/App.cs diff --git a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj similarity index 100% rename from Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj rename to src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj diff --git a/Bootstrap.Client.DataAccess/DbManager.cs b/src/client/Bootstrap.Client.DataAccess/DbManager.cs similarity index 100% rename from Bootstrap.Client.DataAccess/DbManager.cs rename to src/client/Bootstrap.Client.DataAccess/DbManager.cs diff --git a/Bootstrap.Client.DataAccess/Dict.cs b/src/client/Bootstrap.Client.DataAccess/Dict.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Dict.cs rename to src/client/Bootstrap.Client.DataAccess/Dict.cs diff --git a/Bootstrap.Client.DataAccess/Helper/AppHelper.cs b/src/client/Bootstrap.Client.DataAccess/Helper/AppHelper.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Helper/AppHelper.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/AppHelper.cs diff --git a/Bootstrap.Client.DataAccess/Helper/DictHelper.cs b/src/client/Bootstrap.Client.DataAccess/Helper/DictHelper.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Helper/DictHelper.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/DictHelper.cs diff --git a/Bootstrap.Client.DataAccess/Helper/MenuHelper.cs b/src/client/Bootstrap.Client.DataAccess/Helper/MenuHelper.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Helper/MenuHelper.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/MenuHelper.cs diff --git a/Bootstrap.Client.DataAccess/Helper/RoleHelper.cs b/src/client/Bootstrap.Client.DataAccess/Helper/RoleHelper.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Helper/RoleHelper.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/RoleHelper.cs diff --git a/Bootstrap.Client.DataAccess/Helper/TraceHelper.cs b/src/client/Bootstrap.Client.DataAccess/Helper/TraceHelper.cs similarity index 87% rename from Bootstrap.Client.DataAccess/Helper/TraceHelper.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/TraceHelper.cs index afdfdd28..f6cfadab 100644 --- a/Bootstrap.Client.DataAccess/Helper/TraceHelper.cs +++ b/src/client/Bootstrap.Client.DataAccess/Helper/TraceHelper.cs @@ -1,9 +1,6 @@ -using Longbow.Configuration; -using Longbow.Web; -using Microsoft.AspNetCore; +using Longbow.Web; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -using System.Net.Http; namespace Bootstrap.Client.DataAccess { diff --git a/Bootstrap.Client.DataAccess/Helper/TraceHttpClient.cs b/src/client/Bootstrap.Client.DataAccess/Helper/TraceHttpClient.cs similarity index 83% rename from Bootstrap.Client.DataAccess/Helper/TraceHttpClient.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/TraceHttpClient.cs index 369f6edc..a7003f63 100644 --- a/Bootstrap.Client.DataAccess/Helper/TraceHttpClient.cs +++ b/src/client/Bootstrap.Client.DataAccess/Helper/TraceHttpClient.cs @@ -3,6 +3,7 @@ using Longbow.Web; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Http; using System; +using System.Collections.Specialized; using System.Linq; using System.Net.Http; @@ -47,7 +48,14 @@ namespace Bootstrap.Client.DataAccess // http://localhost:50852/api/Traces user.RequestUrl = context.Request.AbsoluteUrl(); - await _client.PostAsJsonAsync("", user, context.RequestAborted); + try + { + await _client.PostAsJsonAsync("", user, context.RequestAborted); + } + catch (Exception ex) + { + ex.Log(new NameValueCollection() { ["RequestUrl"] = _client.BaseAddress.AbsoluteUri }); + } } } } diff --git a/Bootstrap.Client.DataAccess/Helper/UserHelper.cs b/src/client/Bootstrap.Client.DataAccess/Helper/UserHelper.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Helper/UserHelper.cs rename to src/client/Bootstrap.Client.DataAccess/Helper/UserHelper.cs diff --git a/Bootstrap.Client.DataAccess/Menu.cs b/src/client/Bootstrap.Client.DataAccess/Menu.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Menu.cs rename to src/client/Bootstrap.Client.DataAccess/Menu.cs diff --git a/Bootstrap.Client.DataAccess/Role.cs b/src/client/Bootstrap.Client.DataAccess/Role.cs similarity index 100% rename from Bootstrap.Client.DataAccess/Role.cs rename to src/client/Bootstrap.Client.DataAccess/Role.cs diff --git a/Bootstrap.Client.DataAccess/User.cs b/src/client/Bootstrap.Client.DataAccess/User.cs similarity index 100% rename from Bootstrap.Client.DataAccess/User.cs rename to src/client/Bootstrap.Client.DataAccess/User.cs diff --git a/Bootstrap.Client/Bootstrap.Client.csproj b/src/client/Bootstrap.Client/Bootstrap.Client.csproj similarity index 100% rename from Bootstrap.Client/Bootstrap.Client.csproj rename to src/client/Bootstrap.Client/Bootstrap.Client.csproj diff --git a/Bootstrap.Client/Controllers/Api/AdminController.cs b/src/client/Bootstrap.Client/Controllers/Api/AdminController.cs similarity index 100% rename from Bootstrap.Client/Controllers/Api/AdminController.cs rename to src/client/Bootstrap.Client/Controllers/Api/AdminController.cs diff --git a/Bootstrap.Client/Controllers/Api/CaptchaController.cs b/src/client/Bootstrap.Client/Controllers/Api/CaptchaController.cs similarity index 100% rename from Bootstrap.Client/Controllers/Api/CaptchaController.cs rename to src/client/Bootstrap.Client/Controllers/Api/CaptchaController.cs diff --git a/Bootstrap.Client/Controllers/HomeController.cs b/src/client/Bootstrap.Client/Controllers/HomeController.cs similarity index 100% rename from Bootstrap.Client/Controllers/HomeController.cs rename to src/client/Bootstrap.Client/Controllers/HomeController.cs diff --git a/Bootstrap.Client/Models/HeaderBarModel.cs b/src/client/Bootstrap.Client/Models/HeaderBarModel.cs similarity index 100% rename from Bootstrap.Client/Models/HeaderBarModel.cs rename to src/client/Bootstrap.Client/Models/HeaderBarModel.cs diff --git a/Bootstrap.Client/Models/ModelBase.cs b/src/client/Bootstrap.Client/Models/ModelBase.cs similarity index 100% rename from Bootstrap.Client/Models/ModelBase.cs rename to src/client/Bootstrap.Client/Models/ModelBase.cs diff --git a/Bootstrap.Client/Models/NavigatorBarModel.cs b/src/client/Bootstrap.Client/Models/NavigatorBarModel.cs similarity index 97% rename from Bootstrap.Client/Models/NavigatorBarModel.cs rename to src/client/Bootstrap.Client/Models/NavigatorBarModel.cs index 244818d5..df809770 100644 --- a/Bootstrap.Client/Models/NavigatorBarModel.cs +++ b/src/client/Bootstrap.Client/Models/NavigatorBarModel.cs @@ -1,6 +1,5 @@ using Bootstrap.Client.DataAccess; using Bootstrap.Security; -using Longbow.Configuration; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; diff --git a/Bootstrap.Client/Program.cs b/src/client/Bootstrap.Client/Program.cs similarity index 100% rename from Bootstrap.Client/Program.cs rename to src/client/Bootstrap.Client/Program.cs diff --git a/Bootstrap.Client/Properties/launchSettings.json b/src/client/Bootstrap.Client/Properties/launchSettings.json similarity index 100% rename from Bootstrap.Client/Properties/launchSettings.json rename to src/client/Bootstrap.Client/Properties/launchSettings.json diff --git a/Bootstrap.Client/Startup.cs b/src/client/Bootstrap.Client/Startup.cs similarity index 100% rename from Bootstrap.Client/Startup.cs rename to src/client/Bootstrap.Client/Startup.cs diff --git a/Bootstrap.Client/Views/Home/About.cshtml b/src/client/Bootstrap.Client/Views/Home/About.cshtml similarity index 100% rename from Bootstrap.Client/Views/Home/About.cshtml rename to src/client/Bootstrap.Client/Views/Home/About.cshtml diff --git a/Bootstrap.Client/Views/Home/Index.cshtml b/src/client/Bootstrap.Client/Views/Home/Index.cshtml similarity index 100% rename from Bootstrap.Client/Views/Home/Index.cshtml rename to src/client/Bootstrap.Client/Views/Home/Index.cshtml diff --git a/Bootstrap.Client/Views/Shared/Footer.cshtml b/src/client/Bootstrap.Client/Views/Shared/Footer.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/Footer.cshtml rename to src/client/Bootstrap.Client/Views/Shared/Footer.cshtml diff --git a/Bootstrap.Client/Views/Shared/Header.cshtml b/src/client/Bootstrap.Client/Views/Shared/Header.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/Header.cshtml rename to src/client/Bootstrap.Client/Views/Shared/Header.cshtml diff --git a/Bootstrap.Client/Views/Shared/Menu.cshtml b/src/client/Bootstrap.Client/Views/Shared/Menu.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/Menu.cshtml rename to src/client/Bootstrap.Client/Views/Shared/Menu.cshtml diff --git a/Bootstrap.Client/Views/Shared/Navigator.cshtml b/src/client/Bootstrap.Client/Views/Shared/Navigator.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/Navigator.cshtml rename to src/client/Bootstrap.Client/Views/Shared/Navigator.cshtml diff --git a/Bootstrap.Client/Views/Shared/SubNavItem.cshtml b/src/client/Bootstrap.Client/Views/Shared/SubNavItem.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/SubNavItem.cshtml rename to src/client/Bootstrap.Client/Views/Shared/SubNavItem.cshtml diff --git a/Bootstrap.Client/Views/Shared/SubNavigation.cshtml b/src/client/Bootstrap.Client/Views/Shared/SubNavigation.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/SubNavigation.cshtml rename to src/client/Bootstrap.Client/Views/Shared/SubNavigation.cshtml diff --git a/Bootstrap.Client/Views/Shared/_Layout.cshtml b/src/client/Bootstrap.Client/Views/Shared/_Layout.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/_Layout.cshtml rename to src/client/Bootstrap.Client/Views/Shared/_Layout.cshtml diff --git a/Bootstrap.Client/Views/Shared/_Root.cshtml b/src/client/Bootstrap.Client/Views/Shared/_Root.cshtml similarity index 100% rename from Bootstrap.Client/Views/Shared/_Root.cshtml rename to src/client/Bootstrap.Client/Views/Shared/_Root.cshtml diff --git a/Bootstrap.Client/Views/_ViewImports.cshtml b/src/client/Bootstrap.Client/Views/_ViewImports.cshtml similarity index 100% rename from Bootstrap.Client/Views/_ViewImports.cshtml rename to src/client/Bootstrap.Client/Views/_ViewImports.cshtml diff --git a/Bootstrap.Client/Views/_ViewStart.cshtml b/src/client/Bootstrap.Client/Views/_ViewStart.cshtml similarity index 100% rename from Bootstrap.Client/Views/_ViewStart.cshtml rename to src/client/Bootstrap.Client/Views/_ViewStart.cshtml diff --git a/Bootstrap.Client/appsettings.Development.json b/src/client/Bootstrap.Client/appsettings.Development.json similarity index 94% rename from Bootstrap.Client/appsettings.Development.json rename to src/client/Bootstrap.Client/appsettings.Development.json index 3bf827e6..6bc5d4c7 100644 --- a/Bootstrap.Client/appsettings.Development.json +++ b/src/client/Bootstrap.Client/appsettings.Development.json @@ -27,7 +27,7 @@ "Enabled": true, "ProviderName": "Sqlite", "ConnectionStrings": { - "ba": "Data Source=..\\Bootstrap.Admin\\BootstrapAdmin.db;", + "ba": "Data Source=..\\..\\admin\\Bootstrap.Admin\\BootstrapAdmin.db;", "client": "Data Source=Client.db;" } }, @@ -43,7 +43,8 @@ ], "SimulateUserName": "Admin", "BootstrapAdminAuthenticationOptions": { - "AuthHost": "http://localhost:50852" + "AuthHost": "http://localhost:50852", + "KeyPath": "..\\..\\admin\\keys" }, "AllowOrigins": "http://localhost:50852", "LongbowCache": { diff --git a/Bootstrap.Client/appsettings.json b/src/client/Bootstrap.Client/appsettings.json similarity index 100% rename from Bootstrap.Client/appsettings.json rename to src/client/Bootstrap.Client/appsettings.json diff --git a/Bootstrap.Client/libman.json b/src/client/Bootstrap.Client/libman.json similarity index 100% rename from Bootstrap.Client/libman.json rename to src/client/Bootstrap.Client/libman.json diff --git a/Bootstrap.Client/wwwroot/browser/readme.txt b/src/client/Bootstrap.Client/wwwroot/browser/readme.txt similarity index 100% rename from Bootstrap.Client/wwwroot/browser/readme.txt rename to src/client/Bootstrap.Client/wwwroot/browser/readme.txt diff --git a/Bootstrap.Client/wwwroot/css/IE8.css b/src/client/Bootstrap.Client/wwwroot/css/IE8.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/IE8.css rename to src/client/Bootstrap.Client/wwwroot/css/IE8.css diff --git a/Bootstrap.Client/wwwroot/css/black.css b/src/client/Bootstrap.Client/wwwroot/css/black.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/black.css rename to src/client/Bootstrap.Client/wwwroot/css/black.css diff --git a/Bootstrap.Client/wwwroot/css/blue.css b/src/client/Bootstrap.Client/wwwroot/css/blue.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/blue.css rename to src/client/Bootstrap.Client/wwwroot/css/blue.css diff --git a/Bootstrap.Client/wwwroot/css/lte.css b/src/client/Bootstrap.Client/wwwroot/css/lte.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/lte.css rename to src/client/Bootstrap.Client/wwwroot/css/lte.css diff --git a/Bootstrap.Client/wwwroot/css/site-responsive.css b/src/client/Bootstrap.Client/wwwroot/css/site-responsive.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/site-responsive.css rename to src/client/Bootstrap.Client/wwwroot/css/site-responsive.css diff --git a/Bootstrap.Client/wwwroot/css/site.css b/src/client/Bootstrap.Client/wwwroot/css/site.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/site.css rename to src/client/Bootstrap.Client/wwwroot/css/site.css diff --git a/Bootstrap.Client/wwwroot/css/theme-responsive.css b/src/client/Bootstrap.Client/wwwroot/css/theme-responsive.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/theme-responsive.css rename to src/client/Bootstrap.Client/wwwroot/css/theme-responsive.css diff --git a/Bootstrap.Client/wwwroot/css/theme.css b/src/client/Bootstrap.Client/wwwroot/css/theme.css similarity index 100% rename from Bootstrap.Client/wwwroot/css/theme.css rename to src/client/Bootstrap.Client/wwwroot/css/theme.css diff --git a/Bootstrap.Client/wwwroot/favicon.ico b/src/client/Bootstrap.Client/wwwroot/favicon.ico similarity index 100% rename from Bootstrap.Client/wwwroot/favicon.ico rename to src/client/Bootstrap.Client/wwwroot/favicon.ico diff --git a/Bootstrap.Client/wwwroot/images/404_icon.png b/src/client/Bootstrap.Client/wwwroot/images/404_icon.png similarity index 100% rename from Bootstrap.Client/wwwroot/images/404_icon.png rename to src/client/Bootstrap.Client/wwwroot/images/404_icon.png diff --git a/Bootstrap.Client/wwwroot/images/admin.jpg b/src/client/Bootstrap.Client/wwwroot/images/admin.jpg similarity index 100% rename from Bootstrap.Client/wwwroot/images/admin.jpg rename to src/client/Bootstrap.Client/wwwroot/images/admin.jpg diff --git a/Bootstrap.Client/wwwroot/images/bg4.png b/src/client/Bootstrap.Client/wwwroot/images/bg4.png similarity index 100% rename from Bootstrap.Client/wwwroot/images/bg4.png rename to src/client/Bootstrap.Client/wwwroot/images/bg4.png diff --git a/Bootstrap.Client/wwwroot/images/bird.png b/src/client/Bootstrap.Client/wwwroot/images/bird.png similarity index 100% rename from Bootstrap.Client/wwwroot/images/bird.png rename to src/client/Bootstrap.Client/wwwroot/images/bird.png diff --git a/Bootstrap.Client/wwwroot/images/error.png b/src/client/Bootstrap.Client/wwwroot/images/error.png similarity index 100% rename from Bootstrap.Client/wwwroot/images/error.png rename to src/client/Bootstrap.Client/wwwroot/images/error.png diff --git a/Bootstrap.Client/wwwroot/images/error_icon.png b/src/client/Bootstrap.Client/wwwroot/images/error_icon.png similarity index 100% rename from Bootstrap.Client/wwwroot/images/error_icon.png rename to src/client/Bootstrap.Client/wwwroot/images/error_icon.png diff --git a/Bootstrap.Client/wwwroot/images/nav-expand.png b/src/client/Bootstrap.Client/wwwroot/images/nav-expand.png similarity index 100% rename from Bootstrap.Client/wwwroot/images/nav-expand.png rename to src/client/Bootstrap.Client/wwwroot/images/nav-expand.png diff --git a/Bootstrap.Client/wwwroot/js/common-scripts.js b/src/client/Bootstrap.Client/wwwroot/js/common-scripts.js similarity index 100% rename from Bootstrap.Client/wwwroot/js/common-scripts.js rename to src/client/Bootstrap.Client/wwwroot/js/common-scripts.js diff --git a/Bootstrap.Client/wwwroot/js/index.js b/src/client/Bootstrap.Client/wwwroot/js/index.js similarity index 100% rename from Bootstrap.Client/wwwroot/js/index.js rename to src/client/Bootstrap.Client/wwwroot/js/index.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.css b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.css rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.css diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.css b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.css diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/bootstrap-table.min.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/export/bootstrap-table-export.min.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-table/locale/bootstrap-table-zh-CN.min.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.css diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/css/bootstrap-toggle.min.css diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.js diff --git a/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js b/src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/bootstrap-toggle/js/bootstrap-toggle.min.js diff --git a/Bootstrap.Client/wwwroot/lib/captcha/images/Pic0.jpg b/src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic0.jpg similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/images/Pic0.jpg rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic0.jpg diff --git a/Bootstrap.Client/wwwroot/lib/captcha/images/Pic1.jpg b/src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic1.jpg similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/images/Pic1.jpg rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic1.jpg diff --git a/Bootstrap.Client/wwwroot/lib/captcha/images/Pic2.jpg b/src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic2.jpg similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/images/Pic2.jpg rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic2.jpg diff --git a/Bootstrap.Client/wwwroot/lib/captcha/images/Pic3.jpg b/src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic3.jpg similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/images/Pic3.jpg rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic3.jpg diff --git a/Bootstrap.Client/wwwroot/lib/captcha/images/Pic4.jpg b/src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic4.jpg similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/images/Pic4.jpg rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/images/Pic4.jpg diff --git a/Bootstrap.Client/wwwroot/lib/captcha/longbow.slidercaptcha.js b/src/client/Bootstrap.Client/wwwroot/lib/captcha/longbow.slidercaptcha.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/longbow.slidercaptcha.js rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/longbow.slidercaptcha.js diff --git a/Bootstrap.Client/wwwroot/lib/captcha/slidercaptcha.css b/src/client/Bootstrap.Client/wwwroot/lib/captcha/slidercaptcha.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/captcha/slidercaptcha.css rename to src/client/Bootstrap.Client/wwwroot/lib/captcha/slidercaptcha.css diff --git a/Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css b/src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css rename to src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.css diff --git a/Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css b/src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/css/bootstrap-datetimepicker.min.css diff --git a/Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js b/src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js rename to src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.js diff --git a/Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js b/src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/js/bootstrap-datetimepicker.min.js diff --git a/Bootstrap.Client/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js b/src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js rename to src/client/Bootstrap.Client/wwwroot/lib/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js diff --git a/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.cookie.js b/src/client/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.cookie.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.cookie.js rename to src/client/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.cookie.js diff --git a/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.js b/src/client/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.js rename to src/client/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.js diff --git a/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.min.js b/src/client/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/dcjqaccordion/js/jquery.dcjqaccordion.2.7.min.js diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css.map b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css.map rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.css.map diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.min.css b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.min.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/css/font-awesome.min.css diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/FontAwesome.otf b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/fonts/FontAwesome.otf rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/FontAwesome.otf diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.eot diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.svg diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff diff --git a/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 b/src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 rename to src/client/Bootstrap.Client/wwwroot/lib/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.js b/src/client/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.js rename to src/client/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.js diff --git a/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.js b/src/client/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.map b/src/client/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.map rename to src/client/Bootstrap.Client/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/Bootstrap.Client/wwwroot/lib/jquery/jquery.js b/src/client/Bootstrap.Client/wwwroot/lib/jquery/jquery.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/jquery/jquery.js rename to src/client/Bootstrap.Client/wwwroot/lib/jquery/jquery.js diff --git a/Bootstrap.Client/wwwroot/lib/jquery/jquery.min.js b/src/client/Bootstrap.Client/wwwroot/lib/jquery/jquery.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/jquery/jquery.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/jquery/jquery.min.js diff --git a/Bootstrap.Client/wwwroot/lib/jquery/jquery.min.map b/src/client/Bootstrap.Client/wwwroot/lib/jquery/jquery.min.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/jquery/jquery.min.map rename to src/client/Bootstrap.Client/wwwroot/lib/jquery/jquery.min.map diff --git a/Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.css b/src/client/Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.css rename to src/client/Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.css diff --git a/Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.js b/src/client/Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.js rename to src/client/Bootstrap.Client/wwwroot/lib/longbow-checkbox/longbow-checkbox.js diff --git a/Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.css b/src/client/Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.css rename to src/client/Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.css diff --git a/Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.js b/src/client/Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.js rename to src/client/Bootstrap.Client/wwwroot/lib/longbow-select/longbow-select.js diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js b/src/client/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js rename to src/client/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js b/src/client/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js rename to src/client/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js b/src/client/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js rename to src/client/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js diff --git a/Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css b/src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css rename to src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.css diff --git a/Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css b/src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/OverlayScrollbars.min.css diff --git a/Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js b/src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js rename to src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.js diff --git a/Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js b/src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js old mode 100755 new mode 100644 similarity index 100% rename from Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/overlayscrollbars/jquery.overlayScrollbars.min.js diff --git a/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js b/src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js rename to src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js diff --git a/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js.map b/src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js.map rename to src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.js.map diff --git a/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js b/src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js diff --git a/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js.map b/src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js.map rename to src/client/Bootstrap.Client/wwwroot/lib/signalr/dist/browser/signalr.min.js.map diff --git a/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.css b/src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/toastr.js/toastr.css rename to src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.css diff --git a/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.js.map b/src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.js.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/toastr.js/toastr.js.map rename to src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.js.map diff --git a/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.css b/src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.css diff --git a/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.js b/src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/toastr.js/toastr.min.js diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.css.map diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/css/bootstrap.min.css.map diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.js.map diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js diff --git a/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map b/src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map similarity index 100% rename from Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map rename to src/client/Bootstrap.Client/wwwroot/lib/twitter-bootstrap/js/bootstrap.bundle.min.js.map diff --git a/Bootstrap.Client/wwwroot/lib/validate/jquery.validate.js b/src/client/Bootstrap.Client/wwwroot/lib/validate/jquery.validate.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/validate/jquery.validate.js rename to src/client/Bootstrap.Client/wwwroot/lib/validate/jquery.validate.js diff --git a/Bootstrap.Client/wwwroot/lib/validate/jquery.validate.min.js b/src/client/Bootstrap.Client/wwwroot/lib/validate/jquery.validate.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/validate/jquery.validate.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/validate/jquery.validate.min.js diff --git a/Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.js b/src/client/Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.js rename to src/client/Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.js diff --git a/Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.min.js b/src/client/Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.min.js similarity index 100% rename from Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.min.js rename to src/client/Bootstrap.Client/wwwroot/lib/validate/localization/messages_zh.min.js diff --git a/UnitTest/BAWebHost.cs b/test/UnitTest/BAWebHost.cs similarity index 95% rename from UnitTest/BAWebHost.cs rename to test/UnitTest/BAWebHost.cs index 6dff0493..fafbc137 100644 --- a/UnitTest/BAWebHost.cs +++ b/test/UnitTest/BAWebHost.cs @@ -78,15 +78,6 @@ namespace Bootstrap.Admin /// public class BAWebHost : WebApplicationFactory { - /// - /// - /// - static BAWebHost() - { - // Copy license - TestHelper.CopyLicense(); - } - public BAWebHost() { var client = CreateClient("Account/Login"); @@ -121,6 +112,7 @@ namespace Bootstrap.Admin config.AddEnvironmentVariables(); var con = config.Build(); + // 增加单元测试本身的配置文件 builder.ConfigureAppConfiguration(app => app.AddJsonFile(TestHelper.RetrievePath($"UnitTest{Path.DirectorySeparatorChar}appsettings.json"), false, true)); if (con.GetValue("Appveyor", false)) { diff --git a/UnitTest/Bootstrap.Admin/Api/AnalyseTest.cs b/test/UnitTest/Bootstrap.Admin/Api/AnalyseTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/AnalyseTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/AnalyseTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/GiteeTest.cs b/test/UnitTest/Bootstrap.Admin/Api/GiteeTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/GiteeTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/GiteeTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/HealthCheckTest.cs b/test/UnitTest/Bootstrap.Admin/Api/HealthCheckTest.cs similarity index 95% rename from UnitTest/Bootstrap.Admin/Api/HealthCheckTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/HealthCheckTest.cs index 5ce385bb..8c24d752 100644 --- a/UnitTest/Bootstrap.Admin/Api/HealthCheckTest.cs +++ b/test/UnitTest/Bootstrap.Admin/Api/HealthCheckTest.cs @@ -9,7 +9,9 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; using Newtonsoft.Json; +using System.IO; using System.Net.Http; +using UnitTest; using Xunit; namespace Bootstrap.Admin.Api @@ -120,6 +122,12 @@ namespace Bootstrap.Admin.Api /// public class HealthCheckWebHost : WebApplicationFactory where TStartup : class { + protected override void ConfigureWebHost(IWebHostBuilder builder) + { + base.ConfigureWebHost(builder); + builder.UseContentRoot(TestHelper.RetrievePath($"UnitTest")); + } + /// /// /// diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/AppsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/AppsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/AppsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/AppsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/CategoryTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/CategoryTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/CategoryTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/CategoryTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/DictTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/DictTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/DictTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/DictTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/ExceptionsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/GroupsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/GroupsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/GroupsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/InterfaceTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/InterfaceTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/InterfaceTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/InterfaceTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/LoginTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/LoginTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/LoginTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/LoginTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/LogsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/LogsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/LogsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/MenusTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/MenusTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/MenusTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/MessagesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/MessagesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/MessagesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/NewTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/NewTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/NewTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/NewTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/NotificationsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/NotificationsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/NotificationsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/NotificationsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/OnlineTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/OnlineTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/OnlineTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/OnlineTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/ProfilesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/ProfilesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/ProfilesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/ProfilesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/RegisterTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/RegisterTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/RegisterTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/RegisterTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/RolesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/RolesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/RolesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/SettingsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/SettingsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/SettingsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/SettingsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/TasksTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/TasksTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/TasksTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/TracesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/TracesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/TracesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/TracesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/MySql/UsersTest.cs b/test/UnitTest/Bootstrap.Admin/Api/MySql/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/MySql/UsersTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/MySql/UsersTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/OnlineUserTest.cs b/test/UnitTest/Bootstrap.Admin/Api/OnlineUserTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/OnlineUserTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/OnlineUserTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/AppsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/AppsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/AppsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/AppsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/CategoryTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/CategoryTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/CategoryTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/CategoryTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/DictTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/DictTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/DictTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/DictTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/ExceptionsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/GroupsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/GroupsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/GroupsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/LoginTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/LoginTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/LoginTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/LoginTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/LogsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/LogsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/LogsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/MessagesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/MessagesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/MessagesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/NewTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/NewTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/NewTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/NewTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/NotificationsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/NotificationsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/NotificationsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/NotificationsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/OnlineTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/OnlineTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/OnlineTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/OnlineTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/ProfilesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/ProfilesTest.cs similarity index 92% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/ProfilesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/ProfilesTest.cs index 50f7a401..052294b8 100644 --- a/UnitTest/Bootstrap.Admin/Api/SQLServer/ProfilesTest.cs +++ b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/ProfilesTest.cs @@ -1,4 +1,4 @@ -using Bootstrap.DataAccess; +using Bootstrap.DataAccess; using System.IO; using System.Net; using System.Net.Http; @@ -60,8 +60,8 @@ namespace Bootstrap.Admin.Api.SqlServer [Fact] public async void SaveAndDelIcon_Ok() { - var iconFile = TestHelper.RetrievePath(string.Format("Bootstrap.Admin{0}wwwroot{0}images{0}logo.jpg", Path.DirectorySeparatorChar)); - var adminFile = TestHelper.RetrievePath(string.Format("Bootstrap.Admin{0}wwwroot{0}images{0}uploader{0}Admin.jpg", Path.DirectorySeparatorChar)); + var iconFile = TestHelper.RetrievePath(string.Format("..{0}src{0}admin{0}Bootstrap.Admin{0}wwwroot{0}images{0}logo.jpg", Path.DirectorySeparatorChar)); + var adminFile = TestHelper.RetrievePath(string.Format("..{0}src{0}admin{0}Bootstrap.Admin{0}wwwroot{0}images{0}uploader{0}Admin.jpg", Path.DirectorySeparatorChar)); FileInfo fi = new FileInfo(iconFile); string fileName = fi.Name; byte[] fileContents = File.ReadAllBytes(fi.FullName); diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/RegisterTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/RegisterTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/RegisterTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/RegisterTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/RolesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/RolesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/RolesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/SettingsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/SettingsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/SettingsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/SettingsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/TasksTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/TasksTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/TasksTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/TracesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/TracesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/TracesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/TracesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLServer/UsersTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLServer/UsersTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLServer/UsersTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/AppsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/AppsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/AppsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/AppsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/CategoryTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/CategoryTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/CategoryTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/CategoryTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/DictTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/DictTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/DictTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/DictTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/ExceptionsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/GroupsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/GroupsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/GroupsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/InterfaceTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/InterfaceTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/InterfaceTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/InterfaceTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/LoginTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/LoginTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/LoginTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/LoginTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/LogsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/LogsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/LogsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/MenusTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/MenusTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/MenusTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/MessagesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/MessagesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/MessagesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/NewTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/NewTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/NewTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/NewTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/NotificationsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/NotificationsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/NotificationsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/NotificationsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/OnlineTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/OnlineTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/OnlineTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/OnlineTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/ProfilesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/ProfilesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/ProfilesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/ProfilesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/RegisterTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/RegisterTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/RegisterTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/RegisterTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/RolesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/RolesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/RolesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/SettingsTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/SettingsTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/SettingsTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/SettingsTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/TasksTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/TasksTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/TasksTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/TracesTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/TracesTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/TracesTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/TracesTest.cs diff --git a/UnitTest/Bootstrap.Admin/Api/SQLite/UsersTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLite/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Api/SQLite/UsersTest.cs rename to test/UnitTest/Bootstrap.Admin/Api/SQLite/UsersTest.cs diff --git a/UnitTest/Bootstrap.Admin/ControllerTest.cs b/test/UnitTest/Bootstrap.Admin/ControllerTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/ControllerTest.cs rename to test/UnitTest/Bootstrap.Admin/ControllerTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/MySql/AccountTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/MySql/AccountTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/MySql/AccountTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/MySql/AccountTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/MySql/AdminTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/MySql/AdminTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/MySql/AdminTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/MySql/AdminTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/MySql/HomeTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/MySql/HomeTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/MySql/HomeTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/MySql/HomeTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AdminTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AdminTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/SQLServer/AdminTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AdminTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HealthCheck.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HealthCheck.cs similarity index 84% rename from UnitTest/Bootstrap.Admin/Controllers/SQLServer/HealthCheck.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HealthCheck.cs index df4830e7..4a5ecccf 100644 --- a/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HealthCheck.cs +++ b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HealthCheck.cs @@ -1,7 +1,6 @@ -using Bootstrap.Admin; -using Xunit; +using Xunit; -namespace UnitTest.Bootstrap.Admin.Controllers.SQLServer +namespace Bootstrap.Admin.Controllers.SQLServer { public class HealthCheck : ControllerTest { diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HomeTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HomeTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/SQLServer/HomeTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/HomeTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLite/AccountTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLite/AccountTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/SQLite/AccountTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLite/AccountTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLite/AdminTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLite/AdminTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/SQLite/AdminTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLite/AdminTest.cs diff --git a/UnitTest/Bootstrap.Admin/Controllers/SQLite/HomeTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLite/HomeTest.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/Controllers/SQLite/HomeTest.cs rename to test/UnitTest/Bootstrap.Admin/Controllers/SQLite/HomeTest.cs diff --git a/UnitTest/Bootstrap.Admin/HttpClientExtensions.cs b/test/UnitTest/Bootstrap.Admin/HttpClientExtensions.cs similarity index 100% rename from UnitTest/Bootstrap.Admin/HttpClientExtensions.cs rename to test/UnitTest/Bootstrap.Admin/HttpClientExtensions.cs diff --git a/UnitTest/Bootstrap.DataAccess/MessageBodyTest.cs b/test/UnitTest/Bootstrap.DataAccess/MessageBodyTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MessageBodyTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MessageBodyTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/AppTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/AppTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/AppTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/AppTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/DictsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/DictsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/DictsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/DictsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/ExceptionsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/GroupsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/GroupsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/GroupsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/LogsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/LogsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/LogsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/MenusTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/MenusTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/MenusTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/MessagesTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/MessagesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/MessagesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/ResetUserTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/ResetUserTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/ResetUserTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/ResetUserTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/RolesTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/RolesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/RolesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/TasksTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/TasksTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/TasksTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/TracesTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/TracesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/TracesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/TracesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MongoDB/UsersTest.cs b/test/UnitTest/Bootstrap.DataAccess/MongoDB/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MongoDB/UsersTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MongoDB/UsersTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/AppTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/AppTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/AppTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/AppTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/DictsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/DictsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/DictsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/DictsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/ExceptionsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/GroupsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/GroupsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/GroupsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/LogsTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/LogsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/LogsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/MenusTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/MenusTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/MenusTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/MessagesTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/MessagesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/MessagesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/ResetUserTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/ResetUserTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/ResetUserTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/ResetUserTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/RolesTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/RolesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/RolesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/TasksTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/TasksTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/TasksTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/TracesTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/TracesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/TracesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/TracesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/MySql/UsersTest.cs b/test/UnitTest/Bootstrap.DataAccess/MySql/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/MySql/UsersTest.cs rename to test/UnitTest/Bootstrap.DataAccess/MySql/UsersTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/RollbackTest.cs b/test/UnitTest/Bootstrap.DataAccess/RollbackTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/RollbackTest.cs rename to test/UnitTest/Bootstrap.DataAccess/RollbackTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/AppTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/AppTest.cs similarity index 99% rename from UnitTest/Bootstrap.DataAccess/SQLServer/AppTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/AppTest.cs index 7fb72411..7161457b 100644 --- a/UnitTest/Bootstrap.DataAccess/SQLServer/AppTest.cs +++ b/test/UnitTest/Bootstrap.DataAccess/SQLServer/AppTest.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using UnitTest; using Xunit; namespace Bootstrap.DataAccess.SqlServer diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/AutoRollbackAttribute.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/AutoRollbackAttribute.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/AutoRollbackAttribute.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/AutoRollbackAttribute.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/ExceptionsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/GroupsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/GroupsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/GroupsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/LogsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/LogsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/LogsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/MenusTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/MenusTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/MenusTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/MessagesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/MessagesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/MessagesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/ResetUserTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/ResetUserTest.cs similarity index 98% rename from UnitTest/Bootstrap.DataAccess/SQLServer/ResetUserTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/ResetUserTest.cs index 702a5460..c7fdc656 100644 --- a/UnitTest/Bootstrap.DataAccess/SQLServer/ResetUserTest.cs +++ b/test/UnitTest/Bootstrap.DataAccess/SQLServer/ResetUserTest.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using Xunit; namespace Bootstrap.DataAccess.SqlServer diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/TasksTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/TasksTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/TasksTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/TracesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/TracesTest.cs similarity index 97% rename from UnitTest/Bootstrap.DataAccess/SQLServer/TracesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/TracesTest.cs index 92c7baa6..3980de19 100644 --- a/UnitTest/Bootstrap.DataAccess/SQLServer/TracesTest.cs +++ b/test/UnitTest/Bootstrap.DataAccess/SQLServer/TracesTest.cs @@ -1,5 +1,4 @@ -using Longbow.Data; -using Longbow.Web.Mvc; +using Longbow.Web.Mvc; using System; using Xunit; diff --git a/UnitTest/Bootstrap.DataAccess/SQLServer/UsersTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLServer/UsersTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLServer/UsersTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/AppTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/AppTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/AppTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/AppTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/DictsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/DictsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/DictsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/DictsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/ExceptionsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/ExceptionsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/ExceptionsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/ExceptionsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/GroupsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/GroupsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/GroupsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/GroupsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/LogsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/LogsTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/LogsTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/LogsTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/MenusTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/MenusTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/MenusTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/MenusTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/MessagesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/MessagesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/MessagesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/MessagesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/ResetUserTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/ResetUserTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/ResetUserTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/ResetUserTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/RolesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/RolesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/RolesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/RolesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/TasksTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/TasksTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/TasksTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/TasksTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/TracesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/TracesTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/TracesTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/TracesTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SQLite/UsersTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLite/UsersTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SQLite/UsersTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SQLite/UsersTest.cs diff --git a/UnitTest/Bootstrap.DataAccess/SystemModeTest.cs b/test/UnitTest/Bootstrap.DataAccess/SystemModeTest.cs similarity index 100% rename from UnitTest/Bootstrap.DataAccess/SystemModeTest.cs rename to test/UnitTest/Bootstrap.DataAccess/SystemModeTest.cs diff --git a/UnitTest/CollectionOrder/DisplayNameOrder.cs b/test/UnitTest/CollectionOrder/DisplayNameOrder.cs similarity index 100% rename from UnitTest/CollectionOrder/DisplayNameOrder.cs rename to test/UnitTest/CollectionOrder/DisplayNameOrder.cs diff --git a/UnitTest/DB/UnitTest.db b/test/UnitTest/DB/UnitTest.db similarity index 100% rename from UnitTest/DB/UnitTest.db rename to test/UnitTest/DB/UnitTest.db diff --git a/UnitTest/TestHelper.cs b/test/UnitTest/TestHelper.cs similarity index 90% rename from UnitTest/TestHelper.cs rename to test/UnitTest/TestHelper.cs index 2435f7c9..f09e6a1f 100644 --- a/UnitTest/TestHelper.cs +++ b/test/UnitTest/TestHelper.cs @@ -33,20 +33,6 @@ namespace UnitTest return Path.Combine(soluFolder, folder); } - /// - /// - /// - public static void CopyLicense() - { - var licFile = RetrievePath($"Scripts{Path.DirectorySeparatorChar}Longbow.lic"); - - var targetFile = Path.Combine(AppContext.BaseDirectory, "Longbow.lic"); - if (!File.Exists(targetFile)) - { - File.Copy(licFile, targetFile, true); - } - } - public static void ConfigureWebHost(IWebHostBuilder builder, DatabaseProviderType providerName = DatabaseProviderType.SqlServer) { if (providerName == DatabaseProviderType.SQLite) diff --git a/UnitTest/UnitTest.csproj b/test/UnitTest/UnitTest.csproj similarity index 78% rename from UnitTest/UnitTest.csproj rename to test/UnitTest/UnitTest.csproj index 3ec8170b..47f9f8bf 100644 --- a/UnitTest/UnitTest.csproj +++ b/test/UnitTest/UnitTest.csproj @@ -3,7 +3,6 @@ netcoreapp2.2 false - true full @@ -26,9 +25,9 @@ - - - + + + diff --git a/UnitTest/appsettings.appveyor.json b/test/UnitTest/appsettings.appveyor.json similarity index 100% rename from UnitTest/appsettings.appveyor.json rename to test/UnitTest/appsettings.appveyor.json diff --git a/UnitTest/appsettings.json b/test/UnitTest/appsettings.json similarity index 93% rename from UnitTest/appsettings.json rename to test/UnitTest/appsettings.json index 32dc8f56..c7f3e469 100644 --- a/UnitTest/appsettings.json +++ b/test/UnitTest/appsettings.json @@ -5,7 +5,8 @@ "System": "Error", "Microsoft": "Error", "Longbow.Logging.FileLogger": "None", - "Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware": "None" + "Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware": "None", + "Microsoft.Extensions.Diagnostics.HealthChecks": "None" } }, "ConnectionStrings": {