V0.0.9

Author: ANYhackerfort

bash

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Ensure we are in a git repository
+if ! git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
+  echo "This is not a git repository."
+  exit 1
+fi
+
+# Find all files with merge conflicts
+conflict_files=$(git diff --name-only --diff-filter=U)
+
+if [ -z "$conflict_files" ]; then
+  echo "No merge conflicts found."
+  exit 0
+fi
+
+echo "Resolving conflicts by accepting current branch changes..."
+
+# Iterate through each conflicted file and accept current changes
+for file in $conflict_files; do
+  echo "Accepting current changes for: $file"
+  git checkout --ours "$file"
+  git add "$file"
+done
+
+# Confirm resolution
+echo "All conflicts resolved by accepting current branch changes."
+echo "You can now commit the changes."

src/LABS/Lab1MainComponent.tsx

@@ -26,6 +26,7 @@ const GraphPaperComponent: React.FC = () => {
 
       <div style={{ width: "100vw", height: "100vh", overflow: "hidden" }}>
         <CornerText position="top-left" text="Frank-Hertz Lab" />
+        <FloatingSquare />
         <Canvas
           gl={{ antialias: true }}
           onCreated={({ gl, scene }) => {

src/landingPage/homePage/Dashboard.css

@@ -9,11 +9,14 @@
   }
 
   /* Tabs styling */
-  .tabs-container {
-    border-bottom: 1px solid #000; /* Black border for a sleek look */
+  .tabsContainerSticky {
+    position: sticky; /* Ensures tabs stick to the top */
+    z-index: 1000; /* Place it above other content */
+    border-bottom: 1px solid #000;
+    padding: 20px;
     background-color: white;
-    width: 100%; /* Ensure tabs span the full container width */
-  }
+    width: 100%;
+}
 
   /* Content container styling */
   .content-container {
@@ -73,13 +76,7 @@
     color: #333; /* Slightly lighter text for description */
     text-align: center;
   }
-  
-  /* Tabs styling */
-.tabs-container {
-    border-bottom: 1px solid #000; /* Black border for a sleek look */
-    padding: 16px;
-    background-color: white;
-  }
+
 
   .MuiTabs-indicator {
     background-color: #000; /* Black indicator under the active tab */

src/landingPage/homePage/homepage.tsx

@@ -76,7 +76,7 @@ const Dashboard: React.FC = () => {
 
   return (
     <div className="dashboard-container">
-      <Box className="tabs-container">
+      <Box className="tabsContainerSticky">
         <Tabs value={activeTab} onChange={handleTabChange} aria-label="lab tabs">
           <Tab label="Your Active Labs" />
           <Tab label="Available Labs" />