Merge pull request #263 from seanmorley15/development

fix deploy bug
seanmorley15 · Aug 20, 2024 · 0943b99 · 0943b99
2 parents c038dce + f15fbbe
commit 0943b99
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/backend/server/worldtravel/models.py b/backend/server/worldtravel/models.py
@@ -45,7 +45,7 @@ def __str__(self):
 class Region(models.Model):
     id = models.CharField(primary_key=True)
     name = models.CharField(max_length=100)
-    name_en = models.CharField(max_length=100)
+    name_en = models.CharField(max_length=100, blank=True, null=True)
     country = models.ForeignKey(Country, on_delete=models.CASCADE)
 
     def __str__(self):

diff --git a/frontend/src/lib/components/RegionCard.svelte b/frontend/src/lib/components/RegionCard.svelte
@@ -57,10 +57,10 @@
 	class="card w-full max-w-xs sm:max-w-sm md:max-w-md lg:max-w-md xl:max-w-md bg-primary-content shadow-xl overflow-hidden text-base-content"
 >
 	<div class="card-body">
-		{#if region.name == region.name_en}
-			<h2 class="card-title overflow-ellipsis">{region.name}</h2>
-		{:else}
+		{#if region.name !== region?.name_en}
 			<h2 class="card-title overflow-ellipsis">{region.name} ({region.name_en})</h2>
+		{:else}
+			<h2 class="card-title overflow-ellipsis">{region.name}</h2>
 		{/if}
 		<p>{region.id}</p>
 		<div class="card-actions justify-end">

diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts
@@ -44,7 +44,7 @@ export type Country = {
 export type Region = {
 	id: number;
 	name: string;
-	name_en: string;
+	name_en?: string;
 	country: number;
 };