diff --git a/.gitmodules b/.gitmodules index 0d12baa..676e11c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "SimpleLogger"] - path = SimpleLogger + path = Libraries/SimpleLogger url = https://systems.reslate.xyz/git/ydeng/SimpleLogger.git diff --git a/SimpleLogger b/Libraries/SimpleLogger similarity index 100% rename from SimpleLogger rename to Libraries/SimpleLogger diff --git a/MultiShop.Shop/AliExpressModule/LRUCache.cs b/MultiShop-Modules/MultiShop.Shop/AliExpressModule/LRUCache.cs similarity index 100% rename from MultiShop.Shop/AliExpressModule/LRUCache.cs rename to MultiShop-Modules/MultiShop.Shop/AliExpressModule/LRUCache.cs diff --git a/MultiShop.Shop/AliExpressModule/MultiShop.Shop.AliExpressModule.csproj b/MultiShop-Modules/MultiShop.Shop/AliExpressModule/MultiShop.Shop.AliExpressModule.csproj similarity index 73% rename from MultiShop.Shop/AliExpressModule/MultiShop.Shop.AliExpressModule.csproj rename to MultiShop-Modules/MultiShop.Shop/AliExpressModule/MultiShop.Shop.AliExpressModule.csproj index a0fe48c..cbe1ea9 100644 --- a/MultiShop.Shop/AliExpressModule/MultiShop.Shop.AliExpressModule.csproj +++ b/MultiShop-Modules/MultiShop.Shop/AliExpressModule/MultiShop.Shop.AliExpressModule.csproj @@ -2,7 +2,7 @@ - + diff --git a/MultiShop.Shop/AliExpressModule/Shop.cs b/MultiShop-Modules/MultiShop.Shop/AliExpressModule/Shop.cs similarity index 100% rename from MultiShop.Shop/AliExpressModule/Shop.cs rename to MultiShop-Modules/MultiShop.Shop/AliExpressModule/Shop.cs diff --git a/MultiShop.Shop/AliExpressModule/ShopEnumerator.cs b/MultiShop-Modules/MultiShop.Shop/AliExpressModule/ShopEnumerator.cs similarity index 100% rename from MultiShop.Shop/AliExpressModule/ShopEnumerator.cs rename to MultiShop-Modules/MultiShop.Shop/AliExpressModule/ShopEnumerator.cs diff --git a/MultiShop.Shop/BanggoodModule/MultiShop.Shop.BanggoodModule.csproj b/MultiShop-Modules/MultiShop.Shop/BanggoodModule/MultiShop.Shop.BanggoodModule.csproj similarity index 79% rename from MultiShop.Shop/BanggoodModule/MultiShop.Shop.BanggoodModule.csproj rename to MultiShop-Modules/MultiShop.Shop/BanggoodModule/MultiShop.Shop.BanggoodModule.csproj index 09a9cae..1100ac5 100644 --- a/MultiShop.Shop/BanggoodModule/MultiShop.Shop.BanggoodModule.csproj +++ b/MultiShop-Modules/MultiShop.Shop/BanggoodModule/MultiShop.Shop.BanggoodModule.csproj @@ -2,7 +2,7 @@ - + diff --git a/MultiShop.Shop/BanggoodModule/Shop.cs b/MultiShop-Modules/MultiShop.Shop/BanggoodModule/Shop.cs similarity index 100% rename from MultiShop.Shop/BanggoodModule/Shop.cs rename to MultiShop-Modules/MultiShop.Shop/BanggoodModule/Shop.cs diff --git a/MultiShop.Shop/BanggoodModule/ShopEnumerator.cs b/MultiShop-Modules/MultiShop.Shop/BanggoodModule/ShopEnumerator.cs similarity index 100% rename from MultiShop.Shop/BanggoodModule/ShopEnumerator.cs rename to MultiShop-Modules/MultiShop.Shop/BanggoodModule/ShopEnumerator.cs diff --git a/MultiShop.Shop/Framework/Currency.cs b/MultiShop-Modules/MultiShop.Shop/Framework/Currency.cs similarity index 100% rename from MultiShop.Shop/Framework/Currency.cs rename to MultiShop-Modules/MultiShop.Shop/Framework/Currency.cs diff --git a/MultiShop.Shop/Framework/IShop.cs b/MultiShop-Modules/MultiShop.Shop/Framework/IShop.cs similarity index 100% rename from MultiShop.Shop/Framework/IShop.cs rename to MultiShop-Modules/MultiShop.Shop/Framework/IShop.cs diff --git a/MultiShop.Shop/Framework/MultiShop.Shop.Framework.csproj b/MultiShop-Modules/MultiShop.Shop/Framework/MultiShop.Shop.Framework.csproj similarity index 100% rename from MultiShop.Shop/Framework/MultiShop.Shop.Framework.csproj rename to MultiShop-Modules/MultiShop.Shop/Framework/MultiShop.Shop.Framework.csproj diff --git a/MultiShop.Shop/Framework/ProductListing.cs b/MultiShop-Modules/MultiShop.Shop/Framework/ProductListing.cs similarity index 100% rename from MultiShop.Shop/Framework/ProductListing.cs rename to MultiShop-Modules/MultiShop.Shop/Framework/ProductListing.cs diff --git a/test/MultiShop.Shop/AliExpressModule.Tests/MultiShop.Shop.AliExpressModule.Tests.csproj b/MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/MultiShop.Shop.AliExpressModule.Tests.csproj similarity index 91% rename from test/MultiShop.Shop/AliExpressModule.Tests/MultiShop.Shop.AliExpressModule.Tests.csproj rename to MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/MultiShop.Shop.AliExpressModule.Tests.csproj index 86a6859..65a441f 100644 --- a/test/MultiShop.Shop/AliExpressModule.Tests/MultiShop.Shop.AliExpressModule.Tests.csproj +++ b/MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/MultiShop.Shop.AliExpressModule.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/test/MultiShop.Shop/AliExpressModule.Tests/ShopTest.cs b/MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/ShopTest.cs similarity index 100% rename from test/MultiShop.Shop/AliExpressModule.Tests/ShopTest.cs rename to MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/ShopTest.cs diff --git a/test/MultiShop.Shop/AliExpressModule.Tests/XUnitLogger.cs b/MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/XUnitLogger.cs similarity index 100% rename from test/MultiShop.Shop/AliExpressModule.Tests/XUnitLogger.cs rename to MultiShop-Modules/test/MultiShop.Shop/AliExpressModule.Tests/XUnitLogger.cs diff --git a/test/MultiShop.Shop/BanggoodModule.Tests/MultiShop.Shop.BanggoodModule.Tests.csproj b/MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/MultiShop.Shop.BanggoodModule.Tests.csproj similarity index 91% rename from test/MultiShop.Shop/BanggoodModule.Tests/MultiShop.Shop.BanggoodModule.Tests.csproj rename to MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/MultiShop.Shop.BanggoodModule.Tests.csproj index c7ff2a9..fb3c389 100644 --- a/test/MultiShop.Shop/BanggoodModule.Tests/MultiShop.Shop.BanggoodModule.Tests.csproj +++ b/MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/MultiShop.Shop.BanggoodModule.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/test/MultiShop.Shop/BanggoodModule.Tests/ShopTest.cs b/MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/ShopTest.cs similarity index 100% rename from test/MultiShop.Shop/BanggoodModule.Tests/ShopTest.cs rename to MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/ShopTest.cs diff --git a/test/MultiShop.Shop/BanggoodModule.Tests/XUnitLogger.cs b/MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/XUnitLogger.cs similarity index 100% rename from test/MultiShop.Shop/BanggoodModule.Tests/XUnitLogger.cs rename to MultiShop-Modules/test/MultiShop.Shop/BanggoodModule.Tests/XUnitLogger.cs diff --git a/scripts/reset_db.py b/scripts/reset_db.py deleted file mode 100644 index b2b925d..0000000 --- a/scripts/reset_db.py +++ /dev/null @@ -1,28 +0,0 @@ -import os -import shutil - - -SERVER_DIR = "src/MultiShop/Server" -DATA_DIR = "Data" -DB_MIGRATE_CMD = "dotnet ef migrations add InitialCreate -o {0}" -DB_UPDATE_CMD = "dotnet ef database update" - -os.chdir(os.path.dirname(os.path.realpath(__file__))) -os.chdir("..") -os.chdir(SERVER_DIR) -print("Working in: " + os.getcwd()) - -migrationsDir = os.path.join(DATA_DIR, "Migrations") - -print("Deleting current migrations directory if it exists.") -shutil.rmtree(migrationsDir, ignore_errors=True) - -print("Deleting old app.db if it exists.") -if os.path.exists("app.db"): - os.remove("app.db") - -print("Creating migration.") -os.system(DB_MIGRATE_CMD.format(migrationsDir)) - -print("Updating database.") -os.system(DB_UPDATE_CMD) \ No newline at end of file diff --git a/scripts/watch_all.py b/scripts/watch_all.py deleted file mode 100644 index c011964..0000000 --- a/scripts/watch_all.py +++ /dev/null @@ -1,24 +0,0 @@ -import os -import asyncio -import sys - -SERVER_CSPROJ_DIR = "src/MultiShop/Server" -ASSET_WATCH_DIR = "src/MultiShop/Client/assets" - - -async def exec(cmd, path): - os.chdir(os.path.dirname(os.path.realpath(__file__))) - os.chdir(os.pardir) - os.chdir(path) - proc = await asyncio.create_subprocess_shell( - cmd, - stdout=sys.stdout, - stderr=sys.stderr, - ) - - await proc.wait() - -async def main(): - await asyncio.gather(exec("dotnet watch run", SERVER_CSPROJ_DIR), exec("npm run watch", ASSET_WATCH_DIR)) - -asyncio.run(main()) \ No newline at end of file