Refolder project and prepare for vercel deployment

matiasvallejosdev · Feb 13, 2024 · efe47b9 · efe47b9
1 parent 14d776e
commit efe47b9
Show file tree

Hide file tree

Showing 58 changed files with 44 additions and 17 deletions.
diff --git a/app/.flake8 → .flake8 b/app/.flake8 → .flake8
diff --git a/app/build.sh b/app/build.sh
diff --git a/app/auth_api/__init__.py → auth_api/__init__.py b/app/auth_api/__init__.py → auth_api/__init__.py
diff --git a/app/auth_api/admin.py → auth_api/admin.py b/app/auth_api/admin.py → auth_api/admin.py
diff --git a/app/auth_api/apps.py → auth_api/apps.py b/app/auth_api/apps.py → auth_api/apps.py
diff --git a/app/auth_api/models.py → auth_api/models.py b/app/auth_api/models.py → auth_api/models.py
diff --git a/app/auth_api/tests/__init__.py → auth_api/tests/__init__.py b/app/auth_api/tests/__init__.py → auth_api/tests/__init__.py
diff --git a/app/auth_api/tests/test_auth_api.py → auth_api/tests/test_auth_api.py b/app/auth_api/tests/test_auth_api.py → auth_api/tests/test_auth_api.py
diff --git a/app/auth_api/urls.py → auth_api/urls.py b/app/auth_api/urls.py → auth_api/urls.py
diff --git a/app/auth_api/views.py → auth_api/views.py b/app/auth_api/views.py → auth_api/views.py
diff --git a/build.sh b/build.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# exit on error
+set -o errexit
+
+pip install -r requirements.txt
+
+python manage.py collectstatic --no-input
+python manage.py migrate
+
+python manage.py drop_test_database --noinput
+python manage.py test
diff --git a/app/core/__init__.py → core/__init__.py b/app/core/__init__.py → core/__init__.py
diff --git a/app/core/admin.py → core/admin.py b/app/core/admin.py → core/admin.py
diff --git a/app/core/apps.py → core/apps.py b/app/core/apps.py → core/apps.py
diff --git a/app/core/management/commands/wait_for_db.py → core/management/commands/wait_for_db.py b/app/core/management/commands/wait_for_db.py → core/management/commands/wait_for_db.py
diff --git a/app/core/migrations/0001_initial.py → core/migrations/0001_initial.py b/app/core/migrations/0001_initial.py → core/migrations/0001_initial.py
diff --git a/app/core/migrations/__init__.py → core/migrations/__init__.py b/app/core/migrations/__init__.py → core/migrations/__init__.py
diff --git a/app/core/models.py → core/models.py b/app/core/models.py → core/models.py
diff --git a/app/core/serializers.py → core/serializers.py b/app/core/serializers.py → core/serializers.py
diff --git a/app/core/tests/__init__.py → core/tests/__init__.py b/app/core/tests/__init__.py → core/tests/__init__.py
diff --git a/app/core/tests/test_admin.py → core/tests/test_admin.py b/app/core/tests/test_admin.py → core/tests/test_admin.py
diff --git a/app/core/tests/test_commands.py → core/tests/test_commands.py b/app/core/tests/test_commands.py → core/tests/test_commands.py
diff --git a/app/core/tests/test_models.py → core/tests/test_models.py b/app/core/tests/test_models.py → core/tests/test_models.py
diff --git a/app/core/tests/test_utils.py → core/tests/test_utils.py b/app/core/tests/test_utils.py → core/tests/test_utils.py
diff --git a/app/core/utils.py → core/utils.py b/app/core/utils.py → core/utils.py
diff --git a/app/core/views.py → core/views.py b/app/core/views.py → core/views.py
diff --git a/app/manage.py → manage.py b/app/manage.py → manage.py
diff --git a/app/requirements.dev.txt → requirements.dev.txt b/app/requirements.dev.txt → requirements.dev.txt
diff --git a/app/requirements.txt → requirements.txt b/app/requirements.txt → requirements.txt
diff --git a/app/todo_api/__init__.py → todo_api/__init__.py b/app/todo_api/__init__.py → todo_api/__init__.py
diff --git a/app/todo_api/admin.py → todo_api/admin.py b/app/todo_api/admin.py → todo_api/admin.py
diff --git a/app/todo_api/apps.py → todo_api/apps.py b/app/todo_api/apps.py → todo_api/apps.py
diff --git a/app/todo_api/migrations/0001_initial.py → todo_api/migrations/0001_initial.py b/app/todo_api/migrations/0001_initial.py → todo_api/migrations/0001_initial.py
diff --git a/app/todo_api/migrations/__init__.py → todo_api/migrations/__init__.py b/app/todo_api/migrations/__init__.py → todo_api/migrations/__init__.py
diff --git a/app/todo_api/models.py → todo_api/models.py b/app/todo_api/models.py → todo_api/models.py
diff --git a/app/todo_api/serializers.py → todo_api/serializers.py b/app/todo_api/serializers.py → todo_api/serializers.py
diff --git a/app/todo_api/tests/__init__.py → todo_api/tests/__init__.py b/app/todo_api/tests/__init__.py → todo_api/tests/__init__.py
diff --git a/app/todo_api/tests/test_models.py → todo_api/tests/test_models.py b/app/todo_api/tests/test_models.py → todo_api/tests/test_models.py
diff --git a/app/todo_api/tests/test_task_api.py → todo_api/tests/test_task_api.py b/app/todo_api/tests/test_task_api.py → todo_api/tests/test_task_api.py
diff --git a/app/todo_api/tests/test_task_list_api.py → todo_api/tests/test_task_list_api.py b/app/todo_api/tests/test_task_list_api.py → todo_api/tests/test_task_list_api.py
diff --git a/app/todo_api/urls.py → todo_api/urls.py b/app/todo_api/urls.py → todo_api/urls.py
diff --git a/app/todo_api/views.py → todo_api/views.py b/app/todo_api/views.py → todo_api/views.py
diff --git a/app/todo_project/__init__.py → todo_project/__init__.py b/app/todo_project/__init__.py → todo_project/__init__.py
diff --git a/app/todo_project/asgi.py → todo_project/asgi.py b/app/todo_project/asgi.py → todo_project/asgi.py
diff --git a/app/todo_project/middleware.py → todo_project/middleware.py b/app/todo_project/middleware.py → todo_project/middleware.py
diff --git a/app/todo_project/settings.py → todo_project/settings.py b/app/todo_project/settings.py → todo_project/settings.py
@@ -22,9 +22,9 @@
 SECRET_KEY = os.environ.get("SECRET_KEY", "SgLSDnEtU4kkqXJMYTJbKCq861VpNd5s")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = 'RENDER' not in os.environ
