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 <>
{Array(5).fill(0).map((_, idx) =>
)}
-
+ >
return (
-
+ <>
{data?.allCategories.map(category =>
- onClick?.(category.id)}
+ {
+ onClick?.(category.id)
+ navigate(`/category/${category.id}`)
+ }}
key={category.id}
- to={`/category/${category.id}`}>
-
- {category.icon} {category.title} {numberFormatter(category.votes_sum)}
+ href={`/category/${category.id}`}
+ >
+
+
+ {category.icon} {category.title} {numberFormatter(category.votes_sum)}
- )}
-
+
+ )}
+ >
)
}
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 (
@@ -59,47 +73,82 @@ export default function NavDesktop() {
- {navLinks.map((link, idx) =>
-
-
- {link.text}
-
-
+
+ LApps }>
+ {
+ e.syntheticEvent.preventDefault();
+ navigate("/");
+ }}
+ className='!px-24 !py-16 font-medium'
+ >
+ Explore
+
+ {
+ e.syntheticEvent.preventDefault();
+ navigate("/hottest");
+ }}
+ className='!px-24 !py-16 font-medium'
+ >
+ Hottest
+
+ Categories}
+ >
+
+
+
+ Submit LApp
+
+
- )}
-
- toggleCategories(!categoriesOpen)}
- onKeyDown={e => (e.key !== 'Escape') || toggleCategories(false)}
- className='text-body4 hover:text-primary-600 cursor-pointer'
+
+ Community }>
+ {
+ e.syntheticEvent.preventDefault();
+ navigate("/blog");
+ }}
+ className='!px-24 !py-16 font-medium'
+ >
+ Stories
+
+ {
+ e.syntheticEvent.preventDefault();
+ navigate("/hackathons");
+ }}
+ className='!px-24 !py-16 font-medium'
+ >
+ Hackathons
+
+
+
+
+
-
- Categories
-
- {
- toggleCategories(false)} />
- }
+ Guide
+
+
+
+
+ Donate
+
@@ -109,7 +158,7 @@ export default function NavDesktop() {
className="flex"
>
-
Submit App️
-
+ */}
{/* {isWalletConnected ?
Connected
: Connect Wallet
@@ -128,20 +177,6 @@ export default function NavDesktop() {
- {/* */}
);
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"
>
- {/*
- Submit App️
- */}
{/*
*/}
@@ -132,15 +130,6 @@ export default function NavMobile({ }: Props) {
animate={drawerOpen ? "show" : "hide"}
>
-
- {navLinks.map((link, idx) =>
+
diff --git a/src/features/Donations/pages/DonatePage/DonationStats/DonationStats.tsx b/src/features/Donations/pages/DonatePage/DonationStats/DonationStats.tsx
index 8805af9..00c973b 100644
--- a/src/features/Donations/pages/DonatePage/DonationStats/DonationStats.tsx
+++ b/src/features/Donations/pages/DonatePage/DonationStats/DonationStats.tsx
@@ -2,7 +2,7 @@ import { BiCoinStack } from "react-icons/bi";
import { FiGrid } from "react-icons/fi";
import { IoMedalOutline, IoRocketOutline } from "react-icons/io5";
import { useDonationsStatsQuery } from "src/graphql";
-import { generateList } from "src/utils/helperFunctions";
+import { generateList, numberFormatter } from "src/utils/helperFunctions";
import StatCard from "../StatCard/StatCard";
import StatCardSkeleton from "../StatCard/StatCard.Skeleton";
@@ -23,7 +23,7 @@ export default function DonationStats() {
Donations >}
- value={donationsStatQuery.data?.getDonationsStats.donations}
+ value={<>{numberFormatter(Number(donationsStatQuery.data?.getDonationsStats.donations))} < span className="text-body4">Sats>}
/>
{props.label}
-
+
{props.value}
diff --git a/src/mocks/handlers.ts b/src/mocks/handlers.ts
index dd6dcca..ae27548 100644
--- a/src/mocks/handlers.ts
+++ b/src/mocks/handlers.ts
@@ -181,7 +181,7 @@ export const handlers = [
ctx.data({
getDonationsStats: {
applications: '32',
- donations: "$2.6k",
+ donations: '2600',
prizes: "$2.5k",
touranments: "1",
}