Skip to content

Commit

Permalink
Merge pull request #548 from NASA-IMPACT/547-fix-cors-issue-on-frontend
Browse files Browse the repository at this point in the history
Fix CORS issue on the frontend
  • Loading branch information
code-geek authored Dec 6, 2023
2 parents 4daaece + 502ede1 commit 5493f95
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 5 deletions.
22 changes: 18 additions & 4 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,28 @@
"django_extensions",
]
THIRD_PARTY_APPS = [
"crispy_forms",
"crispy_bootstrap5",
"allauth",
"allauth.account",
"allauth.socialaccount",
"allauth",
"corsheaders",
"crispy_bootstrap5",
"crispy_forms",
"django_celery_beat",
"rest_framework",
"rest_framework_datatables",
"rest_framework",
]

CORS_ALLOWED_ORIGINS = [
"http://localhost:3000",
"http://sde-lrm.nasa-impact.net",
"https://sde-qa.nasa-impact.net",
"https://sciencediscoveryengine.test.nasa.gov",
"https://sciencediscoveryengine.nasa.gov",
"http://sde-qa.nasa-impact.net",
"http://sciencediscoveryengine.test.nasa.gov",
"http://sciencediscoveryengine.nasa.gov",
"https://localhost:4200",
"http://localhost:4200",
]

LOCAL_APPS = ["sde_indexing_helper.users", "sde_collections", "feedback"]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.2.6 on 2023-12-06 15:50

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("feedback", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name="contentcurationrequest",
name="additional_info",
field=models.TextField(blank=True, default=""),
),
]
2 changes: 1 addition & 1 deletion feedback/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ContentCurationRequest(models.Model):
scientific_focus = models.CharField(max_length=200)
data_type = models.CharField(max_length=100)
data_link = models.CharField(max_length=1000)
additional_info = models.TextField()
additional_info = models.TextField(default="", blank=True)

class Meta:
verbose_name = "Content Curation Request"
Expand Down

0 comments on commit 5493f95

Please sign in to comment.