Merge pull request #75 from lugvitc/master

Merging Master to deployment

Author: mradigen

src/App.css

@@ -1,9 +1,9 @@
 html {
   background-color: #000000;
-  cursor: url("./images/icons/cursor.png"), auto;
+  /* cursor: url("./images/icons/cursor.png"), auto; */
 }
-.custom-tux {
+/* .custom-tux {
   cursor:
     url("./path/to/custom-cursor.png") 25 25,
     auto;
-}
+} */

src/App.jsx

@@ -32,6 +32,8 @@ import HackersHorizon from "./pages/events/event/hackers-horizon/HackersHorizon"
 import LinuxInstallationBooth2 from "./pages/events/event/linux-installation-booth2/LinuxInstallationBooth2";
 import Password2023 from "./pages/events/event/password2023/Password2023";
 import CyberOday2 from "./pages/events/event/cod2/Cod2";
+import Password2024 from "./pages/events/event/password2024/Password2024";
+import FOSSit2024 from "./pages/events/event/fossit2024/FOSSit2024.jsx";
 
 import Chapter_1 from "./pages/learn/chapters/Chapter_1";
 import Chapter_2 from "./pages/learn/chapters/Chapter_2";
@@ -60,6 +62,8 @@ export const paths = {
   linuxInstallationBooth2: "/linuxInstallationBooth2",
   password2023: "/password2023",
   cyberOday2: "/cyberOday2",
+  password2024: "/password2024",
+  fossit2024: "/fossit2024",
 
   cli: "/cli",
   chapter_1: "/chapter_1",
@@ -145,6 +149,14 @@ const router = createHashRouter([
     path: "/cyberOday2",
     element: <CyberOday2 />,
   },
+  {
+    path: "/password2024",
+    element: <Password2024 />,
+  },
+  {
+    path: "/fossit2024",
+    element: <FOSSit2024 />,
+  },
   {
     path: "/cli",
     element: <Cli />,

src/components/footer/Footer.jsx

@@ -14,17 +14,6 @@ function Footer() {
                 </span>
               </div>
               <div class="flex justify-center ">
-                <a
-                  target="_blank"
-                  href="https://discord.gg/ApShC247me"
-                  class="mr-6 text-gray-600 dark:text-gray-400 hover:text-blue-400"
-                >
-                  <img
-                    src={Discord}
-                    alt=""
-                    className="h-6 w-6 hover:bg-blue-600 rounded-md"
-                  />
-                </a>
                 <a
                   target="_blank"
                   href="https://www.instagram.com/lugvitc/"

src/components/navbar/MainNavbar.jsx

@@ -46,55 +46,55 @@ const navListMenuItems = [
   {
     title: "Forums",
     description: "Linux Club's own forum and discussion area.",
-    link: "https://forum.lugvitc.org/",
+    link: "https://forum.lugvitc.net/",
   },
   {
     title: "Cloud",
     description:
       "Linux Club's own online management tool to manage club's activities",
-    link: "https://cloud.lugvitc.org/",
+    link: "https://cloud.lugvitc.net/",
   },
 ];
 
 const navListMenuItemsAboutUs = [
-  {
-    title: "Gallery",
-    description: "Sharing our experiences.",
-    icon: SquaresPlusIcon,
-    link: "#/gallery",
-  },
+  // {
+  //   title: "Gallery",
+  //   description: "Sharing our experiences.",
+  //   icon: SquaresPlusIcon,
+  //   link: "#/gallery",
+  // },
   {
     title: "About Us",
     description: "Meet and learn about our dedication",
     icon: UserGroupIcon,
     link: "#/about",
   },
-  {
-    title: "Blog",
-    description: "Find the perfect solution for your needs.",
-    icon: Bars4Icon,
-    link: "#/blogs",
-  },
+  // {
+  //   title: "Blog",
+  //   description: "Find the perfect solution for your needs.",
+  //   icon: Bars4Icon,
+  //   link: "#/blogs",
+  // },
   {
     title: "Members",
     description: "Amazing group of inquisitive people.",
     icon: UserGroupIcon,
     link: "#/members",
   },
-  {
-    title: "Leaderboard",
-    description: "leaderboard for club members.",
-    icon: TrophyIcon,
-    link: "#/leaderboard",
-  },
+  // {
+  //   title: "Leaderboard",
+  //   description: "leaderboard for club members.",
+  //   icon: TrophyIcon,
+  //   link: "#/leaderboard",
+  // },
 ];
 
 const navListMenuItemsSupport = [
   {
     title: "Support",
     description: "Reach out to us for assistance or inquiries on our Forums",
     icon: GlobeAmericasIcon,
-    link: "https://forum.lugvitc.org/",
+    link: "https://forum.lugvitc.net/",
   },
   {
     title: "Contact",
@@ -348,6 +348,11 @@ const navListItems = [
     icon: CubeTransparentIcon,
     link: "#/events",
   },
+  {
+    label: "~cd hub",
+    icon: CodeBracketSquareIcon,
+    link: "http://hub.lugvitc.net/",
+  }
 ];
 
 function NavList() {
@@ -372,9 +377,23 @@ function NavList() {
         </Typography>
         // </Link>
       ))}
-      <NavListMenu />
+      {/* <NavListMenu /> */}
       <NavListMenuAboutUs />
-      <NavListMenuSupport />
+      {/* <NavListMenuSupport /> */}
+      <Typography
+          as="a"
+          href={"/#/contact"}
+          variant="small"
+          color="gray"
+          className="font-light font-space text-xs  text-white"
+        >
+          <MenuItem className="flex items-center gap-2 lg:rounded-full hover:bg-[#1f2937]">
+            {React.createElement(PhoneIcon, {
+              className: "h-[18px] w-[18px] text-white",
+            })}{" "}
+            <span className="text-white "> ~cd contact</span>
+          </MenuItem>
+        </Typography>
     </ul>
   );
 }