From fcfa6b78bec742f3ec47f12cb55abe242461c1c6 Mon Sep 17 00:00:00 2001 From: Lucas Michot Date: Sat, 10 Jul 2021 19:22:40 +0200 Subject: [PATCH] Simplify directory structure. --- composer.json | 4 ++-- phpunit.xml.dist | 14 +++++++------- src/{ShopifyApp => }/Actions/ActivatePlan.php | 0 .../Actions/ActivateUsageCharge.php | 0 src/{ShopifyApp => }/Actions/AfterAuthorize.php | 0 src/{ShopifyApp => }/Actions/AuthenticateShop.php | 0 src/{ShopifyApp => }/Actions/CancelCharge.php | 0 src/{ShopifyApp => }/Actions/CancelCurrentPlan.php | 0 src/{ShopifyApp => }/Actions/CreateScripts.php | 0 src/{ShopifyApp => }/Actions/CreateWebhooks.php | 0 src/{ShopifyApp => }/Actions/DeleteWebhooks.php | 0 src/{ShopifyApp => }/Actions/DispatchScripts.php | 0 src/{ShopifyApp => }/Actions/DispatchWebhooks.php | 0 src/{ShopifyApp => }/Actions/GetPlanUrl.php | 0 src/{ShopifyApp => }/Actions/InstallShop.php | 0 .../Console/WebhookJobMakeCommand.php | 0 .../Console/stubs/webhook-job.stub | 0 src/{ShopifyApp => }/Contracts/ApiHelper.php | 0 src/{ShopifyApp => }/Contracts/Commands/Charge.php | 0 src/{ShopifyApp => }/Contracts/Commands/Shop.php | 0 .../Contracts/Objects/Values/AccessToken.php | 0 .../Contracts/Objects/Values/PlanId.php | 0 .../Contracts/Objects/Values/SessionId.php | 0 .../Contracts/Objects/Values/SessionToken.php | 0 .../Contracts/Objects/Values/ShopDomain.php | 0 .../Contracts/Objects/Values/ShopId.php | 0 src/{ShopifyApp => }/Contracts/Queries/Charge.php | 0 src/{ShopifyApp => }/Contracts/Queries/Plan.php | 0 src/{ShopifyApp => }/Contracts/Queries/Shop.php | 0 src/{ShopifyApp => }/Contracts/ShopModel.php | 0 src/{ShopifyApp => }/Directives/SessionToken.php | 0 src/{ShopifyApp => }/Exceptions/ApiException.php | 0 src/{ShopifyApp => }/Exceptions/BaseException.php | 0 .../Exceptions/ChargeNotRecurringException.php | 0 .../ChargeNotRecurringOrOnetimeException.php | 0 src/{ShopifyApp => }/Exceptions/HttpException.php | 0 .../Exceptions/MissingAuthUrlException.php | 0 .../Exceptions/MissingShopDomainException.php | 0 .../Exceptions/SignatureVerificationException.php | 0 .../Http/Controllers/ApiController.php | 0 .../Http/Controllers/AuthController.php | 0 .../Http/Controllers/BillingController.php | 0 .../Http/Controllers/HomeController.php | 0 .../Http/Controllers/WebhookController.php | 0 src/{ShopifyApp => }/Http/Middleware/AuthProxy.php | 0 .../Http/Middleware/AuthWebhook.php | 0 src/{ShopifyApp => }/Http/Middleware/Billable.php | 0 .../Http/Middleware/VerifyShopify.php | 0 .../Http/Requests/StoreUsageCharge.php | 0 src/{ShopifyApp => }/Macros/TokenRedirect.php | 0 src/{ShopifyApp => }/Macros/TokenRoute.php | 0 src/{ShopifyApp => }/Macros/TokenUrl.php | 0 .../Messaging/Events/AppLoggedIn.php | 0 .../Messaging/Jobs/AppUninstalledJob.php | 0 .../Messaging/Jobs/ScripttagInstaller.php | 0 .../Messaging/Jobs/WebhookInstaller.php | 0 src/{ShopifyApp => }/Objects/Enums/ApiMethod.php | 0 src/{ShopifyApp => }/Objects/Enums/AuthMode.php | 0 .../Objects/Enums/ChargeInterval.php | 0 .../Objects/Enums/ChargeStatus.php | 0 src/{ShopifyApp => }/Objects/Enums/ChargeType.php | 0 src/{ShopifyApp => }/Objects/Enums/DataSource.php | 0 .../Objects/Enums/PlanInterval.php | 0 src/{ShopifyApp => }/Objects/Enums/PlanType.php | 0 .../Objects/Transfers/AbstractTransfer.php | 0 src/{ShopifyApp => }/Objects/Transfers/Charge.php | 0 .../Objects/Transfers/PlanDetails.php | 0 .../Objects/Transfers/UsageCharge.php | 0 .../Objects/Transfers/UsageChargeDetails.php | 0 .../Objects/Values/AccessToken.php | 0 src/{ShopifyApp => }/Objects/Values/ChargeId.php | 0 .../Objects/Values/ChargeReference.php | 0 src/{ShopifyApp => }/Objects/Values/Hmac.php | 0 .../Objects/Values/NullAccessToken.php | 0 src/{ShopifyApp => }/Objects/Values/NullPlanId.php | 0 .../Objects/Values/NullSessionId.php | 0 .../Objects/Values/NullSessionToken.php | 0 .../Objects/Values/NullShopDomain.php | 0 .../Objects/Values/NullableAccessToken.php | 0 .../Objects/Values/NullablePlanId.php | 0 .../Objects/Values/NullableSessionId.php | 0 .../Objects/Values/NullableSessionToken.php | 0 .../Objects/Values/NullableShopDomain.php | 0 src/{ShopifyApp => }/Objects/Values/PlanId.php | 0 .../Objects/Values/SessionContext.php | 0 src/{ShopifyApp => }/Objects/Values/SessionId.php | 0 .../Objects/Values/SessionToken.php | 0 src/{ShopifyApp => }/Objects/Values/ShopDomain.php | 0 src/{ShopifyApp => }/Objects/Values/ShopId.php | 0 src/{ShopifyApp => }/Services/ApiHelper.php | 0 src/{ShopifyApp => }/Services/ChargeHelper.php | 0 src/{ShopifyApp => }/Services/CookieHelper.php | 0 src/{ShopifyApp => }/ShopifyAppProvider.php | 0 src/{ShopifyApp => }/Storage/Commands/Charge.php | 0 src/{ShopifyApp => }/Storage/Commands/Shop.php | 0 src/{ShopifyApp => }/Storage/Models/Charge.php | 0 src/{ShopifyApp => }/Storage/Models/Plan.php | 0 src/{ShopifyApp => }/Storage/Observers/Shop.php | 0 src/{ShopifyApp => }/Storage/Queries/Charge.php | 0 src/{ShopifyApp => }/Storage/Queries/Plan.php | 0 src/{ShopifyApp => }/Storage/Queries/Shop.php | 0 .../Storage/Scopes/Namespacing.php | 0 src/{ShopifyApp => }/Traits/ApiController.php | 0 src/{ShopifyApp => }/Traits/AuthController.php | 0 src/{ShopifyApp => }/Traits/BillingController.php | 0 src/{ShopifyApp => }/Traits/HomeController.php | 0 src/{ShopifyApp => }/Traits/ShopAccessible.php | 0 src/{ShopifyApp => }/Traits/ShopModel.php | 0 src/{ShopifyApp => }/Traits/WebhookController.php | 0 src/{ShopifyApp => }/Util.php | 0 .../resources/config/shopify-app.php | 0 .../resources/database/factories/ChargeFactory.php | 0 .../resources/database/factories/PlanFactory.php | 0 .../resources/database/factories/ShopFactory.php | 0 .../2020_01_29_010501_create_plans_table.php | 0 .../2020_01_29_230905_create_shops_table.php | 0 .../2020_01_29_231006_create_charges_table.php | 0 ...211514_add_interval_column_to_charges_table.php | 0 ...3_211854_add_interval_column_to_plans_table.php | 0 ...3633_add_password_updated_at_to_users_table.php | 0 .../resources/jobs/AppUninstalledJob.php | 0 src/{ShopifyApp => }/resources/routes/api.php | 0 src/{ShopifyApp => }/resources/routes/shopify.php | 0 .../views/auth/fullpage_redirect.blade.php | 0 .../resources/views/auth/token.blade.php | 0 .../resources/views/billing/error.blade.php | 0 .../views/billing/fullpage_redirect.blade.php | 0 .../resources/views/home/index.blade.php | 0 .../resources/views/layouts/default.blade.php | 0 .../resources/views/layouts/error.blade.php | 0 .../views/partials/flash_messages.blade.php | 0 .../views/partials/laravel_skeleton_css.blade.php | 0 .../views/partials/polaris_skeleton_css.blade.php | 0 .../views/partials/token_handler.blade.php | 0 tests/TestCase.php | 2 +- 135 files changed, 10 insertions(+), 10 deletions(-) rename src/{ShopifyApp => }/Actions/ActivatePlan.php (100%) rename src/{ShopifyApp => }/Actions/ActivateUsageCharge.php (100%) rename src/{ShopifyApp => }/Actions/AfterAuthorize.php (100%) rename src/{ShopifyApp => }/Actions/AuthenticateShop.php (100%) rename src/{ShopifyApp => }/Actions/CancelCharge.php (100%) rename src/{ShopifyApp => }/Actions/CancelCurrentPlan.php (100%) rename src/{ShopifyApp => }/Actions/CreateScripts.php (100%) rename src/{ShopifyApp => }/Actions/CreateWebhooks.php (100%) rename src/{ShopifyApp => }/Actions/DeleteWebhooks.php (100%) rename src/{ShopifyApp => }/Actions/DispatchScripts.php (100%) rename src/{ShopifyApp => }/Actions/DispatchWebhooks.php (100%) rename src/{ShopifyApp => }/Actions/GetPlanUrl.php (100%) rename src/{ShopifyApp => }/Actions/InstallShop.php (100%) rename src/{ShopifyApp => }/Console/WebhookJobMakeCommand.php (100%) rename src/{ShopifyApp => }/Console/stubs/webhook-job.stub (100%) rename src/{ShopifyApp => }/Contracts/ApiHelper.php (100%) rename src/{ShopifyApp => }/Contracts/Commands/Charge.php (100%) rename src/{ShopifyApp => }/Contracts/Commands/Shop.php (100%) rename src/{ShopifyApp => }/Contracts/Objects/Values/AccessToken.php (100%) rename src/{ShopifyApp => }/Contracts/Objects/Values/PlanId.php (100%) rename src/{ShopifyApp => }/Contracts/Objects/Values/SessionId.php (100%) rename src/{ShopifyApp => }/Contracts/Objects/Values/SessionToken.php (100%) rename src/{ShopifyApp => }/Contracts/Objects/Values/ShopDomain.php (100%) rename src/{ShopifyApp => }/Contracts/Objects/Values/ShopId.php (100%) rename src/{ShopifyApp => }/Contracts/Queries/Charge.php (100%) rename src/{ShopifyApp => }/Contracts/Queries/Plan.php (100%) rename src/{ShopifyApp => }/Contracts/Queries/Shop.php (100%) rename src/{ShopifyApp => }/Contracts/ShopModel.php (100%) rename src/{ShopifyApp => }/Directives/SessionToken.php (100%) rename src/{ShopifyApp => }/Exceptions/ApiException.php (100%) rename src/{ShopifyApp => }/Exceptions/BaseException.php (100%) rename src/{ShopifyApp => }/Exceptions/ChargeNotRecurringException.php (100%) rename src/{ShopifyApp => }/Exceptions/ChargeNotRecurringOrOnetimeException.php (100%) rename src/{ShopifyApp => }/Exceptions/HttpException.php (100%) rename src/{ShopifyApp => }/Exceptions/MissingAuthUrlException.php (100%) rename src/{ShopifyApp => }/Exceptions/MissingShopDomainException.php (100%) rename src/{ShopifyApp => }/Exceptions/SignatureVerificationException.php (100%) rename src/{ShopifyApp => }/Http/Controllers/ApiController.php (100%) rename src/{ShopifyApp => }/Http/Controllers/AuthController.php (100%) rename src/{ShopifyApp => }/Http/Controllers/BillingController.php (100%) rename src/{ShopifyApp => }/Http/Controllers/HomeController.php (100%) rename src/{ShopifyApp => }/Http/Controllers/WebhookController.php (100%) rename src/{ShopifyApp => }/Http/Middleware/AuthProxy.php (100%) rename src/{ShopifyApp => }/Http/Middleware/AuthWebhook.php (100%) rename src/{ShopifyApp => }/Http/Middleware/Billable.php (100%) rename src/{ShopifyApp => }/Http/Middleware/VerifyShopify.php (100%) rename src/{ShopifyApp => }/Http/Requests/StoreUsageCharge.php (100%) rename src/{ShopifyApp => }/Macros/TokenRedirect.php (100%) rename src/{ShopifyApp => }/Macros/TokenRoute.php (100%) rename src/{ShopifyApp => }/Macros/TokenUrl.php (100%) rename src/{ShopifyApp => }/Messaging/Events/AppLoggedIn.php (100%) rename src/{ShopifyApp => }/Messaging/Jobs/AppUninstalledJob.php (100%) rename src/{ShopifyApp => }/Messaging/Jobs/ScripttagInstaller.php (100%) rename src/{ShopifyApp => }/Messaging/Jobs/WebhookInstaller.php (100%) rename src/{ShopifyApp => }/Objects/Enums/ApiMethod.php (100%) rename src/{ShopifyApp => }/Objects/Enums/AuthMode.php (100%) rename src/{ShopifyApp => }/Objects/Enums/ChargeInterval.php (100%) rename src/{ShopifyApp => }/Objects/Enums/ChargeStatus.php (100%) rename src/{ShopifyApp => }/Objects/Enums/ChargeType.php (100%) rename src/{ShopifyApp => }/Objects/Enums/DataSource.php (100%) rename src/{ShopifyApp => }/Objects/Enums/PlanInterval.php (100%) rename src/{ShopifyApp => }/Objects/Enums/PlanType.php (100%) rename src/{ShopifyApp => }/Objects/Transfers/AbstractTransfer.php (100%) rename src/{ShopifyApp => }/Objects/Transfers/Charge.php (100%) rename src/{ShopifyApp => }/Objects/Transfers/PlanDetails.php (100%) rename src/{ShopifyApp => }/Objects/Transfers/UsageCharge.php (100%) rename src/{ShopifyApp => }/Objects/Transfers/UsageChargeDetails.php (100%) rename src/{ShopifyApp => }/Objects/Values/AccessToken.php (100%) rename src/{ShopifyApp => }/Objects/Values/ChargeId.php (100%) rename src/{ShopifyApp => }/Objects/Values/ChargeReference.php (100%) rename src/{ShopifyApp => }/Objects/Values/Hmac.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullAccessToken.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullPlanId.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullSessionId.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullSessionToken.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullShopDomain.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullableAccessToken.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullablePlanId.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullableSessionId.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullableSessionToken.php (100%) rename src/{ShopifyApp => }/Objects/Values/NullableShopDomain.php (100%) rename src/{ShopifyApp => }/Objects/Values/PlanId.php (100%) rename src/{ShopifyApp => }/Objects/Values/SessionContext.php (100%) rename src/{ShopifyApp => }/Objects/Values/SessionId.php (100%) rename src/{ShopifyApp => }/Objects/Values/SessionToken.php (100%) rename src/{ShopifyApp => }/Objects/Values/ShopDomain.php (100%) rename src/{ShopifyApp => }/Objects/Values/ShopId.php (100%) rename src/{ShopifyApp => }/Services/ApiHelper.php (100%) rename src/{ShopifyApp => }/Services/ChargeHelper.php (100%) rename src/{ShopifyApp => }/Services/CookieHelper.php (100%) rename src/{ShopifyApp => }/ShopifyAppProvider.php (100%) rename src/{ShopifyApp => }/Storage/Commands/Charge.php (100%) rename src/{ShopifyApp => }/Storage/Commands/Shop.php (100%) rename src/{ShopifyApp => }/Storage/Models/Charge.php (100%) rename src/{ShopifyApp => }/Storage/Models/Plan.php (100%) rename src/{ShopifyApp => }/Storage/Observers/Shop.php (100%) rename src/{ShopifyApp => }/Storage/Queries/Charge.php (100%) rename src/{ShopifyApp => }/Storage/Queries/Plan.php (100%) rename src/{ShopifyApp => }/Storage/Queries/Shop.php (100%) rename src/{ShopifyApp => }/Storage/Scopes/Namespacing.php (100%) rename src/{ShopifyApp => }/Traits/ApiController.php (100%) rename src/{ShopifyApp => }/Traits/AuthController.php (100%) rename src/{ShopifyApp => }/Traits/BillingController.php (100%) rename src/{ShopifyApp => }/Traits/HomeController.php (100%) rename src/{ShopifyApp => }/Traits/ShopAccessible.php (100%) rename src/{ShopifyApp => }/Traits/ShopModel.php (100%) rename src/{ShopifyApp => }/Traits/WebhookController.php (100%) rename src/{ShopifyApp => }/Util.php (100%) rename src/{ShopifyApp => }/resources/config/shopify-app.php (100%) rename src/{ShopifyApp => }/resources/database/factories/ChargeFactory.php (100%) rename src/{ShopifyApp => }/resources/database/factories/PlanFactory.php (100%) rename src/{ShopifyApp => }/resources/database/factories/ShopFactory.php (100%) rename src/{ShopifyApp => }/resources/database/migrations/2020_01_29_010501_create_plans_table.php (100%) rename src/{ShopifyApp => }/resources/database/migrations/2020_01_29_230905_create_shops_table.php (100%) rename src/{ShopifyApp => }/resources/database/migrations/2020_01_29_231006_create_charges_table.php (100%) rename src/{ShopifyApp => }/resources/database/migrations/2020_07_03_211514_add_interval_column_to_charges_table.php (100%) rename src/{ShopifyApp => }/resources/database/migrations/2020_07_03_211854_add_interval_column_to_plans_table.php (100%) rename src/{ShopifyApp => }/resources/database/migrations/2021_04_21_103633_add_password_updated_at_to_users_table.php (100%) rename src/{ShopifyApp => }/resources/jobs/AppUninstalledJob.php (100%) rename src/{ShopifyApp => }/resources/routes/api.php (100%) rename src/{ShopifyApp => }/resources/routes/shopify.php (100%) rename src/{ShopifyApp => }/resources/views/auth/fullpage_redirect.blade.php (100%) rename src/{ShopifyApp => }/resources/views/auth/token.blade.php (100%) rename src/{ShopifyApp => }/resources/views/billing/error.blade.php (100%) rename src/{ShopifyApp => }/resources/views/billing/fullpage_redirect.blade.php (100%) rename src/{ShopifyApp => }/resources/views/home/index.blade.php (100%) rename src/{ShopifyApp => }/resources/views/layouts/default.blade.php (100%) rename src/{ShopifyApp => }/resources/views/layouts/error.blade.php (100%) rename src/{ShopifyApp => }/resources/views/partials/flash_messages.blade.php (100%) rename src/{ShopifyApp => }/resources/views/partials/laravel_skeleton_css.blade.php (100%) rename src/{ShopifyApp => }/resources/views/partials/polaris_skeleton_css.blade.php (100%) rename src/{ShopifyApp => }/resources/views/partials/token_handler.blade.php (100%) diff --git a/composer.json b/composer.json index d0bc0d53..18e0f594 100644 --- a/composer.json +++ b/composer.json @@ -50,12 +50,12 @@ }, "autoload": { "psr-4": { - "Osiset\\ShopifyApp\\": "src/ShopifyApp" + "Osiset\\ShopifyApp\\": "src/" } }, "autoload-dev": { "psr-4": { - "Osiset\\ShopifyApp\\Test\\": "tests" + "Osiset\\ShopifyApp\\Test\\": "tests/" } }, "minimum-stability": "dev", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c96be1a3..d2e2c532 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,15 +17,15 @@ > - src/ShopifyApp/ + src/ - src/ShopifyApp/Contracts/ - src/ShopifyApp/Exceptions/ - src/ShopifyApp/Objects/Enums/ - src/ShopifyApp/resources/ - src/ShopifyApp/Messaging/Events/AppLoggedIn.php - src/ShopifyApp/ShopifyAppProvider.php + src/Contracts/ + src/Exceptions/ + src/Objects/Enums/ + src/resources/ + src/Messaging/Events/AppLoggedIn.php + src/ShopifyAppProvider.php diff --git a/src/ShopifyApp/Actions/ActivatePlan.php b/src/Actions/ActivatePlan.php similarity index 100% rename from src/ShopifyApp/Actions/ActivatePlan.php rename to src/Actions/ActivatePlan.php diff --git a/src/ShopifyApp/Actions/ActivateUsageCharge.php b/src/Actions/ActivateUsageCharge.php similarity index 100% rename from src/ShopifyApp/Actions/ActivateUsageCharge.php rename to src/Actions/ActivateUsageCharge.php diff --git a/src/ShopifyApp/Actions/AfterAuthorize.php b/src/Actions/AfterAuthorize.php similarity index 100% rename from src/ShopifyApp/Actions/AfterAuthorize.php rename to src/Actions/AfterAuthorize.php diff --git a/src/ShopifyApp/Actions/AuthenticateShop.php b/src/Actions/AuthenticateShop.php similarity index 100% rename from src/ShopifyApp/Actions/AuthenticateShop.php rename to src/Actions/AuthenticateShop.php diff --git a/src/ShopifyApp/Actions/CancelCharge.php b/src/Actions/CancelCharge.php similarity index 100% rename from src/ShopifyApp/Actions/CancelCharge.php rename to src/Actions/CancelCharge.php diff --git a/src/ShopifyApp/Actions/CancelCurrentPlan.php b/src/Actions/CancelCurrentPlan.php similarity index 100% rename from src/ShopifyApp/Actions/CancelCurrentPlan.php rename to src/Actions/CancelCurrentPlan.php diff --git a/src/ShopifyApp/Actions/CreateScripts.php b/src/Actions/CreateScripts.php similarity index 100% rename from src/ShopifyApp/Actions/CreateScripts.php rename to src/Actions/CreateScripts.php diff --git a/src/ShopifyApp/Actions/CreateWebhooks.php b/src/Actions/CreateWebhooks.php similarity index 100% rename from src/ShopifyApp/Actions/CreateWebhooks.php rename to src/Actions/CreateWebhooks.php diff --git a/src/ShopifyApp/Actions/DeleteWebhooks.php b/src/Actions/DeleteWebhooks.php similarity index 100% rename from src/ShopifyApp/Actions/DeleteWebhooks.php rename to src/Actions/DeleteWebhooks.php diff --git a/src/ShopifyApp/Actions/DispatchScripts.php b/src/Actions/DispatchScripts.php similarity index 100% rename from src/ShopifyApp/Actions/DispatchScripts.php rename to src/Actions/DispatchScripts.php diff --git a/src/ShopifyApp/Actions/DispatchWebhooks.php b/src/Actions/DispatchWebhooks.php similarity index 100% rename from src/ShopifyApp/Actions/DispatchWebhooks.php rename to src/Actions/DispatchWebhooks.php diff --git a/src/ShopifyApp/Actions/GetPlanUrl.php b/src/Actions/GetPlanUrl.php similarity index 100% rename from src/ShopifyApp/Actions/GetPlanUrl.php rename to src/Actions/GetPlanUrl.php diff --git a/src/ShopifyApp/Actions/InstallShop.php b/src/Actions/InstallShop.php similarity index 100% rename from src/ShopifyApp/Actions/InstallShop.php rename to src/Actions/InstallShop.php diff --git a/src/ShopifyApp/Console/WebhookJobMakeCommand.php b/src/Console/WebhookJobMakeCommand.php similarity index 100% rename from src/ShopifyApp/Console/WebhookJobMakeCommand.php rename to src/Console/WebhookJobMakeCommand.php diff --git a/src/ShopifyApp/Console/stubs/webhook-job.stub b/src/Console/stubs/webhook-job.stub similarity index 100% rename from src/ShopifyApp/Console/stubs/webhook-job.stub rename to src/Console/stubs/webhook-job.stub diff --git a/src/ShopifyApp/Contracts/ApiHelper.php b/src/Contracts/ApiHelper.php similarity index 100% rename from src/ShopifyApp/Contracts/ApiHelper.php rename to src/Contracts/ApiHelper.php diff --git a/src/ShopifyApp/Contracts/Commands/Charge.php b/src/Contracts/Commands/Charge.php similarity index 100% rename from src/ShopifyApp/Contracts/Commands/Charge.php rename to src/Contracts/Commands/Charge.php diff --git a/src/ShopifyApp/Contracts/Commands/Shop.php b/src/Contracts/Commands/Shop.php similarity index 100% rename from src/ShopifyApp/Contracts/Commands/Shop.php rename to src/Contracts/Commands/Shop.php diff --git a/src/ShopifyApp/Contracts/Objects/Values/AccessToken.php b/src/Contracts/Objects/Values/AccessToken.php similarity index 100% rename from src/ShopifyApp/Contracts/Objects/Values/AccessToken.php rename to src/Contracts/Objects/Values/AccessToken.php diff --git a/src/ShopifyApp/Contracts/Objects/Values/PlanId.php b/src/Contracts/Objects/Values/PlanId.php similarity index 100% rename from src/ShopifyApp/Contracts/Objects/Values/PlanId.php rename to src/Contracts/Objects/Values/PlanId.php diff --git a/src/ShopifyApp/Contracts/Objects/Values/SessionId.php b/src/Contracts/Objects/Values/SessionId.php similarity index 100% rename from src/ShopifyApp/Contracts/Objects/Values/SessionId.php rename to src/Contracts/Objects/Values/SessionId.php diff --git a/src/ShopifyApp/Contracts/Objects/Values/SessionToken.php b/src/Contracts/Objects/Values/SessionToken.php similarity index 100% rename from src/ShopifyApp/Contracts/Objects/Values/SessionToken.php rename to src/Contracts/Objects/Values/SessionToken.php diff --git a/src/ShopifyApp/Contracts/Objects/Values/ShopDomain.php b/src/Contracts/Objects/Values/ShopDomain.php similarity index 100% rename from src/ShopifyApp/Contracts/Objects/Values/ShopDomain.php rename to src/Contracts/Objects/Values/ShopDomain.php diff --git a/src/ShopifyApp/Contracts/Objects/Values/ShopId.php b/src/Contracts/Objects/Values/ShopId.php similarity index 100% rename from src/ShopifyApp/Contracts/Objects/Values/ShopId.php rename to src/Contracts/Objects/Values/ShopId.php diff --git a/src/ShopifyApp/Contracts/Queries/Charge.php b/src/Contracts/Queries/Charge.php similarity index 100% rename from src/ShopifyApp/Contracts/Queries/Charge.php rename to src/Contracts/Queries/Charge.php diff --git a/src/ShopifyApp/Contracts/Queries/Plan.php b/src/Contracts/Queries/Plan.php similarity index 100% rename from src/ShopifyApp/Contracts/Queries/Plan.php rename to src/Contracts/Queries/Plan.php diff --git a/src/ShopifyApp/Contracts/Queries/Shop.php b/src/Contracts/Queries/Shop.php similarity index 100% rename from src/ShopifyApp/Contracts/Queries/Shop.php rename to src/Contracts/Queries/Shop.php diff --git a/src/ShopifyApp/Contracts/ShopModel.php b/src/Contracts/ShopModel.php similarity index 100% rename from src/ShopifyApp/Contracts/ShopModel.php rename to src/Contracts/ShopModel.php diff --git a/src/ShopifyApp/Directives/SessionToken.php b/src/Directives/SessionToken.php similarity index 100% rename from src/ShopifyApp/Directives/SessionToken.php rename to src/Directives/SessionToken.php diff --git a/src/ShopifyApp/Exceptions/ApiException.php b/src/Exceptions/ApiException.php similarity index 100% rename from src/ShopifyApp/Exceptions/ApiException.php rename to src/Exceptions/ApiException.php diff --git a/src/ShopifyApp/Exceptions/BaseException.php b/src/Exceptions/BaseException.php similarity index 100% rename from src/ShopifyApp/Exceptions/BaseException.php rename to src/Exceptions/BaseException.php diff --git a/src/ShopifyApp/Exceptions/ChargeNotRecurringException.php b/src/Exceptions/ChargeNotRecurringException.php similarity index 100% rename from src/ShopifyApp/Exceptions/ChargeNotRecurringException.php rename to src/Exceptions/ChargeNotRecurringException.php diff --git a/src/ShopifyApp/Exceptions/ChargeNotRecurringOrOnetimeException.php b/src/Exceptions/ChargeNotRecurringOrOnetimeException.php similarity index 100% rename from src/ShopifyApp/Exceptions/ChargeNotRecurringOrOnetimeException.php rename to src/Exceptions/ChargeNotRecurringOrOnetimeException.php diff --git a/src/ShopifyApp/Exceptions/HttpException.php b/src/Exceptions/HttpException.php similarity index 100% rename from src/ShopifyApp/Exceptions/HttpException.php rename to src/Exceptions/HttpException.php diff --git a/src/ShopifyApp/Exceptions/MissingAuthUrlException.php b/src/Exceptions/MissingAuthUrlException.php similarity index 100% rename from src/ShopifyApp/Exceptions/MissingAuthUrlException.php rename to src/Exceptions/MissingAuthUrlException.php diff --git a/src/ShopifyApp/Exceptions/MissingShopDomainException.php b/src/Exceptions/MissingShopDomainException.php similarity index 100% rename from src/ShopifyApp/Exceptions/MissingShopDomainException.php rename to src/Exceptions/MissingShopDomainException.php diff --git a/src/ShopifyApp/Exceptions/SignatureVerificationException.php b/src/Exceptions/SignatureVerificationException.php similarity index 100% rename from src/ShopifyApp/Exceptions/SignatureVerificationException.php rename to src/Exceptions/SignatureVerificationException.php diff --git a/src/ShopifyApp/Http/Controllers/ApiController.php b/src/Http/Controllers/ApiController.php similarity index 100% rename from src/ShopifyApp/Http/Controllers/ApiController.php rename to src/Http/Controllers/ApiController.php diff --git a/src/ShopifyApp/Http/Controllers/AuthController.php b/src/Http/Controllers/AuthController.php similarity index 100% rename from src/ShopifyApp/Http/Controllers/AuthController.php rename to src/Http/Controllers/AuthController.php diff --git a/src/ShopifyApp/Http/Controllers/BillingController.php b/src/Http/Controllers/BillingController.php similarity index 100% rename from src/ShopifyApp/Http/Controllers/BillingController.php rename to src/Http/Controllers/BillingController.php diff --git a/src/ShopifyApp/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php similarity index 100% rename from src/ShopifyApp/Http/Controllers/HomeController.php rename to src/Http/Controllers/HomeController.php diff --git a/src/ShopifyApp/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php similarity index 100% rename from src/ShopifyApp/Http/Controllers/WebhookController.php rename to src/Http/Controllers/WebhookController.php diff --git a/src/ShopifyApp/Http/Middleware/AuthProxy.php b/src/Http/Middleware/AuthProxy.php similarity index 100% rename from src/ShopifyApp/Http/Middleware/AuthProxy.php rename to src/Http/Middleware/AuthProxy.php diff --git a/src/ShopifyApp/Http/Middleware/AuthWebhook.php b/src/Http/Middleware/AuthWebhook.php similarity index 100% rename from src/ShopifyApp/Http/Middleware/AuthWebhook.php rename to src/Http/Middleware/AuthWebhook.php diff --git a/src/ShopifyApp/Http/Middleware/Billable.php b/src/Http/Middleware/Billable.php similarity index 100% rename from src/ShopifyApp/Http/Middleware/Billable.php rename to src/Http/Middleware/Billable.php diff --git a/src/ShopifyApp/Http/Middleware/VerifyShopify.php b/src/Http/Middleware/VerifyShopify.php similarity index 100% rename from src/ShopifyApp/Http/Middleware/VerifyShopify.php rename to src/Http/Middleware/VerifyShopify.php diff --git a/src/ShopifyApp/Http/Requests/StoreUsageCharge.php b/src/Http/Requests/StoreUsageCharge.php similarity index 100% rename from src/ShopifyApp/Http/Requests/StoreUsageCharge.php rename to src/Http/Requests/StoreUsageCharge.php diff --git a/src/ShopifyApp/Macros/TokenRedirect.php b/src/Macros/TokenRedirect.php similarity index 100% rename from src/ShopifyApp/Macros/TokenRedirect.php rename to src/Macros/TokenRedirect.php diff --git a/src/ShopifyApp/Macros/TokenRoute.php b/src/Macros/TokenRoute.php similarity index 100% rename from src/ShopifyApp/Macros/TokenRoute.php rename to src/Macros/TokenRoute.php diff --git a/src/ShopifyApp/Macros/TokenUrl.php b/src/Macros/TokenUrl.php similarity index 100% rename from src/ShopifyApp/Macros/TokenUrl.php rename to src/Macros/TokenUrl.php diff --git a/src/ShopifyApp/Messaging/Events/AppLoggedIn.php b/src/Messaging/Events/AppLoggedIn.php similarity index 100% rename from src/ShopifyApp/Messaging/Events/AppLoggedIn.php rename to src/Messaging/Events/AppLoggedIn.php diff --git a/src/ShopifyApp/Messaging/Jobs/AppUninstalledJob.php b/src/Messaging/Jobs/AppUninstalledJob.php similarity index 100% rename from src/ShopifyApp/Messaging/Jobs/AppUninstalledJob.php rename to src/Messaging/Jobs/AppUninstalledJob.php diff --git a/src/ShopifyApp/Messaging/Jobs/ScripttagInstaller.php b/src/Messaging/Jobs/ScripttagInstaller.php similarity index 100% rename from src/ShopifyApp/Messaging/Jobs/ScripttagInstaller.php rename to src/Messaging/Jobs/ScripttagInstaller.php diff --git a/src/ShopifyApp/Messaging/Jobs/WebhookInstaller.php b/src/Messaging/Jobs/WebhookInstaller.php similarity index 100% rename from src/ShopifyApp/Messaging/Jobs/WebhookInstaller.php rename to src/Messaging/Jobs/WebhookInstaller.php diff --git a/src/ShopifyApp/Objects/Enums/ApiMethod.php b/src/Objects/Enums/ApiMethod.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/ApiMethod.php rename to src/Objects/Enums/ApiMethod.php diff --git a/src/ShopifyApp/Objects/Enums/AuthMode.php b/src/Objects/Enums/AuthMode.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/AuthMode.php rename to src/Objects/Enums/AuthMode.php diff --git a/src/ShopifyApp/Objects/Enums/ChargeInterval.php b/src/Objects/Enums/ChargeInterval.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/ChargeInterval.php rename to src/Objects/Enums/ChargeInterval.php diff --git a/src/ShopifyApp/Objects/Enums/ChargeStatus.php b/src/Objects/Enums/ChargeStatus.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/ChargeStatus.php rename to src/Objects/Enums/ChargeStatus.php diff --git a/src/ShopifyApp/Objects/Enums/ChargeType.php b/src/Objects/Enums/ChargeType.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/ChargeType.php rename to src/Objects/Enums/ChargeType.php diff --git a/src/ShopifyApp/Objects/Enums/DataSource.php b/src/Objects/Enums/DataSource.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/DataSource.php rename to src/Objects/Enums/DataSource.php diff --git a/src/ShopifyApp/Objects/Enums/PlanInterval.php b/src/Objects/Enums/PlanInterval.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/PlanInterval.php rename to src/Objects/Enums/PlanInterval.php diff --git a/src/ShopifyApp/Objects/Enums/PlanType.php b/src/Objects/Enums/PlanType.php similarity index 100% rename from src/ShopifyApp/Objects/Enums/PlanType.php rename to src/Objects/Enums/PlanType.php diff --git a/src/ShopifyApp/Objects/Transfers/AbstractTransfer.php b/src/Objects/Transfers/AbstractTransfer.php similarity index 100% rename from src/ShopifyApp/Objects/Transfers/AbstractTransfer.php rename to src/Objects/Transfers/AbstractTransfer.php diff --git a/src/ShopifyApp/Objects/Transfers/Charge.php b/src/Objects/Transfers/Charge.php similarity index 100% rename from src/ShopifyApp/Objects/Transfers/Charge.php rename to src/Objects/Transfers/Charge.php diff --git a/src/ShopifyApp/Objects/Transfers/PlanDetails.php b/src/Objects/Transfers/PlanDetails.php similarity index 100% rename from src/ShopifyApp/Objects/Transfers/PlanDetails.php rename to src/Objects/Transfers/PlanDetails.php diff --git a/src/ShopifyApp/Objects/Transfers/UsageCharge.php b/src/Objects/Transfers/UsageCharge.php similarity index 100% rename from src/ShopifyApp/Objects/Transfers/UsageCharge.php rename to src/Objects/Transfers/UsageCharge.php diff --git a/src/ShopifyApp/Objects/Transfers/UsageChargeDetails.php b/src/Objects/Transfers/UsageChargeDetails.php similarity index 100% rename from src/ShopifyApp/Objects/Transfers/UsageChargeDetails.php rename to src/Objects/Transfers/UsageChargeDetails.php diff --git a/src/ShopifyApp/Objects/Values/AccessToken.php b/src/Objects/Values/AccessToken.php similarity index 100% rename from src/ShopifyApp/Objects/Values/AccessToken.php rename to src/Objects/Values/AccessToken.php diff --git a/src/ShopifyApp/Objects/Values/ChargeId.php b/src/Objects/Values/ChargeId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/ChargeId.php rename to src/Objects/Values/ChargeId.php diff --git a/src/ShopifyApp/Objects/Values/ChargeReference.php b/src/Objects/Values/ChargeReference.php similarity index 100% rename from src/ShopifyApp/Objects/Values/ChargeReference.php rename to src/Objects/Values/ChargeReference.php diff --git a/src/ShopifyApp/Objects/Values/Hmac.php b/src/Objects/Values/Hmac.php similarity index 100% rename from src/ShopifyApp/Objects/Values/Hmac.php rename to src/Objects/Values/Hmac.php diff --git a/src/ShopifyApp/Objects/Values/NullAccessToken.php b/src/Objects/Values/NullAccessToken.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullAccessToken.php rename to src/Objects/Values/NullAccessToken.php diff --git a/src/ShopifyApp/Objects/Values/NullPlanId.php b/src/Objects/Values/NullPlanId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullPlanId.php rename to src/Objects/Values/NullPlanId.php diff --git a/src/ShopifyApp/Objects/Values/NullSessionId.php b/src/Objects/Values/NullSessionId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullSessionId.php rename to src/Objects/Values/NullSessionId.php diff --git a/src/ShopifyApp/Objects/Values/NullSessionToken.php b/src/Objects/Values/NullSessionToken.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullSessionToken.php rename to src/Objects/Values/NullSessionToken.php diff --git a/src/ShopifyApp/Objects/Values/NullShopDomain.php b/src/Objects/Values/NullShopDomain.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullShopDomain.php rename to src/Objects/Values/NullShopDomain.php diff --git a/src/ShopifyApp/Objects/Values/NullableAccessToken.php b/src/Objects/Values/NullableAccessToken.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullableAccessToken.php rename to src/Objects/Values/NullableAccessToken.php diff --git a/src/ShopifyApp/Objects/Values/NullablePlanId.php b/src/Objects/Values/NullablePlanId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullablePlanId.php rename to src/Objects/Values/NullablePlanId.php diff --git a/src/ShopifyApp/Objects/Values/NullableSessionId.php b/src/Objects/Values/NullableSessionId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullableSessionId.php rename to src/Objects/Values/NullableSessionId.php diff --git a/src/ShopifyApp/Objects/Values/NullableSessionToken.php b/src/Objects/Values/NullableSessionToken.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullableSessionToken.php rename to src/Objects/Values/NullableSessionToken.php diff --git a/src/ShopifyApp/Objects/Values/NullableShopDomain.php b/src/Objects/Values/NullableShopDomain.php similarity index 100% rename from src/ShopifyApp/Objects/Values/NullableShopDomain.php rename to src/Objects/Values/NullableShopDomain.php diff --git a/src/ShopifyApp/Objects/Values/PlanId.php b/src/Objects/Values/PlanId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/PlanId.php rename to src/Objects/Values/PlanId.php diff --git a/src/ShopifyApp/Objects/Values/SessionContext.php b/src/Objects/Values/SessionContext.php similarity index 100% rename from src/ShopifyApp/Objects/Values/SessionContext.php rename to src/Objects/Values/SessionContext.php diff --git a/src/ShopifyApp/Objects/Values/SessionId.php b/src/Objects/Values/SessionId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/SessionId.php rename to src/Objects/Values/SessionId.php diff --git a/src/ShopifyApp/Objects/Values/SessionToken.php b/src/Objects/Values/SessionToken.php similarity index 100% rename from src/ShopifyApp/Objects/Values/SessionToken.php rename to src/Objects/Values/SessionToken.php diff --git a/src/ShopifyApp/Objects/Values/ShopDomain.php b/src/Objects/Values/ShopDomain.php similarity index 100% rename from src/ShopifyApp/Objects/Values/ShopDomain.php rename to src/Objects/Values/ShopDomain.php diff --git a/src/ShopifyApp/Objects/Values/ShopId.php b/src/Objects/Values/ShopId.php similarity index 100% rename from src/ShopifyApp/Objects/Values/ShopId.php rename to src/Objects/Values/ShopId.php diff --git a/src/ShopifyApp/Services/ApiHelper.php b/src/Services/ApiHelper.php similarity index 100% rename from src/ShopifyApp/Services/ApiHelper.php rename to src/Services/ApiHelper.php diff --git a/src/ShopifyApp/Services/ChargeHelper.php b/src/Services/ChargeHelper.php similarity index 100% rename from src/ShopifyApp/Services/ChargeHelper.php rename to src/Services/ChargeHelper.php diff --git a/src/ShopifyApp/Services/CookieHelper.php b/src/Services/CookieHelper.php similarity index 100% rename from src/ShopifyApp/Services/CookieHelper.php rename to src/Services/CookieHelper.php diff --git a/src/ShopifyApp/ShopifyAppProvider.php b/src/ShopifyAppProvider.php similarity index 100% rename from src/ShopifyApp/ShopifyAppProvider.php rename to src/ShopifyAppProvider.php diff --git a/src/ShopifyApp/Storage/Commands/Charge.php b/src/Storage/Commands/Charge.php similarity index 100% rename from src/ShopifyApp/Storage/Commands/Charge.php rename to src/Storage/Commands/Charge.php diff --git a/src/ShopifyApp/Storage/Commands/Shop.php b/src/Storage/Commands/Shop.php similarity index 100% rename from src/ShopifyApp/Storage/Commands/Shop.php rename to src/Storage/Commands/Shop.php diff --git a/src/ShopifyApp/Storage/Models/Charge.php b/src/Storage/Models/Charge.php similarity index 100% rename from src/ShopifyApp/Storage/Models/Charge.php rename to src/Storage/Models/Charge.php diff --git a/src/ShopifyApp/Storage/Models/Plan.php b/src/Storage/Models/Plan.php similarity index 100% rename from src/ShopifyApp/Storage/Models/Plan.php rename to src/Storage/Models/Plan.php diff --git a/src/ShopifyApp/Storage/Observers/Shop.php b/src/Storage/Observers/Shop.php similarity index 100% rename from src/ShopifyApp/Storage/Observers/Shop.php rename to src/Storage/Observers/Shop.php diff --git a/src/ShopifyApp/Storage/Queries/Charge.php b/src/Storage/Queries/Charge.php similarity index 100% rename from src/ShopifyApp/Storage/Queries/Charge.php rename to src/Storage/Queries/Charge.php diff --git a/src/ShopifyApp/Storage/Queries/Plan.php b/src/Storage/Queries/Plan.php similarity index 100% rename from src/ShopifyApp/Storage/Queries/Plan.php rename to src/Storage/Queries/Plan.php diff --git a/src/ShopifyApp/Storage/Queries/Shop.php b/src/Storage/Queries/Shop.php similarity index 100% rename from src/ShopifyApp/Storage/Queries/Shop.php rename to src/Storage/Queries/Shop.php diff --git a/src/ShopifyApp/Storage/Scopes/Namespacing.php b/src/Storage/Scopes/Namespacing.php similarity index 100% rename from src/ShopifyApp/Storage/Scopes/Namespacing.php rename to src/Storage/Scopes/Namespacing.php diff --git a/src/ShopifyApp/Traits/ApiController.php b/src/Traits/ApiController.php similarity index 100% rename from src/ShopifyApp/Traits/ApiController.php rename to src/Traits/ApiController.php diff --git a/src/ShopifyApp/Traits/AuthController.php b/src/Traits/AuthController.php similarity index 100% rename from src/ShopifyApp/Traits/AuthController.php rename to src/Traits/AuthController.php diff --git a/src/ShopifyApp/Traits/BillingController.php b/src/Traits/BillingController.php similarity index 100% rename from src/ShopifyApp/Traits/BillingController.php rename to src/Traits/BillingController.php diff --git a/src/ShopifyApp/Traits/HomeController.php b/src/Traits/HomeController.php similarity index 100% rename from src/ShopifyApp/Traits/HomeController.php rename to src/Traits/HomeController.php diff --git a/src/ShopifyApp/Traits/ShopAccessible.php b/src/Traits/ShopAccessible.php similarity index 100% rename from src/ShopifyApp/Traits/ShopAccessible.php rename to src/Traits/ShopAccessible.php diff --git a/src/ShopifyApp/Traits/ShopModel.php b/src/Traits/ShopModel.php similarity index 100% rename from src/ShopifyApp/Traits/ShopModel.php rename to src/Traits/ShopModel.php diff --git a/src/ShopifyApp/Traits/WebhookController.php b/src/Traits/WebhookController.php similarity index 100% rename from src/ShopifyApp/Traits/WebhookController.php rename to src/Traits/WebhookController.php diff --git a/src/ShopifyApp/Util.php b/src/Util.php similarity index 100% rename from src/ShopifyApp/Util.php rename to src/Util.php diff --git a/src/ShopifyApp/resources/config/shopify-app.php b/src/resources/config/shopify-app.php similarity index 100% rename from src/ShopifyApp/resources/config/shopify-app.php rename to src/resources/config/shopify-app.php diff --git a/src/ShopifyApp/resources/database/factories/ChargeFactory.php b/src/resources/database/factories/ChargeFactory.php similarity index 100% rename from src/ShopifyApp/resources/database/factories/ChargeFactory.php rename to src/resources/database/factories/ChargeFactory.php diff --git a/src/ShopifyApp/resources/database/factories/PlanFactory.php b/src/resources/database/factories/PlanFactory.php similarity index 100% rename from src/ShopifyApp/resources/database/factories/PlanFactory.php rename to src/resources/database/factories/PlanFactory.php diff --git a/src/ShopifyApp/resources/database/factories/ShopFactory.php b/src/resources/database/factories/ShopFactory.php similarity index 100% rename from src/ShopifyApp/resources/database/factories/ShopFactory.php rename to src/resources/database/factories/ShopFactory.php diff --git a/src/ShopifyApp/resources/database/migrations/2020_01_29_010501_create_plans_table.php b/src/resources/database/migrations/2020_01_29_010501_create_plans_table.php similarity index 100% rename from src/ShopifyApp/resources/database/migrations/2020_01_29_010501_create_plans_table.php rename to src/resources/database/migrations/2020_01_29_010501_create_plans_table.php diff --git a/src/ShopifyApp/resources/database/migrations/2020_01_29_230905_create_shops_table.php b/src/resources/database/migrations/2020_01_29_230905_create_shops_table.php similarity index 100% rename from src/ShopifyApp/resources/database/migrations/2020_01_29_230905_create_shops_table.php rename to src/resources/database/migrations/2020_01_29_230905_create_shops_table.php diff --git a/src/ShopifyApp/resources/database/migrations/2020_01_29_231006_create_charges_table.php b/src/resources/database/migrations/2020_01_29_231006_create_charges_table.php similarity index 100% rename from src/ShopifyApp/resources/database/migrations/2020_01_29_231006_create_charges_table.php rename to src/resources/database/migrations/2020_01_29_231006_create_charges_table.php diff --git a/src/ShopifyApp/resources/database/migrations/2020_07_03_211514_add_interval_column_to_charges_table.php b/src/resources/database/migrations/2020_07_03_211514_add_interval_column_to_charges_table.php similarity index 100% rename from src/ShopifyApp/resources/database/migrations/2020_07_03_211514_add_interval_column_to_charges_table.php rename to src/resources/database/migrations/2020_07_03_211514_add_interval_column_to_charges_table.php diff --git a/src/ShopifyApp/resources/database/migrations/2020_07_03_211854_add_interval_column_to_plans_table.php b/src/resources/database/migrations/2020_07_03_211854_add_interval_column_to_plans_table.php similarity index 100% rename from src/ShopifyApp/resources/database/migrations/2020_07_03_211854_add_interval_column_to_plans_table.php rename to src/resources/database/migrations/2020_07_03_211854_add_interval_column_to_plans_table.php diff --git a/src/ShopifyApp/resources/database/migrations/2021_04_21_103633_add_password_updated_at_to_users_table.php b/src/resources/database/migrations/2021_04_21_103633_add_password_updated_at_to_users_table.php similarity index 100% rename from src/ShopifyApp/resources/database/migrations/2021_04_21_103633_add_password_updated_at_to_users_table.php rename to src/resources/database/migrations/2021_04_21_103633_add_password_updated_at_to_users_table.php diff --git a/src/ShopifyApp/resources/jobs/AppUninstalledJob.php b/src/resources/jobs/AppUninstalledJob.php similarity index 100% rename from src/ShopifyApp/resources/jobs/AppUninstalledJob.php rename to src/resources/jobs/AppUninstalledJob.php diff --git a/src/ShopifyApp/resources/routes/api.php b/src/resources/routes/api.php similarity index 100% rename from src/ShopifyApp/resources/routes/api.php rename to src/resources/routes/api.php diff --git a/src/ShopifyApp/resources/routes/shopify.php b/src/resources/routes/shopify.php similarity index 100% rename from src/ShopifyApp/resources/routes/shopify.php rename to src/resources/routes/shopify.php diff --git a/src/ShopifyApp/resources/views/auth/fullpage_redirect.blade.php b/src/resources/views/auth/fullpage_redirect.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/auth/fullpage_redirect.blade.php rename to src/resources/views/auth/fullpage_redirect.blade.php diff --git a/src/ShopifyApp/resources/views/auth/token.blade.php b/src/resources/views/auth/token.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/auth/token.blade.php rename to src/resources/views/auth/token.blade.php diff --git a/src/ShopifyApp/resources/views/billing/error.blade.php b/src/resources/views/billing/error.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/billing/error.blade.php rename to src/resources/views/billing/error.blade.php diff --git a/src/ShopifyApp/resources/views/billing/fullpage_redirect.blade.php b/src/resources/views/billing/fullpage_redirect.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/billing/fullpage_redirect.blade.php rename to src/resources/views/billing/fullpage_redirect.blade.php diff --git a/src/ShopifyApp/resources/views/home/index.blade.php b/src/resources/views/home/index.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/home/index.blade.php rename to src/resources/views/home/index.blade.php diff --git a/src/ShopifyApp/resources/views/layouts/default.blade.php b/src/resources/views/layouts/default.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/layouts/default.blade.php rename to src/resources/views/layouts/default.blade.php diff --git a/src/ShopifyApp/resources/views/layouts/error.blade.php b/src/resources/views/layouts/error.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/layouts/error.blade.php rename to src/resources/views/layouts/error.blade.php diff --git a/src/ShopifyApp/resources/views/partials/flash_messages.blade.php b/src/resources/views/partials/flash_messages.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/partials/flash_messages.blade.php rename to src/resources/views/partials/flash_messages.blade.php diff --git a/src/ShopifyApp/resources/views/partials/laravel_skeleton_css.blade.php b/src/resources/views/partials/laravel_skeleton_css.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/partials/laravel_skeleton_css.blade.php rename to src/resources/views/partials/laravel_skeleton_css.blade.php diff --git a/src/ShopifyApp/resources/views/partials/polaris_skeleton_css.blade.php b/src/resources/views/partials/polaris_skeleton_css.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/partials/polaris_skeleton_css.blade.php rename to src/resources/views/partials/polaris_skeleton_css.blade.php diff --git a/src/ShopifyApp/resources/views/partials/token_handler.blade.php b/src/resources/views/partials/token_handler.blade.php similarity index 100% rename from src/ShopifyApp/resources/views/partials/token_handler.blade.php rename to src/resources/views/partials/token_handler.blade.php diff --git a/tests/TestCase.php b/tests/TestCase.php index 794b848f..7a6f6836 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -50,7 +50,7 @@ public function setUp(): void // Setup database $this->setupDatabase($this->app); - $this->withFactories(__DIR__.'/../src/ShopifyApp/resources/database/factories'); + $this->withFactories(__DIR__.'/../src/resources/database/factories'); // Assign the user model $this->model = $this->app['config']->get('auth.providers.users.model');