Merge branch 'main' of https://github.com/Robotics-Club-IIT-BHU/Robot…

…ics_Club_Website_24-25
Robotics-Club-IIT-BHU · Aug 13, 2024 · eaec4dc · eaec4dc
2 parents dd394fc + 00d413e
commit eaec4dc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 62 deletions.
diff --git a/frontend/src/components/Footer.jsx b/frontend/src/components/Footer.jsx
@@ -1,4 +1,4 @@
-import React from 'react'
+// import React from 'react'
 
 const Footer = () => {
   return (
@@ -18,10 +18,10 @@ const Footer = () => {
             <a href="https://www.instagram.com/robotics_club.iitbhu/"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" className="fill-current text-white" viewBox="0 0 24 24">
             <path d="M8 0C5.829 0 5.556.01 4.703.048 3.85.088 3.269.222 2.76.42a3.9 3.9 0 0 0-1.417.923A3.9 3.9 0 0 0 .42 2.76C.222 3.268.087 3.85.048 4.7.01 5.555 0 5.827 0 8.001c0 2.172.01 2.444.048 3.297.04.852.174 1.433.372 1.942.205.526.478.972.923 1.417.444.445.89.719 1.416.923.51.198 1.09.333 1.942.372C5.555 15.99 5.827 16 8 16s2.444-.01 3.298-.048c.851-.04 1.434-.174 1.943-.372a3.9 3.9 0 0 0 1.416-.923c.445-.445.718-.891.923-1.417.197-.509.332-1.09.372-1.942C15.99 10.445 16 10.173 16 8s-.01-2.445-.048-3.299c-.04-.851-.175-1.433-.372-1.941a3.9 3.9 0 0 0-.923-1.417A3.9 3.9 0 0 0 13.24.42c-.51-.198-1.092-.333-1.943-.372C10.443.01 10.172 0 7.998 0zm-.717 1.442h.718c2.136 0 2.389.007 3.232.046.78.035 1.204.166 1.486.275.373.145.64.319.92.599s.453.546.598.92c.11.281.24.705.275 1.485.039.843.047 1.096.047 3.231s-.008 2.389-.047 3.232c-.035.78-.166 1.203-.275 1.485a2.5 2.5 0 0 1-.599.919c-.28.28-.546.453-.92.598-.28.11-.704.24-1.485.276-.843.038-1.096.047-3.232.047s-2.39-.009-3.233-.047c-.78-.036-1.203-.166-1.485-.276a2.5 2.5 0 0 1-.92-.598 2.5 2.5 0 0 1-.6-.92c-.109-.281-.24-.705-.275-1.485-.038-.843-.046-1.096-.046-3.233s.008-2.388.046-3.231c.036-.78.166-1.204.276-1.486.145-.373.319-.64.599-.92s.546-.453.92-.598c.282-.11.705-.24 1.485-.276.738-.034 1.024-.044 2.515-.045zm4.988 1.328a.96.96 0 1 0 0 1.92.96.96 0 0 0 0-1.92m-4.27 1.122a4.109 4.109 0 1 0 0 8.217 4.109 4.109 0 0 0 0-8.217m0 1.441a2.667 2.667 0 1 1 0 5.334 2.667 2.667 0 0 1 0-5.334"/>
             </svg></a>
-            <a href="https://in.linkedin.com/company/robotics-club-iit-bhu-varanasi"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="bi bi-linkedin" viewBox="0 0 24 24">
+            <a href="https://in.linkedin.com/company/robotics-club-iit-bhu-varanasi"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" className="bi bi-linkedin" viewBox="0 0 24 24">
             <path d="M0 1.146C0 .513.526 0 1.175 0h13.65C15.474 0 16 .513 16 1.146v13.708c0 .633-.526 1.146-1.175 1.146H1.175C.526 16 0 15.487 0 14.854zm4.943 12.248V6.169H2.542v7.225zm-1.2-8.212c.837 0 1.358-.554 1.358-1.248-.015-.709-.52-1.248-1.342-1.248S2.4 3.226 2.4 3.934c0 .694.521 1.248 1.327 1.248zm4.908 8.212V9.359c0-.216.016-.432.08-.586.173-.431.568-.878 1.232-.878.869 0 1.216.662 1.216 1.634v3.865h2.401V9.25c0-2.22-1.184-3.252-2.764-3.252-1.274 0-1.845.7-2.165 1.193v.025h-.016l.016-.025V6.169h-2.4c.03.678 0 7.225 0 7.225z"/>
             </svg></a>
-            <a href="https://www.youtube.com/channel/UCJ74h9xdwA9oOHcMAZR-hyg"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16">
+            <a href="https://www.youtube.com/channel/UCJ74h9xdwA9oOHcMAZR-hyg"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" className="bi bi-youtube" viewBox="0 0 16 16">
             <path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/>
             </svg></a>
           </div>
@@ -60,4 +60,4 @@ const Footer = () => {
   );
 };
 
-export default Footer;
+export default Footer;
diff --git a/frontend/src/index.css b/frontend/src/index.css
@@ -11,6 +11,9 @@ a{
 nav{
   @apply z-10;
 }
+footer{
+  @apply z-50;
+}
 .card{
   @apply bg-gray-800 rounded-lg p-4  w-[280px] h-[350px];
 }

diff --git a/frontend/src/pages/achievements.css b/frontend/src/pages/achievements.css
@@ -11,45 +11,6 @@
     flex-direction: column;
     min-height: 100vh;
   }
-
-  .main-container {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-  }
-
-  main {
-    flex: 1;
-  }
-
-  header {
-    background-color: transparent;
-  }
-
-  nav {
-    padding-top: 10px;
-    display: flex;
-    justify-content: space-evenly;
-    align-items: center;
-    width: 100%;
-    height: 60px;
-    position: relative;
-  }
-
-  nav li {
-    list-style-type: none;
-    text-transform: capitalize;
-    color: aliceblue;
-    font-size: x-small;
-    font-weight: 5;
-    letter-spacing: 0.5px;
-  }
-
-  nav img {
-    width: 9vw;
-    cursor: pointer;
-  }
-
   .r {
     list-style-type: none;
     text-transform: capitalize;
@@ -98,11 +59,6 @@
   }
 
   /* Box Styling */
-  .boxes-container {
-    position: relative;
-    margin-top: 50 rem;
-  }
-
   .box1, .box2, .box3, .box4 {
     background-color: #333;
     border: 3px solid;
@@ -138,13 +94,7 @@
     left: 50vw;
     top: calc(60vw + 12.5vw + 10.5vw);
   }
-
-  /* Footer Styling */
-  footer {
-    position: relative;
-    top: calc(60vw + 12.5vw + 10.5vw + 37vw + 20px); /* Ensure it appears below the last box */
-  }
-
+
   .main3 {
     background-color: rgb(42, 42, 42);
     width: 100%;

diff --git a/frontend/src/pages/achievements.jsx b/frontend/src/pages/achievements.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+// import React from 'react';
 import './achievements.css';
 import Navbar from "../components/Navbar";
 import Footer from "../components/Footer";
@@ -7,8 +7,8 @@ const Achievements = () => {
   return (
     <>
       <Navbar />
-      <main className="main-container">
-        <div className="main">
+      <main className="flex flex-col">
+        <div className="flex-1">
           <section>
             <div className="rob">
               <article>
@@ -20,9 +20,9 @@ const Achievements = () => {
           </section>
 
           <section>
-            <div className="main2">
-              <p id="p">our achievements</p>
-              <div className="boxes-container">
+            <div className="relative mx-20">
+              <h1 className='text-7xl text-white flex justify-center font-bold my-20'>Our Achievements</h1>
+              <div className="container">
                 <div className="box1"></div>
                 <div className="box2"></div>
                 <div className="box3"></div>
@@ -37,4 +37,4 @@ const Achievements = () => {
   );
 };
 
-export default Achievements;
+export default Achievements;