diff --git a/.coveragerc b/backend/.coveragerc similarity index 100% rename from .coveragerc rename to backend/.coveragerc diff --git a/Dockerfile.backend b/backend/Dockerfile.backend similarity index 97% rename from Dockerfile.backend rename to backend/Dockerfile.backend index 2bce5b74b..151e2a5c2 100644 --- a/Dockerfile.backend +++ b/backend/Dockerfile.backend @@ -23,6 +23,6 @@ RUN chmod +x ./scripts/start_backend.dev.sh # --------------------------------------- # Production # --------------------------------------- -FROM build AS production +FROM build AS production COPY ./scripts/start_backend.prod.sh ./scripts/start_backend.prod.sh RUN chmod +x ./scripts/start_backend.prod.sh \ No newline at end of file diff --git a/Pipfile b/backend/Pipfile similarity index 100% rename from Pipfile rename to backend/Pipfile diff --git a/Pipfile.lock b/backend/Pipfile.lock similarity index 100% rename from Pipfile.lock rename to backend/Pipfile.lock diff --git a/Procfile b/backend/Procfile similarity index 71% rename from Procfile rename to backend/Procfile index 122ca550e..7d9fa1167 100644 --- a/Procfile +++ b/backend/Procfile @@ -1,4 +1,4 @@ -release: chmod u+x scripts/heroku_release.sh && ./scripts/heroku_release.sh +release: chmod u+x ../scripts/heroku_release.sh && ../scripts/heroku_release.sh web: gunicorn lotus.wsgi:application -w 4 --threads 4 --preload worker: celery -A lotus worker -l info beat: celery -A lotus beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/locustfiles/track_event.py b/backend/locustfiles/track_event.py similarity index 100% rename from locustfiles/track_event.py rename to backend/locustfiles/track_event.py diff --git a/lotus/__init__.py b/backend/lotus/__init__.py similarity index 100% rename from lotus/__init__.py rename to backend/lotus/__init__.py diff --git a/lotus/asgi.py b/backend/lotus/asgi.py similarity index 100% rename from lotus/asgi.py rename to backend/lotus/asgi.py diff --git a/lotus/lotus_celery.py b/backend/lotus/lotus_celery.py similarity index 100% rename from lotus/lotus_celery.py rename to backend/lotus/lotus_celery.py diff --git a/lotus/middleware.py b/backend/lotus/middleware.py similarity index 100% rename from lotus/middleware.py rename to backend/lotus/middleware.py diff --git a/lotus/settings.py b/backend/lotus/settings.py similarity index 100% rename from lotus/settings.py rename to backend/lotus/settings.py diff --git a/lotus/urls.py b/backend/lotus/urls.py similarity index 100% rename from lotus/urls.py rename to backend/lotus/urls.py diff --git a/lotus/wsgi.py b/backend/lotus/wsgi.py similarity index 100% rename from lotus/wsgi.py rename to backend/lotus/wsgi.py diff --git a/manage.py b/backend/manage.py similarity index 100% rename from manage.py rename to backend/manage.py diff --git a/metering_billing/__init__.py b/backend/metering_billing/__init__.py similarity index 100% rename from metering_billing/__init__.py rename to backend/metering_billing/__init__.py diff --git a/metering_billing/admin.py b/backend/metering_billing/admin.py similarity index 100% rename from metering_billing/admin.py rename to backend/metering_billing/admin.py diff --git a/metering_billing/apps.py b/backend/metering_billing/apps.py similarity index 100% rename from metering_billing/apps.py rename to backend/metering_billing/apps.py diff --git a/metering_billing/auth_utils.py b/backend/metering_billing/auth_utils.py similarity index 100% rename from metering_billing/auth_utils.py rename to backend/metering_billing/auth_utils.py diff --git a/metering_billing/billable_metrics.py b/backend/metering_billing/billable_metrics.py similarity index 100% rename from metering_billing/billable_metrics.py rename to backend/metering_billing/billable_metrics.py diff --git a/metering_billing/exceptions.py b/backend/metering_billing/exceptions.py similarity index 100% rename from metering_billing/exceptions.py rename to backend/metering_billing/exceptions.py diff --git a/metering_billing/invoice.py b/backend/metering_billing/invoice.py similarity index 100% rename from metering_billing/invoice.py rename to backend/metering_billing/invoice.py diff --git a/metering_billing/management/__init__.py b/backend/metering_billing/management/__init__.py similarity index 100% rename from metering_billing/management/__init__.py rename to backend/metering_billing/management/__init__.py diff --git a/metering_billing/management/commands/__init__.py b/backend/metering_billing/management/commands/__init__.py similarity index 100% rename from metering_billing/management/commands/__init__.py rename to backend/metering_billing/management/commands/__init__.py diff --git a/metering_billing/management/commands/down_test_data.py b/backend/metering_billing/management/commands/down_test_data.py similarity index 100% rename from metering_billing/management/commands/down_test_data.py rename to backend/metering_billing/management/commands/down_test_data.py diff --git a/metering_billing/management/commands/execute_calculate_invoice.py b/backend/metering_billing/management/commands/execute_calculate_invoice.py similarity index 100% rename from metering_billing/management/commands/execute_calculate_invoice.py rename to backend/metering_billing/management/commands/execute_calculate_invoice.py diff --git a/metering_billing/management/commands/initadmin.py b/backend/metering_billing/management/commands/initadmin.py similarity index 100% rename from metering_billing/management/commands/initadmin.py rename to backend/metering_billing/management/commands/initadmin.py diff --git a/metering_billing/management/commands/setup_tasks.py b/backend/metering_billing/management/commands/setup_tasks.py similarity index 100% rename from metering_billing/management/commands/setup_tasks.py rename to backend/metering_billing/management/commands/setup_tasks.py diff --git a/metering_billing/management/commands/up_test_data.py b/backend/metering_billing/management/commands/up_test_data.py similarity index 100% rename from metering_billing/management/commands/up_test_data.py rename to backend/metering_billing/management/commands/up_test_data.py diff --git a/metering_billing/management/commands/wait_for_db.py b/backend/metering_billing/management/commands/wait_for_db.py similarity index 100% rename from metering_billing/management/commands/wait_for_db.py rename to backend/metering_billing/management/commands/wait_for_db.py diff --git a/metering_billing/migrations/0001_initial.py b/backend/metering_billing/migrations/0001_initial.py similarity index 100% rename from metering_billing/migrations/0001_initial.py rename to backend/metering_billing/migrations/0001_initial.py diff --git a/metering_billing/migrations/0002_alter_billingplan_flat_rate_and_more.py b/backend/metering_billing/migrations/0002_alter_billingplan_flat_rate_and_more.py similarity index 100% rename from metering_billing/migrations/0002_alter_billingplan_flat_rate_and_more.py rename to backend/metering_billing/migrations/0002_alter_billingplan_flat_rate_and_more.py diff --git a/metering_billing/migrations/0003_alter_billingplan_components.py b/backend/metering_billing/migrations/0003_alter_billingplan_components.py similarity index 100% rename from metering_billing/migrations/0003_alter_billingplan_components.py rename to backend/metering_billing/migrations/0003_alter_billingplan_components.py diff --git a/metering_billing/migrations/0003_alter_invoice_customer_alter_invoice_line_items_and_more.py b/backend/metering_billing/migrations/0003_alter_invoice_customer_alter_invoice_line_items_and_more.py similarity index 100% rename from metering_billing/migrations/0003_alter_invoice_customer_alter_invoice_line_items_and_more.py rename to backend/metering_billing/migrations/0003_alter_invoice_customer_alter_invoice_line_items_and_more.py diff --git a/metering_billing/migrations/0004_alter_invoice_status_alter_organization_stripe_id.py b/backend/metering_billing/migrations/0004_alter_invoice_status_alter_organization_stripe_id.py similarity index 100% rename from metering_billing/migrations/0004_alter_invoice_status_alter_organization_stripe_id.py rename to backend/metering_billing/migrations/0004_alter_invoice_status_alter_organization_stripe_id.py diff --git a/metering_billing/migrations/0005_invoice_payment_intent_id.py b/backend/metering_billing/migrations/0005_invoice_payment_intent_id.py similarity index 100% rename from metering_billing/migrations/0005_invoice_payment_intent_id.py rename to backend/metering_billing/migrations/0005_invoice_payment_intent_id.py diff --git a/metering_billing/migrations/0006_merge_20220906_2201.py b/backend/metering_billing/migrations/0006_merge_20220906_2201.py similarity index 100% rename from metering_billing/migrations/0006_merge_20220906_2201.py rename to backend/metering_billing/migrations/0006_merge_20220906_2201.py diff --git a/metering_billing/migrations/0007_alter_customer_customer_id_and_more.py b/backend/metering_billing/migrations/0007_alter_customer_customer_id_and_more.py similarity index 100% rename from metering_billing/migrations/0007_alter_customer_customer_id_and_more.py rename to backend/metering_billing/migrations/0007_alter_customer_customer_id_and_more.py diff --git a/metering_billing/migrations/0008_alter_billablemetric_unique_together_and_more.py b/backend/metering_billing/migrations/0008_alter_billablemetric_unique_together_and_more.py similarity index 100% rename from metering_billing/migrations/0008_alter_billablemetric_unique_together_and_more.py rename to backend/metering_billing/migrations/0008_alter_billablemetric_unique_together_and_more.py diff --git a/metering_billing/migrations/0009_remove_subscription_next_plan_and_more.py b/backend/metering_billing/migrations/0009_remove_subscription_next_plan_and_more.py similarity index 100% rename from metering_billing/migrations/0009_remove_subscription_next_plan_and_more.py rename to backend/metering_billing/migrations/0009_remove_subscription_next_plan_and_more.py diff --git a/metering_billing/migrations/0010_alter_invoice_status.py b/backend/metering_billing/migrations/0010_alter_invoice_status.py similarity index 100% rename from metering_billing/migrations/0010_alter_invoice_status.py rename to backend/metering_billing/migrations/0010_alter_invoice_status.py diff --git a/metering_billing/migrations/0011_alter_billingplan_billing_plan_id_and_more.py b/backend/metering_billing/migrations/0011_alter_billingplan_billing_plan_id_and_more.py similarity index 100% rename from metering_billing/migrations/0011_alter_billingplan_billing_plan_id_and_more.py rename to backend/metering_billing/migrations/0011_alter_billingplan_billing_plan_id_and_more.py diff --git a/metering_billing/migrations/0012_alter_billablemetric_aggregation_type_and_more.py b/backend/metering_billing/migrations/0012_alter_billablemetric_aggregation_type_and_more.py similarity index 100% rename from metering_billing/migrations/0012_alter_billablemetric_aggregation_type_and_more.py rename to backend/metering_billing/migrations/0012_alter_billablemetric_aggregation_type_and_more.py diff --git a/metering_billing/migrations/0013_billablemetric_recurring_plancomponent_max_amount_and_more.py b/backend/metering_billing/migrations/0013_billablemetric_recurring_plancomponent_max_amount_and_more.py similarity index 100% rename from metering_billing/migrations/0013_billablemetric_recurring_plancomponent_max_amount_and_more.py rename to backend/metering_billing/migrations/0013_billablemetric_recurring_plancomponent_max_amount_and_more.py diff --git a/metering_billing/migrations/0014_rename_recurring_billablemetric_carries_over_and_more.py b/backend/metering_billing/migrations/0014_rename_recurring_billablemetric_carries_over_and_more.py similarity index 100% rename from metering_billing/migrations/0014_rename_recurring_billablemetric_carries_over_and_more.py rename to backend/metering_billing/migrations/0014_rename_recurring_billablemetric_carries_over_and_more.py diff --git a/metering_billing/migrations/0015_billablemetric_metric_name_and_more.py b/backend/metering_billing/migrations/0015_billablemetric_metric_name_and_more.py similarity index 100% rename from metering_billing/migrations/0015_billablemetric_metric_name_and_more.py rename to backend/metering_billing/migrations/0015_billablemetric_metric_name_and_more.py diff --git a/metering_billing/migrations/0016_alter_billablemetric_unique_together_and_more.py b/backend/metering_billing/migrations/0016_alter_billablemetric_unique_together_and_more.py similarity index 100% rename from metering_billing/migrations/0016_alter_billablemetric_unique_together_and_more.py rename to backend/metering_billing/migrations/0016_alter_billablemetric_unique_together_and_more.py diff --git a/metering_billing/migrations/0017_alter_invoice_status.py b/backend/metering_billing/migrations/0017_alter_invoice_status.py similarity index 100% rename from metering_billing/migrations/0017_alter_invoice_status.py rename to backend/metering_billing/migrations/0017_alter_invoice_status.py diff --git a/metering_billing/migrations/0018_alter_subscription_status.py b/backend/metering_billing/migrations/0018_alter_subscription_status.py similarity index 100% rename from metering_billing/migrations/0018_alter_subscription_status.py rename to backend/metering_billing/migrations/0018_alter_subscription_status.py diff --git a/metering_billing/migrations/0019_subscription_subscription_uid_and_more.py b/backend/metering_billing/migrations/0019_subscription_subscription_uid_and_more.py similarity index 100% rename from metering_billing/migrations/0019_subscription_subscription_uid_and_more.py rename to backend/metering_billing/migrations/0019_subscription_subscription_uid_and_more.py diff --git a/metering_billing/migrations/0020_auto_20220927_0715.py b/backend/metering_billing/migrations/0020_auto_20220927_0715.py similarity index 100% rename from metering_billing/migrations/0020_auto_20220927_0715.py rename to backend/metering_billing/migrations/0020_auto_20220927_0715.py diff --git a/metering_billing/migrations/0021_auto_20220927_0715.py b/backend/metering_billing/migrations/0021_auto_20220927_0715.py similarity index 100% rename from metering_billing/migrations/0021_auto_20220927_0715.py rename to backend/metering_billing/migrations/0021_auto_20220927_0715.py diff --git a/metering_billing/migrations/0022_remove_plancomponent_cost_per_metric_and_more.py b/backend/metering_billing/migrations/0022_remove_plancomponent_cost_per_metric_and_more.py similarity index 100% rename from metering_billing/migrations/0022_remove_plancomponent_cost_per_metric_and_more.py rename to backend/metering_billing/migrations/0022_remove_plancomponent_cost_per_metric_and_more.py diff --git a/metering_billing/migrations/0023_remove_billablemetric_unique_with_property_name_and_more.py b/backend/metering_billing/migrations/0023_remove_billablemetric_unique_with_property_name_and_more.py similarity index 100% rename from metering_billing/migrations/0023_remove_billablemetric_unique_with_property_name_and_more.py rename to backend/metering_billing/migrations/0023_remove_billablemetric_unique_with_property_name_and_more.py diff --git a/metering_billing/migrations/0024_alter_billingplan_components_and_more.py b/backend/metering_billing/migrations/0024_alter_billingplan_components_and_more.py similarity index 100% rename from metering_billing/migrations/0024_alter_billingplan_components_and_more.py rename to backend/metering_billing/migrations/0024_alter_billingplan_components_and_more.py diff --git a/metering_billing/migrations/0025_customer_billing_address_customer_email.py b/backend/metering_billing/migrations/0025_customer_billing_address_customer_email.py similarity index 100% rename from metering_billing/migrations/0025_customer_billing_address_customer_email.py rename to backend/metering_billing/migrations/0025_customer_billing_address_customer_email.py diff --git a/metering_billing/migrations/0026_alter_user_email.py b/backend/metering_billing/migrations/0026_alter_user_email.py similarity index 100% rename from metering_billing/migrations/0026_alter_user_email.py rename to backend/metering_billing/migrations/0026_alter_user_email.py diff --git a/metering_billing/migrations/0027_rename_payment_intent_id_invoice_external_payment_obj_id_and_more.py b/backend/metering_billing/migrations/0027_rename_payment_intent_id_invoice_external_payment_obj_id_and_more.py similarity index 100% rename from metering_billing/migrations/0027_rename_payment_intent_id_invoice_external_payment_obj_id_and_more.py rename to backend/metering_billing/migrations/0027_rename_payment_intent_id_invoice_external_payment_obj_id_and_more.py diff --git a/metering_billing/migrations/0028_billingplan_replacement_billing_plan_and_more.py b/backend/metering_billing/migrations/0028_billingplan_replacement_billing_plan_and_more.py similarity index 100% rename from metering_billing/migrations/0028_billingplan_replacement_billing_plan_and_more.py rename to backend/metering_billing/migrations/0028_billingplan_replacement_billing_plan_and_more.py diff --git a/metering_billing/migrations/0029_subscription_flat_fee_already_billed_and_more.py b/backend/metering_billing/migrations/0029_subscription_flat_fee_already_billed_and_more.py similarity index 100% rename from metering_billing/migrations/0029_subscription_flat_fee_already_billed_and_more.py rename to backend/metering_billing/migrations/0029_subscription_flat_fee_already_billed_and_more.py diff --git a/metering_billing/migrations/0030_alter_billingplan_name.py b/backend/metering_billing/migrations/0030_alter_billingplan_name.py similarity index 100% rename from metering_billing/migrations/0030_alter_billingplan_name.py rename to backend/metering_billing/migrations/0030_alter_billingplan_name.py diff --git a/metering_billing/migrations/0031_subscription_auto_renew_billing_plan_and_more.py b/backend/metering_billing/migrations/0031_subscription_auto_renew_billing_plan_and_more.py similarity index 100% rename from metering_billing/migrations/0031_subscription_auto_renew_billing_plan_and_more.py rename to backend/metering_billing/migrations/0031_subscription_auto_renew_billing_plan_and_more.py diff --git a/metering_billing/migrations/0032_rename_subscription_uid_subscription_subscription_id_and_more.py b/backend/metering_billing/migrations/0032_rename_subscription_uid_subscription_subscription_id_and_more.py similarity index 100% rename from metering_billing/migrations/0032_rename_subscription_uid_subscription_subscription_id_and_more.py rename to backend/metering_billing/migrations/0032_rename_subscription_uid_subscription_subscription_id_and_more.py diff --git a/metering_billing/migrations/0033_remove_plancomponent_cost_per_batch_currency_and_more.py b/backend/metering_billing/migrations/0033_remove_plancomponent_cost_per_batch_currency_and_more.py similarity index 100% rename from metering_billing/migrations/0033_remove_plancomponent_cost_per_batch_currency_and_more.py rename to backend/metering_billing/migrations/0033_remove_plancomponent_cost_per_batch_currency_and_more.py diff --git a/metering_billing/migrations/0034_remove_billingplan_currency_remove_customer_currency_and_more.py b/backend/metering_billing/migrations/0034_remove_billingplan_currency_remove_customer_currency_and_more.py similarity index 100% rename from metering_billing/migrations/0034_remove_billingplan_currency_remove_customer_currency_and_more.py rename to backend/metering_billing/migrations/0034_remove_billingplan_currency_remove_customer_currency_and_more.py diff --git a/metering_billing/migrations/0035_remove_organization_stripe_id.py b/backend/metering_billing/migrations/0035_remove_organization_stripe_id.py similarity index 100% rename from metering_billing/migrations/0035_remove_organization_stripe_id.py rename to backend/metering_billing/migrations/0035_remove_organization_stripe_id.py diff --git a/metering_billing/migrations/0036_categoricalfilter_numericfilter_and_more.py b/backend/metering_billing/migrations/0036_categoricalfilter_numericfilter_and_more.py similarity index 100% rename from metering_billing/migrations/0036_categoricalfilter_numericfilter_and_more.py rename to backend/metering_billing/migrations/0036_categoricalfilter_numericfilter_and_more.py diff --git a/metering_billing/migrations/0037_alter_billablemetric_billable_metric_name.py b/backend/metering_billing/migrations/0037_alter_billablemetric_billable_metric_name.py similarity index 100% rename from metering_billing/migrations/0037_alter_billablemetric_billable_metric_name.py rename to backend/metering_billing/migrations/0037_alter_billablemetric_billable_metric_name.py diff --git a/metering_billing/migrations/0038_historicaluser_historicalsubscription_and_more.py b/backend/metering_billing/migrations/0038_historicaluser_historicalsubscription_and_more.py similarity index 100% rename from metering_billing/migrations/0038_historicaluser_historicalsubscription_and_more.py rename to backend/metering_billing/migrations/0038_historicaluser_historicalsubscription_and_more.py diff --git a/metering_billing/migrations/__init__.py b/backend/metering_billing/migrations/__init__.py similarity index 100% rename from metering_billing/migrations/__init__.py rename to backend/metering_billing/migrations/__init__.py diff --git a/metering_billing/models.py b/backend/metering_billing/models.py similarity index 100% rename from metering_billing/models.py rename to backend/metering_billing/models.py diff --git a/metering_billing/payment_providers.py b/backend/metering_billing/payment_providers.py similarity index 100% rename from metering_billing/payment_providers.py rename to backend/metering_billing/payment_providers.py diff --git a/metering_billing/permissions.py b/backend/metering_billing/permissions.py similarity index 100% rename from metering_billing/permissions.py rename to backend/metering_billing/permissions.py diff --git a/metering_billing/serializers/internal_serializers.py b/backend/metering_billing/serializers/internal_serializers.py similarity index 100% rename from metering_billing/serializers/internal_serializers.py rename to backend/metering_billing/serializers/internal_serializers.py diff --git a/metering_billing/serializers/model_serializers.py b/backend/metering_billing/serializers/model_serializers.py similarity index 100% rename from metering_billing/serializers/model_serializers.py rename to backend/metering_billing/serializers/model_serializers.py diff --git a/metering_billing/tasks.py b/backend/metering_billing/tasks.py similarity index 100% rename from metering_billing/tasks.py rename to backend/metering_billing/tasks.py diff --git a/metering_billing/template_tags/__init__.py b/backend/metering_billing/template_tags/__init__.py similarity index 100% rename from metering_billing/template_tags/__init__.py rename to backend/metering_billing/template_tags/__init__.py diff --git a/metering_billing/template_tags/render_vite_bundle.py b/backend/metering_billing/template_tags/render_vite_bundle.py similarity index 100% rename from metering_billing/template_tags/render_vite_bundle.py rename to backend/metering_billing/template_tags/render_vite_bundle.py diff --git a/metering_billing/templates/index.html b/backend/metering_billing/templates/index.html similarity index 100% rename from metering_billing/templates/index.html rename to backend/metering_billing/templates/index.html diff --git a/metering_billing/tests/__init__.py b/backend/metering_billing/tests/__init__.py similarity index 100% rename from metering_billing/tests/__init__.py rename to backend/metering_billing/tests/__init__.py diff --git a/metering_billing/tests/conftest.py b/backend/metering_billing/tests/conftest.py similarity index 100% rename from metering_billing/tests/conftest.py rename to backend/metering_billing/tests/conftest.py diff --git a/metering_billing/tests/test_billable_metric.py b/backend/metering_billing/tests/test_billable_metric.py similarity index 100% rename from metering_billing/tests/test_billable_metric.py rename to backend/metering_billing/tests/test_billable_metric.py diff --git a/metering_billing/tests/test_cancel_sub.py b/backend/metering_billing/tests/test_cancel_sub.py similarity index 100% rename from metering_billing/tests/test_cancel_sub.py rename to backend/metering_billing/tests/test_cancel_sub.py diff --git a/metering_billing/tests/test_customer.py b/backend/metering_billing/tests/test_customer.py similarity index 100% rename from metering_billing/tests/test_customer.py rename to backend/metering_billing/tests/test_customer.py diff --git a/metering_billing/tests/test_draft_invoices.py b/backend/metering_billing/tests/test_draft_invoices.py similarity index 100% rename from metering_billing/tests/test_draft_invoices.py rename to backend/metering_billing/tests/test_draft_invoices.py diff --git a/metering_billing/tests/test_event_preview.py b/backend/metering_billing/tests/test_event_preview.py similarity index 100% rename from metering_billing/tests/test_event_preview.py rename to backend/metering_billing/tests/test_event_preview.py diff --git a/metering_billing/tests/test_get_access.py b/backend/metering_billing/tests/test_get_access.py similarity index 100% rename from metering_billing/tests/test_get_access.py rename to backend/metering_billing/tests/test_get_access.py diff --git a/metering_billing/tests/test_register.py b/backend/metering_billing/tests/test_register.py similarity index 100% rename from metering_billing/tests/test_register.py rename to backend/metering_billing/tests/test_register.py diff --git a/metering_billing/tests/test_subscription.py b/backend/metering_billing/tests/test_subscription.py similarity index 100% rename from metering_billing/tests/test_subscription.py rename to backend/metering_billing/tests/test_subscription.py diff --git a/metering_billing/tests/test_tasks.py b/backend/metering_billing/tests/test_tasks.py similarity index 100% rename from metering_billing/tests/test_tasks.py rename to backend/metering_billing/tests/test_tasks.py diff --git a/metering_billing/tests/test_track_event.py b/backend/metering_billing/tests/test_track_event.py similarity index 100% rename from metering_billing/tests/test_track_event.py rename to backend/metering_billing/tests/test_track_event.py diff --git a/metering_billing/utils.py b/backend/metering_billing/utils.py similarity index 100% rename from metering_billing/utils.py rename to backend/metering_billing/utils.py diff --git a/metering_billing/view_utils.py b/backend/metering_billing/view_utils.py similarity index 100% rename from metering_billing/view_utils.py rename to backend/metering_billing/view_utils.py diff --git a/metering_billing/views/auth_views.py b/backend/metering_billing/views/auth_views.py similarity index 100% rename from metering_billing/views/auth_views.py rename to backend/metering_billing/views/auth_views.py diff --git a/metering_billing/views/model_views.py b/backend/metering_billing/views/model_views.py similarity index 100% rename from metering_billing/views/model_views.py rename to backend/metering_billing/views/model_views.py diff --git a/metering_billing/views/track.py b/backend/metering_billing/views/track.py similarity index 100% rename from metering_billing/views/track.py rename to backend/metering_billing/views/track.py diff --git a/metering_billing/views/views.py b/backend/metering_billing/views/views.py similarity index 100% rename from metering_billing/views/views.py rename to backend/metering_billing/views/views.py diff --git a/metering_billing/webhooks.py b/backend/metering_billing/webhooks.py similarity index 100% rename from metering_billing/webhooks.py rename to backend/metering_billing/webhooks.py diff --git a/project_schema.yaml b/backend/project_schema.yaml similarity index 100% rename from project_schema.yaml rename to backend/project_schema.yaml diff --git a/pytest.ini b/backend/pytest.ini similarity index 100% rename from pytest.ini rename to backend/pytest.ini diff --git a/scripts/heroku_release.sh b/backend/scripts/heroku_release.sh similarity index 100% rename from scripts/heroku_release.sh rename to backend/scripts/heroku_release.sh diff --git a/scripts/run-codestyle-docker.sh b/backend/scripts/run-codestyle-docker.sh similarity index 100% rename from scripts/run-codestyle-docker.sh rename to backend/scripts/run-codestyle-docker.sh diff --git a/scripts/run-tests-docker.sh b/backend/scripts/run-tests-docker.sh similarity index 100% rename from scripts/run-tests-docker.sh rename to backend/scripts/run-tests-docker.sh diff --git a/scripts/start_backend.dev.sh b/backend/scripts/start_backend.dev.sh similarity index 100% rename from scripts/start_backend.dev.sh rename to backend/scripts/start_backend.dev.sh diff --git a/scripts/start_backend.prod.sh b/backend/scripts/start_backend.prod.sh similarity index 100% rename from scripts/start_backend.prod.sh rename to backend/scripts/start_backend.prod.sh diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 33314c39a..5fa4e137c 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -13,14 +13,14 @@ services: env_file: - ./env/.env.dev build: - context: . + context: ./backend dockerfile: Dockerfile.backend target: development ports: - 8000:8000 volumes: - - ./lotus:/lotus/lotus - - ./metering_billing:/lotus/metering_billing + - ./backend/lotus:/lotus/lotus + - ./backend/metering_billing:/lotus/metering_billing command: sh -c "./scripts/start_backend.dev.sh" depends_on: - db @@ -29,15 +29,15 @@ services: frontend: restart: always build: - context: . + context: ./frontend dockerfile: Dockerfile.frontend target: development ports: - 3000:3000 command: yarn run dev --host 0.0.0.0 --port 3000 volumes: - - ./src:/frontend/src:delegated - - ./public:/frontend/public:delegated + - ./frontend/src:/frontend/src:delegated + - ./frontend/public:/frontend/public:delegated - /frontend/node_modules/ stdin_open: true depends_on: @@ -53,7 +53,7 @@ services: env_file: - ./env/.env.dev build: - context: . + context: ./backend dockerfile: Dockerfile.backend target: development command: celery -A lotus worker -l info @@ -67,7 +67,7 @@ services: - ./env/.env.dev restart: on-failure build: - context: . + context: ./backend dockerfile: Dockerfile.backend target: development command: celery -A lotus beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index e39e69eb2..819ca39e6 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -13,7 +13,7 @@ services: env_file: - ./env/.env.prod build: - context: . + context: ./backend dockerfile: Dockerfile.backend target: production expose: @@ -29,7 +29,7 @@ services: frontend: restart: always build: - context: . + context: ./frontend dockerfile: Dockerfile.frontend target: production stdin_open: true @@ -50,7 +50,7 @@ services: env_file: - ./env/.env.prod build: - context: . + context: ./backend dockerfile: Dockerfile.backend target: production command: celery -A lotus worker -l info @@ -64,7 +64,7 @@ services: - ./env/.env.prod restart: on-failure build: - context: . + context: ./backend dockerfile: Dockerfile.backend target: production command: celery -A lotus beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/Dockerfile.frontend b/frontend/Dockerfile.frontend similarity index 100% rename from Dockerfile.frontend rename to frontend/Dockerfile.frontend diff --git a/nginx.conf b/frontend/nginx.conf similarity index 100% rename from nginx.conf rename to frontend/nginx.conf diff --git a/package.json b/frontend/package.json similarity index 100% rename from package.json rename to frontend/package.json diff --git a/postcss.config.cjs b/frontend/postcss.config.cjs similarity index 100% rename from postcss.config.cjs rename to frontend/postcss.config.cjs diff --git a/public/corner_logo.svg b/frontend/public/corner_logo.svg similarity index 100% rename from public/corner_logo.svg rename to frontend/public/corner_logo.svg diff --git a/public/logo_large.png b/frontend/public/logo_large.png similarity index 100% rename from public/logo_large.png rename to frontend/public/logo_large.png diff --git a/public/logo_small256.jpg b/frontend/public/logo_small256.jpg similarity index 100% rename from public/logo_small256.jpg rename to frontend/public/logo_small256.jpg diff --git a/public/vite.svg b/frontend/public/vite.svg similarity index 100% rename from public/vite.svg rename to frontend/public/vite.svg diff --git a/src/.env.prod b/frontend/src/.env.prod similarity index 100% rename from src/.env.prod rename to frontend/src/.env.prod diff --git a/src/App.tsx b/frontend/src/App.tsx similarity index 100% rename from src/App.tsx rename to frontend/src/App.tsx diff --git a/src/api/api.ts b/frontend/src/api/api.ts similarity index 100% rename from src/api/api.ts rename to frontend/src/api/api.ts diff --git a/src/assets/images/connectwithstripe.svg b/frontend/src/assets/images/connectwithstripe.svg similarity index 100% rename from src/assets/images/connectwithstripe.svg rename to frontend/src/assets/images/connectwithstripe.svg diff --git a/src/assets/images/corner_logo.svg b/frontend/src/assets/images/corner_logo.svg similarity index 100% rename from src/assets/images/corner_logo.svg rename to frontend/src/assets/images/corner_logo.svg diff --git a/src/assets/images/logo_large.jpg b/frontend/src/assets/images/logo_large.jpg similarity index 100% rename from src/assets/images/logo_large.jpg rename to frontend/src/assets/images/logo_large.jpg diff --git a/src/assets/images/logo_small.svg b/frontend/src/assets/images/logo_small.svg similarity index 100% rename from src/assets/images/logo_small.svg rename to frontend/src/assets/images/logo_small.svg diff --git a/src/components/CreateMetricForm.tsx b/frontend/src/components/CreateMetricForm.tsx similarity index 100% rename from src/components/CreateMetricForm.tsx rename to frontend/src/components/CreateMetricForm.tsx diff --git a/src/components/Customers/CreateCustomerForm.tsx b/frontend/src/components/Customers/CreateCustomerForm.tsx similarity index 100% rename from src/components/Customers/CreateCustomerForm.tsx rename to frontend/src/components/Customers/CreateCustomerForm.tsx diff --git a/src/components/Customers/CustomerDetail.css b/frontend/src/components/Customers/CustomerDetail.css similarity index 100% rename from src/components/Customers/CustomerDetail.css rename to frontend/src/components/Customers/CustomerDetail.css diff --git a/src/components/Customers/CustomerDetail.tsx b/frontend/src/components/Customers/CustomerDetail.tsx similarity index 100% rename from src/components/Customers/CustomerDetail.tsx rename to frontend/src/components/Customers/CustomerDetail.tsx diff --git a/src/components/Customers/CustomerInvoices.tsx b/frontend/src/components/Customers/CustomerInvoices.tsx similarity index 100% rename from src/components/Customers/CustomerInvoices.tsx rename to frontend/src/components/Customers/CustomerInvoices.tsx diff --git a/src/components/Customers/CustomerSubscriptionView.tsx b/frontend/src/components/Customers/CustomerSubscriptionView.tsx similarity index 100% rename from src/components/Customers/CustomerSubscriptionView.tsx rename to frontend/src/components/Customers/CustomerSubscriptionView.tsx diff --git a/src/components/Customers/CustomerTable.tsx b/frontend/src/components/Customers/CustomerTable.tsx similarity index 100% rename from src/components/Customers/CustomerTable.tsx rename to frontend/src/components/Customers/CustomerTable.tsx diff --git a/src/components/Dashboard/CustomerByPlanPie.tsx b/frontend/src/components/Dashboard/CustomerByPlanPie.tsx similarity index 100% rename from src/components/Dashboard/CustomerByPlanPie.tsx rename to frontend/src/components/Dashboard/CustomerByPlanPie.tsx diff --git a/src/components/Dashboard/Dashboard.tsx b/frontend/src/components/Dashboard/Dashboard.tsx similarity index 100% rename from src/components/Dashboard/Dashboard.tsx rename to frontend/src/components/Dashboard/Dashboard.tsx diff --git a/src/components/Dashboard/MetricBarGraph.tsx b/frontend/src/components/Dashboard/MetricBarGraph.tsx similarity index 100% rename from src/components/Dashboard/MetricBarGraph.tsx rename to frontend/src/components/Dashboard/MetricBarGraph.tsx diff --git a/src/components/Dashboard/RevenueBarGraph.tsx b/frontend/src/components/Dashboard/RevenueBarGraph.tsx similarity index 100% rename from src/components/Dashboard/RevenueBarGraph.tsx rename to frontend/src/components/Dashboard/RevenueBarGraph.tsx diff --git a/src/components/Dashboard/RevenueDisplay.tsx b/frontend/src/components/Dashboard/RevenueDisplay.tsx similarity index 100% rename from src/components/Dashboard/RevenueDisplay.tsx rename to frontend/src/components/Dashboard/RevenueDisplay.tsx diff --git a/src/components/Dashboard/SubscriptionStatistics.tsx b/frontend/src/components/Dashboard/SubscriptionStatistics.tsx similarity index 100% rename from src/components/Dashboard/SubscriptionStatistics.tsx rename to frontend/src/components/Dashboard/SubscriptionStatistics.tsx diff --git a/src/components/EventPreview.tsx b/frontend/src/components/EventPreview.tsx similarity index 100% rename from src/components/EventPreview.tsx rename to frontend/src/components/EventPreview.tsx diff --git a/src/components/Head.png b/frontend/src/components/Head.png similarity index 100% rename from src/components/Head.png rename to frontend/src/components/Head.png diff --git a/src/components/LoadingSpinner.tsx b/frontend/src/components/LoadingSpinner.tsx similarity index 100% rename from src/components/LoadingSpinner.tsx rename to frontend/src/components/LoadingSpinner.tsx diff --git a/src/components/MetricTable.tsx b/frontend/src/components/MetricTable.tsx similarity index 100% rename from src/components/MetricTable.tsx rename to frontend/src/components/MetricTable.tsx diff --git a/src/components/PlanDisplayBasic.tsx b/frontend/src/components/PlanDisplayBasic.tsx similarity index 100% rename from src/components/PlanDisplayBasic.tsx rename to frontend/src/components/PlanDisplayBasic.tsx diff --git a/src/components/Plans/FeatureForm.tsx b/frontend/src/components/Plans/FeatureForm.tsx similarity index 100% rename from src/components/Plans/FeatureForm.tsx rename to frontend/src/components/Plans/FeatureForm.tsx diff --git a/src/components/Plans/UsageComponentForm.css b/frontend/src/components/Plans/UsageComponentForm.css similarity index 100% rename from src/components/Plans/UsageComponentForm.css rename to frontend/src/components/Plans/UsageComponentForm.css diff --git a/src/components/Plans/UsageComponentForm.tsx b/frontend/src/components/Plans/UsageComponentForm.tsx similarity index 100% rename from src/components/Plans/UsageComponentForm.tsx rename to frontend/src/components/Plans/UsageComponentForm.tsx diff --git a/src/components/Registration/CreateOrganization.tsx b/frontend/src/components/Registration/CreateOrganization.tsx similarity index 100% rename from src/components/Registration/CreateOrganization.tsx rename to frontend/src/components/Registration/CreateOrganization.tsx diff --git a/src/components/Registration/SignUp.tsx b/frontend/src/components/Registration/SignUp.tsx similarity index 100% rename from src/components/Registration/SignUp.tsx rename to frontend/src/components/Registration/SignUp.tsx diff --git a/src/components/Seperator.tsx b/frontend/src/components/Seperator.tsx similarity index 100% rename from src/components/Seperator.tsx rename to frontend/src/components/Seperator.tsx diff --git a/src/components/Settings/Settings.css b/frontend/src/components/Settings/Settings.css similarity index 100% rename from src/components/Settings/Settings.css rename to frontend/src/components/Settings/Settings.css diff --git a/src/components/Settings/Settings.tsx b/frontend/src/components/Settings/Settings.tsx similarity index 100% rename from src/components/Settings/Settings.tsx rename to frontend/src/components/Settings/Settings.tsx diff --git a/src/components/SideBar.css b/frontend/src/components/SideBar.css similarity index 100% rename from src/components/SideBar.css rename to frontend/src/components/SideBar.css diff --git a/src/components/SideBar.tsx b/frontend/src/components/SideBar.tsx similarity index 100% rename from src/components/SideBar.tsx rename to frontend/src/components/SideBar.tsx diff --git a/src/components/base/Button/button.less b/frontend/src/components/base/Button/button.less similarity index 100% rename from src/components/base/Button/button.less rename to frontend/src/components/base/Button/button.less diff --git a/src/components/base/Button/index.tsx b/frontend/src/components/base/Button/index.tsx similarity index 100% rename from src/components/base/Button/index.tsx rename to frontend/src/components/base/Button/index.tsx diff --git a/src/components/base/PageLayout.tsx b/frontend/src/components/base/PageLayout.tsx similarity index 100% rename from src/components/base/PageLayout.tsx rename to frontend/src/components/base/PageLayout.tsx diff --git a/src/components/base/Paper.tsx b/frontend/src/components/base/Paper.tsx similarity index 100% rename from src/components/base/Paper.tsx rename to frontend/src/components/base/Paper.tsx diff --git a/src/components/base/Typograpy/index..tsx b/frontend/src/components/base/Typograpy/index..tsx similarity index 100% rename from src/components/base/Typograpy/index..tsx rename to frontend/src/components/base/Typograpy/index..tsx diff --git a/src/components/base/Typograpy/index.less b/frontend/src/components/base/Typograpy/index.less similarity index 100% rename from src/components/base/Typograpy/index.less rename to frontend/src/components/base/Typograpy/index.less diff --git a/src/components/menuConfig.ts b/frontend/src/components/menuConfig.ts similarity index 100% rename from src/components/menuConfig.ts rename to frontend/src/components/menuConfig.ts diff --git a/src/config/ExternalRoutes.tsx b/frontend/src/config/ExternalRoutes.tsx similarity index 100% rename from src/config/ExternalRoutes.tsx rename to frontend/src/config/ExternalRoutes.tsx diff --git a/src/config/Routes.tsx b/frontend/src/config/Routes.tsx similarity index 100% rename from src/config/Routes.tsx rename to frontend/src/config/Routes.tsx diff --git a/src/index.css b/frontend/src/index.css similarity index 100% rename from src/index.css rename to frontend/src/index.css diff --git a/src/index.html b/frontend/src/index.html similarity index 100% rename from src/index.html rename to frontend/src/index.html diff --git a/src/integrations/StripeIntegrations.tsx b/frontend/src/integrations/StripeIntegrations.tsx similarity index 100% rename from src/integrations/StripeIntegrations.tsx rename to frontend/src/integrations/StripeIntegrations.tsx diff --git a/src/integrations/api.ts b/frontend/src/integrations/api.ts similarity index 100% rename from src/integrations/api.ts rename to frontend/src/integrations/api.ts diff --git a/src/main.tsx b/frontend/src/main.tsx similarity index 100% rename from src/main.tsx rename to frontend/src/main.tsx diff --git a/src/pages/CreatePlan.tsx b/frontend/src/pages/CreatePlan.tsx similarity index 100% rename from src/pages/CreatePlan.tsx rename to frontend/src/pages/CreatePlan.tsx diff --git a/src/pages/EditPlan.tsx b/frontend/src/pages/EditPlan.tsx similarity index 100% rename from src/pages/EditPlan.tsx rename to frontend/src/pages/EditPlan.tsx diff --git a/src/pages/Login.css b/frontend/src/pages/Login.css similarity index 100% rename from src/pages/Login.css rename to frontend/src/pages/Login.css diff --git a/src/pages/Login.tsx b/frontend/src/pages/Login.tsx similarity index 100% rename from src/pages/Login.tsx rename to frontend/src/pages/Login.tsx diff --git a/src/pages/Registration.tsx b/frontend/src/pages/Registration.tsx similarity index 100% rename from src/pages/Registration.tsx rename to frontend/src/pages/Registration.tsx diff --git a/src/pages/Registrations.css b/frontend/src/pages/Registrations.css similarity index 100% rename from src/pages/Registrations.css rename to frontend/src/pages/Registrations.css diff --git a/src/pages/ViewCustomers.tsx b/frontend/src/pages/ViewCustomers.tsx similarity index 100% rename from src/pages/ViewCustomers.tsx rename to frontend/src/pages/ViewCustomers.tsx diff --git a/src/pages/ViewMetrics.css b/frontend/src/pages/ViewMetrics.css similarity index 100% rename from src/pages/ViewMetrics.css rename to frontend/src/pages/ViewMetrics.css diff --git a/src/pages/ViewMetrics.tsx b/frontend/src/pages/ViewMetrics.tsx similarity index 100% rename from src/pages/ViewMetrics.tsx rename to frontend/src/pages/ViewMetrics.tsx diff --git a/src/pages/ViewPlans.tsx b/frontend/src/pages/ViewPlans.tsx similarity index 100% rename from src/pages/ViewPlans.tsx rename to frontend/src/pages/ViewPlans.tsx diff --git a/src/pages/ViewSettings.tsx b/frontend/src/pages/ViewSettings.tsx similarity index 100% rename from src/pages/ViewSettings.tsx rename to frontend/src/pages/ViewSettings.tsx diff --git a/src/pages/ViewSubscriptions.tsx b/frontend/src/pages/ViewSubscriptions.tsx similarity index 100% rename from src/pages/ViewSubscriptions.tsx rename to frontend/src/pages/ViewSubscriptions.tsx diff --git a/src/types/account-type.ts b/frontend/src/types/account-type.ts similarity index 100% rename from src/types/account-type.ts rename to frontend/src/types/account-type.ts diff --git a/src/types/customer-type.ts b/frontend/src/types/customer-type.ts similarity index 100% rename from src/types/customer-type.ts rename to frontend/src/types/customer-type.ts diff --git a/src/types/event-type.ts b/frontend/src/types/event-type.ts similarity index 100% rename from src/types/event-type.ts rename to frontend/src/types/event-type.ts diff --git a/src/types/feature-type.ts b/frontend/src/types/feature-type.ts similarity index 100% rename from src/types/feature-type.ts rename to frontend/src/types/feature-type.ts diff --git a/src/types/invoice-type.ts b/frontend/src/types/invoice-type.ts similarity index 100% rename from src/types/invoice-type.ts rename to frontend/src/types/invoice-type.ts diff --git a/src/types/metric-type.ts b/frontend/src/types/metric-type.ts similarity index 100% rename from src/types/metric-type.ts rename to frontend/src/types/metric-type.ts diff --git a/src/types/plan-type.ts b/frontend/src/types/plan-type.ts similarity index 100% rename from src/types/plan-type.ts rename to frontend/src/types/plan-type.ts diff --git a/src/types/revenue-type.ts b/frontend/src/types/revenue-type.ts similarity index 100% rename from src/types/revenue-type.ts rename to frontend/src/types/revenue-type.ts diff --git a/src/types/stripe-type.ts b/frontend/src/types/stripe-type.ts similarity index 100% rename from src/types/stripe-type.ts rename to frontend/src/types/stripe-type.ts diff --git a/src/types/subscription-type.ts b/frontend/src/types/subscription-type.ts similarity index 100% rename from src/types/subscription-type.ts rename to frontend/src/types/subscription-type.ts diff --git a/src/vite-env.d.ts b/frontend/src/vite-env.d.ts similarity index 100% rename from src/vite-env.d.ts rename to frontend/src/vite-env.d.ts diff --git a/tailwind.config.cjs b/frontend/tailwind.config.cjs similarity index 100% rename from tailwind.config.cjs rename to frontend/tailwind.config.cjs diff --git a/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from tsconfig.json rename to frontend/tsconfig.json diff --git a/tsconfig.node.json b/frontend/tsconfig.node.json similarity index 100% rename from tsconfig.node.json rename to frontend/tsconfig.node.json diff --git a/vite.config.ts b/frontend/vite.config.ts similarity index 100% rename from vite.config.ts rename to frontend/vite.config.ts diff --git a/yarn.lock b/frontend/yarn.lock similarity index 100% rename from yarn.lock rename to frontend/yarn.lock