Skip to content

Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmedkall wants to merge 1 commit into
base:fix-filter
Choose a base branch
from
Open

Feature: Filtering UI Update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
"@radix-ui/react-toast": "^1.1.2",
"@radix-ui/react-toggle": "^1.0.1",
"@radix-ui/react-toggle-group": "^1.0.1",
"@radix-ui/react-tooltip": "^1.0.3",
"@radix-ui/react-tooltip": "^1.0.7",
"@stoplight/elements": "^7.7.13",
"@swc/helpers": "^0.5.1",
"@tailwindcss/forms": "^0.5.3",
Expand Down
241 changes: 149 additions & 92 deletions pages/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
ClearRefinements,
Configure,
DynamicWidgets,
HierarchicalMenu,
Highlight,
Hits,
HitsPerPage,
InstantSearch,
Menu,
Pagination,
// RatingMenu,
RefinementList,
SearchBox,
SortBy,
Stats,
ToggleRefinement,
} from "react-instantsearch"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
const { theme } = useTheme()
const [isFilterVisible, setIsFilterVisible] = useState(true)
const [isFilterVisible, setIsFilterVisible] = useState(false)

const [searchInput, setSearchInput] = useState("")
// const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
setSearchInput(e.target.query.value)
}
const toggleFilterVisibility = () => {
setIsFilterVisible(!isFilterVisible)
}
setIsFilterVisible(prevState => !prevState); // Toggle the state
};
// Mock data, replace with your actual data
const activities = [
{ label_type: 'Activity 1', count: 10 },
{ label_type: 'Activity 2', count: 20 },
// ... other activities
];

const contractTypes = [
{ label_subtype: 'Contract Type 1', count: 5 },
{ label_subtype: 'Contract Type 2', count: 8 },
// ... other contract types
];

// Function to sort items based on count
const transformAndSortItems = (items, attribute) => {
return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
};

