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

ProjektAdLer · Nov 8, 2023 · 7af0a52 · 7af0a52
2 parents effe86d + 8040ae7
commit 7af0a52
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/...resentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementAnswerFeedback.tsx b/...resentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementAnswerFeedback.tsx
@@ -11,12 +11,16 @@ export default function AdaptivityElementAnswerFeedback({
   closeFeedback: () => void;
 }) {
   useEffect(() => {
-    setHeaderText(isCorrect ? "Korrekt!" : "Inkorrekt!");
+    setHeaderText(
+      isCorrect
+        ? "Glückwunsch! Diese Antwort war richtig!"
+        : "Schade, leider war deine Antwort falsch."
+    );
   }, [isCorrect, setHeaderText]);
 
   return (
     <div className="flex w-full h-fit my-4">
-      <div className="w-1/2">
+      {/*       <div className="w-1/2">
         {isCorrect && (
           <p className="pl-4 font-bold">
             Glückwunsch! Diese Antwort war richtig!
@@ -27,7 +31,7 @@ export default function AdaptivityElementAnswerFeedback({
             Schade, leider war deine Antwort falsch.
           </p>
         )}
-      </div>
+      </div> */}
       <div className="flex justify-end w-1/2">
         <StyledButton shape="freefloatcenter" onClick={closeFeedback}>
           Weiter

diff --git a/...esentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx b/...esentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementDialogContainer.tsx
@@ -134,7 +134,7 @@ export default function AdaptivityElementDialogContainer({
               ></img>
 
               {currentTask === null && currentQuestion === null && (
-                <div className="w-[50px] lg:w-[50px] bg-buttonbgblue rounded-full ">
+                <div className="w-[50px] lg:w-[50px] bg-buttonbgblue rounded-full text-sm">
                   <CircularProgressbarWithChildren
                     value={progressPercentage}
                     strokeWidth={10}

diff --git a/...nts/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementHint.tsx b/...nts/Core/Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementHint.tsx
@@ -10,7 +10,7 @@ export default function AdaptivityElementHint({
   setHeaderText: (headerText: string) => void;
 }) {
   useEffect(() => {
-    setHeaderText("HINT_PLACEHOLDER_HEADER");
+    setHeaderText("Ich helfe dir auf die Sprünge");
   }, [setHeaderText]);
 
   return (

diff --git a/...Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementTaskSelection.tsx b/...Presentation/Adaptivity/AdaptivityElement/UIComponents/AdaptivityElementTaskSelection.tsx
@@ -44,7 +44,7 @@ export default function AdaptivityElementTaskSelection({
 
   useEffect(() => {
     setHeaderText(
-      "Hallo Freund, ich helfe dir zu lernen. Such dir ein Thema aus und wir arbeiten gemeinsam an deinem Wissen."
+      "Hallo Freund, ich helfe dir zu lernen. Suche dir ein Thema aus und wir arbeiten gemeinsam an deinem Wissen."
     );
   }, [setHeaderText]);
 
@@ -74,7 +74,10 @@ export default function AdaptivityElementTaskSelection({
         );
 
         return (
-          <div key={i.toString() + "_" + task.taskID} className="flex flex-col">
+          <div
+            key={i.toString() + "_" + task.taskID}
+            className="flex flex-col text-sm"
+          >
             <StyledButton
               shape="freefloatcenter"
               className="w-full max-w-2xl"