Dev resolve conflict (#106)

* Update Dev (#96) * - * remove and refactor code * import useQuery * make navlinks active * delete NavLink component * set max-width on pages --------- Co-authored-by: felixNyalenda <[email protected]> Co-authored-by: Jimmy Oty <[email protected]> * Update 05-01-24 (#99) * init blog formatting * format blogs page * add line-clamp to podCard title&desc * return categories * add blog search functionality * prevent blogWrapper.css styles affecting other components * add text-primary & bg in global.css * style code on blog body * wrap no result in a p tag --------- Co-authored-by: felixNyalenda <[email protected]> * Update 05-01-24 Beta (#101) * init blog formatting * format blogs page * add line-clamp to podCard title&desc * return categories * add blog search functionality * prevent blogWrapper.css styles affecting other components * add text-primary & bg in global.css * style code on blog body * wrap no result in a p tag * import formatDistanceToNow (#100) --------- Co-authored-by: felixNyalenda <[email protected]> --------- Co-authored-by: SpaceYaTech <[email protected]> Co-authored-by: Jimmy Oty <[email protected]>
SpaceyaTech · Jan 10, 2024 · 8efc6de · 8efc6de
1 parent 6bff912
commit 8efc6de
Show file tree

Hide file tree

Showing 37 changed files with 3,848 additions and 3,852 deletions.
diff --git a/src/ADMIN/components/AdminHeader.jsx b/src/ADMIN/components/AdminHeader.jsx
@@ -1,95 +1,95 @@
-/* eslint-disable react/react-in-jsx-scope */
-import { Link } from "react-router-dom";
-import logo from "../../assets/images/sytLogo.png";
-import bell from "../../assets/images/icons/bell-icon.svg";
-import profile from "../../assets/images/adminPage/profile-pic.png";
-
-function AdminHeader() {
-  return (
-    <header className="py-5 md:px-10 px-5 relative">
-      {/* mobile menu */}
-      <nav className="flex justify-between items-center md:hidden">
-        <div>
-          {/* logo */}
-
-          <Link to="/">
-            <img src={logo} alt="logo" className="md:w-16 w-12 md:hidden" />
-          </Link>
-        </div>
-        <div className="flex gap-5 items-center">
-          <Link
-            className="transition-all duration-300 cursor-pointer"
-            to="/notification"
-          >
-            <img src={bell} alt="notification icon" />
-          </Link>
-          <Link
-            className="transition-all duration-300 cursor-pointer"
-            to="/profile"
-          >
-            <img src={profile} alt="profile pic" className="rounded-full" />
-          </Link>
-        </div>
-      </nav>
-
-      {/* navlinks */}
-      <nav className="md:flex justify-between hidden items-center text-base font-medium gap-12">
-        <div>
-          {/* logo */}
-
-          <Link to="/">
-            <img src={logo} alt="logo" className="md:w-16 w-12" />
-          </Link>
-        </div>
-        <div className="md:flex flex-1 gap-12">
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer rounded"
-            to="/admin"
-          >
-            Dashboard
-          </Link>
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-            to="/admin"
-          >
-            Blogs
-          </Link>
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-            to="/admin/all-chapters"
-          >
-            Chapters
-          </Link>
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-            to="/admin/events"
-          >
-            Events
-          </Link>
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-            to="/admin/calendar"
-          >
-            Calendar
-          </Link>
-        </div>
-        <div className="md:flex gap-8 items-center ">
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-            to="/"
-          >
-            <img src={bell} alt="notification icon" />
-          </Link>
-          <Link
-            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-            to="/about-us"
-          >
-            <img src={profile} alt="profile pic" className="rounded-full" />
-          </Link>
-        </div>
-      </nav>
-    </header>
-  );
-}
-
-export default AdminHeader;
+/* eslint-disable react/react-in-jsx-scope */
+import { Link } from "react-router-dom";
+import logo from "../../assets/images/sytLogo.png";
+import bell from "../../assets/images/icons/bell-icon.svg";
+import profile from "../../assets/images/adminPage/profile-pic.png";
+
+function AdminHeader() {
+  return (
+    <header className="py-5 md:px-10 px-5 relative">
+      {/* mobile menu */}
+      <nav className="flex justify-between items-center md:hidden">
+        <div>
+          {/* logo */}
+
+          <Link to="/">
+            <img src={logo} alt="logo" className="md:w-16 w-12 md:hidden" />
+          </Link>
+        </div>
+        <div className="flex gap-5 items-center">
+          <Link
+            className="transition-all duration-300 cursor-pointer"
+            to="/notification"
+          >
+            <img src={bell} alt="notification icon" />
+          </Link>
+          <Link
+            className="transition-all duration-300 cursor-pointer"
+            to="/profile"
+          >
+            <img src={profile} alt="profile pic" className="rounded-full" />
+          </Link>
+        </div>
+      </nav>
+
+      {/* navlinks */}
+      <nav className="md:flex justify-between hidden items-center text-base font-medium gap-12">
+        <div>
+          {/* logo */}
+
+          <Link to="/">
+            <img src={logo} alt="logo" className="md:w-16 w-12" />
+          </Link>
+        </div>
+        <div className="md:flex flex-1 gap-12">
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer rounded"
+            to="/admin"
+          >
+            Dashboard
+          </Link>
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+            to="/admin"
+          >
+            Blogs
+          </Link>
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+            to="/admin/all-chapters"
+          >
+            Chapters
+          </Link>
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+            to="/admin/events"
+          >
+            Events
+          </Link>
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+            to="/admin/calendar"
+          >
+            Calendar
+          </Link>
+        </div>
+        <div className="md:flex gap-8 items-center ">
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+            to="/"
+          >
+            <img src={bell} alt="notification icon" />
+          </Link>
+          <Link
+            className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+            to="/about-us"
+          >
+            <img src={profile} alt="profile pic" className="rounded-full" />
+          </Link>
+        </div>
+      </nav>
+    </header>
+  );
+}
+
+export default AdminHeader;
diff --git a/src/ADMIN/components/BottomNavBar.jsx b/src/ADMIN/components/BottomNavBar.jsx
@@ -1,41 +1,41 @@
-import { Link } from "react-router-dom";
-
-function BottomNavBar() {
-  return (
-    <nav className="flex flex-row items-center justify-between font-medium text-sm fixed overflow-hidden bottom-0 left-0 bg-white w-full px-3 py-5 shadow-2xl border-y border-[#E7E0EC] md:hidden">
-      <Link
-        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-        to="/admin"
-      >
-        Dashboard
-      </Link>
-
-      <Link
-        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-        to="/blogs"
-      >
-        Blogs
-      </Link>
-      <Link
-        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-        to="/admin/all-chapters"
-      >
-        Chapters
-      </Link>
-      <Link
-        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-        to="/admin/events"
-      >
-        Events
-      </Link>
-      <Link
-        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
-        to="/calendar"
-      >
-        Calendar
-      </Link>
-    </nav>
-  );
-}
-
-export default BottomNavBar;
+import { Link } from "react-router-dom";
+
+function BottomNavBar() {
+  return (
+    <nav className="flex flex-row items-center justify-between font-medium text-sm fixed overflow-hidden bottom-0 left-0 bg-white w-full px-3 py-5 shadow-2xl border-y border-[#E7E0EC] md:hidden">
+      <Link
+        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+        to="/admin"
+      >
+        Dashboard
+      </Link>
+
+      <Link
+        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+        to="/blogs"
+      >
+        Blogs
+      </Link>
+      <Link
+        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+        to="/admin/all-chapters"
+      >
+        Chapters
+      </Link>
+      <Link
+        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+        to="/admin/events"
+      >
+        Events
+      </Link>
+      <Link
+        className="text-[#7E8180] hover:text-primary transition-all duration-300 cursor-pointer"
+        to="/calendar"
+      >
+        Calendar
+      </Link>
+    </nav>
+  );
+}
+
+export default BottomNavBar;