Merge branch 'main' of https://github.com/ProjektAdLer/2D_3D_AdLer

ProjektAdLer · Feb 12, 2024 · 0264ef8 · 0264ef8
2 parents 4d76cf6 + 6f1564e
commit 0264ef8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Components/Core/Adapters/BackendAdapter/MockBackendAdapter.ts b/src/Components/Core/Adapters/BackendAdapter/MockBackendAdapter.ts
@@ -66,11 +66,11 @@ export default class MockBackendAdapter implements IBackendPort {
       elements: [
         {
           elementID: 1,
-          hasScored: true,
+          hasScored: false,
         },
         {
           elementID: 2,
-          hasScored: true,
+          hasScored: false,
         },
         {
           elementID: 3,
@@ -884,9 +884,13 @@ export default class MockBackendAdapter implements IBackendPort {
           spaceName: "Raum der kleinen Welt",
           spaceDescription: "Raumbeschreibung der kleinen Welt",
           spaceSlotContents: [1, 2, 3, null, 4, null, null, 5, null, 6],
-          requiredPointsToComplete: 2,
+          requiredPointsToComplete: 1,
           requiredSpacesToEnter: "",
-          spaceGoals: ["Raumziel 1/3", "Raumziel 2/3", "Raumziel 3/3"],
+          spaceGoals: [
+            "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit",
+            "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit",
+            "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit",
+          ],
           spaceTemplate: "L_32x31_10L",
           spaceTemplateStyle: "Campus",
           spaceStory: {
@@ -1114,7 +1118,7 @@ export default class MockBackendAdapter implements IBackendPort {
           spaceDescription: "rdescription4",
           spaceGoals: ["rgoals4"],
           spaceSlotContents: [4],
-          requiredPointsToComplete: 0,
+          requiredPointsToComplete: 1,
           requiredSpacesToEnter: "(3)v((2)^(1))",
           spaceTemplate: "L_32x31_10L",
           spaceTemplateStyle: "",

diff --git a/src/Components/Core/Presentation/React/LearningSpaceDisplay/BottomTooltip/BottomTooltip.tsx b/src/Components/Core/Presentation/React/LearningSpaceDisplay/BottomTooltip/BottomTooltip.tsx
@@ -31,11 +31,11 @@ export default function BottomTooltip({
     <div
       className={tailwindMerge(
         className,
-        "flex justify-center w-full bottom-2 md:bottom-10 z-40"
+        "flex justify-center w-full bottom-2 md:bottom-10 z-40 pointer-events-none "
       )}
     >
       <StyledContainer
-        className="cursor-pointer"
+        className="cursor-pointer pointer-events-auto"
         onClick={viewModel.onClickCallback.Value} // didn't use useObservable because react has problems with functions in states
       >
         <div className="flex items-center gap-1 p-2 font-bold rounded-lg lg:p-4 text-adlerdarkblue text-md lg:text-2xl bg-buttonbgblue">