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

ProjektAdLer · Jan 15, 2024 · 122bb21 · 122bb21
2 parents d1dbfcf + 5170bdd
commit 122bb21
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/src/Components/Core/Presentation/React/ReactRelated/ReactEntryPoint/WelcomePage.tsx b/src/Components/Core/Presentation/React/ReactRelated/ReactEntryPoint/WelcomePage.tsx
@@ -33,9 +33,9 @@ export default function WelcomePage() {
         <LoginComponent className="flex flex-col items-center justify-around col-span-6 col-start-2 xl:pt-8 lg:pt-4" />
       </section>
 
-      <section className="flex items-center justify-around col-span-6 col-start-2 row-span-3 row-start-3 gap-4 mb-4 portrait:flex-col portrait:row-start-2 portrait:row-span-4 portrait:col-start-2 portrait:gap-6">
+      <section className="flex items-center justify-around  col-span-6 col-start-2 row-span-3 row-start-3 gap-4 mb-4 portrait:flex-col portrait:row-start-2 portrait:row-span-4 portrait:col-start-2 portrait:gap-6">
         <LearningWorldMenuButton />
-        <StyledButton
+        {/*         <StyledButton
           disabled
           shape="freefloatcenter"
           containerClassName="w-full h-full"
@@ -45,7 +45,7 @@ export default function WelcomePage() {
           <p className="absolute p-4 mx-auto text-2xl font-bold rounded-lg text-center bg-adlerbuttonlocked lg:bottom-[42%] portrait:bottom-[20%] portrait:text-lg bottom-32 text-adlerdeactivatedtext">
             Der Avatar Creator ist demnächst verfügbar!
           </p>
-        </StyledButton>
+        </StyledButton> */}
       </section>
 
       <LogoutComponent className="relative z-0 flex flex-col self-end col-span-2 col-start-7 row-start-6 gap-2 justify-self-end" />

diff --git a/...re/Presentation/React/WelcomePage/LearningWorldMenuButton/LearningWorldMenuButtonView.tsx b/...re/Presentation/React/WelcomePage/LearningWorldMenuButton/LearningWorldMenuButtonView.tsx
@@ -35,7 +35,7 @@ export default function LearningWorldMenuButton({
   return (
     <StyledButton
       shape="freefloatcenternopadding"
-      containerClassName="w-full h-full"
+      containerClassName=" w-full lg:w-1/2 h-full"
       onClick={() => history.push("/worldmenu")}
       disabled={!userLoggedIn}
       className={

diff --git a/src/Components/Core/Presentation/React/WelcomePage/SignInAndOutComponent/LogoutComponent.tsx b/src/Components/Core/Presentation/React/WelcomePage/SignInAndOutComponent/LogoutComponent.tsx
@@ -36,20 +36,21 @@ export default function LogoutComponent({
 
   return (
     <div className={tailwindMerge(className)}>
-      <StyledButton
-        color={userLoggedIn ? "success" : "default"}
-        shape="freefloatleft"
-        data-testid="login-button"
-        className="flex h-10 gap-2 m-1 !border-b-[1px] !border-r-[1px] pointer-events-none w-fit"
-      >
-        <img className="w-10" src={moodleIcon} alt="Moodle-Icon"></img>
-        {userLoggedIn && (
-          <p className="text-sm font-regular portrait:hidden">
-            {"Eingeloggt als " + userName}
-          </p>
-        )}
-      </StyledButton>
-
+      {userLoggedIn && (
+        <StyledButton
+          color={userLoggedIn ? "success" : "default"}
+          shape="freefloatleft"
+          data-testid="login-button"
+          className="flex h-10 gap-2 m-1 !border-b-[1px] !border-r-[1px] pointer-events-none w-fit"
+        >
+          <img className="w-10" src={moodleIcon} alt="Moodle-Icon"></img>
+          {userLoggedIn && (
+            <p className="text-sm font-regular portrait:hidden">
+              {"Eingeloggt als " + userName}
+            </p>
+          )}
+        </StyledButton>
+      )}
       {userLoggedIn && (
         <StyledButton
           shape="freefloatleft"

diff --git a/src/localize/de/startPage.json b/src/localize/de/startPage.json
@@ -1,5 +1,5 @@
 {
-  "welcome": "Willkommen bei AdLer!",
+  "welcome": "Willkommen in AdLer!",
   "moodleLoginSubheading": "Bitte loggen Sie sich in Moodle ein.",
   "loginSuccessfullSubheading": "Login erfolgreich!",
   "learningWorldButton": "Gehe zum Lernwelt Menü",