From c19b30c11a227d0f7c5288088338a7b2deb38c76 Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Wed, 16 Feb 2022 16:21:21 -0500 Subject: [PATCH] fix: fixed for prod --- .gitignore | 3 +- Pipfile | 1 + Pipfile.lock | 86 ++------------------------------- config/settings.py | 7 ++- form/migrations/0001_initial.py | 34 ------------- form/migrations/__init__.py | 0 form/templates/form/index.html | 4 +- 7 files changed, 14 insertions(+), 121 deletions(-) delete mode 100644 form/migrations/0001_initial.py delete mode 100644 form/migrations/__init__.py diff --git a/.gitignore b/.gitignore index 56a04c3..cd78d7d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ __pycache__ db.sqlite3 media +static # Backup files # *.bak @@ -134,4 +135,4 @@ GitHub.sublime-settings !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json -.history \ No newline at end of file +.history diff --git a/Pipfile b/Pipfile index 4dd7aa2..63c9aa2 100644 --- a/Pipfile +++ b/Pipfile @@ -8,6 +8,7 @@ Django = "*" python-dotenv = "*" django-address = "*" django-crispy-forms = "*" +gunicorn = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index d092053..ee8caa3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "57c6fcc08d5613c3832161125af0b9cd702aaa552d0efd5baf912d44aa97d9ab" + "sha256": "4655e86815d1a8b57f96a34fdbfd0e87b6607093fa13e4a22e567f5be0dbf58b" }, "pipfile-spec": 6, "requires": { @@ -16,88 +16,10 @@ ] }, "default": { - "asgiref": { - "hashes": [ - "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0", - "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9" - ], - "version": "==3.5.0" - }, - "backports.zoneinfo": { - "hashes": [ - "sha256:17746bd546106fa389c51dbea67c8b7c8f0d14b5526a579ca6ccf5ed72c526cf", - "sha256:1b13e654a55cd45672cb54ed12148cd33628f672548f373963b0bff67b217328", - "sha256:1c5742112073a563c81f786e77514969acb58649bcdf6cdf0b4ed31a348d4546", - "sha256:4a0f800587060bf8880f954dbef70de6c11bbe59c673c3d818921f042f9954a6", - "sha256:5c144945a7752ca544b4b78c8c41544cdfaf9786f25fe5ffb10e838e19a27570", - "sha256:7b0a64cda4145548fed9efc10322770f929b944ce5cee6c0dfe0c87bf4c0c8c9", - "sha256:8439c030a11780786a2002261569bdf362264f605dfa4d65090b64b05c9f79a7", - "sha256:8961c0f32cd0336fb8e8ead11a1f8cd99ec07145ec2931122faaac1c8f7fd987", - "sha256:89a48c0d158a3cc3f654da4c2de1ceba85263fafb861b98b59040a5086259722", - "sha256:a76b38c52400b762e48131494ba26be363491ac4f9a04c1b7e92483d169f6582", - "sha256:da6013fd84a690242c310d77ddb8441a559e9cb3d3d59ebac9aca1a57b2e18bc", - "sha256:e55b384612d93be96506932a786bbcde5a2db7a9e6a4bb4bffe8b733f5b9036b", - "sha256:e81b76cace8eda1fca50e345242ba977f9be6ae3945af8d46326d776b4cf78d1", - "sha256:e8236383a20872c0cdf5a62b554b27538db7fa1bbec52429d8d106effbaeca08", - "sha256:f04e857b59d9d1ccc39ce2da1021d196e47234873820cbeaad210724b1ee28ac", - "sha256:fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2" - ], - "markers": "python_version < '3.9'", - "version": "==0.2.1" - }, - "django": { - "hashes": [ - "sha256:110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a", - "sha256:996495c58bff749232426c88726d8cd38d24c94d7c1d80835aafffa9bc52985a" - ], - "index": "pypi", - "version": "==4.0.2" - }, - "django-address": { - "hashes": [ - "sha256:1918a92ab56cfe9df1976b940256d90b1230d9ae08c0e38e18ea645e78e84f02", - "sha256:75d7fb77d1eaba0e612e361d6e6794f55f1810971d46c13cfb49d8802634fcab" - ], - "index": "pypi", - "version": "==0.2.5" - }, - "django-crispy-forms": { - "hashes": [ - "sha256:35887b8851a931374dd697207a8f56c57a9c5cb9dbf0b9fa54314da5666cea5b", - "sha256:bc4d2037f6de602d39c0bc452ac3029d1f5d65e88458872cc4dbc01c3a400604" - ], - "index": "pypi", - "version": "==1.14.0" - }, "django-phonenumber-field": { - "hashes": [ - "sha256:897b902a1654b0eb21f6268498a3359e2c4eb90af9585cb8693af186ede8c5bb", - "sha256:b1ff950f90a8911ff323ccf77c8f6fe4299a9f671fa61c8734a6994359f07446" - ], - "index": "pypi", - "version": "==6.1.0" - }, - "phonenumbers": { - "hashes": [ - "sha256:1c8270a2e257d6c65458a42283f82d3eca7f7b9d925454a6966e2f04df75e1cf", - "sha256:386ea186019e8f4d646e48e9da9c3e786c254cfb1bd541cc0a8d0a2ccb85d3ca" - ], - "version": "==8.12.43" - }, - "python-dotenv": { - "hashes": [ - "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3", - "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f" - ], - "index": "pypi", - "version": "==0.19.2" - }, - "sqlparse": { - "hashes": [ - "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae", - "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d" - ], - "version": "==0.4.2" + "extras": [ + "phonenumbers" + ] } }, "develop": {} diff --git a/config/settings.py b/config/settings.py index 7ed21fb..5a30ac0 100644 --- a/config/settings.py +++ b/config/settings.py @@ -64,6 +64,8 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] +CSRF_TRUSTED_ORIGINS = ['https://relish.monster'] + ROOT_URLCONF = 'config.urls' TEMPLATES = [ @@ -130,7 +132,8 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ -STATIC_URL = 'static/' +STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, 'static') # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field @@ -143,4 +146,4 @@ CRISPY_TEMPLATE_PACK = 'bootstrap4' PHONENUMBER_DB_FORMAT = 'NATIONAL' PHONENUMBER_DEFAULT_REGION = 'US' -PHONENUMBER_DEFAULT_FORMAT = 'NATIONAL' \ No newline at end of file +PHONENUMBER_DEFAULT_FORMAT = 'NATIONAL' diff --git a/form/migrations/0001_initial.py b/form/migrations/0001_initial.py deleted file mode 100644 index e22a80a..0000000 --- a/form/migrations/0001_initial.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 4.0.2 on 2022-02-16 01:22 - -import address.models -from django.db import migrations, models -import django.db.models.deletion -import phonenumber_field.modelfields - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('address', '0004_alter_address_id_alter_country_id_alter_locality_id_and_more'), - ] - - operations = [ - migrations.CreateModel( - name='Response', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('email', models.EmailField(blank=True, max_length=100, null=True)), - ('phone', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=128, null=True, region=None)), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('address', address.models.AddressField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='address.address')), - ], - options={ - 'verbose_name': 'Response', - 'verbose_name_plural': 'Responses', - 'ordering': ['created_at'], - }, - ), - ] diff --git a/form/migrations/__init__.py b/form/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/form/templates/form/index.html b/form/templates/form/index.html index c014aa8..da6b075 100644 --- a/form/templates/form/index.html +++ b/form/templates/form/index.html @@ -24,7 +24,7 @@ body { {% endblock %} {% block content %} -
+
{% if success %}

Response submitted. Thank you for your help!

{% else %} @@ -33,4 +33,4 @@ body { {% crispy form %} {% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %}