);
diff --git a/backToTheFutureFrontend/src/models/Command.tsx b/backToTheFutureFrontend/src/models/Command.tsx
new file mode 100644
index 0000000..50a6542
--- /dev/null
+++ b/backToTheFutureFrontend/src/models/Command.tsx
@@ -0,0 +1,6 @@
+export enum Command {
+ Eat,
+ Sleep,
+ Clean,
+ Play
+}
diff --git a/backToTheFutureFrontend/src/models/TamagotchiState.tsx b/backToTheFutureFrontend/src/models/TamagotchiState.tsx
new file mode 100644
index 0000000..9433b52
--- /dev/null
+++ b/backToTheFutureFrontend/src/models/TamagotchiState.tsx
@@ -0,0 +1,8 @@
+export enum State
+{
+ Base,
+ Eating,
+ Sleeping,
+ Cleaning,
+ Playing
+}
diff --git a/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx b/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx
index 99acf93..72fbecc 100644
--- a/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx
+++ b/oldSchoolFrontend/src/components/screens/MainActionsScreen.tsx
@@ -90,7 +90,8 @@ export default function MainActionsScreen({gameStateSetter}: MainActionsScreenPr
for (let index in photos) {
if (photos[index].name.toLowerCase() === response.data) {
indexToHighLightSetter(+index)
- infoTextSetter("Only the first photo with " + color + "\nbackground color has been found!")
+ let article = color == "orange" ? "an" : "a"
+ infoTextSetter("Only the first photo with " + article + " " + color + "\nbackground color has been found!")
return
}
}
@@ -136,10 +137,10 @@ export default function MainActionsScreen({gameStateSetter}: MainActionsScreenPr
}
if (type == "background color") {
sendGroupByRequest("/functions/groupByByColor")
- infoTextSetter("Photos with the same background color\nwere grouped.")
+ infoTextSetter("Photos have been grouped according to\nthe background color.")
} else if (type == "hair type and hat") {
sendGroupByRequest("/functions/groupByPhotosByHairAndHat")
- infoTextSetter("Photos with the same hair tone (dark or light) were grouped.\nInside each group photos were grouped by a hat presence.")
+ infoTextSetter("Photos have been grouped according to the hair tone (dark or light).\nInside each group, photos are grouped according to the absence/presence of a hat.")
}
}