revise default color behavior

ssciwr · Dec 20, 2024 · d357b87 · d357b87
1 parent 6819ee4
commit d357b87
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/frontend/src/lib/components/ChildrenGallery.svelte b/frontend/src/lib/components/ChildrenGallery.svelte
@@ -11,16 +11,6 @@ import { Heading, Spinner } from "flowbite-svelte";
 import { _ } from "svelte-i18n";
 import AlertMessage from "./AlertMessage.svelte";
 
-function makeChildClass(childdata: CardElement): string {
-	if (childdata.image !== null && childdata.image !== undefined) {
-		return "";
-	}
-	const classstr =
-		"hover:cursor-pointer m-2 max-w-prose text-gray-700 hover:text-white dark:text-white hover:dark:text-gray-400 hover:bg-primary-800 dark:hover:bg-primary-700";
-
-	return classstr;
-}
-
 function createStyle(data: CardElement[]): CardStyle[] {
 	return data.map((item) => ({
 		card:
@@ -31,7 +21,8 @@ function createStyle(data: CardElement[]): CardStyle[] {
 						horizontal: false,
 					}
 				: {
-						class: makeChildClass(item),
+						class:
+							"hover:cursor-pointer m-2 max-w-prose text-gray-700 hover:text-white dark:text-white hover:dark:text-gray-400 hover:bg-primary-800 dark:hover:bg-primary-700",
 						style: item.color ? `background-color: ${item.color};` : "",
 						horizontal: false,
 					},

diff --git a/frontend/src/lib/components/ChildrenRegistration.svelte b/frontend/src/lib/components/ChildrenRegistration.svelte
@@ -151,7 +151,7 @@ async function submitChildData(): Promise<void> {
 				birth_year: birthyear,
 				birth_month: birthmonth,
 				has_image: image !== null,
-				color: color,
+				color: image !== null ? null : color,
 			} as ChildCreate,
 		});
 
@@ -163,6 +163,8 @@ async function submitChildData(): Promise<void> {
 		}
 		currentChild.id = new_child.data.id;
 	} else {
+		console.log("updating existing child");
+
 		// update existing child
 		const response = await updateChild({
 			body: {
@@ -341,7 +343,7 @@ async function submitData(): Promise<void> {
 						label={$_("childData.childColor")}
 						required={false}
 						placeholder={$_("childData.chooseColor")}
-						disabled={image!==null || disableEdit}
+						disabled={disableEdit}
 						id="child_color"
 						kwargs = {{type: "color"}}
 						componentClass="w-1/4 h-12 rounded"

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
@@ -171,7 +171,7 @@
 		"noFileChosen": "Keine Datei ausgewählt",
 		"deleteImageButton": "Bild löschen",
 		"nextButtonLabel": "Weiter zu Meilensteinen",
-		"childColor": "Hintergrundfarbe für Icon wenn kein Bild benutzt werden soll",
+		"childColor": "Hintergrundfarbe für Icon wählen",
 		"chooseColor": "Farbe wählen"
 	},
 	"forgotPw": {

diff --git a/mondey_backend/src/mondey_backend/models/children.py b/mondey_backend/src/mondey_backend/models/children.py
@@ -8,7 +8,7 @@ class ChildBase(SQLModel):
     name: str = ""
     birth_year: int
     birth_month: int
-    color: str = "#ffffff"
+    color: str | None = None
 
 
 class Child(ChildBase, table=True):