const OldSearchBar = (
<div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
exit={{ y: -10, opacity: 0 }}
transition={{ ease: "easeOut", duration: 0.53 }}
className="z-30 "
// key={currentIndex}
// key={currentIndex}
>
<Configure hitsPerPage={50} />
<section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
</Box>

<Stats
className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
translationds={{
stats(nbHits, processingTimeMS) {
let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
</div>
</section>
</motion.div>
<div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
<div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
<div className="hidden w-full items-center justify-between sm:flex">
<div>
<p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
{/* Number of entries: {data ? data.length : "Loading"} */}
{/* Number of entries: {nbHits} */}
</p>
<p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
<kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
<span className="text-xs">⌘</span>F
</kbd>
to search the table
</p>
</div>
<button
className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
onClick={toggleFilterVisibility}
aria-label="Open sidebar">
<svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
<path
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M4 6H20M4 12H20M4 18H11"></path>
</svg>
Filter
</button>
</div>
{/* {OldSearchBar} */}
<div
className="
flex
w-full auto-cols-auto
">
<div className="flex w-full auto-cols-auto flex-col">
{/* add vertical navbar */}

<div
className={` w-1/4
${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
transition-opacity
duration-200
`}>
<div
className="
flex
flex-col
justify-between

">
<div className="mt-2">
<div className="mr-4">
<h5 className="">Filter by Activity</h5>
className={`
${isFilterVisible ? " block" : "hidden"}
m-2 w-auto
min-w-[16rem]
overflow-hidden duration-200
transition-opacity

`}
>
<div className=" m-2 flex flex-row items-center ">
<div className=" mr-4 flex flex-col">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
variant="outline"
className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
onClick={() => setinitialSearch(true)}
>Activity</Button>
</DropdownMenuTrigger>
<DropdownMenuContent
className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
style={{
transform: 'translate3d(-35px, 0px, 0px)'
}}
> <RefinementList
className="mt-3"
attribute="label_type"
searchable={true}
limit={20}
searchablePlaceholder="Search by activity"
onClick={() => setinitialSearch(true)}
transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
classNames={{
checkbox: 'hidden',
list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
selectedItem: 'font-bold bg-gray-200 rounded-md ',
label: 'text-xl',
count: 'invisible',
searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
}}
/>
</DropdownMenuContent>
</DropdownMenu>
</div>


<div className="flex flex-col">

<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
variant="outline"
className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
onClick={() => setinitialSearch(true)}
>
Contract Type
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent
className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
style={{
transform: 'translate3d(47px, 0px, 0px)'
}}
>
<RefinementList
className="mt-3"
attribute="label_subtype"
searchable={true}
limit={20}
searchablePlaceholder="Search by type"
onClick={() => setinitialSearch(true)}
transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
classNames={{
checkbox: 'hidden',
list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
selectedItem: 'font-bold bg-gray-200 rounded-md ',
label: 'text-xl',
count: 'invisible',
searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
}}
/>
</DropdownMenuContent>
</DropdownMenu>

<RefinementList
className="mt-3"
attribute="label_type"
limit={10}
showMore={true}
showMoreLimit={20}
placeholder="Search by activity"
searchablePlaceholder="Search by activity"
searchable={true}
onClick={() => setinitialSearch(true)}
transformItems={items =>
items.sort((a, b) => (a.count < b.count ? 1 : -1))
}
/>
<h5 className="mt-5">Contract Type</h5>
<HierarchicalMenu
onClick={() => setinitialSearch(true)}
className="mt-3"
attributes={["label_subtype"]}
// defaultRefinement={["label_type"]}
transformItems={items =>
items.sort((a, b) => (a.count < b.count ? 1 : -1))
}
/>
<div className="mt-1">&nbsp;</div>
</div>
</div>
</div>



</div>

<div className=" flex w-full flex-col transition-all">
<div className="justify-between items-center w-full hidden sm:flex">
<button
className="rounded-md p-1.5 mb-0.5 text-gray-600
focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
onClick={toggleFilterVisibility}
aria-label="Open sidebar">
<svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
<path
stroke="currentColor"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M4 6H20M4 12H20M4 18H11"></path>
</svg>
</button>
<div>
<p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
{/* Number of entries: {data ? data.length : "Loading"} */}
{/* Number of entries: {nbHits} */}
</p>
<p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
<kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
<span className="text-xs">⌘</span>F
</kbd>
to search the table
</p>
</div>
</div>

{initialSearch ? (
<CustomHits />
) : props.data ? (
Expand Down
10 changes: 9 additions & 1 deletion styles/globals.scss
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


}

.dropdown-menu-scrollbar::-webkit-scrollbar {
display: none;
}

/* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
.dropdown-menu-scrollbar {
-ms-overflow-style: none; /* IE and Edge */
scrollbar-width: none; /* Firefox */
}

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Feature: Filtering UI Update by ahmedkall · Pull Request #5 · function03-labs/WalletLabels · GitHub
Skip to content
Feature: Filtering UI Update#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

ahmedkall
wants to merge
1
commit into

base:fix-filter
Choose a base branch

from

 Open


Feature: Filtering UI Update
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,7 +53,7 @@
 "@radix-ui/react-toast": "^1.1.2",
 "@radix-ui/react-toggle": "^1.0.1",
 "@radix-ui/react-toggle-group": "^1.0.1",
 "@radix-ui/react-tooltip": "^1.0.3",
 "@radix-ui/react-tooltip": "^1.0.7",
 "@stoplight/elements": "^7.7.13",
 "@swc/helpers": "^0.5.1",
 "@tailwindcss/forms": "^0.5.3",
Expand Down

241 changes: 149 additions & 92 deletions
pages/index.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,23 +11,19 @@ import { ChevronRightIcon, Search } from "lucide-react"
import { useTheme } from "next-themes"
import CountUp from "react-countup"
import {
 ClearRefinements,
 Configure,
 DynamicWidgets,
 HierarchicalMenu,
 Highlight,
 Hits,
 HitsPerPage,
 InstantSearch,
 Menu,
 Pagination,
 // RatingMenu,
 RefinementList,
 SearchBox,
 SortBy,
 Stats,
 ToggleRefinement,
} from "react-instantsearch"
import {
 DropdownMenu,
 DropdownMenuContent,
 DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { Button } from '@/components/ui/button';


import { badgeCategories } from "@/config/badge_categories"
// imprt color mode from config
Expand All@@ -45,6 +41,7 @@ import CustomHitsTags, {
import { connectToDatabase } from "../lib/mongodb"
import Footer from "./Footer"
import header from "./header"
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

export const Grid = dynamic(() => import("@/components/Grid"), { ssr: false })
//feetch initial data from api
Expand DownExpand Up@@ -94,7 +91,7 @@ export async function getStaticProps() {

export default function IndexPage(props) {
 const { theme } = useTheme()
 const [isFilterVisible, setIsFilterVisible] = useState(true)
 const [isFilterVisible, setIsFilterVisible] = useState(false)

 const [searchInput, setSearchInput] = useState("")
 // const { data, isLoading, isError, error } = useLabels(searchInput, props)
Expand All@@ -107,8 +104,25 @@ export default function IndexPage(props) {
 setSearchInput(e.target.query.value)
 }
 const toggleFilterVisibility = () => {
 setIsFilterVisible(!isFilterVisible)
 }
 setIsFilterVisible(prevState => !prevState); // Toggle the state
 };
 // Mock data, replace with your actual data
 const activities = [
 { label_type: 'Activity 1', count: 10 },
 { label_type: 'Activity 2', count: 20 },
 // ... other activities
 ];

 const contractTypes = [
 { label_subtype: 'Contract Type 1', count: 5 },
 { label_subtype: 'Contract Type 2', count: 8 },
 // ... other contract types
 ];

 // Function to sort items based on count
 const transformAndSortItems = (items, attribute) => {
 return items.sort((a, b) => (a[attribute] < b[attribute] ? 1 : -1));
 };

 const OldSearchBar = (
 <div className="flex w-full items-end justify-between">
Expand DownExpand Up@@ -147,7 +161,7 @@ export default function IndexPage(props) {
 exit={{ y: -10, opacity: 0 }}
 transition={{ ease: "easeOut", duration: 0.53 }}
 className="z-30 "
// key={currentIndex}
 // key={currentIndex}
 >
 <Configure hitsPerPage={50} />
 <section className="md:py-17 container grid items-center gap-10 pt-10 pb-8">
Expand DownExpand Up@@ -255,7 +269,7 @@ export default function IndexPage(props) {
 </Box>

 <Stats
 className="hidden sm:block text-sm text-muted-foreground whitespace-nowrap"
 className="hidden whitespace-nowrap text-sm text-muted-foreground sm:block"
 translationds={{
 stats(nbHits, processingTimeMS) {
 let hitCountPhrase
Expand DownExpand Up@@ -286,91 +300,134 @@ export default function IndexPage(props) {
 </div>
 </section>
 </motion.div>
 <div className="mx-2 mb-24 flex flex-col items-center gap-2 md:mx-8">
 <div className="relative mx-2 mb-24 flex flex-col items-center md:mx-8 ">
 <div className="hidden w-full items-center justify-between sm:flex">
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 <button
 className="mb-0.5 flex items-center justify-center gap-2 rounded-md p-1.5 text-gray-600 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 Filter
 </button>
 </div>
 {/* {OldSearchBar} */}
 <div
 className="
 flex
 w-full auto-cols-auto
 ">
 <div className="flex w-full auto-cols-auto flex-col">
 {/* add vertical navbar */}

 <div
 className={` w-1/4
 ${isFilterVisible ? "block mr-4" : "opacity-0 !w-0 h-0"}
 transition-opacity
 duration-200
 `}>
 <div
 className="
 flex
 flex-col
 justify-between

 ">
 <div className="mt-2">
 <div className="mr-4">
 <h5 className="">Filter by Activity</h5>
 className={` 
 ${isFilterVisible ? " block" : "hidden"}
 m-2 w-auto 
 min-w-[16rem]
 overflow-hidden duration-200 
 transition-opacity

 `}
 >
 <div className=" m-2 flex flex-row items-center ">
 <div className=" mr-4 flex flex-col">
 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >Activity</Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="fixed left-0 top-0 z-50 mt-1 w-auto min-w-max origin-top-left rounded-md bg-white shadow-lg"
 style={{
 transform: 'translate3d(-35px, 0px, 0px)'
 }}
 > <RefinementList
 className="mt-3"
 attribute="label_type"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by activity"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>
 </div>


 <div className="flex flex-col">

 <DropdownMenu>
 <DropdownMenuTrigger asChild>
 <Button
 variant="outline"
 className="inline-flex h-8 cursor-pointer items-center justify-center rounded-md border-0 bg-gray-200 px-4 text-xs font-semibold leading-5 text-black"
 onClick={() => setinitialSearch(true)}
 >
 Contract Type
 </Button>
 </DropdownMenuTrigger>
 <DropdownMenuContent
 className="mt-1 w-auto min-w-max rounded-md bg-white p-2 shadow-lg duration-300 transition-opacity"
 style={{
 transform: 'translate3d(47px, 0px, 0px)'
 }}
 >
 <RefinementList
 className="mt-3"
 attribute="label_subtype"
 searchable={true}
 limit={20}
 searchablePlaceholder="Search by type"
 onClick={() => setinitialSearch(true)}
 transformItems={items => items.sort((a, b) => a.count < b.count ? 1 : -1)}
 classNames={{
 checkbox: 'hidden',
 list: 'max-h-60 overflow-auto w-59 dropdown-menu-scrollbar ',
 item: 'mb-2 text-left pl-2 hover:bg-gray-200 rounded-md', // Align text to the left
 selectedItem: 'font-bold bg-gray-200 rounded-md ',
 label: 'text-xl',
 count: 'invisible',
 searchBox: ' w-full rounded-md border border-input bg-background text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50'
 }}
 />
 </DropdownMenuContent>
 </DropdownMenu>

 <RefinementList
 className="mt-3"
 attribute="label_type"
 limit={10}
 showMore={true}
 showMoreLimit={20}
 placeholder="Search by activity"
 searchablePlaceholder="Search by activity"
 searchable={true}
 onClick={() => setinitialSearch(true)}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <h5 className="mt-5">Contract Type</h5>
 <HierarchicalMenu
 onClick={() => setinitialSearch(true)}
 className="mt-3"
 attributes={["label_subtype"]}
 // defaultRefinement={["label_type"]}
 transformItems={items =>
 items.sort((a, b) => (a.count < b.count ? 1 : -1))
 }
 />
 <div className="mt-1">&nbsp;</div>
 </div>
 </div>
 </div>



 </div>

 <div className=" flex w-full flex-col transition-all">
 <div className="justify-between items-center w-full hidden sm:flex">
 <button
 className="rounded-md p-1.5 mb-0.5 text-gray-600
 focus:outline-none focus:ring-2 focus:ring-gray-300 dark:text-gray-200 w-auto"
 onClick={toggleFilterVisibility}
 aria-label="Open sidebar">
 <svg className="h-5 w-5" viewBox="0 0 24 24" fill="none">
 <path
 stroke="currentColor"
 strokeLinecap="round"
 strokeLinejoin="round"
 strokeWidth="2"
 d="M4 6H20M4 12H20M4 18H11"></path>
 </svg>
 </button>
 <div>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 {/* Number of entries: {data ? data.length : "Loading"} */}
 {/* Number of entries: {nbHits} */}
 </p>
 <p className="hidden text-sm text-slate-500 dark:text-slate-400 sm:block">
 <kbd className="pointer-events-none inline-flex h-5 select-none items-center gap-1 rounded border border-slate-100 bg-slate-100 px-1.5 font-mono text-[10px] font-medium text-slate-600 opacity-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-400">
 <span className="text-xs">⌘</span>F
 </kbd>
 to search the table
 </p>
 </div>
 </div>

 {initialSearch ? (
 <CustomHits />
 ) : props.data ? (
Expand Down

10 changes: 9 additions & 1 deletion
styles/globals.scss

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -315,7 +315,15 @@


 }

 .dropdown-menu-scrollbar::-webkit-scrollbar {
 display: none;
 }

 /* Hide scrollbar for IE, Edge, and Firefox on elements with class .dropdown-menu-scrollbar */
 .dropdown-menu-scrollbar {
 -ms-overflow-style: none; /* IE and Edge */
 scrollbar-width: none; /* Firefox */
 }

.btn { display: inline-block; padding: 6px 12px; text-align: center; vertical-align: middle; }
.btn-primary { background-color: #007bff; border-color: #007bff; color: #fff; }
Expand Down