+DEBUG = True
 
-ALLOWED_HOSTS = ["*", "localhost", "127.0.0.1", ".vercel.app"]
+ALLOWED_HOSTS = ["*", "localhost", "127.0.0.1", ".vercel.app", ".now.sh"]
 
 RENDER_EXTERNAL_HOSTNAME = os.environ.get("RENDER_EXTERNAL_HOSTNAME")
 
@@ -158,7 +158,7 @@
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
 
 if not DEBUG:  # Tell Django to copy statics to the `staticfiles` directory
-    STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles/")
+    STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles_build", "static")
     MEDIA_ROOT = os.path.join(BASE_DIR, "staticfiles/images")
     STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 

diff --git a/app/todo_project/urls.py → todo_project/urls.py b/app/todo_project/urls.py → todo_project/urls.py
diff --git a/app/todo_project/wsgi.py → todo_project/wsgi.py b/app/todo_project/wsgi.py → todo_project/wsgi.py
@@ -11,3 +11,5 @@
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todo_project.settings")
 application = get_wsgi_application()
+
+app = application
diff --git a/app/user_api/__init__.py → user_api/__init__.py b/app/user_api/__init__.py → user_api/__init__.py
diff --git a/app/user_api/admin.py → user_api/admin.py b/app/user_api/admin.py → user_api/admin.py
diff --git a/app/user_api/apps.py → user_api/apps.py b/app/user_api/apps.py → user_api/apps.py
diff --git a/app/user_api/models.py → user_api/models.py b/app/user_api/models.py → user_api/models.py
diff --git a/app/user_api/permissions.py → user_api/permissions.py b/app/user_api/permissions.py → user_api/permissions.py
diff --git a/app/user_api/tests/__init__.py → user_api/tests/__init__.py b/app/user_api/tests/__init__.py → user_api/tests/__init__.py
diff --git a/app/user_api/tests/test_user_api.py → user_api/tests/test_user_api.py b/app/user_api/tests/test_user_api.py → user_api/tests/test_user_api.py
diff --git a/app/user_api/urls.py → user_api/urls.py b/app/user_api/urls.py → user_api/urls.py
diff --git a/app/user_api/views.py → user_api/views.py b/app/user_api/views.py → user_api/views.py
diff --git a/vercel.json b/vercel.json
@@ -0,0 +1,28 @@
+
+{
+    "version": 2,
+    "builds": [
+      {
+        "src": "todo_project/wsgi.py",
+        "use": "@vercel/python",
+        "config": { "maxLambdaSize": "15mb", "runtime": "python3.9" }
+      },
+      {
+        "src": "build.sh",
+        "use": "@vercel/static-build",
+        "config": {
+          "distDir": "staticfiles_build"
+        }
+      }
+    ],
+    "routes": [
+      {
+        "src": "/static/(.*)",
+        "dest": "/static/$1"
+      },
+      {
+        "src": "/(.*)",
+        "dest": "todo_project/wsgi.py"
+      }
+    ]
+  }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@

		os.environ.setdefault("DJANGO_SETTINGS_MODULE", "todo_project.settings")
		application = get_wsgi_application()

		app = application