diff --git a/src/Components/Navbar/NavDesktop.tsx b/src/Components/Navbar/NavDesktop.tsx index 3499d15..27166ae 100644 --- a/src/Components/Navbar/NavDesktop.tsx +++ b/src/Components/Navbar/NavDesktop.tsx @@ -14,6 +14,7 @@ import '@szhsin/react-menu/dist/index.css'; import { FiChevronDown } from "react-icons/fi"; import { createRoute, PAGES_ROUTES } from "src/utils/routing"; import Button from "../Button/Button"; +import { BiRocket } from "react-icons/bi"; export default function NavDesktop() { @@ -44,7 +45,7 @@ export default function NavDesktop() { - Submit project + Submit project - + { props.onChange?.(null) }} className={` - text-center flex flex-wrap gap-8 flex-col justify-end items-center font-medium hover:bg-gray-100 active:bg-gray-200 rounded-t-8 px-16 py-16 min-w-max + text-body5 text-center flex flex-wrap gap-8 flex-col justify-end items-center font-medium py-16 min-w-max ${props.value === null ? "text-primary-500 border-b-2 border-primary-500" : "text-gray-500"} `} - > {props.filtersActive ? "Search results" : "All projects"} + > All Projects {data.categoryList?.filter(v => !!v?.projectsCount && v.projectsCount !== '0').map((category, idx) => { return {category!.name} ({category?.projectsCount!}) diff --git a/src/features/Projects/Components/ProjectCardMini/ProjectCardMini.tsx b/src/features/Projects/Components/ProjectCardMini/ProjectCardMini.tsx index 0c8817b..fd3c916 100644 --- a/src/features/Projects/Components/ProjectCardMini/ProjectCardMini.tsx +++ b/src/features/Projects/Components/ProjectCardMini/ProjectCardMini.tsx @@ -27,8 +27,8 @@ export default function ProjectCardMini({ project, onClick }: Props) { - {project.dead && "💀 "}{project?.title} - {tag?.name} + {project?.title} + • {tag?.name} {/* {numberFormatter(project?.votes_count)} */} {/* */} diff --git a/src/features/Projects/pages/ExplorePage/ExplorePage.tsx b/src/features/Projects/pages/ExplorePage/ExplorePage.tsx index f333a2a..ca9ff88 100644 --- a/src/features/Projects/pages/ExplorePage/ExplorePage.tsx +++ b/src/features/Projects/pages/ExplorePage/ExplorePage.tsx @@ -168,7 +168,7 @@ function ExplorePage() { selectedCategry={selectedCategory} /> - + selectCategoryTab(v)} /> Filter + {hasSearchFilters && {Object.keys(filters ?? {}).length}} - + {/* Show dead projects {deadProjectsCount !== undefined && `(${deadProjectsCount})`} - + */} p !== null && ((showDeadProjects ? true : !p.dead) || hasDeadProjectsFilter)) as any[] ?? []} + projects={data?.projects?.filter((p) => p !== null) as any[] ?? []} /> {canLoadMore && Load more diff --git a/src/features/Projects/pages/ExplorePage/Filters/filters.graphql b/src/features/Projects/pages/ExplorePage/Filters/filters.graphql index e5af2d0..f2830cb 100644 --- a/src/features/Projects/pages/ExplorePage/Filters/filters.graphql +++ b/src/features/Projects/pages/ExplorePage/Filters/filters.graphql @@ -1,5 +1,5 @@ query GetFilters { - categoryList { + categoryList(isHidden: false) { id name icon diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx index e0ceb2a..ab30212 100644 --- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx +++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx @@ -55,9 +55,9 @@ export default function Header(props: Props) { {filters?.yearFounded && 📆 Founded in {filters.yearFounded} removeFilter("yearFounded")} className='ml-4 text-gray-600 hover:scale-125'> } {filters?.projectStatus && 🌱 Status: {filters?.projectStatus} removeFilter("projectStatus")} className='ml-4 text-gray-600 hover:scale-125'> } - {filters?.projectLicense && 💻 License: {filters.projectLicense} removeFilter("projectLicense")} className='ml-4 text-gray-600 hover:scale-125'> } + {filters?.projectLicense && 💻 {filters.projectLicense} removeFilter("projectLicense")} className='ml-4 text-gray-600 hover:scale-125'> } {filters?.categories && filters.categories.length > 0 && Category: {filters.categories[0].label} removeFilter("categories")} className='ml-4 text-gray-600 hover:scale-125'> } - {filters?.tags && filters.tags.length > 0 && Tags: {filters.tags.map(t => t.label).join(', ')} removeFilter("tags")} className='ml-4 text-gray-600 hover:scale-125'> } + {filters?.tags && filters.tags.length > 0 && 🏷️ {filters.tags.map(t => t.label).join(', ')} removeFilter("tags")} className='ml-4 text-gray-600 hover:scale-125'> } } diff --git a/src/graphql/index.tsx b/src/graphql/index.tsx index d20710a..f335e9d 100644 --- a/src/graphql/index.tsx +++ b/src/graphql/index.tsx @@ -471,7 +471,7 @@ export type AllCategoriesLazyQueryHookResult = ReturnType; export const GetFiltersDocument = gql` query GetFilters { - categoryList { + categoryList(isHidden: false) { id name icon
{project.dead && "💀 "}{project?.title}
{tag?.name}
{project?.title}
• {tag?.name}