diff --git a/package-lock.json b/package-lock.json index f4ed3e2..8fb48e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@reduxjs/toolkit": "^1.8.1", "@remirror/pm": "^1.0.16", "@remirror/react": "^1.0.34", - "@szhsin/react-menu": "^3.0.0", + "@szhsin/react-menu": "^3.0.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.1.1", "@testing-library/user-event": "^13.5.0", @@ -14707,9 +14707,9 @@ } }, "node_modules/@szhsin/react-menu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@szhsin/react-menu/-/react-menu-3.0.0.tgz", - "integrity": "sha512-KLyIp6mqOLzDNnLVtYYy7m3IfjwVpJImqFaPbNY0oT2cScD559E8dG6jl7dzk2FBav/zjqXd54vzjyHZAB83yQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@szhsin/react-menu/-/react-menu-3.0.2.tgz", + "integrity": "sha512-m9Ly+cT+CxQx3xhq90CVaOLQWU7f7UKeMxfDt1gPYV23tDwEe8Zo6PO547qPlAEGEwwb9MdA38U8OyueXKJc2g==", "dependencies": { "prop-types": "^15.7.2", "react-transition-state": "^1.1.4" @@ -77536,9 +77536,9 @@ } }, "@szhsin/react-menu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@szhsin/react-menu/-/react-menu-3.0.0.tgz", - "integrity": "sha512-KLyIp6mqOLzDNnLVtYYy7m3IfjwVpJImqFaPbNY0oT2cScD559E8dG6jl7dzk2FBav/zjqXd54vzjyHZAB83yQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@szhsin/react-menu/-/react-menu-3.0.2.tgz", + "integrity": "sha512-m9Ly+cT+CxQx3xhq90CVaOLQWU7f7UKeMxfDt1gPYV23tDwEe8Zo6PO547qPlAEGEwwb9MdA38U8OyueXKJc2g==", "requires": { "prop-types": "^15.7.2", "react-transition-state": "^1.1.4" diff --git a/package.json b/package.json index 3a65744..47597ff 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@reduxjs/toolkit": "^1.8.1", "@remirror/pm": "^1.0.16", "@remirror/react": "^1.0.34", - "@szhsin/react-menu": "^3.0.0", + "@szhsin/react-menu": "^3.0.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.1.1", "@testing-library/user-event": "^13.5.0", diff --git a/src/Components/Accordion/Accordion.stories.tsx b/src/Components/Accordion/Accordion.stories.tsx index 03d1d99..87f6f05 100644 --- a/src/Components/Accordion/Accordion.stories.tsx +++ b/src/Components/Accordion/Accordion.stories.tsx @@ -14,28 +14,35 @@ const items = [ { heading: "What is BOLT.FUN ??", content:

- Exercitation in fugiat est ut ad ea cupidatat ut in - cupidatat occaecat ut occaecat consequat est minim minim - esse tempor laborum consequat esse adipisicing eu - reprehenderit enim. + BOLT.FUN is a place by the community for the community of Lapps makers, developers, passionates, & anyone else interested.

}, { - heading: "What Do we do ??", + heading: "What can you do here ??", content:

- Exercitation in fugiat est ut ad ea cupidatat ut in - cupidatat occaecat ut occaecat consequat est minim minim - esse tempor laborum consequat esse adipisicing eu - reprehenderit enim. + - Publish & view the various Lapps out there +
+ - Read stories +
+ - Ask/Answer questions +
+ - Offer/Complete bounties +
+ - View/Add hackathons +

}, { heading: "Who is working on BOLT.FUN ??", content:

- Exercitation in fugiat est ut ad ea cupidatat ut in - cupidatat occaecat ut occaecat consequat est minim minim - esse tempor laborum consequat esse adipisicing eu - reprehenderit enim. + - Johns (Manager) +
+ - Ed (Product Designer) +
+ - Alexandare (Designer) +
+ - MTG (Developer) +

}, ] diff --git a/src/Components/Navbar/CategoriesList/CategoriesList.tsx b/src/Components/Navbar/CategoriesList/CategoriesList.tsx index ff94b93..22aac25 100644 --- a/src/Components/Navbar/CategoriesList/CategoriesList.tsx +++ b/src/Components/Navbar/CategoriesList/CategoriesList.tsx @@ -1,40 +1,52 @@ +import { + MenuItem, +} from '@szhsin/react-menu' import Skeleton from 'react-loading-skeleton' -import { Link } from 'react-router-dom' +import { Link, useNavigate } from 'react-router-dom' import { useNavCategoriesQuery } from 'src/graphql' import { numberFormatter } from 'src/utils/helperFunctions' interface Props { // categories: Pick[] - classes?: Partial<{ list: string, item: string }> + classes?: Partial<{ item: string }> onClick?: (categoryId: number) => void } +; + export default function CategoriesList({ classes = {}, onClick }: Props) { const { data, loading } = useNavCategoriesQuery() - + const navigate = useNavigate() if (loading) - return + return ( - + + )} + ) } diff --git a/src/Components/Navbar/NavDesktop.tsx b/src/Components/Navbar/NavDesktop.tsx index 5973967..0474032 100644 --- a/src/Components/Navbar/NavDesktop.tsx +++ b/src/Components/Navbar/NavDesktop.tsx @@ -9,11 +9,23 @@ import Search from "./Search/Search"; import IconButton from "../IconButton/IconButton"; import { toggleSearch } from "src/redux/features/ui.slice"; import { navLinks } from "./Navbar"; -import { Link } from "react-router-dom"; +import { Link, useNavigate } from "react-router-dom"; import CategoriesList from "./CategoriesList/CategoriesList"; import { useEffect, useRef, useState } from "react"; import { IoExtensionPuzzle } from "react-icons/io5"; import { useClickOutside, useToggle } from "@react-hookz/web"; +import { + Menu, + MenuItem, + MenuButton, + MenuDivider, + SubMenu +} from '@szhsin/react-menu'; +import '@szhsin/react-menu/dist/index.css'; +import { FiChevronDown, FiSend } from "react-icons/fi"; +import { MdComment, MdOutlineExplore, MdOutlineLocalFireDepartment } from "react-icons/md"; +import { IoMdTrophy } from "react-icons/io"; +import { BiCoinStack } from "react-icons/bi"; export default function NavDesktop() { @@ -51,6 +63,8 @@ export default function NavDesktop() { ); }; + const navigate = useNavigate() + return ( ); diff --git a/src/Components/Navbar/NavMobile.tsx b/src/Components/Navbar/NavMobile.tsx index 8db6f07..c751c09 100644 --- a/src/Components/Navbar/NavMobile.tsx +++ b/src/Components/Navbar/NavMobile.tsx @@ -1,5 +1,5 @@ import { motion } from "framer-motion"; -import { useEffect, useState } from "react"; +import { useEffect, useRef, useState } from "react"; import { BsChevronDown, BsSearch } from "react-icons/bs"; import { GrClose } from "react-icons/gr"; import Button from "../Button/Button"; @@ -8,13 +8,17 @@ import Search from "./Search/Search"; import IconButton from "../IconButton/IconButton"; import { useAppDispatch, useAppSelector } from "src/utils/hooks"; import { toggleSearch } from "src/redux/features/ui.slice"; -import { FiMenu } from "react-icons/fi"; +import { FiChevronDown, FiMenu, FiSend } from "react-icons/fi"; import { navLinks } from "./Navbar"; -import { Link } from "react-router-dom"; +import { Link, useNavigate } from "react-router-dom"; import { IoExtensionPuzzle } from "react-icons/io5"; import CategoriesList from "./CategoriesList/CategoriesList"; import { useToggle } from "@react-hookz/web"; import styles from './styles.module.css' +import { Menu, MenuButton, MenuItem, SubMenu } from "@szhsin/react-menu"; +import '@szhsin/react-menu/dist/index.css'; +import { IoMdTrophy } from "react-icons/io"; +import { MdComment, MdOutlineExplore, MdOutlineLocalFireDepartment } from "react-icons/md"; interface Props { } @@ -58,6 +62,7 @@ const categoriesArrowVariants = { export default function NavMobile({ }: Props) { const dispatch = useAppDispatch(); + const navigate = useNavigate() const { searchOpen } = useAppSelector((state) => ({ isWalletConnected: state.wallet.isConnected, searchOpen: state.ui.isSearchOpen @@ -99,13 +104,6 @@ export default function NavMobile({ }: Props) { animate={searchOpen ? { opacity: 0 } : { opacity: 1 }} className="flex" > - {/* */} {/* */} @@ -132,15 +130,6 @@ export default function NavMobile({ }: Props) { animate={drawerOpen ? "show" : "hide"} >
- {/*
- - setSearchInput(e.target.value)} - className="bg-gray-100 text-gray-600 focus:outline-primary w-full py-12 px-20 pl-40 rounded-24 placeholder-gray-500" placeholder="Search" /> - - - */} - Submit App️ + Submit LApp️ @@ -167,33 +156,87 @@ export default function NavMobile({ }: Props) { {/* */}
-