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

ProjektAdLer · Jan 21, 2025 · eb87b6c · eb87b6c
2 parents 919bdb5 + ee33bd1
commit eb87b6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/_shared_docker.yml b/.github/workflows/_shared_docker.yml
@@ -15,24 +15,24 @@ jobs:
       IMAGE_NAME: ${{ github.repository }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: download build folder form previous job
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@v4
         with:
           name: build
           path: build
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -41,7 +41,7 @@ jobs:
             type=semver,pattern={{major}}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

diff --git a/src/Components/Core/Presentation/React/LearningSpaceDisplay/SideBar/SideBar.tsx b/src/Components/Core/Presentation/React/LearningSpaceDisplay/SideBar/SideBar.tsx
@@ -4,7 +4,7 @@ import StyledButton from "../../ReactRelated/ReactBaseComponents/StyledButton";
 import StyledContainer from "~ReactComponents/ReactRelated/ReactBaseComponents/StyledContainer";
 import FullscreenSwitch from "~ReactComponents/LearningSpaceDisplay/FullscreenSwitch/FullscreenSwitch";
 import engineLogo from "../../../../../../Assets/icons/adler-engine.svg";
-import hamburgerButton from "../../../../../../Assets/icons/hamburger-menu.svg";
+// import hamburgerButton from "../../../../../../Assets/icons/hamburger-menu.svg";
 import useBuilder from "~ReactComponents/ReactRelated/CustomHooks/useBuilder";
 import SideBarViewModel from "./SideBarViewModel";
 import SideBarController from "./SideBarController";
@@ -193,7 +193,7 @@ export default function SideBar({ className }: Readonly<AdLerUIComponent>) {
           </div>
           {/* End of empty placeholder containers*/}
         </div>
-        <footer className="bg-adlerdarkblue h-2 w-1/4 rounded-sm self-center m-1 z-20"></footer>
+        <footer className="z-20 self-center w-1/4 h-2 m-1 rounded-sm bg-adlerdarkblue"></footer>
         <img
           src={engineLogo}
           alt="inventory background"

diff --git a/...eTest/Presentation/React/LearningSpaceDisplay/SideBar/__snapshots__/SideBar.test.tsx.snap b/...eTest/Presentation/React/LearningSpaceDisplay/SideBar/__snapshots__/SideBar.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`SideBar should render 1`] = `
           <img
             alt="EngineLogo"
             class="lg:w-20 md:w-16 sm:w-14"
-            src="hamburger-menu.svg"
+            src="smartphone.svg"
           />
         </button>
       </div>