From 145542659dfb6b4fa24db05e1c0aec8cfb5402a0 Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Wed, 3 Jan 2024 11:34:57 +0100
Subject: [PATCH 01/30] feat: Filter options passed as search params in the
 router

---
 components/filter.tsx | 41 +++++++++++++++++++++++++++++------------
 utils/url.ts          | 11 +++++++++++
 2 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 utils/url.ts

diff --git a/components/filter.tsx b/components/filter.tsx
index 2032285..3e290c3 100644
--- a/components/filter.tsx
+++ b/components/filter.tsx
@@ -1,15 +1,22 @@
 "use client";
-import React, { FC } from "react";
+import React from "react";
+import { usePathname, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
 import { Select, SelectItem } from "@nextui-org/select";
 import { FilterItem } from "@/types/filters";
+import { createUrl } from "@/utils/url";
 import Emoji from "./emoji";
 
-interface FilterProps {
+interface IFilterProps {
   placeholder: string;
   emoji: string;
   items: FilterItem[];
 }
-export const Filter: FC<FilterProps> = ({ placeholder, items, emoji }) => {
+export const Filter = ({ placeholder, items, emoji }: IFilterProps) => {
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
   return (
     <Select
       color="default"
@@ -18,15 +25,25 @@ export const Filter: FC<FilterProps> = ({ placeholder, items, emoji }) => {
       startContent={<Emoji emoji={emoji} className="text-sm" />}
       size={"sm"}
     >
-      {items.map((item) => (
-        <SelectItem
-          key={item.value}
-          value={item.value}
-          startContent={<Emoji emoji={item.emoji} />}
-        >
-          {item.label}
-        </SelectItem>
-      ))}
+      {items.map((item) => {
+        const optionNameLowerCase = placeholder.toLowerCase();
+        const optionSearchParams = new URLSearchParams(searchParams.toString());
+        optionSearchParams.set(optionNameLowerCase, item.value);
+        const optionUrl = createUrl(pathname, optionSearchParams);
+
+        return (
+          <SelectItem
+            key={item.value}
+            value={item.value}
+            startContent={<Emoji emoji={item.emoji} />}
+            onClick={() => {
+              router.replace(optionUrl, { scroll: false });
+            }}
+          >
+            {item.label}
+          </SelectItem>
+        );
+      })}
     </Select>
   );
 };
diff --git a/utils/url.ts b/utils/url.ts
new file mode 100644
index 0000000..42eb7ea
--- /dev/null
+++ b/utils/url.ts
@@ -0,0 +1,11 @@
+import { ReadonlyURLSearchParams } from "next/navigation";
+
+export const createUrl = (
+  pathname: string,
+  params: URLSearchParams | ReadonlyURLSearchParams,
+) => {
+  const paramsString = params.toString();
+  const queryString = `${paramsString.length ? "?" : ""}${paramsString}`;
+
+  return `${pathname}${queryString}`;
+};

From 2b003a64391fa66d51f841b3c1b56619de80485e Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Wed, 3 Jan 2024 13:34:48 +0100
Subject: [PATCH 02/30] (WIP) feat: Dynamic filtering with search params

---
 app/page.tsx                             | 38 +++++++++++++++++++++++-
 components/contributions-table/row.tsx   | 14 +++++----
 components/contributions-table/table.tsx |  2 +-
 types/contribution.ts                    |  2 +-
 utils/contribution.ts                    |  4 +--
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 6d7ccf1..8accbd0 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,9 +1,42 @@
+import ContributionsTable from "@/components/contributions-table/table";
 import Filter from "@/components/filter";
 import { title, subtitle } from "@/components/primitives";
 import Search from "@/components/search";
 import { SEARCH_OPTIONS, LANGUAGES_OPTIONS } from "@/data/filters";
+import { queryDatabase } from "@/lib/notion";
+import { transformNotionDataToContributions } from "@/utils/contribution";
+
+export default async function Home({
+  searchParams,
+}: {
+  searchParams?: { [key: string]: string | string[] | undefined };
+}) {
+  const params = searchParams as { [key: string]: string };
+  const filter =
+    params && params.languages
+      ? {
+          property: "Repo Language",
+          rollup: {
+            any: {
+              multi_select: {
+                contains: params.languages,
+              },
+            },
+          },
+        }
+      : undefined;
+
+  const data = await queryDatabase({
+    page_size: 10,
+    filter,
+  });
+  const contributions = transformNotionDataToContributions(data);
+  const items = {
+    data: contributions,
+    hasMore: data.has_more,
+    nextCursor: data.next_cursor ?? undefined,
+  };
 
-export default function Home() {
   return (
     <div>
       <section className="flex flex-col items-center py-8 md:py-10">
@@ -42,6 +75,9 @@ export default function Home() {
             <h2 className={subtitle({ class: "mt-4" })}>Sort</h2>
           </div>
         </div>
+        <div>
+          <ContributionsTable items={items} />
+        </div>
       </div>
     </div>
   );
diff --git a/components/contributions-table/row.tsx b/components/contributions-table/row.tsx
index 242fa6f..a96d488 100644
--- a/components/contributions-table/row.tsx
+++ b/components/contributions-table/row.tsx
@@ -38,15 +38,19 @@ Project.Avatar = Avatar;
 
 interface IContentProps {
   title: string;
-  language: string; //TODO: make it an enum type with available languages from filters
+  languages: string[]; //TODO: make it an enum type with available languages from filters
 }
-export const Content = ({ title, language }: IContentProps) => {
+export const Content = ({ title, languages }: IContentProps) => {
   return (
     <div className="space-y-2">
       <p className="max-w-64 truncate">{title}</p>
-      <Chip className="mx-1" variant="bordered">
-        {language}
-      </Chip>
+      <div className="flex gap-1">
+        {languages.map((language, idx) => (
+          <Chip key={idx} className="mx-1" variant="bordered">
+            {language}
+          </Chip>
+        ))}
+      </div>
     </div>
   );
 };
diff --git a/components/contributions-table/table.tsx b/components/contributions-table/table.tsx
index 6d03445..2a1b07c 100644
--- a/components/contributions-table/table.tsx
+++ b/components/contributions-table/table.tsx
@@ -48,7 +48,7 @@ export const Table = ({ items, queries = {} }: ITableProps) => {
             />
           );
         case "content":
-          return <Content title={item.title} language={item.language} />;
+          return <Content title={item.title} languages={item.languages} />;
         case "labels":
           return <Labels labels={item.labels} />;
         case "date":
diff --git a/types/contribution.ts b/types/contribution.ts
index 0d4f985..2caae5b 100644
--- a/types/contribution.ts
+++ b/types/contribution.ts
@@ -4,7 +4,7 @@ export type Contribution = {
   id: number;
   avatar: string;
   labels: string[];
-  language: string;
+  languages: string[];
   project: string;
   repository: string;
   title: string;
diff --git a/utils/contribution.ts b/utils/contribution.ts
index 21b1cd8..95459ad 100644
--- a/utils/contribution.ts
+++ b/utils/contribution.ts
@@ -16,9 +16,9 @@ export function transformNotionDataToContributions(
       labels: properties["Issue Labels"].multi_select.map(
         (label: any) => label.name,
       ),
-      language: properties["Repo Language"].rollup.array[0].multi_select.map(
+      languages: properties["Repo Language"].rollup.array[0].multi_select.map(
         (language: any) => language.name,
-      )[0],
+      ),
       project:
         properties["Project Name"].rollup.array[0].rich_text[0].plain_text,
       repository: avatarKey.split("/").pop(),

From a9056f0166873a09b2d4a3ea6569dd8f4b1d14b1 Mon Sep 17 00:00:00 2001
From: Leandro <leapalazzolo@gmail.com>
Date: Wed, 3 Jan 2024 17:19:06 -0300
Subject: [PATCH 03/30] chore: add checkbox from next-ui

---
 package.json   | 1 +
 pnpm-lock.yaml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 2851428..015f7d5 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "@nextui-org/autocomplete": "^2.0.9",
     "@nextui-org/button": "2.0.26",
     "@nextui-org/card": "^2.0.24",
+    "@nextui-org/checkbox": "^2.0.25",
     "@nextui-org/chip": "^2.0.25",
     "@nextui-org/code": "2.0.24",
     "@nextui-org/dropdown": "^2.1.16",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 77c4440..cbba7c8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ dependencies:
   '@nextui-org/card':
     specifier: ^2.0.24
     version: 2.0.24(@nextui-org/system@2.0.15)(@nextui-org/theme@2.1.17)(framer-motion@10.16.16)(react-dom@18.2.0)(react@18.2.0)
+  '@nextui-org/checkbox':
+    specifier: ^2.0.25
+    version: 2.0.25(@nextui-org/system@2.0.15)(@nextui-org/theme@2.1.17)(react-dom@18.2.0)(react@18.2.0)
   '@nextui-org/chip':
     specifier: ^2.0.25
     version: 2.0.25(@nextui-org/system@2.0.15)(@nextui-org/theme@2.1.17)(react-dom@18.2.0)(react@18.2.0)

From d9d1b959ea99f71d0f27b0ec312e88f0cc857f2b Mon Sep 17 00:00:00 2001
From: Leandro <leapalazzolo@gmail.com>
Date: Wed, 3 Jan 2024 17:19:57 -0300
Subject: [PATCH 04/30] feat: use query in contributions tabe to get new issues
 when a filter is updated

---
 app/page.tsx | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 8accbd0..578c172 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -5,6 +5,7 @@ import Search from "@/components/search";
 import { SEARCH_OPTIONS, LANGUAGES_OPTIONS } from "@/data/filters";
 import { queryDatabase } from "@/lib/notion";
 import { transformNotionDataToContributions } from "@/utils/contribution";
+import RemoveFilters from "@/components/removeFilters";
 
 export default async function Home({
   searchParams,
@@ -12,7 +13,8 @@ export default async function Home({
   searchParams?: { [key: string]: string | string[] | undefined };
 }) {
   const params = searchParams as { [key: string]: string };
-  const filter =
+  const languagesFilterIsSelected = params && params.languages;
+  let filter =
     params && params.languages
       ? {
           property: "Repo Language",
@@ -55,20 +57,17 @@ export default async function Home({
             placeholder="Languages"
             emoji={"💪"}
             items={LANGUAGES_OPTIONS}
+            selectedValue={params.languages}
           />
           <Filter
             placeholder="Interests"
             emoji={"🪄"}
             items={LANGUAGES_OPTIONS}
+            selectedValue={""}
           />
-          {/* <div>
-            <Bounties
-              currency="USD"
-              defaultValue={100}
-              maxValue={10000}
-              emoji="💰"
-            />
-          </div> */}
+          {languagesFilterIsSelected && (
+            <RemoveFilters value={params.languages} param="Languages" />
+          )}
         </div>
         <div className="flex justify-end">
           <div>
@@ -76,7 +75,13 @@ export default async function Home({
           </div>
         </div>
         <div>
-          <ContributionsTable items={items} />
+          <ContributionsTable
+            items={items}
+            queries={{
+              page_size: 10,
+              filter,
+            }}
+          />
         </div>
       </div>
     </div>

From ad1ded1f63e68d2a5662bc187a1204a68eafe74c Mon Sep 17 00:00:00 2001
From: Leandro <leapalazzolo@gmail.com>
Date: Wed, 3 Jan 2024 17:20:44 -0300
Subject: [PATCH 05/30] refactor: add new prop to show the fiter value from the
 url

---
 components/filter.tsx | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/components/filter.tsx b/components/filter.tsx
index 3e290c3..7eb9a34 100644
--- a/components/filter.tsx
+++ b/components/filter.tsx
@@ -1,5 +1,5 @@
 "use client";
-import React from "react";
+import React, { useEffect } from "react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useRouter } from "next/navigation";
 import { Select, SelectItem } from "@nextui-org/select";
@@ -11,8 +11,25 @@ interface IFilterProps {
   placeholder: string;
   emoji: string;
   items: FilterItem[];
+  selectedValue: string;
 }
-export const Filter = ({ placeholder, items, emoji }: IFilterProps) => {
+export const Filter = ({
+  placeholder,
+  items,
+  emoji,
+  selectedValue,
+}: IFilterProps) => {
+  const [value, setValue] = React.useState(selectedValue);
+
+  useEffect(() => {
+    setValue(selectedValue);
+  }, [selectedValue]);
+
+  const handleSelectionChange = (e: {
+    target: { value: React.SetStateAction<string> };
+  }) => {
+    setValue(e.target.value);
+  };
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
@@ -21,8 +38,11 @@ export const Filter = ({ placeholder, items, emoji }: IFilterProps) => {
     <Select
       color="default"
       variant="faded"
-      placeholder={placeholder}
-      startContent={<Emoji emoji={emoji} className="text-sm" />}
+      labelPlacement={"inside"}
+      label={placeholder}
+      onChange={handleSelectionChange}
+      selectedKeys={[value]}
+      startContent={value ? <Emoji emoji={emoji} className="text-sm" /> : <></>}
       size={"sm"}
     >
       {items.map((item) => {

From d4a6af1c4f1553a93e52cdad6cb6696bd576cd29 Mon Sep 17 00:00:00 2001
From: Leandro <leapalazzolo@gmail.com>
Date: Wed, 3 Jan 2024 17:21:04 -0300
Subject: [PATCH 06/30] feat: add chip with default filter value and remove
 button to clear param in the url

---
 components/removeFilters.tsx | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 components/removeFilters.tsx

diff --git a/components/removeFilters.tsx b/components/removeFilters.tsx
new file mode 100644
index 0000000..8e6dd09
--- /dev/null
+++ b/components/removeFilters.tsx
@@ -0,0 +1,33 @@
+"use client";
+import React from "react";
+import { usePathname, useSearchParams } from "next/navigation";
+import { useRouter } from "next/navigation";
+import { Chip } from "@nextui-org/chip";
+import { createUrl } from "@/utils/url";
+
+interface IRemoveFilters {
+  param: string;
+  value: string;
+}
+
+export const RemoveFilters = ({ param, value }: IRemoveFilters) => {
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  const removeSearchParams = () => {
+    const optionNameLowerCase = param.toLowerCase();
+    const optionSearchParams = new URLSearchParams(searchParams.toString());
+    optionSearchParams.delete(optionNameLowerCase);
+    const optionUrl = createUrl(pathname, optionSearchParams);
+    router.replace(optionUrl);
+  };
+  return (
+    <div className="flex gap-4">
+      <Chip color="secondary" onClose={removeSearchParams}>
+        {value}
+      </Chip>
+    </div>
+  );
+};
+
+export default RemoveFilters;

From c3846d2f71bb45010da59781dfb0b977a57024e8 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Thu, 4 Jan 2024 18:50:04 -0300
Subject: [PATCH 07/30] feat: add interests values in filter and chip to delete

---
 app/page.tsx                     |  28 +++--
 data/config.ts                   |   4 +
 data/{filters.tsx => filters.ts} |  45 +++++++
 data/interests.ts                | 204 +++++++++++++++++++++++++++++++
 4 files changed, 270 insertions(+), 11 deletions(-)
 rename data/{filters.tsx => filters.ts} (77%)
 create mode 100644 data/interests.ts

diff --git a/app/page.tsx b/app/page.tsx
index 578c172..59ffb08 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,8 +2,9 @@ import ContributionsTable from "@/components/contributions-table/table";
 import Filter from "@/components/filter";
 import { title, subtitle } from "@/components/primitives";
 import Search from "@/components/search";
-import { SEARCH_OPTIONS, LANGUAGES_OPTIONS } from "@/data/filters";
-import { queryDatabase } from "@/lib/notion";
+import { SEARCH_OPTIONS, LANGUAGES_OPTIONS, INTERESTS_OPTIONS, } from "@/data/filters";
+import { REPOSITORIES_BY_INTERESTS } from "@/data/interests";
+import { queryDatabase, getIssuesByProject } from "@/lib/notion";
 import { transformNotionDataToContributions } from "@/utils/contribution";
 import RemoveFilters from "@/components/removeFilters";
 
@@ -12,20 +13,22 @@ export default async function Home({
 }: {
   searchParams?: { [key: string]: string | string[] | undefined };
 }) {
+
   const params = searchParams as { [key: string]: string };
   const languagesFilterIsSelected = params && params.languages;
+  const interestsFilterIsSelected = params && params.interests;
   let filter =
     params && params.languages
       ? {
-          property: "Repo Language",
-          rollup: {
-            any: {
-              multi_select: {
-                contains: params.languages,
-              },
+        property: "Repo Language",
+        rollup: {
+          any: {
+            multi_select: {
+              contains: params.languages,
             },
           },
-        }
+        },
+      }
       : undefined;
 
   const data = await queryDatabase({
@@ -62,12 +65,15 @@ export default async function Home({
           <Filter
             placeholder="Interests"
             emoji={"🪄"}
-            items={LANGUAGES_OPTIONS}
-            selectedValue={""}
+            items={INTERESTS_OPTIONS}
+            selectedValue={params.interests}
           />
           {languagesFilterIsSelected && (
             <RemoveFilters value={params.languages} param="Languages" />
           )}
+          {interestsFilterIsSelected && (
+            <RemoveFilters value={params.interests} param="Interests" />
+          )}
         </div>
         <div className="flex justify-end">
           <div>
diff --git a/data/config.ts b/data/config.ts
index fad8ee3..2d534f3 100644
--- a/data/config.ts
+++ b/data/config.ts
@@ -6,3 +6,7 @@ export const SITE_CONFIG = {
     github: "https://github.com/kudos-ink",
   },
 };
+
+export const DATA = {
+  interests: "/data/interesets.json"
+}
\ No newline at end of file
diff --git a/data/filters.tsx b/data/filters.ts
similarity index 77%
rename from data/filters.tsx
rename to data/filters.ts
index 12d4cdf..7b03ea4 100644
--- a/data/filters.tsx
+++ b/data/filters.ts
@@ -107,3 +107,48 @@ export const LANGUAGES_OPTIONS = [
   //   { value: "Zig", label: "Zig", emoji: "" },
   //   { value: "jq", label: "jq", emoji: "" },
 ];
+export const POLKADOT = "polkadot";
+export const SUBSTRATE = "substrate";
+export const KUSAMA = "kusama";
+export const EVM = "evm";
+export const ETHEREUM = "ethereum";
+export const DEFI = "defi";
+export const SMART_CONTRACTS = "smart-contracts";
+export const CUMULUS = "cumulus";
+export const BITCOIN = "bitcoin";
+export const BRIDGE = "bridge";
+export const WASM = "wasm";
+export const MEV = "mev";
+export const ROLLUP = "rollup";
+export const DEX = "dex";
+export const DAO = "dao";
+export const SOCIAL = "social";
+export const ZERO_KNOWLEDGE = "zero-knowledge";
+export const IOT = "iot";
+export const XCM = "xcm";
+export const WALLET = "wallet";
+export const AI = "ai";
+
+export const INTERESTS_OPTIONS = [
+  { value: POLKADOT, label: "Polkadot", emoji: "🔗" },
+  { value: SUBSTRATE, label: "Substrate", emoji: "🌐" },
+  { value: KUSAMA, label: "Kusama", emoji: "🐤" },
+  { value: EVM, label: "EVM", emoji: "💻" },
+  { value: ETHEREUM, label: "Ethereum", emoji: "🌌" },
+  { value: DEFI, label: "DeFi", emoji: "💸" },
+  { value: SMART_CONTRACTS, label: "Smart Contracts", emoji: "📜" },
+  { value: CUMULUS, label: "Cumulus", emoji: "⛅" },
+  { value: BITCOIN, label: "Bitcoin", emoji: "₿" },
+  { value: BRIDGE, label: "Bridge", emoji: "🌉" },
+  { value: WASM, label: "Wasm", emoji: "🛠️" },
+  { value: MEV, label: "MEV", emoji: "💎" },
+  { value: ROLLUP, label: "Rollup", emoji: "🔄" },
+  { value: DEX, label: "DEX", emoji: "💹" },
+  { value: DAO, label: "DAO", emoji: "🗳️" },
+  { value: SOCIAL, label: "Social", emoji: "👥" },
+  { value: ZERO_KNOWLEDGE, label: "Zero Knowledge", emoji: "🔒" },
+  { value: IOT, label: "IoT", emoji: "🤖" }, // Changed to Earth + Robot
+  { value: XCM, label: "XCM", emoji: "🔄" },
+  { value: WALLET, label: "Wallet", emoji: "💼" },
+  { value: AI, label: "AI", emoji: "🧠" },
+];
\ No newline at end of file
diff --git a/data/interests.ts b/data/interests.ts
new file mode 100644
index 0000000..71161e3
--- /dev/null
+++ b/data/interests.ts
@@ -0,0 +1,204 @@
+export const REPOSITORIES_BY_INTERESTS = {
+
+    "substrate": [
+        "InvArch/InvArch-Node",
+        "pendulum-chain/pendulum",
+        "bit-country/Metaverse-Network",
+        "grindytech/gafi",
+        "AstarNetwork/Astar",
+        "interlay/interbtc",
+        "OAK-Foundation/xcm-demo",
+        "OAK-Foundation/oak.js",
+        "moonbeam-foundation/moonbeam",
+        "webb-tools/tangle",
+        "TalismanSociety/talisman",
+        "t3rn/t3rn",
+        "paritytech/polkadot-sdk",
+        "automata-network/automata",
+        "subspace/subspace",
+        "mangata-finance/mangata-node",
+        "virto-network/virto-node",
+        "galacticcouncil/HydraDX-node",
+        "InvArch/InvArch-Frames",
+        "darwinia-network/darwinia",
+        "hashed-io/hashed-substrate",
+        "LibertyDSNP/frequency",
+        "OAK-Foundation/OAK-blockchain",
+        "centrifuge/centrifuge-chain",
+        "dappforce/subsocial-parachain",
+        "KILTprotocol/kilt-node",
+        "Manta-Network/Manta",
+        "sora-xor/sora2-parachain",
+        "moondance-labs/tanssi",
+        "sora-xor/sora2-network",
+        "gear-tech/gear",
+        "Joystream/joystream",
+        "docknetwork/dock-substrate",
+        "capsule-corp-ternoa/ternoa-node",
+        "bifrost-finance/bifrost",
+        "bitgreen/bitgreen-node",
+        "deeper-chain/deeper-chain",
+        "crustio/crust",
+        "AcalaNetwork/Acala"
+    ],
+    "polkadot": [
+        "InvArch/InvArch-Node",
+        "pendulum-chain/pendulum",
+        "bit-country/Metaverse-Network",
+        "grindytech/gafi",
+        "AstarNetwork/Astar",
+        "interlay/interbtc",
+        "aleph-zero-foundation/aleph-node",
+        "opensquare-network/dotreasury",
+        "opensquare-network/subsquare",
+        "OAK-Foundation/xcm-demo",
+        "subquery/subql",
+        "subsquid/squid-sdk",
+        "pendulum-chain/portal",
+        "ImbueNetwork/imbue-frontend",
+        "OAK-Foundation/oak.js",
+        "moonbeam-foundation/moonbeam",
+        "TalismanSociety/talisman",
+        "paritytech/polkadot-sdk",
+        "automata-network/automata",
+        "subspace/subspace",
+        "mangata-finance/mangata-node",
+        "virto-network/virto-node",
+        "galacticcouncil/HydraDX-node",
+        "InvArch/InvArch-Frames",
+        "darwinia-network/darwinia",
+        "hashed-io/hashed-substrate",
+        "LibertyDSNP/frequency",
+        "OAK-Foundation/OAK-blockchain",
+        "centrifuge/centrifuge-chain",
+        "dappforce/subsocial-parachain",
+        "pendulum-chain/spacewalk",
+        "Brushfam/openbrush-contracts",
+        "KILTprotocol/kilt-node",
+        "Manta-Network/Manta",
+        "sora-xor/sora2-parachain",
+        "moondance-labs/tanssi",
+        "sora-xor/sora2-network",
+        "Joystream/joystream",
+        "zeitgeistpm/zeitgeist",
+        "docknetwork/dock-substrate",
+        "capsule-corp-ternoa/ternoa-node",
+        "NodleCode/chain",
+        "bifrost-finance/bifrost",
+        "ImbueNetwork/imbue",
+        "encointer/encointer-parachain",
+        "parallel-finance/parallel",
+        "bitgreen/bitgreen-node",
+        "deeper-chain/deeper-chain",
+        "crustio/crust",
+        "AcalaNetwork/Acala"
+    ],
+    "kusama": [
+        "interlay/interbtc",
+        "opensquare-network/dotreasury",
+        "opensquare-network/subsquare",
+        "sora-xor/sora2-parachain",
+        "sora-xor/sora2-network",
+        "parallel-finance/parallel",
+        "encointer/encointer-parachain",
+        "AcalaNetwork/Acala",
+        "airalab/robonomics",
+        "AstarNetwork/Astar",
+        "opensquare-network/dotreasury"
+    ],
+    "evm": [
+        "AstarNetwork/Astar",
+        "moonbeam-foundation/moonbeam",
+        "darwinia-network/darwinia",
+        "OAK-Foundation/OAK-blockchain",
+        "mangata-finance/mangata-node",
+        "sora-xor/sora2-network"
+    ],
+    "ethereum": [
+        "AstarNetwork/Astar",
+        "moonbeam-foundation/moonbeam",
+        "TalismanSociety/talisman",
+        "darwinia-network/darwinia",
+        "sora-xor/sora2-network",
+        "mangata-finance/mangata-node"
+    ],
+    "defi": [
+        "bit-country/Metaverse-Network",
+        "grindytech/gafi",
+        "AstarNetwork/Astar",
+        "interlay/interbtc",
+        "moonbeam-foundation/moonbeam",
+        "TalismanSociety/talisman",
+        "sora-xor/sora2-parachain",
+        "sora-xor/sora2-network",
+        "bifrost-finance/bifrost",
+        "parallel-finance/parallel",
+        "AcalaNetwork/Acala",
+        "interlay/interbtc"
+    ],
+    "smart-contracts": [
+        "bit-country/Metaverse-Network",
+        "grindytech/gafi",
+        "AstarNetwork/Astar",
+        "moonbeam-foundation/moonbeam",
+        "TalismanSociety/talisman",
+        "t3rn/t3rn",
+        "paritytech/polkadot-sdk",
+        "subspace/subspace",
+        "mangata-finance/mangata-node",
+        "Joystream/joystream"
+    ],
+    "cumulus": [
+        "pendulum-chain/pendulum",
+        "moonbeam-foundation/moonbeam",
+        "paritytech/polkadot-sdk",
+        "parallel-finance/parallel"
+    ],
+    "bitcoin": [
+        "interlay/interbtc"
+    ],
+    "bridge": [
+        "interlay/interbtc",
+        "bit-country/Metaverse-Network",
+        "darwinia-network/darwinia",
+        "bifrost-finance/bifrost"
+    ],
+    "wasm": [
+        "pendulum-chain/pendulum",
+        "bit-country/Metaverse-Network",
+        "moonbeam-foundation/moonbeam",
+        "bifrost-finance/bifrost",
+        "parallel-finance/parallel"
+    ],
+    "mev": [
+        "mangata-finance/mangata-node"
+    ],
+    "rollup": [
+        "mangata-finance/mangata-node"
+    ],
+    "dex": [
+        "galacticcouncil/HydraDX-node"
+    ],
+    "dao": [
+        "InvArch/InvArch-Frames"
+    ],
+    "social": [
+        "dappforce/subsocial-parachain"
+    ],
+    "zero-knowledge": [
+        "webb-tools/tangle",
+        "Manta-Network/Manta"
+    ],
+    "iot": [
+        "airalab/robonomics"
+    ],
+    "xcm": [
+        "OAK-Foundation/xcm-demo"
+    ],
+    "wallet": [
+        "TalismanSociety/talisman"
+    ],
+    "ai": [
+        "opentensor/bittensor"
+    ]
+}
\ No newline at end of file

From 955e4a354c0a7d14fa6af0dc07508df8e3d27c20 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Thu, 4 Jan 2024 21:34:42 -0300
Subject: [PATCH 08/30] feat: new search WIP

---
 app/page.tsx      |  22 ++-
 data/filters.ts   | 119 ++++++++-------
 data/interests.ts | 365 ++++++++++++++++++++--------------------------
 3 files changed, 247 insertions(+), 259 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 59ffb08..368240f 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -17,6 +17,7 @@ export default async function Home({
   const params = searchParams as { [key: string]: string };
   const languagesFilterIsSelected = params && params.languages;
   const interestsFilterIsSelected = params && params.interests;
+  const hasSearch = params && params.search;
   let filter =
     params && params.languages
       ? {
@@ -29,7 +30,16 @@ export default async function Home({
           },
         },
       }
-      : undefined;
+      : params && params.languages ? {
+        property: "Project Name",
+        rollup: {
+          any: {
+            rich_text: {
+              contains: params.search
+            },
+          },
+        }
+      } : undefined;
 
   const data = await queryDatabase({
     page_size: 10,
@@ -51,6 +61,11 @@ export default async function Home({
       <div className="flex flex-col items-center gap-4 py-8 md:py-10">
         <div className="inline-block max-w-lg text-center justify-center">
           <Search placeholder="Search" emoji="🔍" items={SEARCH_OPTIONS} />
+          {/* TODO: 
+          1. make it controlled
+          2. set the selected value in the params
+          3. use custom function
+          4. reset the other values  */}
           <h2 className={subtitle({ class: "mt-4" })}>Banner</h2>
         </div>
       </div>
@@ -74,6 +89,9 @@ export default async function Home({
           {interestsFilterIsSelected && (
             <RemoveFilters value={params.interests} param="Interests" />
           )}
+          {hasSearch && (
+            <RemoveFilters value={params.search} param="Search" />
+          )}
         </div>
         <div className="flex justify-end">
           <div>
@@ -90,6 +108,6 @@ export default async function Home({
           />
         </div>
       </div>
-    </div>
+    </div >
   );
 }
diff --git a/data/filters.ts b/data/filters.ts
index 7b03ea4..3f27bff 100644
--- a/data/filters.ts
+++ b/data/filters.ts
@@ -1,55 +1,3 @@
-export const SEARCH_OPTIONS = [
-  { value: "senior", emoji: "👵", label: "Senior" },
-  { value: "engineer", emoji: "🤓", label: "Engineer" },
-  { value: "dev", emoji: "🤓", label: "Developer" },
-  { value: "finance", emoji: "💰", label: "Finance" },
-  { value: "sys-admin", emoji: "♾️", label: "Sys Admin" },
-  { value: "javascript", emoji: "☕️", label: "JavaScript" },
-  // { value: "exec", emoji: "💼", label: "Executive" },
-  { value: "backend", emoji: "🍑", label: "Backend" },
-  { value: "golang", emoji: "🐀", label: "Golang" },
-  { value: "cloud", emoji: "☁️", label: "Cloud" },
-  // { value: "medical", emoji: "🚑", label: "Medical" },
-  { value: "front-end", emoji: "🎨", label: "Front End" },
-  { value: "full-stack", emoji: "🥞", label: "Full Stack" },
-  { value: "ops", emoji: "♾️", label: "Ops" },
-  { value: "design", emoji: "🎨", label: "Design" },
-  { value: "react", emoji: "⚛️", label: "React" },
-  { value: "infosec", emoji: "🔑", label: "InfoSec" },
-  { value: "marketing", emoji: "🚥", label: "Marketing" },
-  { value: "mobile", emoji: "📱", label: "Mobile" },
-  { value: "content-writing", emoji: "✍️", label: "Content Writing" },
-  { value: "saas", emoji: "📦", label: "SaaS" },
-  { value: "recruiter", emoji: "🎯", label: "Recruiter" },
-  { value: "full-time", emoji: "⏰", label: "Full Time" },
-  { value: "api", emoji: "🤖", label: "API" },
-  // { value: "sales", emoji: "💼", label: "Sales" },
-  { value: "ruby", emoji: "💎", label: "Ruby" },
-  { value: "education", emoji: "👨‍🏫", label: "Education" },
-  { value: "devops", emoji: "♾️", label: "DevOps" },
-  { value: "stats", emoji: "👩‍🔬", label: "Stats" },
-  { value: "python", emoji: "🐍", label: "Python" },
-  { value: "node", emoji: "🔗", label: "Node" },
-  // { value: "english", emoji: "🇬🇧", label: "English" },
-  { value: "non-tech", emoji: "🔌", label: "Non Tech" },
-  { value: "video", emoji: "📼", label: "Video" },
-  // { value: "travel", emoji: "🎒", label: "Travel" },
-  { value: "quality-assurance", emoji: "🔬", label: "Quality Assurance" },
-  // { value: "ecommerce", emoji: "🛍", label: "Ecommerce" },
-  { value: "teaching", emoji: "👨‍🏫", label: "Teaching" },
-  { value: "linux", emoji: "🐧", label: "Linux" },
-  { value: "java", emoji: "☕️", label: "Java" },
-  { value: "crypto", emoji: "🏅", label: "Crypto" },
-  { value: "junior", emoji: "👶", label: "Junior" },
-  { value: "git", emoji: "📦", label: "Git" },
-  { value: "legal", emoji: "👩‍⚖️", label: "Legal" },
-  { value: "android", emoji: "🤖", label: "Android" },
-  // { value: "accounting", emoji: "💼", label: "Accounting" },
-  // { value: "admin", emoji: "♾️", label: "Admin" },
-  // { value: "microsoft", emoji: "🖼", label: "Microsoft" },
-  // { value: "excel", emoji: "📗", label: "Excel" },
-  { value: "php", emoji: "🐘", label: "PHP" },
-];
 
 export const LANGUAGES_OPTIONS = [
   { value: "Assembly", label: "Assembly", emoji: "🔧" }, // Assembly
@@ -151,4 +99,69 @@ export const INTERESTS_OPTIONS = [
   { value: XCM, label: "XCM", emoji: "🔄" },
   { value: WALLET, label: "Wallet", emoji: "💼" },
   { value: AI, label: "AI", emoji: "🧠" },
-];
\ No newline at end of file
+];
+
+export const SEARCH_OPTIONS = [
+  { value: "t3rn/t3rn", label: "T3Rn", emoji: "🔄" },
+  { value: "paritytech/polkadot-sdk", label: "Polkadot Sdk", emoji: "🔗" },
+  { value: "automata-network/automata", label: "Automata", emoji: "🤖" },
+  { value: "subspace/subspace", label: "Subspace", emoji: "🚀" },
+  { value: "mangata-finance/mangata-node", label: "Mangata Node", emoji: "🌐" },
+  { value: "virto-network/virto-node", label: "Virto Node", emoji: "🌐" },
+  { value: "galacticcouncil/HydraDX-node", label: "HydraDX Node", emoji: "🌌" },
+  { value: "InvArch/InvArch-Frames", label: "Invarch Frames", emoji: "🖼️" },
+  { value: "darwinia-network/darwinia", label: "Darwinia", emoji: "🌐" },
+  { value: "hashed-io/hashed-substrate", label: "Hashed Substrate", emoji: "🔍" },
+  { value: "LibertyDSNP/frequency", label: "Frequency", emoji: "📡" },
+  { value: "OAK-Foundation/OAK-blockchain", label: "Oak Blockchain", emoji: "🌳" },
+  { value: "centrifuge/centrifuge-chain", label: "Centrifuge Chain", emoji: "🔄" },
+  { value: "dappforce/subsocial-parachain", label: "Subsocial Parachain", emoji: "🌐" },
+  { value: "pendulum-chain/spacewalk", label: "Spacewalk", emoji: "🚀" },
+  { value: "Brushfam/openbrush-contracts", label: "Openbrush Contracts", emoji: "🎨" },
+  { value: "KILTprotocol/kilt-node", label: "Kilt Node", emoji: "🔄" },
+  { value: "Manta-Network/Manta", label: "Manta", emoji: "🌊" },
+  { value: "sora-xor/sora2-parachain", label: "Sora2 Parachain", emoji: "🔄" },
+  { value: "moondance-labs/tanssi", label: "Tanssi", emoji: "💃" },
+  { value: "sora-xor/sora2-network", label: "Sora2 Network", emoji: "🔄" },
+  { value: "gear-tech/gear", label: "Gear", emoji: "⚙️" },
+  { value: "Joystream/joystream", label: "Joystream", emoji: "🎮" },
+  { value: "peaqnetwork/peaq-network-node", label: "Peaq Network Node", emoji: "🌐" },
+  { value: "zeitgeistpm/zeitgeist", label: "Zeitgeist", emoji: "🕰️" },
+  { value: "docknetwork/dock-substrate", label: "Dock Substrate", emoji: "🚢" },
+  { value: "capsule-corp-ternoa/ternoa-node", label: "Ternoa Node", emoji: "📦" },
+  { value: "NodleCode/chain", label: "Chain", emoji: "⛓️" },
+  { value: "bifrost-finance/bifrost", label: "Bifrost", emoji: "🌈" },
+  { value: "ImbueNetwork/imbue", label: "Imbue", emoji: "🌊" },
+  { value: "encointer/encointer-parachain", label: "Encointer Parachain", emoji: "🔄" },
+  { value: "parallel-finance/parallel", label: "Parallel", emoji: "🔄" },
+  { value: "bitgreen/bitgreen-node", label: "Bitgreen Node", emoji: "🌱" },
+  { value: "deeper-chain/deeper-chain", label: "Deeper Chain", emoji: "🔄" },
+  { value: "crustio/crust", label: "Crust", emoji: "🍞" },
+  { value: "AcalaNetwork/Acala", label: "Acala", emoji: "♾️" },
+  { value: "InvArch/InvArch-Node", label: "Invarch Node", emoji: "🏛️" },
+  { value: "Phala-Network/phala-blockchain", label: "Phala Blockchain", emoji: "🔒" },
+  { value: "encointer/encointer-node", label: "Encointer Node", emoji: "🔄" },
+  { value: "encointer/personhood-oracle", label: "Personhood Oracle", emoji: "🔄" },
+  { value: "airalab/robonomics", label: "Robonomics", emoji: "🤖" },
+  { value: "pendulum-chain/pendulum", label: "Pendulum", emoji: "🕰️" },
+  { value: "encointer/pallets", label: "Pallets", emoji: "🔄" },
+  { value: "integritee-network/worker", label: "Worker", emoji: "🛠️" },
+  { value: "bit-country/Metaverse-Network", label: "Metaverse Network", emoji: "🌐" },
+  { value: "grindytech/gafi", label: "Gafi", emoji: "🔄" },
+  { value: "litentry/litentry-parachain", label: "Litentry Parachain", emoji: "📜" },
+  { value: "AstarNetwork/Astar", label: "Astar", emoji: "⭐" },
+  { value: "interlay/interbtc", label: "Interbtc", emoji: "🔄" },
+  { value: "aleph-zero-foundation/aleph-node", label: "Aleph Node", emoji: "🔄" },
+  { value: "opensquare-network/dotreasury", label: "Dotreasury", emoji: "💼" },
+  { value: "opensquare-network/subsquare", label: "Subsquare", emoji: "🔄" },
+  { value: "OAK-Foundation/xcm-demo", label: "Xcm Demo", emoji: "🔄" },
+  { value: "subquery/subql", label: "Subql", emoji: "🔍" },
+  { value: "subsquid/squid-sdk", label: "Squid Sdk", emoji: "🦑" },
+  { value: "pendulum-chain/portal", label: "Portal", emoji: "🚪" },
+  { value: "ImbueNetwork/imbue-frontend", label: "Imbue Frontend", emoji: "🌐" },
+  { value: "OAK-Foundation/oak.js", label: "Oak.Js", emoji: "🌳" },
+  { value: "moonbeam-foundation/moonbeam", label: "Moonbeam", emoji: "🌙" },
+  { value: "webb-tools/tangle", label: "Tangle", emoji: "🌀" },
+  { value: "TalismanSociety/talisman", label: "Talisman", emoji: "📿" },
+  { value: "opentensor/bittensor", label: "Bittensor", emoji: "🧠" },
+]
\ No newline at end of file
diff --git a/data/interests.ts b/data/interests.ts
index 71161e3..f4d7ea6 100644
--- a/data/interests.ts
+++ b/data/interests.ts
@@ -1,204 +1,161 @@
-export const REPOSITORIES_BY_INTERESTS = {
-
-    "substrate": [
-        "InvArch/InvArch-Node",
-        "pendulum-chain/pendulum",
-        "bit-country/Metaverse-Network",
-        "grindytech/gafi",
-        "AstarNetwork/Astar",
-        "interlay/interbtc",
-        "OAK-Foundation/xcm-demo",
-        "OAK-Foundation/oak.js",
-        "moonbeam-foundation/moonbeam",
-        "webb-tools/tangle",
-        "TalismanSociety/talisman",
-        "t3rn/t3rn",
-        "paritytech/polkadot-sdk",
-        "automata-network/automata",
-        "subspace/subspace",
-        "mangata-finance/mangata-node",
-        "virto-network/virto-node",
-        "galacticcouncil/HydraDX-node",
-        "InvArch/InvArch-Frames",
-        "darwinia-network/darwinia",
-        "hashed-io/hashed-substrate",
-        "LibertyDSNP/frequency",
-        "OAK-Foundation/OAK-blockchain",
-        "centrifuge/centrifuge-chain",
-        "dappforce/subsocial-parachain",
-        "KILTprotocol/kilt-node",
-        "Manta-Network/Manta",
-        "sora-xor/sora2-parachain",
-        "moondance-labs/tanssi",
-        "sora-xor/sora2-network",
-        "gear-tech/gear",
-        "Joystream/joystream",
-        "docknetwork/dock-substrate",
-        "capsule-corp-ternoa/ternoa-node",
-        "bifrost-finance/bifrost",
-        "bitgreen/bitgreen-node",
-        "deeper-chain/deeper-chain",
-        "crustio/crust",
-        "AcalaNetwork/Acala"
-    ],
-    "polkadot": [
-        "InvArch/InvArch-Node",
-        "pendulum-chain/pendulum",
-        "bit-country/Metaverse-Network",
-        "grindytech/gafi",
-        "AstarNetwork/Astar",
-        "interlay/interbtc",
-        "aleph-zero-foundation/aleph-node",
-        "opensquare-network/dotreasury",
-        "opensquare-network/subsquare",
-        "OAK-Foundation/xcm-demo",
-        "subquery/subql",
-        "subsquid/squid-sdk",
-        "pendulum-chain/portal",
-        "ImbueNetwork/imbue-frontend",
-        "OAK-Foundation/oak.js",
-        "moonbeam-foundation/moonbeam",
-        "TalismanSociety/talisman",
-        "paritytech/polkadot-sdk",
-        "automata-network/automata",
-        "subspace/subspace",
-        "mangata-finance/mangata-node",
-        "virto-network/virto-node",
-        "galacticcouncil/HydraDX-node",
-        "InvArch/InvArch-Frames",
-        "darwinia-network/darwinia",
-        "hashed-io/hashed-substrate",
-        "LibertyDSNP/frequency",
-        "OAK-Foundation/OAK-blockchain",
-        "centrifuge/centrifuge-chain",
-        "dappforce/subsocial-parachain",
-        "pendulum-chain/spacewalk",
-        "Brushfam/openbrush-contracts",
-        "KILTprotocol/kilt-node",
-        "Manta-Network/Manta",
-        "sora-xor/sora2-parachain",
-        "moondance-labs/tanssi",
-        "sora-xor/sora2-network",
-        "Joystream/joystream",
-        "zeitgeistpm/zeitgeist",
-        "docknetwork/dock-substrate",
-        "capsule-corp-ternoa/ternoa-node",
-        "NodleCode/chain",
-        "bifrost-finance/bifrost",
-        "ImbueNetwork/imbue",
-        "encointer/encointer-parachain",
-        "parallel-finance/parallel",
-        "bitgreen/bitgreen-node",
-        "deeper-chain/deeper-chain",
-        "crustio/crust",
-        "AcalaNetwork/Acala"
-    ],
-    "kusama": [
-        "interlay/interbtc",
-        "opensquare-network/dotreasury",
-        "opensquare-network/subsquare",
-        "sora-xor/sora2-parachain",
-        "sora-xor/sora2-network",
-        "parallel-finance/parallel",
-        "encointer/encointer-parachain",
-        "AcalaNetwork/Acala",
-        "airalab/robonomics",
-        "AstarNetwork/Astar",
-        "opensquare-network/dotreasury"
-    ],
-    "evm": [
-        "AstarNetwork/Astar",
-        "moonbeam-foundation/moonbeam",
-        "darwinia-network/darwinia",
-        "OAK-Foundation/OAK-blockchain",
-        "mangata-finance/mangata-node",
-        "sora-xor/sora2-network"
-    ],
-    "ethereum": [
-        "AstarNetwork/Astar",
-        "moonbeam-foundation/moonbeam",
-        "TalismanSociety/talisman",
-        "darwinia-network/darwinia",
-        "sora-xor/sora2-network",
-        "mangata-finance/mangata-node"
-    ],
-    "defi": [
-        "bit-country/Metaverse-Network",
-        "grindytech/gafi",
-        "AstarNetwork/Astar",
-        "interlay/interbtc",
-        "moonbeam-foundation/moonbeam",
-        "TalismanSociety/talisman",
-        "sora-xor/sora2-parachain",
-        "sora-xor/sora2-network",
-        "bifrost-finance/bifrost",
-        "parallel-finance/parallel",
-        "AcalaNetwork/Acala",
-        "interlay/interbtc"
-    ],
-    "smart-contracts": [
-        "bit-country/Metaverse-Network",
-        "grindytech/gafi",
-        "AstarNetwork/Astar",
-        "moonbeam-foundation/moonbeam",
-        "TalismanSociety/talisman",
-        "t3rn/t3rn",
-        "paritytech/polkadot-sdk",
-        "subspace/subspace",
-        "mangata-finance/mangata-node",
-        "Joystream/joystream"
-    ],
-    "cumulus": [
-        "pendulum-chain/pendulum",
-        "moonbeam-foundation/moonbeam",
-        "paritytech/polkadot-sdk",
-        "parallel-finance/parallel"
-    ],
-    "bitcoin": [
-        "interlay/interbtc"
-    ],
-    "bridge": [
-        "interlay/interbtc",
-        "bit-country/Metaverse-Network",
-        "darwinia-network/darwinia",
-        "bifrost-finance/bifrost"
-    ],
-    "wasm": [
-        "pendulum-chain/pendulum",
-        "bit-country/Metaverse-Network",
-        "moonbeam-foundation/moonbeam",
-        "bifrost-finance/bifrost",
-        "parallel-finance/parallel"
-    ],
-    "mev": [
-        "mangata-finance/mangata-node"
-    ],
-    "rollup": [
-        "mangata-finance/mangata-node"
-    ],
-    "dex": [
-        "galacticcouncil/HydraDX-node"
-    ],
-    "dao": [
-        "InvArch/InvArch-Frames"
-    ],
-    "social": [
-        "dappforce/subsocial-parachain"
-    ],
-    "zero-knowledge": [
-        "webb-tools/tangle",
-        "Manta-Network/Manta"
-    ],
-    "iot": [
-        "airalab/robonomics"
-    ],
-    "xcm": [
-        "OAK-Foundation/xcm-demo"
-    ],
-    "wallet": [
-        "TalismanSociety/talisman"
-    ],
-    "ai": [
-        "opentensor/bittensor"
-    ]
-}
\ No newline at end of file
+export const REPOSITORIES_BY_INTERESTS = [
+    "InvArch/InvArch-Node",
+    "pendulum-chain/pendulum",
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "interlay/interbtc",
+    "OAK-Foundation/xcm-demo",
+    "OAK-Foundation/oak.js",
+    "moonbeam-foundation/moonbeam",
+    "webb-tools/tangle",
+    "TalismanSociety/talisman",
+    "t3rn/t3rn",
+    "paritytech/polkadot-sdk",
+    "automata-network/automata",
+    "subspace/subspace",
+    "mangata-finance/mangata-node",
+    "virto-network/virto-node",
+    "galacticcouncil/HydraDX-node",
+    "InvArch/InvArch-Frames",
+    "darwinia-network/darwinia",
+    "hashed-io/hashed-substrate",
+    "LibertyDSNP/frequency",
+    "OAK-Foundation/OAK-blockchain",
+    "centrifuge/centrifuge-chain",
+    "dappforce/subsocial-parachain",
+    "KILTprotocol/kilt-node",
+    "Manta-Network/Manta",
+    "sora-xor/sora2-parachain",
+    "moondance-labs/tanssi",
+    "sora-xor/sora2-network",
+    "gear-tech/gear",
+    "Joystream/joystream",
+    "docknetwork/dock-substrate",
+    "capsule-corp-ternoa/ternoa-node",
+    "bifrost-finance/bifrost",
+    "bitgreen/bitgreen-node",
+    "deeper-chain/deeper-chain",
+    "crustio/crust",
+    "AcalaNetwork/Acala",
+    "InvArch/InvArch-Node",
+    "pendulum-chain/pendulum",
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "interlay/interbtc",
+    "aleph-zero-foundation/aleph-node",
+    "opensquare-network/dotreasury",
+    "opensquare-network/subsquare",
+    "OAK-Foundation/xcm-demo",
+    "subquery/subql",
+    "subsquid/squid-sdk",
+    "pendulum-chain/portal",
+    "ImbueNetwork/imbue-frontend",
+    "OAK-Foundation/oak.js",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "paritytech/polkadot-sdk",
+    "automata-network/automata",
+    "subspace/subspace",
+    "mangata-finance/mangata-node",
+    "virto-network/virto-node",
+    "galacticcouncil/HydraDX-node",
+    "InvArch/InvArch-Frames",
+    "darwinia-network/darwinia",
+    "hashed-io/hashed-substrate",
+    "LibertyDSNP/frequency",
+    "OAK-Foundation/OAK-blockchain",
+    "centrifuge/centrifuge-chain",
+    "dappforce/subsocial-parachain",
+    "pendulum-chain/spacewalk",
+    "Brushfam/openbrush-contracts",
+    "KILTprotocol/kilt-node",
+    "Manta-Network/Manta",
+    "sora-xor/sora2-parachain",
+    "moondance-labs/tanssi",
+    "sora-xor/sora2-network",
+    "Joystream/joystream",
+    "zeitgeistpm/zeitgeist",
+    "docknetwork/dock-substrate",
+    "capsule-corp-ternoa/ternoa-node",
+    "NodleCode/chain",
+    "bifrost-finance/bifrost",
+    "ImbueNetwork/imbue",
+    "encointer/encointer-parachain",
+    "parallel-finance/parallel",
+    "bitgreen/bitgreen-node",
+    "deeper-chain/deeper-chain",
+    "crustio/crust",
+    "AcalaNetwork/Acala",
+    "interlay/interbtc",
+    "opensquare-network/dotreasury",
+    "opensquare-network/subsquare",
+    "sora-xor/sora2-parachain",
+    "sora-xor/sora2-network",
+    "parallel-finance/parallel",
+    "encointer/encointer-parachain",
+    "AcalaNetwork/Acala",
+    "airalab/robonomics",
+    "AstarNetwork/Astar",
+    "opensquare-network/dotreasury",
+    "AstarNetwork/Astar",
+    "moonbeam-foundation/moonbeam",
+    "darwinia-network/darwinia",
+    "OAK-Foundation/OAK-blockchain",
+    "mangata-finance/mangata-node",
+    "sora-xor/sora2-network",
+    "AstarNetwork/Astar",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "darwinia-network/darwinia",
+    "sora-xor/sora2-network",
+    "mangata-finance/mangata-node",
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "interlay/interbtc",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "sora-xor/sora2-parachain",
+    "sora-xor/sora2-network",
+    "bifrost-finance/bifrost",
+    "parallel-finance/parallel",
+    "AcalaNetwork/Acala",
+    "interlay/interbtc",
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "t3rn/t3rn",
+    "paritytech/polkadot-sdk",
+    "subspace/subspace",
+    "mangata-finance/mangata-node",
+    "Joystream/joystream",
+    "pendulum-chain/pendulum",
+    "moonbeam-foundation/moonbeam",
+    "paritytech/polkadot-sdk",
+    "parallel-finance/parallel",
+    "interlay/interbtc",
+    "interlay/interbtc",
+    "bit-country/Metaverse-Network",
+    "darwinia-network/darwinia",
+    "bifrost-finance/bifrost",
+    "pendulum-chain/pendulum",
+    "bit-country/Metaverse-Network",
+    "moonbeam-foundation/moonbeam",
+    "bifrost-finance/bifrost",
+    "parallel-finance/parallel",
+    "mangata-finance/mangata-node",
+    "mangata-finance/mangata-node",
+    "galacticcouncil/HydraDX-node",
+    "InvArch/InvArch-Frames",
+    "dappforce/subsocial-parachain",
+    "webb-tools/tangle",
+    "Manta-Network/Manta",
+    "airalab/robonomics",
+    "OAK-Foundation/xcm-demo",
+    "TalismanSociety/talisman",
+    "opentensor/bittensor"
+]

From 0215dcde063ebe92cfb9e31f024c40db770b57f6 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Fri, 5 Jan 2024 09:48:07 -0300
Subject: [PATCH 09/30] feat: improve search

---
 app/page.tsx          |  4 +++-
 components/filter.tsx | 21 +++++++++++++--------
 components/search.tsx | 44 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 368240f..ece5c14 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -60,7 +60,9 @@ export default async function Home({
       </section>
       <div className="flex flex-col items-center gap-4 py-8 md:py-10">
         <div className="inline-block max-w-lg text-center justify-center">
-          <Search placeholder="Search" emoji="🔍" items={SEARCH_OPTIONS} />
+          <Search placeholder="Search" emoji="🔍"
+            items={SEARCH_OPTIONS}
+            selectedValue={params.search} />
           {/* TODO: 
           1. make it controlled
           2. set the selected value in the params
diff --git a/components/filter.tsx b/components/filter.tsx
index 7eb9a34..d8c84b4 100644
--- a/components/filter.tsx
+++ b/components/filter.tsx
@@ -25,6 +25,18 @@ export const Filter = ({
     setValue(selectedValue);
   }, [selectedValue]);
 
+
+  useEffect(() => {
+    if (!value) {
+      return
+    }
+    const optionNameLowerCase = placeholder.toLowerCase();
+    const optionSearchParams = new URLSearchParams(searchParams.toString());
+    optionSearchParams.set(optionNameLowerCase, value);
+    const optionUrl = createUrl(pathname, optionSearchParams);
+    router.replace(optionUrl, { scroll: false });
+  }, [value]);
+
   const handleSelectionChange = (e: {
     target: { value: React.SetStateAction<string> };
   }) => {
@@ -46,19 +58,12 @@ export const Filter = ({
       size={"sm"}
     >
       {items.map((item) => {
-        const optionNameLowerCase = placeholder.toLowerCase();
-        const optionSearchParams = new URLSearchParams(searchParams.toString());
-        optionSearchParams.set(optionNameLowerCase, item.value);
-        const optionUrl = createUrl(pathname, optionSearchParams);
-
         return (
           <SelectItem
             key={item.value}
             value={item.value}
             startContent={<Emoji emoji={item.emoji} />}
-            onClick={() => {
-              router.replace(optionUrl, { scroll: false });
-            }}
+
           >
             {item.label}
           </SelectItem>
diff --git a/components/search.tsx b/components/search.tsx
index 16d0167..f749347 100644
--- a/components/search.tsx
+++ b/components/search.tsx
@@ -1,20 +1,51 @@
 "use client";
-import React, { FC } from "react";
+import React, { FC, useEffect } from "react";
 import { Autocomplete, AutocompleteItem } from "@nextui-org/autocomplete";
 import { FilterItem } from "@/types/filters";
 import Emoji from "./emoji";
+import { useRouter } from "next/navigation";
+import { usePathname, useSearchParams } from "next/navigation";
+import { createUrl } from "@/utils/url";
 
 interface SearchProps {
   placeholder: string;
   emoji: string;
   items: FilterItem[];
+  selectedValue: string;
 }
 
 const Search: FC<SearchProps> = ({
   placeholder,
   emoji,
   items,
+  selectedValue
 }: SearchProps) => {
+
+  const [value, setValue] = React.useState(selectedValue);
+
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
+  useEffect(() => {
+    setValue(selectedValue ? selectedValue : "");
+  }, [selectedValue]);
+
+  useEffect(() => {
+    if (value === undefined || value === "") {
+      return
+    }
+    const optionNameLowerCase = placeholder.toLowerCase();
+    const optionSearchParams = new URLSearchParams(searchParams.toString());
+    if (value !== null) {
+      optionSearchParams.set(optionNameLowerCase, value);
+    } else {
+      optionSearchParams.delete(optionNameLowerCase);
+    }
+    const optionUrl = createUrl(pathname, optionSearchParams);
+    router.replace(optionUrl, { scroll: false });
+
+  }, [value]);
   return (
     <Autocomplete
       placeholder={placeholder}
@@ -25,14 +56,19 @@ const Search: FC<SearchProps> = ({
       className="max-w-md"
       size="lg"
       allowsCustomValue={true}
+      selectedKey={value}
+      onSelectionChange={setValue}
     >
-      {(item: FilterItem) => (
-        <AutocompleteItem key={item.value} textValue={item.label}>
+      {(item: FilterItem) => {
+
+
+        return <AutocompleteItem key={item.value} textValue={item.label}
+        >
           <Emoji emoji={item.emoji} className="text-xl"></Emoji>
           &nbsp;
           <span className="text-l">{item.label}</span>
         </AutocompleteItem>
-      )}
+      }}
     </Autocomplete>
   );
 };

From 5a623f30861111949e771e8e2027477f323f89ba Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Fri, 5 Jan 2024 09:57:10 -0300
Subject: [PATCH 10/30] refactor: filter

---
 components/filter.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/filter.tsx b/components/filter.tsx
index d8c84b4..ec00449 100644
--- a/components/filter.tsx
+++ b/components/filter.tsx
@@ -21,13 +21,17 @@ export const Filter = ({
 }: IFilterProps) => {
   const [value, setValue] = React.useState(selectedValue);
 
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
   useEffect(() => {
     setValue(selectedValue);
   }, [selectedValue]);
 
 
   useEffect(() => {
-    if (!value) {
+    if (value === undefined) {
       return
     }
     const optionNameLowerCase = placeholder.toLowerCase();
@@ -42,9 +46,6 @@ export const Filter = ({
   }) => {
     setValue(e.target.value);
   };
-  const router = useRouter();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
 
   return (
     <Select

From 40487c6bb1c189033ebf8b75a68b18d22f80eae1 Mon Sep 17 00:00:00 2001
From: Leandro <leapalazzolo@gmail.com>
Date: Fri, 5 Jan 2024 10:46:29 -0300
Subject: [PATCH 11/30] fix: allow only parametrized search

---
 components/search.tsx | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/components/search.tsx b/components/search.tsx
index f749347..408fbda 100644
--- a/components/search.tsx
+++ b/components/search.tsx
@@ -18,9 +18,8 @@ const Search: FC<SearchProps> = ({
   placeholder,
   emoji,
   items,
-  selectedValue
+  selectedValue,
 }: SearchProps) => {
-
   const [value, setValue] = React.useState(selectedValue);
 
   const router = useRouter();
@@ -28,12 +27,14 @@ const Search: FC<SearchProps> = ({
   const searchParams = useSearchParams();
 
   useEffect(() => {
-    setValue(selectedValue ? selectedValue : "");
+    setValue(selectedValue || "");
   }, [selectedValue]);
+  console.log(value);
 
   useEffect(() => {
+    console.log(value);
     if (value === undefined || value === "") {
-      return
+      return;
     }
     const optionNameLowerCase = placeholder.toLowerCase();
     const optionSearchParams = new URLSearchParams(searchParams.toString());
@@ -44,30 +45,26 @@ const Search: FC<SearchProps> = ({
     }
     const optionUrl = createUrl(pathname, optionSearchParams);
     router.replace(optionUrl, { scroll: false });
-
   }, [value]);
   return (
     <Autocomplete
       placeholder={placeholder}
       variant="faded"
-      color="default"
       defaultItems={items}
       startContent={<Emoji emoji={emoji} className="text-xl"></Emoji>}
       className="max-w-md"
       size="lg"
-      allowsCustomValue={true}
       selectedKey={value}
       onSelectionChange={setValue}
     >
       {(item: FilterItem) => {
-
-
-        return <AutocompleteItem key={item.value} textValue={item.label}
-        >
-          <Emoji emoji={item.emoji} className="text-xl"></Emoji>
-          &nbsp;
-          <span className="text-l">{item.label}</span>
-        </AutocompleteItem>
+        return (
+          <AutocompleteItem key={item.value}>
+            <Emoji emoji={item.emoji} className="text-xl"></Emoji>
+            &nbsp;
+            <span className="text-l">{item.label}</span>
+          </AutocompleteItem>
+        );
       }}
     </Autocomplete>
   );

From f9b716e1e2b5c3f31e25b2a157118f55f73cf124 Mon Sep 17 00:00:00 2001
From: Leandro <leapalazzolo@gmail.com>
Date: Fri, 5 Jan 2024 10:46:39 -0300
Subject: [PATCH 12/30] feat: add remove all feature

---
 app/page.tsx                 | 70 +++++++++++++++++++++---------------
 components/removeFilters.tsx | 18 ++++++----
 2 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index ece5c14..bebde18 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,9 +2,12 @@ import ContributionsTable from "@/components/contributions-table/table";
 import Filter from "@/components/filter";
 import { title, subtitle } from "@/components/primitives";
 import Search from "@/components/search";
-import { SEARCH_OPTIONS, LANGUAGES_OPTIONS, INTERESTS_OPTIONS, } from "@/data/filters";
-import { REPOSITORIES_BY_INTERESTS } from "@/data/interests";
-import { queryDatabase, getIssuesByProject } from "@/lib/notion";
+import {
+  SEARCH_OPTIONS,
+  LANGUAGES_OPTIONS,
+  INTERESTS_OPTIONS,
+} from "@/data/filters";
+import { queryDatabase } from "@/lib/notion";
 import { transformNotionDataToContributions } from "@/utils/contribution";
 import RemoveFilters from "@/components/removeFilters";
 
@@ -13,33 +16,39 @@ export default async function Home({
 }: {
   searchParams?: { [key: string]: string | string[] | undefined };
 }) {
-
   const params = searchParams as { [key: string]: string };
-  const languagesFilterIsSelected = params && params.languages;
-  const interestsFilterIsSelected = params && params.interests;
-  const hasSearch = params && params.search;
+  const languagesFilterIsSelected = !!params && !!params.languages;
+  const interestsFilterIsSelected = !!params && !!params.interests;
+  const hasSearch = !!params && !!params.search;
+  const showRemoveAllFilters =
+    [languagesFilterIsSelected, interestsFilterIsSelected, hasSearch].filter(
+      Boolean,
+    ).length >= 2;
+
   let filter =
     params && params.languages
       ? {
-        property: "Repo Language",
-        rollup: {
-          any: {
-            multi_select: {
-              contains: params.languages,
-            },
-          },
-        },
-      }
-      : params && params.languages ? {
-        property: "Project Name",
-        rollup: {
-          any: {
-            rich_text: {
-              contains: params.search
+          property: "Repo Language",
+          rollup: {
+            any: {
+              multi_select: {
+                contains: params.languages,
+              },
             },
           },
         }
-      } : undefined;
+      : params && params.languages
+        ? {
+            property: "Project Name",
+            rollup: {
+              any: {
+                rich_text: {
+                  contains: params.search,
+                },
+              },
+            },
+          }
+        : undefined;
 
   const data = await queryDatabase({
     page_size: 10,
@@ -60,9 +69,12 @@ export default async function Home({
       </section>
       <div className="flex flex-col items-center gap-4 py-8 md:py-10">
         <div className="inline-block max-w-lg text-center justify-center">
-          <Search placeholder="Search" emoji="🔍"
+          <Search
+            placeholder="Search"
+            emoji="🔍"
             items={SEARCH_OPTIONS}
-            selectedValue={params.search} />
+            selectedValue={params.search}
+          />
           {/* TODO: 
           1. make it controlled
           2. set the selected value in the params
@@ -91,9 +103,9 @@ export default async function Home({
           {interestsFilterIsSelected && (
             <RemoveFilters value={params.interests} param="Interests" />
           )}
-          {hasSearch && (
-            <RemoveFilters value={params.search} param="Search" />
-          )}
+          {hasSearch && <RemoveFilters value={params.search} param="Search" />}
+
+          {showRemoveAllFilters && <RemoveFilters value={"All filters"} />}
         </div>
         <div className="flex justify-end">
           <div>
@@ -110,6 +122,6 @@ export default async function Home({
           />
         </div>
       </div>
-    </div >
+    </div>
   );
 }
diff --git a/components/removeFilters.tsx b/components/removeFilters.tsx
index 8e6dd09..3e5783f 100644
--- a/components/removeFilters.tsx
+++ b/components/removeFilters.tsx
@@ -6,7 +6,7 @@ import { Chip } from "@nextui-org/chip";
 import { createUrl } from "@/utils/url";
 
 interface IRemoveFilters {
-  param: string;
+  param?: string;
   value: string;
 }
 
@@ -15,15 +15,19 @@ export const RemoveFilters = ({ param, value }: IRemoveFilters) => {
   const pathname = usePathname();
   const searchParams = useSearchParams();
   const removeSearchParams = () => {
-    const optionNameLowerCase = param.toLowerCase();
-    const optionSearchParams = new URLSearchParams(searchParams.toString());
-    optionSearchParams.delete(optionNameLowerCase);
-    const optionUrl = createUrl(pathname, optionSearchParams);
-    router.replace(optionUrl);
+    if (!!param) {
+      const optionNameLowerCase = param.toLowerCase();
+      const optionSearchParams = new URLSearchParams(searchParams.toString());
+      optionSearchParams.delete(optionNameLowerCase);
+      const optionUrl = createUrl(pathname, optionSearchParams);
+      router.replace(optionUrl);
+    } else {
+      router.replace(pathname);
+    }
   };
   return (
     <div className="flex gap-4">
-      <Chip color="secondary" onClose={removeSearchParams}>
+      <Chip variant="solid" onClose={removeSearchParams}>
         {value}
       </Chip>
     </div>

From 85f65db061a5768b9b4785bb7cbee9867f4f8e69 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Fri, 5 Jan 2024 17:51:01 -0300
Subject: [PATCH 13/30] refactor: filter and search

---
 app/page.tsx          |  29 +---
 components/search.tsx |   2 +-
 data/filters.ts       | 312 +++++++++++++++++++++++++++++++++---------
 data/interests.ts     | 161 ----------------------
 lib/notion/index.ts   |  76 ++++++++--
 5 files changed, 315 insertions(+), 265 deletions(-)
 delete mode 100644 data/interests.ts

diff --git a/app/page.tsx b/app/page.tsx
index bebde18..709c960 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -6,8 +6,9 @@ import {
   SEARCH_OPTIONS,
   LANGUAGES_OPTIONS,
   INTERESTS_OPTIONS,
+  REPOSITORIES_BY_INTERESTS,
 } from "@/data/filters";
-import { queryDatabase } from "@/lib/notion";
+import { queryDatabase, createFilter } from "@/lib/notion";
 import { transformNotionDataToContributions } from "@/utils/contribution";
 import RemoveFilters from "@/components/removeFilters";
 
@@ -24,31 +25,7 @@ export default async function Home({
     [languagesFilterIsSelected, interestsFilterIsSelected, hasSearch].filter(
       Boolean,
     ).length >= 2;
-
-  let filter =
-    params && params.languages
-      ? {
-          property: "Repo Language",
-          rollup: {
-            any: {
-              multi_select: {
-                contains: params.languages,
-              },
-            },
-          },
-        }
-      : params && params.languages
-        ? {
-            property: "Project Name",
-            rollup: {
-              any: {
-                rich_text: {
-                  contains: params.search,
-                },
-              },
-            },
-          }
-        : undefined;
+  const filter = await createFilter(params.languages, params.search, REPOSITORIES_BY_INTERESTS[params.interests])
 
   const data = await queryDatabase({
     page_size: 10,
diff --git a/components/search.tsx b/components/search.tsx
index 408fbda..6981c68 100644
--- a/components/search.tsx
+++ b/components/search.tsx
@@ -59,7 +59,7 @@ const Search: FC<SearchProps> = ({
     >
       {(item: FilterItem) => {
         return (
-          <AutocompleteItem key={item.value}>
+          <AutocompleteItem key={item.value} textValue={item.label}>
             <Emoji emoji={item.emoji} className="text-xl"></Emoji>
             &nbsp;
             <span className="text-l">{item.label}</span>
diff --git a/data/filters.ts b/data/filters.ts
index 3f27bff..79f333d 100644
--- a/data/filters.ts
+++ b/data/filters.ts
@@ -102,66 +102,252 @@ export const INTERESTS_OPTIONS = [
 ];
 
 export const SEARCH_OPTIONS = [
-  { value: "t3rn/t3rn", label: "T3Rn", emoji: "🔄" },
-  { value: "paritytech/polkadot-sdk", label: "Polkadot Sdk", emoji: "🔗" },
-  { value: "automata-network/automata", label: "Automata", emoji: "🤖" },
-  { value: "subspace/subspace", label: "Subspace", emoji: "🚀" },
-  { value: "mangata-finance/mangata-node", label: "Mangata Node", emoji: "🌐" },
-  { value: "virto-network/virto-node", label: "Virto Node", emoji: "🌐" },
-  { value: "galacticcouncil/HydraDX-node", label: "HydraDX Node", emoji: "🌌" },
-  { value: "InvArch/InvArch-Frames", label: "Invarch Frames", emoji: "🖼️" },
-  { value: "darwinia-network/darwinia", label: "Darwinia", emoji: "🌐" },
-  { value: "hashed-io/hashed-substrate", label: "Hashed Substrate", emoji: "🔍" },
-  { value: "LibertyDSNP/frequency", label: "Frequency", emoji: "📡" },
-  { value: "OAK-Foundation/OAK-blockchain", label: "Oak Blockchain", emoji: "🌳" },
-  { value: "centrifuge/centrifuge-chain", label: "Centrifuge Chain", emoji: "🔄" },
-  { value: "dappforce/subsocial-parachain", label: "Subsocial Parachain", emoji: "🌐" },
-  { value: "pendulum-chain/spacewalk", label: "Spacewalk", emoji: "🚀" },
-  { value: "Brushfam/openbrush-contracts", label: "Openbrush Contracts", emoji: "🎨" },
-  { value: "KILTprotocol/kilt-node", label: "Kilt Node", emoji: "🔄" },
-  { value: "Manta-Network/Manta", label: "Manta", emoji: "🌊" },
-  { value: "sora-xor/sora2-parachain", label: "Sora2 Parachain", emoji: "🔄" },
-  { value: "moondance-labs/tanssi", label: "Tanssi", emoji: "💃" },
-  { value: "sora-xor/sora2-network", label: "Sora2 Network", emoji: "🔄" },
-  { value: "gear-tech/gear", label: "Gear", emoji: "⚙️" },
-  { value: "Joystream/joystream", label: "Joystream", emoji: "🎮" },
-  { value: "peaqnetwork/peaq-network-node", label: "Peaq Network Node", emoji: "🌐" },
-  { value: "zeitgeistpm/zeitgeist", label: "Zeitgeist", emoji: "🕰️" },
-  { value: "docknetwork/dock-substrate", label: "Dock Substrate", emoji: "🚢" },
-  { value: "capsule-corp-ternoa/ternoa-node", label: "Ternoa Node", emoji: "📦" },
-  { value: "NodleCode/chain", label: "Chain", emoji: "⛓️" },
-  { value: "bifrost-finance/bifrost", label: "Bifrost", emoji: "🌈" },
-  { value: "ImbueNetwork/imbue", label: "Imbue", emoji: "🌊" },
-  { value: "encointer/encointer-parachain", label: "Encointer Parachain", emoji: "🔄" },
-  { value: "parallel-finance/parallel", label: "Parallel", emoji: "🔄" },
-  { value: "bitgreen/bitgreen-node", label: "Bitgreen Node", emoji: "🌱" },
-  { value: "deeper-chain/deeper-chain", label: "Deeper Chain", emoji: "🔄" },
-  { value: "crustio/crust", label: "Crust", emoji: "🍞" },
-  { value: "AcalaNetwork/Acala", label: "Acala", emoji: "♾️" },
-  { value: "InvArch/InvArch-Node", label: "Invarch Node", emoji: "🏛️" },
-  { value: "Phala-Network/phala-blockchain", label: "Phala Blockchain", emoji: "🔒" },
-  { value: "encointer/encointer-node", label: "Encointer Node", emoji: "🔄" },
-  { value: "encointer/personhood-oracle", label: "Personhood Oracle", emoji: "🔄" },
-  { value: "airalab/robonomics", label: "Robonomics", emoji: "🤖" },
-  { value: "pendulum-chain/pendulum", label: "Pendulum", emoji: "🕰️" },
-  { value: "encointer/pallets", label: "Pallets", emoji: "🔄" },
-  { value: "integritee-network/worker", label: "Worker", emoji: "🛠️" },
-  { value: "bit-country/Metaverse-Network", label: "Metaverse Network", emoji: "🌐" },
-  { value: "grindytech/gafi", label: "Gafi", emoji: "🔄" },
-  { value: "litentry/litentry-parachain", label: "Litentry Parachain", emoji: "📜" },
-  { value: "AstarNetwork/Astar", label: "Astar", emoji: "⭐" },
-  { value: "interlay/interbtc", label: "Interbtc", emoji: "🔄" },
-  { value: "aleph-zero-foundation/aleph-node", label: "Aleph Node", emoji: "🔄" },
-  { value: "opensquare-network/dotreasury", label: "Dotreasury", emoji: "💼" },
-  { value: "opensquare-network/subsquare", label: "Subsquare", emoji: "🔄" },
-  { value: "OAK-Foundation/xcm-demo", label: "Xcm Demo", emoji: "🔄" },
-  { value: "subquery/subql", label: "Subql", emoji: "🔍" },
-  { value: "subsquid/squid-sdk", label: "Squid Sdk", emoji: "🦑" },
-  { value: "pendulum-chain/portal", label: "Portal", emoji: "🚪" },
-  { value: "ImbueNetwork/imbue-frontend", label: "Imbue Frontend", emoji: "🌐" },
-  { value: "OAK-Foundation/oak.js", label: "Oak.Js", emoji: "🌳" },
-  { value: "moonbeam-foundation/moonbeam", label: "Moonbeam", emoji: "🌙" },
-  { value: "webb-tools/tangle", label: "Tangle", emoji: "🌀" },
-  { value: "TalismanSociety/talisman", label: "Talisman", emoji: "📿" },
-  { value: "opentensor/bittensor", label: "Bittensor", emoji: "🧠" },
-]
\ No newline at end of file
+  { value: "polkadot-sdk", label: "Polkadot Sdk", emoji: "🔗" },
+  { value: "OAK-blockchain", label: "Oak Blockchain", emoji: "🌳" },
+  { value: "InvArch-Node", label: "Invarch Node", emoji: "🏛️" },
+  { value: "phala-blockchain", label: "Phala Blockchain", emoji: "🔒" },
+  { value: "talisman", label: "Talisman", emoji: "📿" },
+  { value: "t3rn", label: "T3Rn", emoji: "🔄" },
+  { value: "automata", label: "Automata", emoji: "🤖" },
+  { value: "subspace", label: "Subspace", emoji: "🚀" },
+  { value: "mangata-node", label: "Mangata Node", emoji: "🌐" },
+  { value: "virto-node", label: "Virto Node", emoji: "🌐" },
+  { value: "HydraDX-node", label: "HydraDX Node", emoji: "🌌" },
+  { value: "InvArch-Frames", label: "Invarch Frames", emoji: "🖼️" },
+  { value: "network/darwinia", label: "Darwinia", emoji: "🌐" },
+  { value: "hashed-substrate", label: "Hashed Substrate", emoji: "🔍" },
+  { value: "frequency", label: "Frequency", emoji: "📡" },
+  { value: "centrifuge-chain", label: "Centrifuge Chain", emoji: "🔄" },
+  { value: "subsocial-parachain", label: "Subsocial Parachain", emoji: "🌐" },
+  { value: "spacewalk", label: "Spacewalk", emoji: "🚀" },
+  { value: "openbrush-contracts", label: "Openbrush Contracts", emoji: "🎨" },
+  { value: "kilt-node", label: "Kilt Node", emoji: "🔄" },
+  { value: "Manta", label: "Manta", emoji: "🌊" },
+  { value: "sora2-parachain", label: "Sora2 Parachain", emoji: "🔄" },
+  { value: "tanssi", label: "Tanssi", emoji: "💃" },
+  { value: "sora2-network", label: "Sora2 Network", emoji: "🔄" },
+  { value: "gear", label: "Gear", emoji: "⚙️" },
+  { value: "joystream", label: "Joystream", emoji: "🎮" },
+  { value: "peaq-network-node", label: "Peaq Network Node", emoji: "🌐" },
+  { value: "zeitgeist", label: "Zeitgeist", emoji: "🕰️" },
+  { value: "dock-substrate", label: "Dock Substrate", emoji: "🚢" },
+  { value: "ternoa-node", label: "Ternoa Node", emoji: "📦" },
+  { value: "chain", label: "Chain", emoji: "⛓️" },
+  { value: "bifrost", label: "Bifrost", emoji: "🌈" },
+  { value: "imbue", label: "Imbue", emoji: "🌊" },
+  { value: "encointer-parachain", label: "Encointer Parachain", emoji: "🔄" },
+  { value: "parallel", label: "Parallel", emoji: "🔄" },
+  { value: "bitgreen-node", label: "Bitgreen Node", emoji: "🌱" },
+  { value: "deeper-chain", label: "Deeper Chain", emoji: "🔄" },
+  { value: "crust", label: "Crust", emoji: "🍞" },
+  { value: "Acala", label: "Acala", emoji: "♾️" },
+  { value: "encointer-node", label: "Encointer Node", emoji: "🔄" },
+  { value: "personhood-oracle", label: "Personhood Oracle", emoji: "🔄" },
+  { value: "robonomics", label: "Robonomics", emoji: "🤖" },
+  { value: "pendulum", label: "Pendulum", emoji: "🕰️" },
+  { value: "pallets", label: "Pallets", emoji: "🔄" },
+  { value: "worker", label: "Worker", emoji: "🛠️" },
+  { value: "Metaverse-Network", label: "Metaverse Network", emoji: "🌐" },
+  { value: "gafi", label: "Gafi", emoji: "🔄" },
+  { value: "litentry-parachain", label: "Litentry Parachain", emoji: "📜" },
+  { value: "Astar", label: "Astar", emoji: "⭐" },
+  { value: "interbtc", label: "Interbtc", emoji: "🔄" },
+  { value: "aleph-node", label: "Aleph Node", emoji: "🔄" },
+  { value: "dotreasury", label: "Dotreasury", emoji: "💼" },
+  { value: "subsquare", label: "Subsquare", emoji: "🔄" },
+  { value: "xcm-demo", label: "Xcm Demo", emoji: "🔄" },
+  { value: "subql", label: "Subql", emoji: "🔍" },
+  { value: "squid-sdk", label: "Squid Sdk", emoji: "🦑" },
+  { value: "portal", label: "Portal", emoji: "🚪" },
+  { value: "imbue-frontend", label: "Imbue Frontend", emoji: "🌐" },
+  { value: "oak.js", label: "Oak.Js", emoji: "🌳" },
+  { value: "moonbeam", label: "Moonbeam", emoji: "🌙" },
+  { value: "tangle", label: "Tangle", emoji: "🌀" },
+  { value: "bittensor", label: "Bittensor", emoji: "🧠" },
+]
+type RepositoryList = {
+  [key: string]: string[];
+};
+
+export const REPOSITORIES_BY_INTERESTS: RepositoryList = {
+  "substrate": [
+    "InvArch-Node",
+    "pendulum",
+    "Metaverse-Network",
+    "gafi",
+    "Astar",
+    "interbtc",
+    "xcm-demo",
+    "oak.js",
+    "moonbeam",
+    "tangle",
+    "talisman",
+    "t3rn",
+    "polkadot-sdk",
+    "automata",
+    "subspace",
+    "mangata-node",
+    "virto-node",
+    "HydraDX-node",
+    "InvArch-Frames",
+    "darwinia",
+    "hashed-substrate",
+    "frequency",
+    "OAK-blockchain",
+    "centrifuge-chain",
+    "subsocial-parachain",
+    "spacewalk",
+    "openbrush-contracts",
+    "kilt-node",
+    "Manta",
+    "sora2-parachain",
+    "tanssi",
+    "sora2-network",
+    "gear",
+    "joystream",
+    "dock-substrate",
+    "ternoa-node",
+    "bifrost",
+    "bitgreen-node",
+    "deeper-chain",
+    "crust",
+    "Acala"
+  ],
+  "polkadot": [
+    "InvArch-Node",
+    "pendulum",
+    "Metaverse-Network",
+    "gafi",
+    "Astar",
+    "interbtc",
+    "aleph-node",
+    "dotreasury",
+    "subsquare",
+    "xcm-demo",
+    "subql",
+    "squid-sdk",
+    "portal",
+    "imbue-frontend",
+    "oak.js",
+    "moonbeam",
+    "talisman",
+    "polkadot-sdk",
+    "automata",
+    "subspace",
+    "mangata-node",
+    "virto-node",
+    "HydraDX-node",
+    "InvArch-Frames",
+    "darwinia",
+    "hashed-substrate",
+    "frequency",
+    "OAK-blockchain",
+    "centrifuge-chain",
+    "subsocial-parachain",
+    "spacewalk",
+    "openbrush-contracts",
+    "kilt-node",
+    "Manta",
+    "sora2-parachain",
+    "tanssi",
+    "sora2-network",
+    "joystream",
+    "zeitgeist",
+    "dock-substrate",
+    "ternoa-node",
+    "chain",
+    "bifrost",
+    "imbue",
+    "encointer-parachain",
+    "parallel",
+    "bitgreen-node",
+    "deeper-chain",
+    "crust",
+    "Acala"
+  ],
+  "kusama": [
+    "interbtc",
+    "dotreasury",
+    "subsquare",
+    "sora2-parachain",
+    "sora2-network",
+    "parallel",
+    "encointer-parachain",
+    "Acala",
+    "robonomics",
+    "Astar",
+    "dotreasury"
+  ],
+  "evm": [
+    "Astar",
+    "moonbeam",
+    "darwinia",
+    "OAK-blockchain",
+    "mangata-node",
+    "sora2-network"
+  ],
+  "ethereum": [
+    "Astar",
+    "moonbeam",
+    "talisman",
+    "darwinia",
+    "sora2-network",
+    "mangata-node"
+  ],
+  "defi": [
+    "Metaverse-Network",
+    "gafi",
+    "Astar",
+    "interbtc",
+    "moonbeam",
+    "talisman",
+    "sora2-parachain",
+    "sora2-network",
+    "bifrost",
+    "parallel",
+    "Acala",
+    "interbtc"
+  ],
+  "smart-contracts": [
+    "Metaverse-Network",
+    "gafi",
+    "Astar",
+    "moonbeam",
+    "talisman",
+    "t3rn",
+    "polkadot-sdk",
+    "subspace",
+    "mangata-node",
+    "joystream"
+  ],
+  "cumulus": [
+    "pendulum",
+    "moonbeam",
+    "polkadot-sdk",
+    "parallel"
+  ],
+  "bitcoin": ["interbtc"],
+  "bridge": [
+    "interbtc",
+    "Metaverse-Network",
+    "darwinia",
+    "bifrost"
+  ],
+  "wasm": [
+    "pendulum",
+    "Metaverse-Network",
+    "moonbeam",
+    "bifrost",
+    "parallel"
+  ],
+  "mev": ["mangata-node"],
+  "rollup": ["mangata-node"],
+  "dex": ["HydraDX-node"],
+  "dao": ["InvArch-Frames"],
+  "social": ["subsocial-parachain"],
+  "zero-knowledge": ["tangle", "Manta"],
+  "iot": ["robonomics"],
+  "xcm": ["xcm-demo"],
+  "wallet": ["talisman"],
+  "ai": ["bittensor"]
+}
diff --git a/data/interests.ts b/data/interests.ts
deleted file mode 100644
index f4d7ea6..0000000
--- a/data/interests.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-export const REPOSITORIES_BY_INTERESTS = [
-    "InvArch/InvArch-Node",
-    "pendulum-chain/pendulum",
-    "bit-country/Metaverse-Network",
-    "grindytech/gafi",
-    "AstarNetwork/Astar",
-    "interlay/interbtc",
-    "OAK-Foundation/xcm-demo",
-    "OAK-Foundation/oak.js",
-    "moonbeam-foundation/moonbeam",
-    "webb-tools/tangle",
-    "TalismanSociety/talisman",
-    "t3rn/t3rn",
-    "paritytech/polkadot-sdk",
-    "automata-network/automata",
-    "subspace/subspace",
-    "mangata-finance/mangata-node",
-    "virto-network/virto-node",
-    "galacticcouncil/HydraDX-node",
-    "InvArch/InvArch-Frames",
-    "darwinia-network/darwinia",
-    "hashed-io/hashed-substrate",
-    "LibertyDSNP/frequency",
-    "OAK-Foundation/OAK-blockchain",
-    "centrifuge/centrifuge-chain",
-    "dappforce/subsocial-parachain",
-    "KILTprotocol/kilt-node",
-    "Manta-Network/Manta",
-    "sora-xor/sora2-parachain",
-    "moondance-labs/tanssi",
-    "sora-xor/sora2-network",
-    "gear-tech/gear",
-    "Joystream/joystream",
-    "docknetwork/dock-substrate",
-    "capsule-corp-ternoa/ternoa-node",
-    "bifrost-finance/bifrost",
-    "bitgreen/bitgreen-node",
-    "deeper-chain/deeper-chain",
-    "crustio/crust",
-    "AcalaNetwork/Acala",
-    "InvArch/InvArch-Node",
-    "pendulum-chain/pendulum",
-    "bit-country/Metaverse-Network",
-    "grindytech/gafi",
-    "AstarNetwork/Astar",
-    "interlay/interbtc",
-    "aleph-zero-foundation/aleph-node",
-    "opensquare-network/dotreasury",
-    "opensquare-network/subsquare",
-    "OAK-Foundation/xcm-demo",
-    "subquery/subql",
-    "subsquid/squid-sdk",
-    "pendulum-chain/portal",
-    "ImbueNetwork/imbue-frontend",
-    "OAK-Foundation/oak.js",
-    "moonbeam-foundation/moonbeam",
-    "TalismanSociety/talisman",
-    "paritytech/polkadot-sdk",
-    "automata-network/automata",
-    "subspace/subspace",
-    "mangata-finance/mangata-node",
-    "virto-network/virto-node",
-    "galacticcouncil/HydraDX-node",
-    "InvArch/InvArch-Frames",
-    "darwinia-network/darwinia",
-    "hashed-io/hashed-substrate",
-    "LibertyDSNP/frequency",
-    "OAK-Foundation/OAK-blockchain",
-    "centrifuge/centrifuge-chain",
-    "dappforce/subsocial-parachain",
-    "pendulum-chain/spacewalk",
-    "Brushfam/openbrush-contracts",
-    "KILTprotocol/kilt-node",
-    "Manta-Network/Manta",
-    "sora-xor/sora2-parachain",
-    "moondance-labs/tanssi",
-    "sora-xor/sora2-network",
-    "Joystream/joystream",
-    "zeitgeistpm/zeitgeist",
-    "docknetwork/dock-substrate",
-    "capsule-corp-ternoa/ternoa-node",
-    "NodleCode/chain",
-    "bifrost-finance/bifrost",
-    "ImbueNetwork/imbue",
-    "encointer/encointer-parachain",
-    "parallel-finance/parallel",
-    "bitgreen/bitgreen-node",
-    "deeper-chain/deeper-chain",
-    "crustio/crust",
-    "AcalaNetwork/Acala",
-    "interlay/interbtc",
-    "opensquare-network/dotreasury",
-    "opensquare-network/subsquare",
-    "sora-xor/sora2-parachain",
-    "sora-xor/sora2-network",
-    "parallel-finance/parallel",
-    "encointer/encointer-parachain",
-    "AcalaNetwork/Acala",
-    "airalab/robonomics",
-    "AstarNetwork/Astar",
-    "opensquare-network/dotreasury",
-    "AstarNetwork/Astar",
-    "moonbeam-foundation/moonbeam",
-    "darwinia-network/darwinia",
-    "OAK-Foundation/OAK-blockchain",
-    "mangata-finance/mangata-node",
-    "sora-xor/sora2-network",
-    "AstarNetwork/Astar",
-    "moonbeam-foundation/moonbeam",
-    "TalismanSociety/talisman",
-    "darwinia-network/darwinia",
-    "sora-xor/sora2-network",
-    "mangata-finance/mangata-node",
-    "bit-country/Metaverse-Network",
-    "grindytech/gafi",
-    "AstarNetwork/Astar",
-    "interlay/interbtc",
-    "moonbeam-foundation/moonbeam",
-    "TalismanSociety/talisman",
-    "sora-xor/sora2-parachain",
-    "sora-xor/sora2-network",
-    "bifrost-finance/bifrost",
-    "parallel-finance/parallel",
-    "AcalaNetwork/Acala",
-    "interlay/interbtc",
-    "bit-country/Metaverse-Network",
-    "grindytech/gafi",
-    "AstarNetwork/Astar",
-    "moonbeam-foundation/moonbeam",
-    "TalismanSociety/talisman",
-    "t3rn/t3rn",
-    "paritytech/polkadot-sdk",
-    "subspace/subspace",
-    "mangata-finance/mangata-node",
-    "Joystream/joystream",
-    "pendulum-chain/pendulum",
-    "moonbeam-foundation/moonbeam",
-    "paritytech/polkadot-sdk",
-    "parallel-finance/parallel",
-    "interlay/interbtc",
-    "interlay/interbtc",
-    "bit-country/Metaverse-Network",
-    "darwinia-network/darwinia",
-    "bifrost-finance/bifrost",
-    "pendulum-chain/pendulum",
-    "bit-country/Metaverse-Network",
-    "moonbeam-foundation/moonbeam",
-    "bifrost-finance/bifrost",
-    "parallel-finance/parallel",
-    "mangata-finance/mangata-node",
-    "mangata-finance/mangata-node",
-    "galacticcouncil/HydraDX-node",
-    "InvArch/InvArch-Frames",
-    "dappforce/subsocial-parachain",
-    "webb-tools/tangle",
-    "Manta-Network/Manta",
-    "airalab/robonomics",
-    "OAK-Foundation/xcm-demo",
-    "TalismanSociety/talisman",
-    "opentensor/bittensor"
-]
diff --git a/lib/notion/index.ts b/lib/notion/index.ts
index 8c05d43..dcd0bbb 100644
--- a/lib/notion/index.ts
+++ b/lib/notion/index.ts
@@ -42,6 +42,7 @@ export async function queryDatabase(
     start_cursor: undefined,
     filter: undefined,
   };
+
   const query = {
     ...defaultQuery,
     ...queryOverrides,
@@ -274,18 +275,65 @@ export async function createRepoMap() {
   return out;
 }
 
-// async function main() {
-//   //   const r = await getGoodFirstIssues({ page_size: 1 });
-//   // const r = await getUnassignedIssues({ page_size: 1 });
-//   //   const r = await getIssuesByProject("Polkadot", { page_size: 1 });
-//   //   const r = await getIssuesByRepo("af89c412b69f4437a6a0cdf80070a4a9", {
-//   //     page_size: 1,
-//   //   });
-//   const r = await createRepoMap();
-//   // const r = await queryDatabase({ page_size: 105 });
-//   //   console.log(r.results.length);
-//   console.log(JSON.stringify(r, null, 2));
-//   //   console.log(JSON.stringify(r, null, 2));
-// }
+export async function createFilter(languages: string, search: string, interests: string[]) {
+  if (!languages && !search && !interests) {
+    // If all parameters are undefined, return undefined
+    return undefined;
+  } else {
+    const filters = [];
 
-// main();
+    if (languages) {
+      // If languages is defined, create a filter for Repo Language
+      filters.push({
+        property: "Repo Language",
+        rollup: {
+          any: {
+            multi_select: {
+              contains: languages,
+            },
+          },
+        },
+      });
+    }
+
+    if (search) {
+      // If search is defined, create a filter for Project Name
+      filters.push({
+        property: "Project Name",
+        rollup: {
+          any: {
+            rich_text: {
+              contains: search,
+            },
+          },
+        },
+      });
+    }
+    if (interests && interests.length > 0) {
+      // If interests is defined and not empty, create a filter for Interests using "or"
+      filters.push({
+        or: interests.map((interest) => ({
+          property: "Project Name",
+          rollup: {
+            any: {
+              rich_text: {
+                contains: interest,
+              },
+            },
+          },
+        })),
+      });
+    }
+
+
+    if (filters.length === 1) {
+      // If there's only one filter, return it directly
+      return filters[0];
+    } else if (filters.length > 1) {
+      // If there are multiple filters, combine them with "and"
+      return {
+        and: filters,
+      };
+    }
+  }
+}
\ No newline at end of file

From 07083b500e14a9d2491a3854b45d63b5aaa1b53a Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sat, 6 Jan 2024 11:48:20 +0100
Subject: [PATCH 14/30] chore: Notion utility functions grouped together

---
 app/page.tsx               | 13 +++--
 app/table/page.tsx         |  2 +-
 hooks/useContributions.tsx |  2 +-
 lib/notion/index.ts        | 63 ------------------------
 utils/contribution.ts      | 33 -------------
 utils/notion.ts            | 99 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 111 insertions(+), 101 deletions(-)
 delete mode 100644 utils/contribution.ts
 create mode 100644 utils/notion.ts

diff --git a/app/page.tsx b/app/page.tsx
index 709c960..714f3e3 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -8,8 +8,11 @@ import {
   INTERESTS_OPTIONS,
   REPOSITORIES_BY_INTERESTS,
 } from "@/data/filters";
-import { queryDatabase, createFilter } from "@/lib/notion";
-import { transformNotionDataToContributions } from "@/utils/contribution";
+import { queryDatabase } from "@/lib/notion";
+import {
+  createNotionFilter,
+  transformNotionDataToContributions,
+} from "@/utils/notion";
 import RemoveFilters from "@/components/removeFilters";
 
 export default async function Home({
@@ -25,7 +28,11 @@ export default async function Home({
     [languagesFilterIsSelected, interestsFilterIsSelected, hasSearch].filter(
       Boolean,
     ).length >= 2;
-  const filter = await createFilter(params.languages, params.search, REPOSITORIES_BY_INTERESTS[params.interests])
+  const filter = await createNotionFilter(
+    params.languages,
+    params.search,
+    REPOSITORIES_BY_INTERESTS[params.interests],
+  );
 
   const data = await queryDatabase({
     page_size: 10,
diff --git a/app/table/page.tsx b/app/table/page.tsx
index 09159a9..53e155e 100644
--- a/app/table/page.tsx
+++ b/app/table/page.tsx
@@ -1,6 +1,6 @@
 import { getGoodFirstIssues } from "@/lib/notion";
 import ContributionsTable from "@/components/contributions-table/table";
-import { transformNotionDataToContributions } from "@/utils/contribution";
+import { transformNotionDataToContributions } from "@/utils/notion";
 
 export default async function Page() {
   const data = await getGoodFirstIssues({ page_size: 10 });
diff --git a/hooks/useContributions.tsx b/hooks/useContributions.tsx
index 78846d7..202bc86 100644
--- a/hooks/useContributions.tsx
+++ b/hooks/useContributions.tsx
@@ -4,7 +4,7 @@ import {
   QueryKey,
 } from "@tanstack/react-query";
 import { queryDatabase } from "@/lib/notion";
-import { transformNotionDataToContributions } from "@/utils/contribution";
+import { transformNotionDataToContributions } from "@/utils/notion";
 import { PaginatedContributions } from "@/types/contribution";
 import { KudosQueryParameters } from "@/lib/notion/types";
 
diff --git a/lib/notion/index.ts b/lib/notion/index.ts
index dcd0bbb..79d8c30 100644
--- a/lib/notion/index.ts
+++ b/lib/notion/index.ts
@@ -274,66 +274,3 @@ export async function createRepoMap() {
   }
   return out;
 }
-
-export async function createFilter(languages: string, search: string, interests: string[]) {
-  if (!languages && !search && !interests) {
-    // If all parameters are undefined, return undefined
-    return undefined;
-  } else {
-    const filters = [];
-
-    if (languages) {
-      // If languages is defined, create a filter for Repo Language
-      filters.push({
-        property: "Repo Language",
-        rollup: {
-          any: {
-            multi_select: {
-              contains: languages,
-            },
-          },
-        },
-      });
-    }
-
-    if (search) {
-      // If search is defined, create a filter for Project Name
-      filters.push({
-        property: "Project Name",
-        rollup: {
-          any: {
-            rich_text: {
-              contains: search,
-            },
-          },
-        },
-      });
-    }
-    if (interests && interests.length > 0) {
-      // If interests is defined and not empty, create a filter for Interests using "or"
-      filters.push({
-        or: interests.map((interest) => ({
-          property: "Project Name",
-          rollup: {
-            any: {
-              rich_text: {
-                contains: interest,
-              },
-            },
-          },
-        })),
-      });
-    }
-
-
-    if (filters.length === 1) {
-      // If there's only one filter, return it directly
-      return filters[0];
-    } else if (filters.length > 1) {
-      // If there are multiple filters, combine them with "and"
-      return {
-        and: filters,
-      };
-    }
-  }
-}
\ No newline at end of file
diff --git a/utils/contribution.ts b/utils/contribution.ts
deleted file mode 100644
index 95459ad..0000000
--- a/utils/contribution.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import projectLogosJson from "@/public/images/imageMap.json";
-import { Contribution } from "@/types/contribution";
-import { getImagePath } from "./github";
-import { QueryDatabaseResponse } from "@notionhq/client/build/src/api-endpoints";
-
-export function transformNotionDataToContributions(
-  notionData: QueryDatabaseResponse,
-): Contribution[] {
-  return notionData.results.reduce((acc: Contribution[], currentItem: any) => {
-    const properties = currentItem.properties;
-
-    const [avatarKey, id] = properties["Issue Link"].url.split("/issues/");
-    const contribution: Contribution = {
-      id,
-      avatar: getImagePath(avatarKey, projectLogosJson), // Assuming getImagePath is a defined function
-      labels: properties["Issue Labels"].multi_select.map(
-        (label: any) => label.name,
-      ),
-      languages: properties["Repo Language"].rollup.array[0].multi_select.map(
-        (language: any) => language.name,
-      ),
-      project:
-        properties["Project Name"].rollup.array[0].rich_text[0].plain_text,
-      repository: avatarKey.split("/").pop(),
-      title: properties["Issue Title"].title[0].text.content,
-      timestamp: properties["Opened Date"].date.start,
-      url: properties["Issue Link"].url,
-    };
-
-    acc.push(contribution);
-    return acc;
-  }, []);
-}
diff --git a/utils/notion.ts b/utils/notion.ts
new file mode 100644
index 0000000..1beb2c7
--- /dev/null
+++ b/utils/notion.ts
@@ -0,0 +1,99 @@
+import projectLogosJson from "@/public/images/imageMap.json";
+import { Contribution } from "@/types/contribution";
+import { getImagePath } from "./github";
+import { QueryDatabaseResponse } from "@notionhq/client/build/src/api-endpoints";
+
+export function transformNotionDataToContributions(
+  notionData: QueryDatabaseResponse,
+): Contribution[] {
+  return notionData.results.reduce((acc: Contribution[], currentItem: any) => {
+    const properties = currentItem.properties;
+
+    const [avatarKey, id] = properties["Issue Link"].url.split("/issues/");
+    const contribution: Contribution = {
+      id,
+      avatar: getImagePath(avatarKey, projectLogosJson), // Assuming getImagePath is a defined function
+      labels: properties["Issue Labels"].multi_select.map(
+        (label: any) => label.name,
+      ),
+      languages: properties["Repo Language"].rollup.array[0].multi_select.map(
+        (language: any) => language.name,
+      ),
+      project:
+        properties["Project Name"].rollup.array[0].rich_text[0].plain_text,
+      repository: avatarKey.split("/").pop(),
+      title: properties["Issue Title"].title[0].text.content,
+      timestamp: properties["Opened Date"].date.start,
+      url: properties["Issue Link"].url,
+    };
+
+    acc.push(contribution);
+    return acc;
+  }, []);
+}
+
+export async function createNotionFilter(
+  languages: string,
+  search: string,
+  interests: string[],
+) {
+  if (!languages && !search && !interests) {
+    // If all parameters are undefined, return undefined
+    return undefined;
+  } else {
+    const filters = [];
+
+    if (languages) {
+      // If languages is defined, create a filter for Repo Language
+      filters.push({
+        property: "Repo Language",
+        rollup: {
+          any: {
+            multi_select: {
+              contains: languages,
+            },
+          },
+        },
+      });
+    }
+
+    if (search) {
+      // If search is defined, create a filter for Project Name
+      filters.push({
+        property: "Project Name",
+        rollup: {
+          any: {
+            rich_text: {
+              contains: search,
+            },
+          },
+        },
+      });
+    }
+    if (interests && interests.length > 0) {
+      // If interests is defined and not empty, create a filter for Interests using "or"
+      filters.push({
+        or: interests.map((interest) => ({
+          property: "Project Name",
+          rollup: {
+            any: {
+              rich_text: {
+                contains: interest,
+              },
+            },
+          },
+        })),
+      });
+    }
+
+    if (filters.length === 1) {
+      // If there's only one filter, return it directly
+      return filters[0];
+    } else if (filters.length > 1) {
+      // If there are multiple filters, combine them with "and"
+      return {
+        and: filters,
+      };
+    }
+  }
+}

From a76c242333838d5cad870730387bee88d4721f49 Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sat, 6 Jan 2024 12:00:11 +0100
Subject: [PATCH 15/30] chore: Filter component renamed SelectFilter

---
 app/page.tsx                                       |  6 +++---
 .../{filter.tsx => filters/select-filter.tsx}      | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename components/{filter.tsx => filters/select-filter.tsx} (91%)

diff --git a/app/page.tsx b/app/page.tsx
index 714f3e3..c888be2 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,5 +1,5 @@
 import ContributionsTable from "@/components/contributions-table/table";
-import Filter from "@/components/filter";
+import SelectFilter from "@/components/filters/select-filter";
 import { title, subtitle } from "@/components/primitives";
 import Search from "@/components/search";
 import {
@@ -69,13 +69,13 @@ export default async function Home({
       </div>
       <div className="grid grid-cols-2 gap-4">
         <div className="flex justify-around items-stretch gap-4">
-          <Filter
+          <SelectFilter
             placeholder="Languages"
             emoji={"💪"}
             items={LANGUAGES_OPTIONS}
             selectedValue={params.languages}
           />
-          <Filter
+          <SelectFilter
             placeholder="Interests"
             emoji={"🪄"}
             items={INTERESTS_OPTIONS}
diff --git a/components/filter.tsx b/components/filters/select-filter.tsx
similarity index 91%
rename from components/filter.tsx
rename to components/filters/select-filter.tsx
index ec00449..67c5a20 100644
--- a/components/filter.tsx
+++ b/components/filters/select-filter.tsx
@@ -5,20 +5,20 @@ import { useRouter } from "next/navigation";
 import { Select, SelectItem } from "@nextui-org/select";
 import { FilterItem } from "@/types/filters";
 import { createUrl } from "@/utils/url";
-import Emoji from "./emoji";
+import Emoji from "../emoji";
 
-interface IFilterProps {
+interface ISelectFilterProps {
   placeholder: string;
   emoji: string;
   items: FilterItem[];
   selectedValue: string;
 }
-export const Filter = ({
+export const SelectFilter = ({
   placeholder,
   items,
   emoji,
   selectedValue,
-}: IFilterProps) => {
+}: ISelectFilterProps) => {
   const [value, setValue] = React.useState(selectedValue);
 
   const router = useRouter();
@@ -29,10 +29,9 @@ export const Filter = ({
     setValue(selectedValue);
   }, [selectedValue]);
 
-
   useEffect(() => {
     if (value === undefined) {
-      return
+      return;
     }
     const optionNameLowerCase = placeholder.toLowerCase();
     const optionSearchParams = new URLSearchParams(searchParams.toString());
@@ -64,7 +63,6 @@ export const Filter = ({
             key={item.value}
             value={item.value}
             startContent={<Emoji emoji={item.emoji} />}
-
           >
             {item.label}
           </SelectItem>
@@ -74,4 +72,4 @@ export const Filter = ({
   );
 };
 
-export default Filter;
+export default SelectFilter;

From ce2b448f0410b62e443a512ca24ac688c5804283 Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sat, 6 Jan 2024 12:04:05 +0100
Subject: [PATCH 16/30] chore: RemoveFilters component renamed ClearFilters

---
 app/page.tsx                                           | 10 +++++-----
 .../{removeFilters.tsx => filters/clear-filters.tsx}   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename components/{removeFilters.tsx => filters/clear-filters.tsx} (79%)

diff --git a/app/page.tsx b/app/page.tsx
index c888be2..8a4b1fd 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,4 +1,5 @@
 import ContributionsTable from "@/components/contributions-table/table";
+import ClearFilters from "@/components/filters/clear-filters";
 import SelectFilter from "@/components/filters/select-filter";
 import { title, subtitle } from "@/components/primitives";
 import Search from "@/components/search";
@@ -13,7 +14,6 @@ import {
   createNotionFilter,
   transformNotionDataToContributions,
 } from "@/utils/notion";
-import RemoveFilters from "@/components/removeFilters";
 
 export default async function Home({
   searchParams,
@@ -82,14 +82,14 @@ export default async function Home({
             selectedValue={params.interests}
           />
           {languagesFilterIsSelected && (
-            <RemoveFilters value={params.languages} param="Languages" />
+            <ClearFilters value={params.languages} param="Languages" />
           )}
           {interestsFilterIsSelected && (
-            <RemoveFilters value={params.interests} param="Interests" />
+            <ClearFilters value={params.interests} param="Interests" />
           )}
-          {hasSearch && <RemoveFilters value={params.search} param="Search" />}
+          {hasSearch && <ClearFilters value={params.search} param="Search" />}
 
-          {showRemoveAllFilters && <RemoveFilters value={"All filters"} />}
+          {showRemoveAllFilters && <ClearFilters value={"All filters"} />}
         </div>
         <div className="flex justify-end">
           <div>
diff --git a/components/removeFilters.tsx b/components/filters/clear-filters.tsx
similarity index 79%
rename from components/removeFilters.tsx
rename to components/filters/clear-filters.tsx
index 3e5783f..3cc2d18 100644
--- a/components/removeFilters.tsx
+++ b/components/filters/clear-filters.tsx
@@ -5,16 +5,16 @@ import { useRouter } from "next/navigation";
 import { Chip } from "@nextui-org/chip";
 import { createUrl } from "@/utils/url";
 
-interface IRemoveFilters {
+interface IClearFilters {
   param?: string;
   value: string;
 }
 
-export const RemoveFilters = ({ param, value }: IRemoveFilters) => {
+export const ClearFilters = ({ param, value }: IClearFilters) => {
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
-  const removeSearchParams = () => {
+  const clearSearchParams = () => {
     if (!!param) {
       const optionNameLowerCase = param.toLowerCase();
       const optionSearchParams = new URLSearchParams(searchParams.toString());
@@ -27,11 +27,11 @@ export const RemoveFilters = ({ param, value }: IRemoveFilters) => {
   };
   return (
     <div className="flex gap-4">
-      <Chip variant="solid" onClose={removeSearchParams}>
+      <Chip variant="solid" onClose={clearSearchParams}>
         {value}
       </Chip>
     </div>
   );
 };
 
-export default RemoveFilters;
+export default ClearFilters;

From db3b8ca1be4563bb1f87fe873b94cc746e954d0a Mon Sep 17 00:00:00 2001
From: Connor Campbell <ccampbell.james@gmail.com>
Date: Sat, 6 Jan 2024 16:37:04 +0000
Subject: [PATCH 17/30] fix: fix search filter + tweak repo mapping

---
 data/filters.ts         | 829 +++++++++++++++++++++++++++++-----------
 lib/notion/constants.ts | 180 +++------
 lib/notion/index.ts     |  29 +-
 3 files changed, 670 insertions(+), 368 deletions(-)

diff --git a/data/filters.ts b/data/filters.ts
index 79f333d..fcfd5c3 100644
--- a/data/filters.ts
+++ b/data/filters.ts
@@ -1,4 +1,3 @@
-
 export const LANGUAGES_OPTIONS = [
   { value: "Assembly", label: "Assembly", emoji: "🔧" }, // Assembly
   //   { value: "Astro", label: "Astro", emoji: "" },
@@ -102,252 +101,616 @@ export const INTERESTS_OPTIONS = [
 ];
 
 export const SEARCH_OPTIONS = [
-  { value: "polkadot-sdk", label: "Polkadot Sdk", emoji: "🔗" },
-  { value: "OAK-blockchain", label: "Oak Blockchain", emoji: "🌳" },
-  { value: "InvArch-Node", label: "Invarch Node", emoji: "🏛️" },
-  { value: "phala-blockchain", label: "Phala Blockchain", emoji: "🔒" },
-  { value: "talisman", label: "Talisman", emoji: "📿" },
-  { value: "t3rn", label: "T3Rn", emoji: "🔄" },
-  { value: "automata", label: "Automata", emoji: "🤖" },
-  { value: "subspace", label: "Subspace", emoji: "🚀" },
-  { value: "mangata-node", label: "Mangata Node", emoji: "🌐" },
-  { value: "virto-node", label: "Virto Node", emoji: "🌐" },
-  { value: "HydraDX-node", label: "HydraDX Node", emoji: "🌌" },
-  { value: "InvArch-Frames", label: "Invarch Frames", emoji: "🖼️" },
-  { value: "network/darwinia", label: "Darwinia", emoji: "🌐" },
-  { value: "hashed-substrate", label: "Hashed Substrate", emoji: "🔍" },
-  { value: "frequency", label: "Frequency", emoji: "📡" },
-  { value: "centrifuge-chain", label: "Centrifuge Chain", emoji: "🔄" },
-  { value: "subsocial-parachain", label: "Subsocial Parachain", emoji: "🌐" },
-  { value: "spacewalk", label: "Spacewalk", emoji: "🚀" },
-  { value: "openbrush-contracts", label: "Openbrush Contracts", emoji: "🎨" },
-  { value: "kilt-node", label: "Kilt Node", emoji: "🔄" },
-  { value: "Manta", label: "Manta", emoji: "🌊" },
-  { value: "sora2-parachain", label: "Sora2 Parachain", emoji: "🔄" },
-  { value: "tanssi", label: "Tanssi", emoji: "💃" },
-  { value: "sora2-network", label: "Sora2 Network", emoji: "🔄" },
-  { value: "gear", label: "Gear", emoji: "⚙️" },
-  { value: "joystream", label: "Joystream", emoji: "🎮" },
-  { value: "peaq-network-node", label: "Peaq Network Node", emoji: "🌐" },
-  { value: "zeitgeist", label: "Zeitgeist", emoji: "🕰️" },
-  { value: "dock-substrate", label: "Dock Substrate", emoji: "🚢" },
-  { value: "ternoa-node", label: "Ternoa Node", emoji: "📦" },
-  { value: "chain", label: "Chain", emoji: "⛓️" },
-  { value: "bifrost", label: "Bifrost", emoji: "🌈" },
-  { value: "imbue", label: "Imbue", emoji: "🌊" },
-  { value: "encointer-parachain", label: "Encointer Parachain", emoji: "🔄" },
-  { value: "parallel", label: "Parallel", emoji: "🔄" },
-  { value: "bitgreen-node", label: "Bitgreen Node", emoji: "🌱" },
-  { value: "deeper-chain", label: "Deeper Chain", emoji: "🔄" },
-  { value: "crust", label: "Crust", emoji: "🍞" },
-  { value: "Acala", label: "Acala", emoji: "♾️" },
-  { value: "encointer-node", label: "Encointer Node", emoji: "🔄" },
-  { value: "personhood-oracle", label: "Personhood Oracle", emoji: "🔄" },
-  { value: "robonomics", label: "Robonomics", emoji: "🤖" },
-  { value: "pendulum", label: "Pendulum", emoji: "🕰️" },
-  { value: "pallets", label: "Pallets", emoji: "🔄" },
-  { value: "worker", label: "Worker", emoji: "🛠️" },
-  { value: "Metaverse-Network", label: "Metaverse Network", emoji: "🌐" },
-  { value: "gafi", label: "Gafi", emoji: "🔄" },
-  { value: "litentry-parachain", label: "Litentry Parachain", emoji: "📜" },
-  { value: "Astar", label: "Astar", emoji: "⭐" },
-  { value: "interbtc", label: "Interbtc", emoji: "🔄" },
-  { value: "aleph-node", label: "Aleph Node", emoji: "🔄" },
-  { value: "dotreasury", label: "Dotreasury", emoji: "💼" },
-  { value: "subsquare", label: "Subsquare", emoji: "🔄" },
-  { value: "xcm-demo", label: "Xcm Demo", emoji: "🔄" },
-  { value: "subql", label: "Subql", emoji: "🔍" },
-  { value: "squid-sdk", label: "Squid Sdk", emoji: "🦑" },
-  { value: "portal", label: "Portal", emoji: "🚪" },
-  { value: "imbue-frontend", label: "Imbue Frontend", emoji: "🌐" },
-  { value: "oak.js", label: "Oak.Js", emoji: "🌳" },
-  { value: "moonbeam", label: "Moonbeam", emoji: "🌙" },
-  { value: "tangle", label: "Tangle", emoji: "🌀" },
+  {
+    value: "paritytech/polkadot-sdk",
+    label: "Polkadot Sdk",
+    emoji: "🔗",
+  },
+  {
+    value: "OAK-Foundation/OAK-blockchain",
+    label: "Oak Blockchain",
+    emoji: "🌳",
+  },
+  {
+    value: "InvArch/InvArch-Node",
+    label: "Invarch Node",
+    emoji: "🏛️",
+  },
+  {
+    value: "Phala-Network/phala-blockchain",
+    label: "Phala Blockchain",
+    emoji: "🔒",
+  },
+  { value: "TalismanSociety/talisman", label: "Talisman", emoji: "📿" },
+  { value: "t3rn/t3rn", label: "T3Rn", emoji: "🔄" },
+  {
+    value: "automata-network/automata",
+    label: "Automata",
+    emoji: "🤖",
+  },
+  { value: "subspace/subspace", label: "Subspace", emoji: "🚀" },
+  {
+    value: "mangata-finance/mangata-node",
+    label: "Mangata Node",
+    emoji: "🌐",
+  },
+  {
+    value: "virto-network/virto-node",
+    label: "Virto Node",
+    emoji: "🌐",
+  },
+  {
+    value: "galacticcouncil/HydraDX-node",
+    label: "HydraDX Node",
+    emoji: "🌌",
+  },
+  {
+    value: "InvArch/InvArch-Frames",
+    label: "Invarch Frames",
+    emoji: "🖼️",
+  },
+  {
+    value: "darwinia-network/darwinia",
+    label: "Darwinia",
+    emoji: "🌐",
+  },
+  {
+    value: "hashed-io/hashed-substrate",
+    label: "Hashed Substrate",
+    emoji: "🔍",
+  },
+  { value: "LibertyDSNP/frequency", label: "Frequency", emoji: "📡" },
+  {
+    value: "centrifuge/centrifuge-chain",
+    label: "Centrifuge Chain",
+    emoji: "🔄",
+  },
+  {
+    value: "dappforce/subsocial-parachain",
+    label: "Subsocial Parachain",
+    emoji: "🌐",
+  },
+  {
+    value: "pendulum-chain/spacewalk",
+    label: "Spacewalk",
+    emoji: "🚀",
+  },
+  {
+    value: "Brushfam/openbrush-contracts",
+    label: "Openbrush Contracts",
+    emoji: "🎨",
+  },
+  { value: "KILTprotocol/kilt-node", label: "Kilt Node", emoji: "🔄" },
+  { value: "Manta-Network/Manta", label: "Manta", emoji: "🌊" },
+  {
+    value: "sora-xor/sora2-parachain",
+    label: "Sora2 Parachain",
+    emoji: "🔄",
+  },
+  { value: "moondance-labs/tanssi", label: "Tanssi", emoji: "💃" },
+  {
+    value: "sora-xor/sora2-network",
+    label: "Sora2 Network",
+    emoji: "🔄",
+  },
+  { value: "gear-tech/gear", label: "Gear", emoji: "⚙️" },
+  { value: "Joystream/joystream", label: "Joystream", emoji: "🎮" },
+  {
+    value: "peaqnetwork/peaq-network-node",
+    label: "Peaq Network Node",
+    emoji: "🌐",
+  },
+  { value: "zeitgeistpm/zeitgeist", label: "Zeitgeist", emoji: "🕰️" },
+  {
+    value: "docknetwork/dock-substrate",
+    label: "Dock Substrate",
+    emoji: "🚢",
+  },
+  {
+    value: "capsule-corp-ternoa/ternoa-node",
+    label: "Ternoa Node",
+    emoji: "📦",
+  },
+  { value: "NodleCode/chain", label: "Chain", emoji: "⛓️" },
+  { value: "bifrost-finance/bifrost", label: "Bifrost", emoji: "🌈" },
+  { value: "ImbueNetwork/imbue", label: "Imbue", emoji: "🌊" },
+  {
+    value: "encointer/encointer-parachain",
+    label: "Encointer Parachain",
+    emoji: "🔄",
+  },
+  {
+    value: "parallel-finance/parallel",
+    label: "Parallel",
+    emoji: "🔄",
+  },
+  {
+    value: "bitgreen/bitgreen-node",
+    label: "Bitgreen Node",
+    emoji: "🌱",
+  },
+  {
+    value: "deeper-chain/deeper-chain",
+    label: "Deeper Chain",
+    emoji: "🔄",
+  },
+  { value: "crustio/crust", label: "Crust", emoji: "🍞" },
+  { value: "AcalaNetwork/Acala", label: "Acala", emoji: "♾️" },
+  {
+    value: "encointer/encointer-node",
+    label: "Encointer Node",
+    emoji: "🔄",
+  },
+  {
+    value: "encointer/personhood-oracle",
+    label: "Personhood Oracle",
+    emoji: "🔄",
+  },
+  { value: "airalab/robonomics", label: "Robonomics", emoji: "🤖" },
+  { value: "pendulum-chain/pendulum", label: "Pendulum", emoji: "🕰️" },
+  { value: "encointer/pallets", label: "Pallets", emoji: "🔄" },
+  { value: "integritee-network/worker", label: "Worker", emoji: "🛠️" },
+  {
+    value: "bit-country/Metaverse-Network",
+    label: "Metaverse Network",
+    emoji: "🌐",
+  },
+  { value: "grindytech/gafi", label: "Gafi", emoji: "🔄" },
+  {
+    value: "litentry/litentry-parachain",
+    label: "Litentry Parachain",
+    emoji: "📜",
+  },
+  { value: "AstarNetwork/Astar", label: "Astar", emoji: "⭐" },
+  { value: "interlay/interbtc", label: "Interbtc", emoji: "🔄" },
+  {
+    value: "aleph-zero-foundation/aleph-node",
+    label: "Aleph Node",
+    emoji: "🔄",
+  },
+  {
+    value: "opensquare-network/dotreasury",
+    label: "Dotreasury",
+    emoji: "💼",
+  },
+  {
+    value: "opensquare-network/subsquare",
+    label: "Subsquare",
+    emoji: "🔄",
+  },
+  { value: "OAK-Foundation/xcm-demo", label: "Xcm Demo", emoji: "🔄" },
+  { value: "subquery/subql", label: "Subql", emoji: "🔍" },
+  { value: "subsquid/squid-sdk", label: "Squid Sdk", emoji: "🦑" },
+  { value: "pendulum-chain/portal", label: "Portal", emoji: "🚪" },
+  {
+    value: "ImbueNetwork/imbue-frontend",
+    label: "Imbue Frontend",
+    emoji: "🌐",
+  },
+  { value: "OAK-Foundation/oak.js", label: "Oak.Js", emoji: "🌳" },
+  {
+    value: "moonbeam-foundation/moonbeam",
+    label: "Moonbeam",
+    emoji: "🌙",
+  },
+  { value: "webb-tools/tangle", label: "Tangle", emoji: "🌀" },
   { value: "bittensor", label: "Bittensor", emoji: "🧠" },
-]
+];
+
+// export const SEARCH_OPTIONS = [
+//   { value: "polkadot-sdk", label: "Polkadot Sdk", emoji: "🔗" },
+//   { value: "OAK-blockchain", label: "Oak Blockchain", emoji: "🌳" },
+//   { value: "InvArch-Node", label: "Invarch Node", emoji: "🏛️" },
+//   { value: "phala-blockchain", label: "Phala Blockchain", emoji: "🔒" },
+//   { value: "talisman", label: "Talisman", emoji: "📿" },
+//   { value: "t3rn", label: "T3Rn", emoji: "🔄" },
+//   { value: "automata", label: "Automata", emoji: "🤖" },
+//   { value: "subspace", label: "Subspace", emoji: "🚀" },
+//   { value: "mangata-node", label: "Mangata Node", emoji: "🌐" },
+//   { value: "virto-node", label: "Virto Node", emoji: "🌐" },
+//   { value: "HydraDX-node", label: "HydraDX Node", emoji: "🌌" },
+//   { value: "InvArch-Frames", label: "Invarch Frames", emoji: "🖼️" },
+//   { value: "network/darwinia", label: "Darwinia", emoji: "🌐" },
+//   { value: "hashed-substrate", label: "Hashed Substrate", emoji: "🔍" },
+//   { value: "frequency", label: "Frequency", emoji: "📡" },
+//   { value: "centrifuge-chain", label: "Centrifuge Chain", emoji: "🔄" },
+//   { value: "subsocial-parachain", label: "Subsocial Parachain", emoji: "🌐" },
+//   { value: "spacewalk", label: "Spacewalk", emoji: "🚀" },
+//   { value: "openbrush-contracts", label: "Openbrush Contracts", emoji: "🎨" },
+//   { value: "kilt-node", label: "Kilt Node", emoji: "🔄" },
+//   { value: "Manta", label: "Manta", emoji: "🌊" },
+//   { value: "sora2-parachain", label: "Sora2 Parachain", emoji: "🔄" },
+//   { value: "tanssi", label: "Tanssi", emoji: "💃" },
+//   { value: "sora2-network", label: "Sora2 Network", emoji: "🔄" },
+//   { value: "gear", label: "Gear", emoji: "⚙️" },
+//   { value: "joystream", label: "Joystream", emoji: "🎮" },
+//   { value: "peaq-network-node", label: "Peaq Network Node", emoji: "🌐" },
+//   { value: "zeitgeist", label: "Zeitgeist", emoji: "🕰️" },
+//   { value: "dock-substrate", label: "Dock Substrate", emoji: "🚢" },
+//   { value: "ternoa-node", label: "Ternoa Node", emoji: "📦" },
+//   { value: "chain", label: "Chain", emoji: "⛓️" },
+//   { value: "bifrost", label: "Bifrost", emoji: "🌈" },
+//   { value: "imbue", label: "Imbue", emoji: "🌊" },
+//   { value: "encointer-parachain", label: "Encointer Parachain", emoji: "🔄" },
+//   { value: "parallel", label: "Parallel", emoji: "🔄" },
+//   { value: "bitgreen-node", label: "Bitgreen Node", emoji: "🌱" },
+//   { value: "deeper-chain", label: "Deeper Chain", emoji: "🔄" },
+//   { value: "crust", label: "Crust", emoji: "🍞" },
+//   { value: "Acala", label: "Acala", emoji: "♾️" },
+//   { value: "encointer-node", label: "Encointer Node", emoji: "🔄" },
+//   { value: "personhood-oracle", label: "Personhood Oracle", emoji: "🔄" },
+//   { value: "robonomics", label: "Robonomics", emoji: "🤖" },
+//   { value: "pendulum", label: "Pendulum", emoji: "🕰️" },
+//   { value: "pallets", label: "Pallets", emoji: "🔄" },
+//   { value: "worker", label: "Worker", emoji: "🛠️" },
+//   { value: "Metaverse-Network", label: "Metaverse Network", emoji: "🌐" },
+//   { value: "gafi", label: "Gafi", emoji: "🔄" },
+//   { value: "litentry-parachain", label: "Litentry Parachain", emoji: "📜" },
+//   { value: "Astar", label: "Astar", emoji: "⭐" },
+//   { value: "interbtc", label: "Interbtc", emoji: "🔄" },
+//   { value: "aleph-node", label: "Aleph Node", emoji: "🔄" },
+//   { value: "dotreasury", label: "Dotreasury", emoji: "💼" },
+//   { value: "subsquare", label: "Subsquare", emoji: "🔄" },
+//   { value: "xcm-demo", label: "Xcm Demo", emoji: "🔄" },
+//   { value: "subql", label: "Subql", emoji: "🔍" },
+//   { value: "squid-sdk", label: "Squid Sdk", emoji: "🦑" },
+//   { value: "portal", label: "Portal", emoji: "🚪" },
+//   { value: "imbue-frontend", label: "Imbue Frontend", emoji: "🌐" },
+//   { value: "oak.js", label: "Oak.Js", emoji: "🌳" },
+//   { value: "moonbeam", label: "Moonbeam", emoji: "🌙" },
+//   { value: "tangle", label: "Tangle", emoji: "🌀" },
+//   { value: "bittensor", label: "Bittensor", emoji: "🧠" },
+// ];
 type RepositoryList = {
   [key: string]: string[];
 };
 
 export const REPOSITORIES_BY_INTERESTS: RepositoryList = {
-  "substrate": [
-    "InvArch-Node",
-    "pendulum",
-    "Metaverse-Network",
-    "gafi",
-    "Astar",
-    "interbtc",
-    "xcm-demo",
-    "oak.js",
-    "moonbeam",
-    "tangle",
-    "talisman",
-    "t3rn",
-    "polkadot-sdk",
-    "automata",
-    "subspace",
-    "mangata-node",
-    "virto-node",
-    "HydraDX-node",
-    "InvArch-Frames",
-    "darwinia",
-    "hashed-substrate",
-    "frequency",
-    "OAK-blockchain",
-    "centrifuge-chain",
-    "subsocial-parachain",
-    "spacewalk",
-    "openbrush-contracts",
-    "kilt-node",
-    "Manta",
-    "sora2-parachain",
-    "tanssi",
-    "sora2-network",
-    "gear",
-    "joystream",
-    "dock-substrate",
-    "ternoa-node",
-    "bifrost",
-    "bitgreen-node",
-    "deeper-chain",
-    "crust",
-    "Acala"
+  substrate: [
+    "InvArch/InvArch-Node",
+    "pendulum-chain/pendulum",
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "interlay/interbtc",
+    "OAK-Foundation/xcm-demo",
+    "OAK-Foundation/oak.js",
+    "moonbeam-foundation/moonbeam",
+    "webb-tools/tangle",
+    "TalismanSociety/talisman",
+    "t3rn/t3rn",
+    "paritytech/polkadot-sdk",
+    "automata-network/automata",
+    "subspace/subspace",
+    "mangata-finance/mangata-node",
+    "virto-network/virto-node",
+    "galacticcouncil/HydraDX-node",
+    "InvArch/InvArch-Frames",
+    "darwinia-network/darwinia",
+    "hashed-io/hashed-substrate",
+    "LibertyDSNP/frequency",
+    "OAK-Foundation/OAK-blockchain",
+    "centrifuge/centrifuge-chain",
+    "dappforce/subsocial-parachain",
+    "pendulum-chain/spacewalk",
+    "Brushfam/openbrush-contracts",
+    "KILTprotocol/kilt-node",
+    "Manta-Network/Manta",
+    "sora-xor/sora2-parachain",
+    "moondance-labs/tanssi",
+    "sora-xor/sora2-network",
+    "gear-tech/gear",
+    "Joystream/joystream",
+    "docknetwork/dock-substrate",
+    "capsule-corp-ternoa/ternoa-node",
+    "bifrost-finance/bifrost",
+    "bitgreen/bitgreen-node",
+    "deeper-chain/deeper-chain",
+    "crustio/crust",
+    "AcalaNetwork/Acala",
   ],
-  "polkadot": [
-    "InvArch-Node",
-    "pendulum",
-    "Metaverse-Network",
-    "gafi",
-    "Astar",
-    "interbtc",
-    "aleph-node",
-    "dotreasury",
-    "subsquare",
-    "xcm-demo",
-    "subql",
-    "squid-sdk",
-    "portal",
-    "imbue-frontend",
-    "oak.js",
-    "moonbeam",
-    "talisman",
-    "polkadot-sdk",
-    "automata",
-    "subspace",
-    "mangata-node",
-    "virto-node",
-    "HydraDX-node",
-    "InvArch-Frames",
-    "darwinia",
-    "hashed-substrate",
-    "frequency",
-    "OAK-blockchain",
-    "centrifuge-chain",
-    "subsocial-parachain",
-    "spacewalk",
-    "openbrush-contracts",
-    "kilt-node",
-    "Manta",
-    "sora2-parachain",
-    "tanssi",
-    "sora2-network",
-    "joystream",
-    "zeitgeist",
-    "dock-substrate",
-    "ternoa-node",
-    "chain",
-    "bifrost",
-    "imbue",
-    "encointer-parachain",
-    "parallel",
-    "bitgreen-node",
-    "deeper-chain",
-    "crust",
-    "Acala"
+  polkadot: [
+    "InvArch/InvArch-Node",
+    "pendulum-chain/pendulum",
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "interlay/interbtc",
+    "aleph-zero-foundation/aleph-node",
+    "opensquare-network/dotreasury",
+    "opensquare-network/subsquare",
+    "OAK-Foundation/xcm-demo",
+    "subquery/subql",
+    "subsquid/squid-sdk",
+    "pendulum-chain/portal",
+    "ImbueNetwork/imbue-frontend",
+    "OAK-Foundation/oak.js",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "paritytech/polkadot-sdk",
+    "automata-network/automata",
+    "subspace/subspace",
+    "mangata-finance/mangata-node",
+    "virto-network/virto-node",
+    "galacticcouncil/HydraDX-node",
+    "InvArch/InvArch-Frames",
+    "darwinia-network/darwinia",
+    "hashed-io/hashed-substrate",
+    "LibertyDSNP/frequency",
+    "OAK-Foundation/OAK-blockchain",
+    "centrifuge/centrifuge-chain",
+    "dappforce/subsocial-parachain",
+    "pendulum-chain/spacewalk",
+    "Brushfam/openbrush-contracts",
+    "KILTprotocol/kilt-node",
+    "Manta-Network/Manta",
+    "sora-xor/sora2-parachain",
+    "moondance-labs/tanssi",
+    "sora-xor/sora2-network",
+    "Joystream/joystream",
+    "zeitgeistpm/zeitgeist",
+    "docknetwork/dock-substrate",
+    "capsule-corp-ternoa/ternoa-node",
+    "NodleCode/chain",
+    "bifrost-finance/bifrost",
+    "ImbueNetwork/imbue",
+    "encointer/encointer-parachain",
+    "parallel-finance/parallel",
+    "bitgreen/bitgreen-node",
+    "deeper-chain/deeper-chain",
+    "crustio/crust",
+    "AcalaNetwork/Acala",
   ],
-  "kusama": [
-    "interbtc",
-    "dotreasury",
-    "subsquare",
-    "sora2-parachain",
-    "sora2-network",
-    "parallel",
-    "encointer-parachain",
-    "Acala",
-    "robonomics",
-    "Astar",
-    "dotreasury"
+  kusama: [
+    "interlay/interbtc",
+    "opensquare-network/dotreasury",
+    "opensquare-network/subsquare",
+    "sora-xor/sora2-parachain",
+    "sora-xor/sora2-network",
+    "parallel-finance/parallel",
+    "encointer/encointer-parachain",
+    "AcalaNetwork/Acala",
+    "airalab/robonomics",
+    "AstarNetwork/Astar",
+    "opensquare-network/dotreasury",
   ],
-  "evm": [
-    "Astar",
-    "moonbeam",
-    "darwinia",
-    "OAK-blockchain",
-    "mangata-node",
-    "sora2-network"
+  evm: [
+    "AstarNetwork/Astar",
+    "moonbeam-foundation/moonbeam",
+    "darwinia-network/darwinia",
+    "OAK-Foundation/OAK-blockchain",
+    "mangata-finance/mangata-node",
+    "sora-xor/sora2-network",
   ],
-  "ethereum": [
-    "Astar",
-    "moonbeam",
-    "talisman",
-    "darwinia",
-    "sora2-network",
-    "mangata-node"
+  ethereum: [
+    "AstarNetwork/Astar",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "darwinia-network/darwinia",
+    "sora-xor/sora2-network",
+    "mangata-finance/mangata-node",
   ],
-  "defi": [
-    "Metaverse-Network",
-    "gafi",
-    "Astar",
-    "interbtc",
-    "moonbeam",
-    "talisman",
-    "sora2-parachain",
-    "sora2-network",
-    "bifrost",
-    "parallel",
-    "Acala",
-    "interbtc"
+  defi: [
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "interlay/interbtc",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "sora-xor/sora2-parachain",
+    "sora-xor/sora2-network",
+    "bifrost-finance/bifrost",
+    "parallel-finance/parallel",
+    "AcalaNetwork/Acala",
+    "interlay/interbtc",
   ],
   "smart-contracts": [
-    "Metaverse-Network",
-    "gafi",
-    "Astar",
-    "moonbeam",
-    "talisman",
-    "t3rn",
-    "polkadot-sdk",
-    "subspace",
-    "mangata-node",
-    "joystream"
+    "bit-country/Metaverse-Network",
+    "grindytech/gafi",
+    "AstarNetwork/Astar",
+    "moonbeam-foundation/moonbeam",
+    "TalismanSociety/talisman",
+    "t3rn/t3rn",
+    "paritytech/polkadot-sdk",
+    "subspace/subspace",
+    "mangata-finance/mangata-node",
+    "Joystream/joystream",
   ],
-  "cumulus": [
-    "pendulum",
-    "moonbeam",
-    "polkadot-sdk",
-    "parallel"
+  cumulus: [
+    "pendulum-chain/pendulum",
+    "moonbeam-foundation/moonbeam",
+    "paritytech/polkadot-sdk",
+    "parallel-finance/parallel",
   ],
-  "bitcoin": ["interbtc"],
-  "bridge": [
-    "interbtc",
-    "Metaverse-Network",
-    "darwinia",
-    "bifrost"
+  bitcoin: ["interlay/interbtc"],
+  bridge: [
+    "interlay/interbtc",
+    "bit-country/Metaverse-Network",
+    "darwinia-network/darwinia",
+    "bifrost-finance/bifrost",
   ],
-  "wasm": [
-    "pendulum",
-    "Metaverse-Network",
-    "moonbeam",
-    "bifrost",
-    "parallel"
+  wasm: [
+    "pendulum-chain/pendulum",
+    "bit-country/Metaverse-Network",
+    "moonbeam-foundation/moonbeam",
+    "bifrost-finance/bifrost",
+    "parallel-finance/parallel",
   ],
-  "mev": ["mangata-node"],
-  "rollup": ["mangata-node"],
-  "dex": ["HydraDX-node"],
-  "dao": ["InvArch-Frames"],
-  "social": ["subsocial-parachain"],
-  "zero-knowledge": ["tangle", "Manta"],
-  "iot": ["robonomics"],
-  "xcm": ["xcm-demo"],
-  "wallet": ["talisman"],
-  "ai": ["bittensor"]
-}
+  mev: ["mangata-finance/mangata-node"],
+  rollup: ["mangata-finance/mangata-node"],
+  dex: ["galacticcouncil/HydraDX-node"],
+  dao: ["InvArch/InvArch-Frames"],
+  social: ["dappforce/subsocial-parachain"],
+  "zero-knowledge": ["webb-tools/tangle", "Manta-Network/Manta"],
+  iot: ["airalab/robonomics"],
+  xcm: ["OAK-Foundation/xcm-demo"],
+  wallet: ["TalismanSociety/talisman"],
+  ai: ["bittensor"],
+};
+
+// export const REPOSITORIES_BY_INTERESTS: RepositoryList = {
+//   substrate: [
+//     "InvArch-Node",
+//     "pendulum",
+//     "Metaverse-Network",
+//     "gafi",
+//     "Astar",
+//     "interbtc",
+//     "xcm-demo",
+//     "oak.js",
+//     "moonbeam",
+//     "tangle",
+//     "talisman",
+//     "t3rn",
+//     "polkadot-sdk",
+//     "automata",
+//     "subspace",
+//     "mangata-node",
+//     "virto-node",
+//     "HydraDX-node",
+//     "InvArch-Frames",
+//     "darwinia",
+//     "hashed-substrate",
+//     "frequency",
+//     "OAK-blockchain",
+//     "centrifuge-chain",
+//     "subsocial-parachain",
+//     "spacewalk",
+//     "openbrush-contracts",
+//     "kilt-node",
+//     "Manta",
+//     "sora2-parachain",
+//     "tanssi",
+//     "sora2-network",
+//     "gear",
+//     "joystream",
+//     "dock-substrate",
+//     "ternoa-node",
+//     "bifrost",
+//     "bitgreen-node",
+//     "deeper-chain",
+//     "crust",
+//     "Acala",
+//   ],
+//   polkadot: [
+//     "InvArch-Node",
+//     "pendulum",
+//     "Metaverse-Network",
+//     "gafi",
+//     "Astar",
+//     "interbtc",
+//     "aleph-node",
+//     "dotreasury",
+//     "subsquare",
+//     "xcm-demo",
+//     "subql",
+//     "squid-sdk",
+//     "portal",
+//     "imbue-frontend",
+//     "oak.js",
+//     "moonbeam",
+//     "talisman",
+//     "polkadot-sdk",
+//     "automata",
+//     "subspace",
+//     "mangata-node",
+//     "virto-node",
+//     "HydraDX-node",
+//     "InvArch-Frames",
+//     "darwinia",
+//     "hashed-substrate",
+//     "frequency",
+//     "OAK-blockchain",
+//     "centrifuge-chain",
+//     "subsocial-parachain",
+//     "spacewalk",
+//     "openbrush-contracts",
+//     "kilt-node",
+//     "Manta",
+//     "sora2-parachain",
+//     "tanssi",
+//     "sora2-network",
+//     "joystream",
+//     "zeitgeist",
+//     "dock-substrate",
+//     "ternoa-node",
+//     "chain",
+//     "bifrost",
+//     "imbue",
+//     "encointer-parachain",
+//     "parallel",
+//     "bitgreen-node",
+//     "deeper-chain",
+//     "crust",
+//     "Acala",
+//   ],
+//   kusama: [
+//     "interbtc",
+//     "dotreasury",
+//     "subsquare",
+//     "sora2-parachain",
+//     "sora2-network",
+//     "parallel",
+//     "encointer-parachain",
+//     "Acala",
+//     "robonomics",
+//     "Astar",
+//     "dotreasury",
+//   ],
+//   evm: [
+//     "Astar",
+//     "moonbeam",
+//     "darwinia",
+//     "OAK-blockchain",
+//     "mangata-node",
+//     "sora2-network",
+//   ],
+//   ethereum: [
+//     "Astar",
+//     "moonbeam",
+//     "talisman",
+//     "darwinia",
+//     "sora2-network",
+//     "mangata-node",
+//   ],
+//   defi: [
+//     "Metaverse-Network",
+//     "gafi",
+//     "Astar",
+//     "interbtc",
+//     "moonbeam",
+//     "talisman",
+//     "sora2-parachain",
+//     "sora2-network",
+//     "bifrost",
+//     "parallel",
+//     "Acala",
+//     "interbtc",
+//   ],
+//   "smart-contracts": [
+//     "Metaverse-Network",
+//     "gafi",
+//     "Astar",
+//     "moonbeam",
+//     "talisman",
+//     "t3rn",
+//     "polkadot-sdk",
+//     "subspace",
+//     "mangata-node",
+//     "joystream",
+//   ],
+//   cumulus: ["pendulum", "moonbeam", "polkadot-sdk", "parallel"],
+//   bitcoin: ["interbtc"],
+//   bridge: ["interbtc", "Metaverse-Network", "darwinia", "bifrost"],
+//   wasm: ["pendulum", "Metaverse-Network", "moonbeam", "bifrost", "parallel"],
+//   mev: ["mangata-node"],
+//   rollup: ["mangata-node"],
+//   dex: ["HydraDX-node"],
+//   dao: ["InvArch-Frames"],
+//   social: ["subsocial-parachain"],
+//   "zero-knowledge": ["tangle", "Manta"],
+//   iot: ["robonomics"],
+//   xcm: ["xcm-demo"],
+//   wallet: ["talisman"],
+//   ai: ["bittensor"],
+// };
diff --git a/lib/notion/constants.ts b/lib/notion/constants.ts
index 7f2e05d..c74f1df 100644
--- a/lib/notion/constants.ts
+++ b/lib/notion/constants.ts
@@ -3,124 +3,68 @@ import { ValidSort } from "./types";
 export const DATABASE_ID = "bc9fe682dbe04550b121303a2befad8a";
 
 export const REPO_LINK_TO_PAGE_ID_MAP = {
-  "https://github.com/automata-network/automata":
-    "094fe93b-27b7-4547-b604-98a700c905e5",
-  "https://github.com/subspace/subspace":
-    "0d16a11f-c7e2-4aa9-ae75-d46fe715e26a",
-  "https://github.com/mangata-finance/mangata-node":
-    "104823c7-9380-4672-94ee-0accd5772d02",
-  "https://github.com/virto-network/virto-node":
-    "179afa85-2631-419a-b2d0-c0db9bfc0750",
-  "https://github.com/opensquare-network/dotreasury":
-    "1b8ae28f-a0f5-44d6-8046-d348f791c804",
-  "https://github.com/galacticcouncil/HydraDX-node":
-    "247abce9-3946-4e12-803b-255e2d03158a",
-  "https://github.com/subquery/subql": "252a454a-56e0-4744-965a-fbe00692b0e5",
-  "https://github.com/InvArch/InvArch-Frames":
-    "256086e7-3943-4662-a560-a14d023ca565",
-  "https://github.com/subsquid/squid-sdk":
-    "2640eb41-4d1c-4d91-9217-10b6da10c5cf",
-  "https://github.com/darwinia-network/darwinia":
-    "26412c33-0827-4c50-ab34-cb5e4aa31feb",
-  "https://github.com/hashed-io/hashed-substrate":
-    "267341d3-765c-4520-a9a9-784776d02da6",
-  "https://github.com/pendulum-chain/portal":
-    "2f3ee721-14fe-4f54-9a4b-fd93e9439c58",
-  "https://github.com/LibertyDSNP/frequency":
-    "2f813d2a-6546-448e-b749-6cb10c8b4684",
-  "https://github.com/OAK-Foundation/OAK-blockchain":
-    "3913379f-49cb-48bc-ae7c-d73bf6c13f77",
-  "https://github.com/centrifuge/centrifuge-chain":
-    "3d8f376a-f6c3-4644-912d-4aec6adb827b",
-  "https://github.com/dappforce/subsocial-parachain":
-    "4be6f937-5d13-4b07-a159-521aa96599fd",
-  "https://github.com/ImbueNetwork/imbue-frontend":
-    "601f4e3f-33ef-42f4-843e-bd6dfdc7ad1d",
-  "https://github.com/pendulum-chain/spacewalk":
-    "63ee19c8-2439-422a-b4e0-4d27cd0daaad",
-  "https://github.com/Brushfam/openbrush-contracts":
-    "70bf41c5-f7f9-48be-b6f1-1cbd10f79b1e",
-  "https://github.com/KILTprotocol/kilt-node":
-    "71e6763d-5bd0-4eed-8bc9-368b4c0148f3",
-  "https://github.com/Manta-Network/Manta":
-    "794a40b3-7eb6-41b0-b46f-ab84d8fcc5ff",
-  "https://github.com/sora-xor/sora2-parachain":
-    "7d0a5a1e-15a0-469b-b11e-10cd00226b00",
-  "https://github.com/moondance-labs/tanssi":
-    "7d89bfac-aae2-4306-a922-5d9c0ed4707f",
-  "https://github.com/OAK-Foundation/oak.js":
-    "7dd9de32-1f6e-4bd0-bae5-79d77cb131ca",
-  "https://github.com/sora-xor/sora2-network":
-    "7f447eeb-c416-4dcc-b7fc-4f41394ed09d",
-  "https://github.com/gear-tech/gear": "84528f03-b3ff-412d-8af6-97468433e5a7",
-  "https://github.com/Joystream/joystream":
-    "8c34d6f5-eb40-4d05-a333-075ad9d9df46",
-  "https://github.com/moonbeam-foundation/moonbeam":
-    "8ddff70d-b906-4660-ab48-8c3563fe1e49",
-  "https://github.com/webb-tools/tangle":
-    "8e76ee24-cbbb-4e89-94fb-4f6cdadb8988",
-  "https://github.com/peaqnetwork/peaq-network-node":
-    "8ecb0e53-74a5-44a2-ac79-251bf1c8923c",
-  "https://github.com/zeitgeistpm/zeitgeist":
-    "927dab5a-c64d-4225-b1b2-ff46146458f0",
-  "https://github.com/docknetwork/dock-substrate":
-    "943ecd57-04b6-4a41-b313-a7f50380870f",
-  "https://github.com/capsule-corp-ternoa/ternoa-node":
-    "98d18e95-74df-4535-a1a4-be648b72a41e",
-  "https://github.com/NodleCode/chain": "992c9a36-65dd-4b5b-8d1c-8d16b1a85b51",
-  "https://github.com/bifrost-finance/bifrost":
-    "9a1c18ea-be2e-49f0-886d-912a2f983170",
-  "https://github.com/ImbueNetwork/imbue":
-    "9a329a5b-f0df-43bc-aefd-d2491313aab9",
-  "https://github.com/TalismanSociety/talisman":
-    "9e63c326-3e9d-4d41-a7d1-5b36a986f746",
-  "https://github.com/encointer/encointer-parachain":
-    "a0706249-3918-44d4-838e-68b742cedb89",
-  "https://github.com/parallel-finance/parallel":
-    "a2f2fdbf-9903-4676-9d4b-14beb4d79ca4",
-  "https://github.com/bitgreen/bitgreen-node":
-    "a85f6556-99c6-47d9-ad21-6950fa9dc57c",
-  "https://github.com/opentensor/bittensor":
-    "ae3161b1-6ec7-4a7e-9f4b-026be1ed0282",
-  "https://github.com/deeper-chain/deeper-chain":
-    "af4b75c9-6a4f-452d-979c-3b954683a17d",
-  "https://github.com/t3rn/t3rn": "af89c412-b69f-4437-a6a0-cdf80070a4a9",
-  "https://github.com/crustio/crust": "b7d9b901-1529-4d44-b2bc-fe9ad1481f61",
-  "https://github.com/AcalaNetwork/Acala":
-    "bdb953d9-c4a3-4340-b62f-d79c35dfb36a",
-  "https://github.com/InvArch/InvArch-Node":
-    "c1d08eca-419a-41d0-9e13-4ff77c3daa84",
-  "https://github.com/Phala-Network/phala-blockchain":
-    "c2121346-154a-46d5-8aab-b3ca09d0ba96",
-  "https://github.com/encointer/encointer-node":
-    "ca0085d5-2c38-4fda-84c2-6294e1415414",
-  "https://github.com/opensquare-network/subsquare":
-    "ce541040-c2a1-40e1-ab90-193e5f3d0ae0",
-  "https://github.com/encointer/personhood-oracle":
-    "cf75d097-40d2-4f89-a5d1-f57b5fc721f2",
-  "https://github.com/airalab/robonomics":
-    "d215802e-377c-467a-90db-9144cc5368c7",
-  "https://github.com/pendulum-chain/pendulum":
-    "d3ca21a3-cabc-4dde-a63c-be1a5ab5687b",
-  "https://github.com/encointer/pallets":
-    "da578f24-d13e-4294-b8b7-b752adfaac22",
-  "https://github.com/integritee-network/worker":
-    "dd2da285-139a-4d39-bbef-89188acae91e",
-  "https://github.com/OAK-Foundation/xcm-demo":
-    "e1c4d97b-a60a-4b86-8592-08e0bc72a555",
-  "https://github.com/bit-country/Metaverse-Network":
-    "e6d8a01c-5f41-4b3a-99ac-2e8ae274f476",
-  "https://github.com/grindytech/gafi": "ecc13454-c074-4b81-9d98-c3cb15d48d8a",
-  "https://github.com/paritytech/polkadot-sdk":
-    "f149aef9-2669-4f93-97cc-848da31be521",
-  "https://github.com/litentry/litentry-parachain":
-    "f4684d74-d632-4301-b76f-2da40798d71b",
-  "https://github.com/AstarNetwork/Astar":
-    "f7e6066b-2424-4a46-b720-b82b62553b09",
-  "https://github.com/interlay/interbtc":
-    "f92c9d2d-58c0-4fcf-9ca4-fb637da54ecb",
-  "https://github.com/aleph-zero-foundation/aleph-node":
-    "fc87cecc-505c-40cb-bf10-9235830b4a33",
+  "automata-network/automata": "094fe93b-27b7-4547-b604-98a700c905e5",
+  "subspace/subspace": "0d16a11f-c7e2-4aa9-ae75-d46fe715e26a",
+  "mangata-finance/mangata-node": "104823c7-9380-4672-94ee-0accd5772d02",
+  "virto-network/virto-node": "179afa85-2631-419a-b2d0-c0db9bfc0750",
+  "opensquare-network/dotreasury": "1b8ae28f-a0f5-44d6-8046-d348f791c804",
+  "galacticcouncil/HydraDX-node": "247abce9-3946-4e12-803b-255e2d03158a",
+  "subquery/subql": "252a454a-56e0-4744-965a-fbe00692b0e5",
+  "InvArch/InvArch-Frames": "256086e7-3943-4662-a560-a14d023ca565",
+  "subsquid/squid-sdk": "2640eb41-4d1c-4d91-9217-10b6da10c5cf",
+  "darwinia-network/darwinia": "26412c33-0827-4c50-ab34-cb5e4aa31feb",
+  "hashed-io/hashed-substrate": "267341d3-765c-4520-a9a9-784776d02da6",
+  "pendulum-chain/portal": "2f3ee721-14fe-4f54-9a4b-fd93e9439c58",
+  "LibertyDSNP/frequency": "2f813d2a-6546-448e-b749-6cb10c8b4684",
+  "OAK-Foundation/OAK-blockchain": "3913379f-49cb-48bc-ae7c-d73bf6c13f77",
+  "centrifuge/centrifuge-chain": "3d8f376a-f6c3-4644-912d-4aec6adb827b",
+  "dappforce/subsocial-parachain": "4be6f937-5d13-4b07-a159-521aa96599fd",
+  "ImbueNetwork/imbue-frontend": "601f4e3f-33ef-42f4-843e-bd6dfdc7ad1d",
+  "pendulum-chain/spacewalk": "63ee19c8-2439-422a-b4e0-4d27cd0daaad",
+  "Brushfam/openbrush-contracts": "70bf41c5-f7f9-48be-b6f1-1cbd10f79b1e",
+  "KILTprotocol/kilt-node": "71e6763d-5bd0-4eed-8bc9-368b4c0148f3",
+  "Manta-Network/Manta": "794a40b3-7eb6-41b0-b46f-ab84d8fcc5ff",
+  "sora-xor/sora2-parachain": "7d0a5a1e-15a0-469b-b11e-10cd00226b00",
+  "moondance-labs/tanssi": "7d89bfac-aae2-4306-a922-5d9c0ed4707f",
+  "OAK-Foundation/oak.js": "7dd9de32-1f6e-4bd0-bae5-79d77cb131ca",
+  "sora-xor/sora2-network": "7f447eeb-c416-4dcc-b7fc-4f41394ed09d",
+  "gear-tech/gear": "84528f03-b3ff-412d-8af6-97468433e5a7",
+  "Joystream/joystream": "8c34d6f5-eb40-4d05-a333-075ad9d9df46",
+  "moonbeam-foundation/moonbeam": "8ddff70d-b906-4660-ab48-8c3563fe1e49",
+  "webb-tools/tangle": "8e76ee24-cbbb-4e89-94fb-4f6cdadb8988",
+  "peaqnetwork/peaq-network-node": "8ecb0e53-74a5-44a2-ac79-251bf1c8923c",
+  "zeitgeistpm/zeitgeist": "927dab5a-c64d-4225-b1b2-ff46146458f0",
+  "docknetwork/dock-substrate": "943ecd57-04b6-4a41-b313-a7f50380870f",
+  "capsule-corp-ternoa/ternoa-node": "98d18e95-74df-4535-a1a4-be648b72a41e",
+  "NodleCode/chain": "992c9a36-65dd-4b5b-8d1c-8d16b1a85b51",
+  "bifrost-finance/bifrost": "9a1c18ea-be2e-49f0-886d-912a2f983170",
+  "ImbueNetwork/imbue": "9a329a5b-f0df-43bc-aefd-d2491313aab9",
+  "TalismanSociety/talisman": "9e63c326-3e9d-4d41-a7d1-5b36a986f746",
+  "encointer/encointer-parachain": "a0706249-3918-44d4-838e-68b742cedb89",
+  "parallel-finance/parallel": "a2f2fdbf-9903-4676-9d4b-14beb4d79ca4",
+  "bitgreen/bitgreen-node": "a85f6556-99c6-47d9-ad21-6950fa9dc57c",
+  "opentensor/bittensor": "ae3161b1-6ec7-4a7e-9f4b-026be1ed0282",
+  "deeper-chain/deeper-chain": "af4b75c9-6a4f-452d-979c-3b954683a17d",
+  "t3rn/t3rn": "af89c412-b69f-4437-a6a0-cdf80070a4a9",
+  "crustio/crust": "b7d9b901-1529-4d44-b2bc-fe9ad1481f61",
+  "AcalaNetwork/Acala": "bdb953d9-c4a3-4340-b62f-d79c35dfb36a",
+  "InvArch/InvArch-Node": "c1d08eca-419a-41d0-9e13-4ff77c3daa84",
+  "Phala-Network/phala-blockchain": "c2121346-154a-46d5-8aab-b3ca09d0ba96",
+  "encointer/encointer-node": "ca0085d5-2c38-4fda-84c2-6294e1415414",
+  "opensquare-network/subsquare": "ce541040-c2a1-40e1-ab90-193e5f3d0ae0",
+  "encointer/personhood-oracle": "cf75d097-40d2-4f89-a5d1-f57b5fc721f2",
+  "airalab/robonomics": "d215802e-377c-467a-90db-9144cc5368c7",
+  "pendulum-chain/pendulum": "d3ca21a3-cabc-4dde-a63c-be1a5ab5687b",
+  "encointer/pallets": "da578f24-d13e-4294-b8b7-b752adfaac22",
+  "integritee-network/worker": "dd2da285-139a-4d39-bbef-89188acae91e",
+  "OAK-Foundation/xcm-demo": "e1c4d97b-a60a-4b86-8592-08e0bc72a555",
+  "bit-country/Metaverse-Network": "e6d8a01c-5f41-4b3a-99ac-2e8ae274f476",
+  "grindytech/gafi": "ecc13454-c074-4b81-9d98-c3cb15d48d8a",
+  "paritytech/polkadot-sdk": "f149aef9-2669-4f93-97cc-848da31be521",
+  "litentry/litentry-parachain": "f4684d74-d632-4301-b76f-2da40798d71b",
+  "AstarNetwork/Astar": "f7e6066b-2424-4a46-b720-b82b62553b09",
+  "interlay/interbtc": "f92c9d2d-58c0-4fcf-9ca4-fb637da54ecb",
+  "aleph-zero-foundation/aleph-node": "fc87cecc-505c-40cb-bf10-9235830b4a33",
 } as const;
 
 export const FIELDNAME_TO_PROPERTY_ID_MAP = {
diff --git a/lib/notion/index.ts b/lib/notion/index.ts
index dcd0bbb..824854c 100644
--- a/lib/notion/index.ts
+++ b/lib/notion/index.ts
@@ -275,7 +275,11 @@ export async function createRepoMap() {
   return out;
 }
 
-export async function createFilter(languages: string, search: string, interests: string[]) {
+export async function createFilter(
+  languages: string,
+  search: string,
+  interests: string[],
+) {
   if (!languages && !search && !interests) {
     // If all parameters are undefined, return undefined
     return undefined;
@@ -299,13 +303,9 @@ export async function createFilter(languages: string, search: string, interests:
     if (search) {
       // If search is defined, create a filter for Project Name
       filters.push({
-        property: "Project Name",
-        rollup: {
-          any: {
-            rich_text: {
-              contains: search,
-            },
-          },
+        property: "Github Repo",
+        relation: {
+          contains: REPO_LINK_TO_PAGE_ID_MAP[search as ValidRepositoryLink],
         },
       });
     }
@@ -313,19 +313,14 @@ export async function createFilter(languages: string, search: string, interests:
       // If interests is defined and not empty, create a filter for Interests using "or"
       filters.push({
         or: interests.map((interest) => ({
-          property: "Project Name",
-          rollup: {
-            any: {
-              rich_text: {
-                contains: interest,
-              },
-            },
+          property: "Github Repo",
+          relation: {
+            contains: REPO_LINK_TO_PAGE_ID_MAP[search as ValidRepositoryLink],
           },
         })),
       });
     }
 
-
     if (filters.length === 1) {
       // If there's only one filter, return it directly
       return filters[0];
@@ -336,4 +331,4 @@ export async function createFilter(languages: string, search: string, interests:
       };
     }
   }
-}
\ No newline at end of file
+}

From 52723f288bdec443d8c5cd542d216fe50638aa21 Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sun, 7 Jan 2024 14:31:26 +0100
Subject: [PATCH 18/30] feat: Filters controlled logic handle from useFilters
 hook

---
 components/filters/clear-filters.tsx |  4 +-
 components/filters/select-filter.tsx | 73 +++++++++++++---------------
 components/filters/toolbar.tsx       | 47 ++++++++++++++++++
 hooks/useFilters.tsx                 | 42 ++++++++++++++++
 types/filters.ts                     |  6 ++-
 5 files changed, 130 insertions(+), 42 deletions(-)
 create mode 100644 components/filters/toolbar.tsx
 create mode 100644 hooks/useFilters.tsx

diff --git a/components/filters/clear-filters.tsx b/components/filters/clear-filters.tsx
index 3cc2d18..eac6f7d 100644
--- a/components/filters/clear-filters.tsx
+++ b/components/filters/clear-filters.tsx
@@ -8,9 +8,10 @@ import { createUrl } from "@/utils/url";
 interface IClearFilters {
   param?: string;
   value: string;
+  onClear: () => void;
 }
 
-export const ClearFilters = ({ param, value }: IClearFilters) => {
+export const ClearFilters = ({ param, value, onClear }: IClearFilters) => {
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
@@ -24,6 +25,7 @@ export const ClearFilters = ({ param, value }: IClearFilters) => {
     } else {
       router.replace(pathname);
     }
+    onClear();
   };
   return (
     <div className="flex gap-4">
diff --git a/components/filters/select-filter.tsx b/components/filters/select-filter.tsx
index 67c5a20..58310ca 100644
--- a/components/filters/select-filter.tsx
+++ b/components/filters/select-filter.tsx
@@ -1,70 +1,63 @@
 "use client";
-import React, { useEffect } from "react";
+import React from "react";
 import { usePathname, useSearchParams } from "next/navigation";
 import { useRouter } from "next/navigation";
 import { Select, SelectItem } from "@nextui-org/select";
-import { FilterItem } from "@/types/filters";
+import { FilterOption } from "@/types/filters";
 import { createUrl } from "@/utils/url";
 import Emoji from "../emoji";
 
 interface ISelectFilterProps {
   placeholder: string;
-  emoji: string;
-  items: FilterItem[];
-  selectedValue: string;
+  mainEmoji: string;
+  options: FilterOption[];
+  selectedKey?: string;
+  onSelect: (value: string) => void;
 }
 export const SelectFilter = ({
   placeholder,
-  items,
-  emoji,
-  selectedValue,
+  mainEmoji,
+  options,
+  selectedKey,
+  onSelect,
 }: ISelectFilterProps) => {
-  const [value, setValue] = React.useState(selectedValue);
-
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
 
-  useEffect(() => {
-    setValue(selectedValue);
-  }, [selectedValue]);
-
-  useEffect(() => {
-    if (value === undefined) {
-      return;
-    }
-    const optionNameLowerCase = placeholder.toLowerCase();
-    const optionSearchParams = new URLSearchParams(searchParams.toString());
-    optionSearchParams.set(optionNameLowerCase, value);
-    const optionUrl = createUrl(pathname, optionSearchParams);
-    router.replace(optionUrl, { scroll: false });
-  }, [value]);
-
-  const handleSelectionChange = (e: {
-    target: { value: React.SetStateAction<string> };
-  }) => {
-    setValue(e.target.value);
+  const handleSelectionChange = (selection: unknown) => {
+    const selectedValue = Array.from(selection as Iterable<string>)[0];
+    onSelect(selectedValue);
   };
 
   return (
     <Select
+      aria-label={`Select Filter ${placeholder}`}
       color="default"
       variant="faded"
-      labelPlacement={"inside"}
-      label={placeholder}
-      onChange={handleSelectionChange}
-      selectedKeys={[value]}
-      startContent={value ? <Emoji emoji={emoji} className="text-sm" /> : <></>}
-      size={"sm"}
+      size="sm"
+      placeholder={placeholder}
+      selectionMode="single"
+      startContent={<Emoji emoji={mainEmoji} className="text-sm" />}
+      selectedKeys={selectedKey ? new Set([selectedKey]) : new Set()}
+      onSelectionChange={handleSelectionChange}
     >
-      {items.map((item) => {
+      {options.map(({ emoji, label, value }) => {
+        const optionNameLowerCase = placeholder.toLowerCase();
+        const optionSearchParams = new URLSearchParams(searchParams.toString());
+        optionSearchParams.set(optionNameLowerCase, value);
+        const optionUrl = createUrl(pathname, optionSearchParams);
+
         return (
           <SelectItem
-            key={item.value}
-            value={item.value}
-            startContent={<Emoji emoji={item.emoji} />}
+            key={value}
+            value={value}
+            startContent={<Emoji emoji={emoji} />}
+            onClick={() => {
+              router.replace(optionUrl, { scroll: false });
+            }}
           >
-            {item.label}
+            {label}
           </SelectItem>
         );
       })}
diff --git a/components/filters/toolbar.tsx b/components/filters/toolbar.tsx
new file mode 100644
index 0000000..6e77e51
--- /dev/null
+++ b/components/filters/toolbar.tsx
@@ -0,0 +1,47 @@
+"use client";
+import { LANGUAGES_OPTIONS, INTERESTS_OPTIONS } from "@/data/filters";
+import { useFilters } from "@/hooks/useFilters";
+import { SearchParams } from "@/types/filters";
+import ClearFilters from "./clear-filters";
+import SelectFilter from "./select-filter";
+
+interface IToolbarProps {
+  searchParams: SearchParams;
+}
+
+const Toolbar = ({ searchParams }: IToolbarProps) => {
+  const { filters, updateFilter, clearAllFilters } = useFilters({
+    initialParams: searchParams,
+  });
+
+  const handleSelect = (paramKey: string) => (value: string) => {
+    updateFilter(paramKey, value);
+  };
+
+  const hasFilters = Object.keys(filters).length > 0;
+
+  return (
+    <div className="flex justify-around items-stretch gap-4">
+      <SelectFilter
+        placeholder="Languages"
+        mainEmoji="🌐"
+        options={LANGUAGES_OPTIONS}
+        selectedKey={filters.languages}
+        onSelect={handleSelect("languages")}
+      />
+      <SelectFilter
+        placeholder="Interests"
+        mainEmoji="🪄"
+        options={INTERESTS_OPTIONS}
+        selectedKey={filters.interests}
+        onSelect={handleSelect("interests")}
+      />
+
+      {hasFilters && (
+        <ClearFilters onClear={clearAllFilters} value="All filters" />
+      )}
+    </div>
+  );
+};
+
+export default Toolbar;
diff --git a/hooks/useFilters.tsx b/hooks/useFilters.tsx
new file mode 100644
index 0000000..66814f6
--- /dev/null
+++ b/hooks/useFilters.tsx
@@ -0,0 +1,42 @@
+import { useCallback, useState } from "react";
+import { SearchParams } from "@/types/filters";
+
+export interface IConfigProps {
+  initialParams: SearchParams;
+}
+
+export interface IFiltersContext {
+  filters: SearchParams;
+  updateFilter: (key: string, value?: string) => void;
+  clearFilter: (key: string) => void;
+  clearAllFilters: () => void;
+}
+
+export const useFilters = ({
+  initialParams,
+}: IConfigProps): IFiltersContext => {
+  const [filters, setFilters] = useState(initialParams);
+
+  const updateFilter = useCallback((key: string, value?: string) => {
+    setFilters((prev) => ({ ...prev, [key]: value }));
+  }, []);
+
+  const clearFilter = useCallback((key: string) => {
+    setFilters((prev) => {
+      const newFilters = { ...prev };
+      delete newFilters[key];
+      return newFilters;
+    });
+  }, []);
+
+  const clearAllFilters = useCallback(() => {
+    setFilters({});
+  }, []);
+
+  return {
+    filters,
+    updateFilter,
+    clearFilter,
+    clearAllFilters,
+  };
+};
diff --git a/types/filters.ts b/types/filters.ts
index 0116f7d..b81a223 100644
--- a/types/filters.ts
+++ b/types/filters.ts
@@ -1,5 +1,9 @@
-export type FilterItem = {
+export type FilterOption = {
   label: string;
   emoji: string;
   value: string;
 };
+
+export type SearchParams = {
+  [key: string]: string | undefined;
+};

From 8f976ba370737c263c59642f54afb84717b3355b Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sun, 7 Jan 2024 14:56:12 +0100
Subject: [PATCH 19/30] feat: processNotionFilters utility function created

---
 utils/notion.ts | 95 +++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 51 deletions(-)

diff --git a/utils/notion.ts b/utils/notion.ts
index 1beb2c7..1baf62f 100644
--- a/utils/notion.ts
+++ b/utils/notion.ts
@@ -32,68 +32,61 @@ export function transformNotionDataToContributions(
   }, []);
 }
 
-export async function createNotionFilter(
-  languages: string,
-  search: string,
-  interests: string[],
-) {
-  if (!languages && !search && !interests) {
-    // If all parameters are undefined, return undefined
-    return undefined;
-  } else {
-    const filters = [];
+export function processNotionFilters(params?: {
+  [key: string]: string | undefined;
+}) {
+  const filters = [];
 
-    if (languages) {
-      // If languages is defined, create a filter for Repo Language
-      filters.push({
-        property: "Repo Language",
-        rollup: {
-          any: {
-            multi_select: {
-              contains: languages,
-            },
+  if (params?.languages) {
+    filters.push({
+      property: "Repo Language",
+      rollup: {
+        any: {
+          multi_select: {
+            contains: params.languages,
           },
         },
-      });
-    }
+      },
+    });
+  }
 
-    if (search) {
-      // If search is defined, create a filter for Project Name
-      filters.push({
+  if (params?.search) {
+    filters.push({
+      property: "Project Name",
+      rollup: {
+        any: {
+          rich_text: {
+            contains: params.search,
+          },
+        },
+      },
+    });
+  }
+
+  if (params?.interests) {
+    const interestsArray = Array.isArray(params.interests)
+      ? params.interests
+      : [params.interests];
+    const interestsFilter = {
+      or: interestsArray.map((interest) => ({
         property: "Project Name",
         rollup: {
           any: {
             rich_text: {
-              contains: search,
+              contains: interest,
             },
           },
         },
-      });
-    }
-    if (interests && interests.length > 0) {
-      // If interests is defined and not empty, create a filter for Interests using "or"
-      filters.push({
-        or: interests.map((interest) => ({
-          property: "Project Name",
-          rollup: {
-            any: {
-              rich_text: {
-                contains: interest,
-              },
-            },
-          },
-        })),
-      });
-    }
+      })),
+    };
+    filters.push(interestsFilter);
+  }
 
-    if (filters.length === 1) {
-      // If there's only one filter, return it directly
-      return filters[0];
-    } else if (filters.length > 1) {
-      // If there are multiple filters, combine them with "and"
-      return {
-        and: filters,
-      };
-    }
+  if (filters.length === 1) {
+    return filters[0];
+  } else if (filters.length > 1) {
+    return { and: filters };
   }
+
+  return undefined;
 }

From de7c7143bb379eeb9e70d7982911fb9b04849863 Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sun, 7 Jan 2024 14:57:25 +0100
Subject: [PATCH 20/30] feat: Homepage filters reorg

---
 app/page.tsx          | 85 ++++++-------------------------------------
 components/search.tsx |  6 +--
 2 files changed, 14 insertions(+), 77 deletions(-)

diff --git a/app/page.tsx b/app/page.tsx
index 8a4b1fd..66db145 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,39 +1,19 @@
 import ContributionsTable from "@/components/contributions-table/table";
-import ClearFilters from "@/components/filters/clear-filters";
-import SelectFilter from "@/components/filters/select-filter";
-import { title, subtitle } from "@/components/primitives";
-import Search from "@/components/search";
-import {
-  SEARCH_OPTIONS,
-  LANGUAGES_OPTIONS,
-  INTERESTS_OPTIONS,
-  REPOSITORIES_BY_INTERESTS,
-} from "@/data/filters";
+import Toolbar from "@/components/filters/toolbar";
+import { title } from "@/components/primitives";
 import { queryDatabase } from "@/lib/notion";
+import { SearchParams } from "@/types/filters";
 import {
-  createNotionFilter,
+  processNotionFilters,
   transformNotionDataToContributions,
 } from "@/utils/notion";
 
-export default async function Home({
-  searchParams,
-}: {
-  searchParams?: { [key: string]: string | string[] | undefined };
-}) {
-  const params = searchParams as { [key: string]: string };
-  const languagesFilterIsSelected = !!params && !!params.languages;
-  const interestsFilterIsSelected = !!params && !!params.interests;
-  const hasSearch = !!params && !!params.search;
-  const showRemoveAllFilters =
-    [languagesFilterIsSelected, interestsFilterIsSelected, hasSearch].filter(
-      Boolean,
-    ).length >= 2;
-  const filter = await createNotionFilter(
-    params.languages,
-    params.search,
-    REPOSITORIES_BY_INTERESTS[params.interests],
-  );
+interface IHomeProps {
+  searchParams: SearchParams;
+}
 
+export default async function Home({ searchParams }: IHomeProps) {
+  const filter = processNotionFilters(searchParams);
   const data = await queryDatabase({
     page_size: 10,
     filter,
@@ -51,51 +31,8 @@ export default async function Home({
         <h1 className={title()}>Find Collaborations,</h1>
         <h1 className={title()}>Collect Kudos</h1>
       </section>
-      <div className="flex flex-col items-center gap-4 py-8 md:py-10">
-        <div className="inline-block max-w-lg text-center justify-center">
-          <Search
-            placeholder="Search"
-            emoji="🔍"
-            items={SEARCH_OPTIONS}
-            selectedValue={params.search}
-          />
-          {/* TODO: 
-          1. make it controlled
-          2. set the selected value in the params
-          3. use custom function
-          4. reset the other values  */}
-          <h2 className={subtitle({ class: "mt-4" })}>Banner</h2>
-        </div>
-      </div>
-      <div className="grid grid-cols-2 gap-4">
-        <div className="flex justify-around items-stretch gap-4">
-          <SelectFilter
-            placeholder="Languages"
-            emoji={"💪"}
-            items={LANGUAGES_OPTIONS}
-            selectedValue={params.languages}
-          />
-          <SelectFilter
-            placeholder="Interests"
-            emoji={"🪄"}
-            items={INTERESTS_OPTIONS}
-            selectedValue={params.interests}
-          />
-          {languagesFilterIsSelected && (
-            <ClearFilters value={params.languages} param="Languages" />
-          )}
-          {interestsFilterIsSelected && (
-            <ClearFilters value={params.interests} param="Interests" />
-          )}
-          {hasSearch && <ClearFilters value={params.search} param="Search" />}
-
-          {showRemoveAllFilters && <ClearFilters value={"All filters"} />}
-        </div>
-        <div className="flex justify-end">
-          <div>
-            <h2 className={subtitle({ class: "mt-4" })}>Sort</h2>
-          </div>
-        </div>
+      <div className="flex flex-col gap-4">
+        <Toolbar searchParams={searchParams} />
         <div>
           <ContributionsTable
             items={items}
diff --git a/components/search.tsx b/components/search.tsx
index 6981c68..f80dec4 100644
--- a/components/search.tsx
+++ b/components/search.tsx
@@ -1,7 +1,7 @@
 "use client";
 import React, { FC, useEffect } from "react";
 import { Autocomplete, AutocompleteItem } from "@nextui-org/autocomplete";
-import { FilterItem } from "@/types/filters";
+import { FilterOption } from "@/types/filters";
 import Emoji from "./emoji";
 import { useRouter } from "next/navigation";
 import { usePathname, useSearchParams } from "next/navigation";
@@ -10,8 +10,8 @@ import { createUrl } from "@/utils/url";
 interface SearchProps {
   placeholder: string;
   emoji: string;
-  items: FilterItem[];
-  selectedValue: string;
+  items: FilterOption[];
+  selectedValue?: string;
 }
 
 const Search: FC<SearchProps> = ({

From 2d5a042b11cb21a67bf9daf447d322fdb704f93f Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sun, 7 Jan 2024 15:07:21 +0100
Subject: [PATCH 21/30] fix: Notion filters

---
 utils/notion.ts | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/utils/notion.ts b/utils/notion.ts
index 1baf62f..9a73ea7 100644
--- a/utils/notion.ts
+++ b/utils/notion.ts
@@ -1,7 +1,12 @@
+import {
+  QueryDatabaseResponse,
+  search,
+} from "@notionhq/client/build/src/api-endpoints";
+import { REPO_LINK_TO_PAGE_ID_MAP } from "@/lib/notion/constants";
+import { ValidRepositoryLink } from "@/lib/notion/types";
 import projectLogosJson from "@/public/images/imageMap.json";
 import { Contribution } from "@/types/contribution";
 import { getImagePath } from "./github";
-import { QueryDatabaseResponse } from "@notionhq/client/build/src/api-endpoints";
 
 export function transformNotionDataToContributions(
   notionData: QueryDatabaseResponse,
@@ -52,13 +57,10 @@ export function processNotionFilters(params?: {
 
   if (params?.search) {
     filters.push({
-      property: "Project Name",
-      rollup: {
-        any: {
-          rich_text: {
-            contains: params.search,
-          },
-        },
+      property: "Github Repo",
+      relation: {
+        contains:
+          REPO_LINK_TO_PAGE_ID_MAP[search as unknown as ValidRepositoryLink],
       },
     });
   }
@@ -69,13 +71,10 @@ export function processNotionFilters(params?: {
       : [params.interests];
     const interestsFilter = {
       or: interestsArray.map((interest) => ({
-        property: "Project Name",
-        rollup: {
-          any: {
-            rich_text: {
-              contains: interest,
-            },
-          },
+        property: "Github Repo",
+        relation: {
+          contains:
+            REPO_LINK_TO_PAGE_ID_MAP[search as unknown as ValidRepositoryLink],
         },
       })),
     };

From f3e4760cc3f24e8083909e27740c4f11d8a32891 Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sun, 7 Jan 2024 15:51:54 +0100
Subject: [PATCH 22/30] fix: build

---
 components/search.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/search.tsx b/components/search.tsx
index f80dec4..6099065 100644
--- a/components/search.tsx
+++ b/components/search.tsx
@@ -55,9 +55,9 @@ const Search: FC<SearchProps> = ({
       className="max-w-md"
       size="lg"
       selectedKey={value}
-      onSelectionChange={setValue}
+      // onSelectionChange={setValue}
     >
-      {(item: FilterItem) => {
+      {(item: FilterOption) => {
         return (
           <AutocompleteItem key={item.value} textValue={item.label}>
             <Emoji emoji={item.emoji} className="text-xl"></Emoji>

From 622cd60dd69f5dc26d0b76c86b9fee65d34cda5f Mon Sep 17 00:00:00 2001
From: Igor Papandinas <igor.papandinas@posteo.net>
Date: Sun, 7 Jan 2024 16:05:34 +0100
Subject: [PATCH 23/30] chore: Useless /table page deleted

---
 app/table/page.tsx | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 app/table/page.tsx

diff --git a/app/table/page.tsx b/app/table/page.tsx
deleted file mode 100644
index 53e155e..0000000
--- a/app/table/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { getGoodFirstIssues } from "@/lib/notion";
-import ContributionsTable from "@/components/contributions-table/table";
-import { transformNotionDataToContributions } from "@/utils/notion";
-
-export default async function Page() {
-  const data = await getGoodFirstIssues({ page_size: 10 });
-  const contributions = transformNotionDataToContributions(data);
-  const items = {
-    data: contributions,
-    hasMore: data.has_more,
-    nextCursor: data.next_cursor ?? undefined,
-  };
-
-  return (
-    <div>
-      <ContributionsTable items={items} />
-    </div>
-  );
-}

From 20db912887f62294691e7d60fa4600d610009b59 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Sun, 7 Jan 2024 15:37:41 -0300
Subject: [PATCH 24/30] fix: hydration using
 https://nextjs.org/docs/messages/react-hydration-error

---
 components/contributions-table/table.tsx | 37 +++++++++++++++++-------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/components/contributions-table/table.tsx b/components/contributions-table/table.tsx
index fdd74a8..64eaff2 100644
--- a/components/contributions-table/table.tsx
+++ b/components/contributions-table/table.tsx
@@ -1,5 +1,5 @@
 "use client";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { useMediaQuery } from "react-responsive";
 import {
   Table as NuiTable,
@@ -17,11 +17,22 @@ import { useContributions } from "@/hooks/useContributions";
 import { KudosQueryParameters } from "@/lib/notion/types";
 import { isNotNull } from "@/utils/type-guard";
 
+interface IColumn {
+  name: string;
+  uid: string;
+}
+
 interface ITableProps {
   items: PaginatedContributions;
   queries?: Partial<KudosQueryParameters>;
 }
 export const Table = ({ items, queries = {} }: ITableProps) => {
+  const [columns, setColumns] = useState<IColumn[]>([
+    { name: "PROJECT", uid: "project" },
+    { name: "CONTENT", uid: "content" },
+    { name: "LABELS", uid: "labels" },
+    { name: "DATE", uid: "date" },]);
+
   const {
     data: results,
     fetchNextPage,
@@ -32,19 +43,23 @@ export const Table = ({ items, queries = {} }: ITableProps) => {
     onLoadMore: fetchNextPage,
   });
 
+  const isMobile = useMediaQuery({ maxWidth: 639 }); // tailwind lg default: 640px
+  const isLaptop = useMediaQuery({ minWidth: 1024 }); // tailwind lg default: 1024px
+  useEffect(() => {
+    setColumns([
+      { name: "PROJECT", uid: "project" },
+      { name: "CONTENT", uid: "content" },
+      ...(isLaptop ? [{ name: "LABELS", uid: "labels" }] : []),
+      { name: "DATE", uid: "date" },
+      ...(isMobile ? [] : [{ name: "ACTIONS", uid: "actions" }]),
+    ]);
+  }, [isMobile, isLaptop]);
+
+
   const contributions = React.useMemo(() => {
     return results?.pages.flatMap((page) => page.data) || [];
   }, [results]);
 
-  const isMobile = useMediaQuery({ maxWidth: 639 }); // tailwind lg default: 640px
-  const isLaptop = useMediaQuery({ minWidth: 1024 }); // tailwind lg default: 1024px
-  const COLUMNS = [
-    { name: "PROJECT", uid: "project" },
-    { name: "CONTENT", uid: "content" },
-    isLaptop ? { name: "LABELS", uid: "labels" } : null,
-    { name: "DATE", uid: "date" },
-    isMobile ? null : { name: "ACTIONS", uid: "actions" },
-  ].filter(isNotNull);
 
   const renderCell = React.useCallback(
     (item: Contribution, columnKey: React.Key) => {
@@ -120,7 +135,7 @@ export const Table = ({ items, queries = {} }: ITableProps) => {
           td: "px-2 sm:px-inherit",
         }}
       >
-        <TableHeader columns={COLUMNS}>
+        <TableHeader columns={columns}>
           {(column) => (
             <TableColumn
               key={column.uid}

From 619b1059b2da387415e1f4c52b4bdf690eb25193 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Sun, 7 Jan 2024 15:45:26 -0300
Subject: [PATCH 25/30] chore: remove unsued import

---
 components/contributions-table/table.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/contributions-table/table.tsx b/components/contributions-table/table.tsx
index 64eaff2..21f03b5 100644
--- a/components/contributions-table/table.tsx
+++ b/components/contributions-table/table.tsx
@@ -15,7 +15,6 @@ import { Contribution, PaginatedContributions } from "@/types/contribution";
 import { ExternalLink, Content, Labels, Time, Project } from "./row";
 import { useContributions } from "@/hooks/useContributions";
 import { KudosQueryParameters } from "@/lib/notion/types";
-import { isNotNull } from "@/utils/type-guard";
 
 interface IColumn {
   name: string;

From 01d6e88fc8a3c2f8be9875a119f5ea471fc85483 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Sun, 7 Jan 2024 16:36:41 -0300
Subject: [PATCH 26/30] chore: remove console logs

---
 components/search.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/search.tsx b/components/search.tsx
index b241124..d162b3a 100644
--- a/components/search.tsx
+++ b/components/search.tsx
@@ -29,10 +29,8 @@ const Search: FC<SearchProps> = ({
   useEffect(() => {
     setValue(selectedValue || "");
   }, [selectedValue]);
-  console.log(value);
 
   useEffect(() => {
-    console.log(value);
     if (value === undefined || value === "") {
       return;
     }

From 72a1dc52ba96638d7fac5e341c53c6587158fb53 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Sun, 7 Jan 2024 16:36:53 -0300
Subject: [PATCH 27/30] fix: interests filter

---
 utils/notion.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/utils/notion.ts b/utils/notion.ts
index 9a73ea7..8f6cf01 100644
--- a/utils/notion.ts
+++ b/utils/notion.ts
@@ -7,6 +7,7 @@ import { ValidRepositoryLink } from "@/lib/notion/types";
 import projectLogosJson from "@/public/images/imageMap.json";
 import { Contribution } from "@/types/contribution";
 import { getImagePath } from "./github";
+import { REPOSITORIES_BY_INTERESTS } from "@/data/filters";
 
 export function transformNotionDataToContributions(
   notionData: QueryDatabaseResponse,
@@ -66,18 +67,16 @@ export function processNotionFilters(params?: {
   }
 
   if (params?.interests) {
-    const interestsArray = Array.isArray(params.interests)
-      ? params.interests
-      : [params.interests];
+    const repositories = REPOSITORIES_BY_INTERESTS[params.interests];
     const interestsFilter = {
-      or: interestsArray.map((interest) => ({
+      or: repositories.map((interest) => ({
         property: "Github Repo",
         relation: {
           contains:
-            REPO_LINK_TO_PAGE_ID_MAP[search as unknown as ValidRepositoryLink],
+            REPO_LINK_TO_PAGE_ID_MAP[interest as unknown as ValidRepositoryLink],
         },
       })),
-    };
+    }
     filters.push(interestsFilter);
   }
 

From d2f8d57dee547e24aab6af96323d2467f0486d60 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Sun, 7 Jan 2024 21:01:20 -0300
Subject: [PATCH 28/30] fix: add/remove filter

---
 components/filters/select-filter.tsx | 17 ++++++++++-------
 components/filters/toolbar.tsx       | 10 +++++++---
 utils/notion.ts                      |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/components/filters/select-filter.tsx b/components/filters/select-filter.tsx
index 58310ca..28e2df4 100644
--- a/components/filters/select-filter.tsx
+++ b/components/filters/select-filter.tsx
@@ -28,6 +28,16 @@ export const SelectFilter = ({
   const handleSelectionChange = (selection: unknown) => {
     const selectedValue = Array.from(selection as Iterable<string>)[0];
     onSelect(selectedValue);
+    const optionNameLowerCase = placeholder.toLowerCase();
+    const optionSearchParams = new URLSearchParams(searchParams.toString());
+    if (selectedValue) {
+      optionSearchParams.set(optionNameLowerCase, selectedValue);
+    } else {
+      optionSearchParams.delete(optionNameLowerCase)
+    }
+    const optionUrl = createUrl(pathname, optionSearchParams);
+    router.replace(optionUrl, { scroll: false });
+
   };
 
   return (
@@ -43,19 +53,12 @@ export const SelectFilter = ({
       onSelectionChange={handleSelectionChange}
     >
       {options.map(({ emoji, label, value }) => {
-        const optionNameLowerCase = placeholder.toLowerCase();
-        const optionSearchParams = new URLSearchParams(searchParams.toString());
-        optionSearchParams.set(optionNameLowerCase, value);
-        const optionUrl = createUrl(pathname, optionSearchParams);
 
         return (
           <SelectItem
             key={value}
             value={value}
             startContent={<Emoji emoji={emoji} />}
-            onClick={() => {
-              router.replace(optionUrl, { scroll: false });
-            }}
           >
             {label}
           </SelectItem>
diff --git a/components/filters/toolbar.tsx b/components/filters/toolbar.tsx
index 6e77e51..f38aa03 100644
--- a/components/filters/toolbar.tsx
+++ b/components/filters/toolbar.tsx
@@ -4,18 +4,22 @@ import { useFilters } from "@/hooks/useFilters";
 import { SearchParams } from "@/types/filters";
 import ClearFilters from "./clear-filters";
 import SelectFilter from "./select-filter";
-
 interface IToolbarProps {
   searchParams: SearchParams;
 }
 
 const Toolbar = ({ searchParams }: IToolbarProps) => {
-  const { filters, updateFilter, clearAllFilters } = useFilters({
+  const { filters, updateFilter, clearFilter, clearAllFilters } = useFilters({
     initialParams: searchParams,
   });
 
   const handleSelect = (paramKey: string) => (value: string) => {
-    updateFilter(paramKey, value);
+    console.log(paramKey, value, filters)
+    if (value) {
+      updateFilter(paramKey, value);
+    } else {
+      clearFilter(paramKey);
+    }
   };
 
   const hasFilters = Object.keys(filters).length > 0;
diff --git a/utils/notion.ts b/utils/notion.ts
index 8f6cf01..9e96c84 100644
--- a/utils/notion.ts
+++ b/utils/notion.ts
@@ -66,7 +66,7 @@ export function processNotionFilters(params?: {
     });
   }
 
-  if (params?.interests) {
+  if (params?.interests && REPOSITORIES_BY_INTERESTS[params.interests]) {
     const repositories = REPOSITORIES_BY_INTERESTS[params.interests];
     const interestsFilter = {
       or: repositories.map((interest) => ({

From 179a2201da8df8afa2156c0e1cd9a40dedb4b657 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Mon, 8 Jan 2024 17:57:38 -0300
Subject: [PATCH 29/30] feat: add projects filter

---
 components/filters/toolbar.tsx | 78 ++++++++++++++++++++++++----------
 data/filters.ts                |  4 +-
 utils/notion.ts                |  6 ++-
 3 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/components/filters/toolbar.tsx b/components/filters/toolbar.tsx
index f38aa03..2a12b3f 100644
--- a/components/filters/toolbar.tsx
+++ b/components/filters/toolbar.tsx
@@ -1,5 +1,5 @@
 "use client";
-import { LANGUAGES_OPTIONS, INTERESTS_OPTIONS } from "@/data/filters";
+import { LANGUAGES_OPTIONS, INTERESTS_OPTIONS, PROJECTS_OPTIONS } from "@/data/filters";
 import { useFilters } from "@/hooks/useFilters";
 import { SearchParams } from "@/types/filters";
 import ClearFilters from "./clear-filters";
@@ -14,37 +14,69 @@ const Toolbar = ({ searchParams }: IToolbarProps) => {
   });
 
   const handleSelect = (paramKey: string) => (value: string) => {
-    console.log(paramKey, value, filters)
     if (value) {
       updateFilter(paramKey, value);
     } else {
       clearFilter(paramKey);
     }
   };
-
-  const hasFilters = Object.keys(filters).length > 0;
+  const clearLanguagesFilter = () => {
+    clearFilter('languages')
+  }
+  const clearInterestsFilter = () => {
+    clearFilter('interests')
+  }
+  const clearProjectsFilter = () => {
+    clearFilter('projects')
+  }
+  const numberOfFilters = Object.keys(filters).length;
 
   return (
-    <div className="flex justify-around items-stretch gap-4">
-      <SelectFilter
-        placeholder="Languages"
-        mainEmoji="🌐"
-        options={LANGUAGES_OPTIONS}
-        selectedKey={filters.languages}
-        onSelect={handleSelect("languages")}
-      />
-      <SelectFilter
-        placeholder="Interests"
-        mainEmoji="🪄"
-        options={INTERESTS_OPTIONS}
-        selectedKey={filters.interests}
-        onSelect={handleSelect("interests")}
-      />
+    <>
+      <div className="flex justify-around items-stretch gap-4">
+        <SelectFilter
+          placeholder="Languages"
+          mainEmoji="🌐"
+          options={LANGUAGES_OPTIONS}
+          selectedKey={filters.languages}
+          onSelect={handleSelect("languages")}
+        />
+        <SelectFilter
+          placeholder="Interests"
+          mainEmoji="🪄"
+          options={INTERESTS_OPTIONS}
+          selectedKey={filters.interests}
+          onSelect={handleSelect("interests")}
+        />
+        <SelectFilter
+          placeholder="Projects"
+          mainEmoji="🖥️"
+          options={PROJECTS_OPTIONS}
+          selectedKey={filters.projects}
+          onSelect={handleSelect("projects")}
+        />
+      </div>
+
+      {
+        numberOfFilters > 0 &&
+        <div className="flex justify-left items-stretch gap-4">
+
+          {searchParams?.languages && (
+            <ClearFilters onClear={clearLanguagesFilter} value={searchParams.languages} param="languages" />
+          )}
+          {searchParams?.interests && (
+            <ClearFilters onClear={clearInterestsFilter} value={searchParams.interests} param="interests" />
+          )}
+          {searchParams?.projects && (
+            <ClearFilters onClear={clearProjectsFilter} value={searchParams.projects} param="projects" />
+          )}
+          {numberOfFilters > 1 && (
+            <ClearFilters onClear={clearAllFilters} value="All filters" />
+          )}
+        </div>
 
-      {hasFilters && (
-        <ClearFilters onClear={clearAllFilters} value="All filters" />
-      )}
-    </div>
+      }
+    </>
   );
 };
 
diff --git a/data/filters.ts b/data/filters.ts
index fcfd5c3..1332da6 100644
--- a/data/filters.ts
+++ b/data/filters.ts
@@ -100,7 +100,7 @@ export const INTERESTS_OPTIONS = [
   { value: AI, label: "AI", emoji: "🧠" },
 ];
 
-export const SEARCH_OPTIONS = [
+export const PROJECTS_OPTIONS = [
   {
     value: "paritytech/polkadot-sdk",
     label: "Polkadot Sdk",
@@ -297,7 +297,7 @@ export const SEARCH_OPTIONS = [
   { value: "bittensor", label: "Bittensor", emoji: "🧠" },
 ];
 
-// export const SEARCH_OPTIONS = [
+// export const PROJECTS_OPTIONS = [
 //   { value: "polkadot-sdk", label: "Polkadot Sdk", emoji: "🔗" },
 //   { value: "OAK-blockchain", label: "Oak Blockchain", emoji: "🌳" },
 //   { value: "InvArch-Node", label: "Invarch Node", emoji: "🏛️" },
diff --git a/utils/notion.ts b/utils/notion.ts
index 9e96c84..8359e01 100644
--- a/utils/notion.ts
+++ b/utils/notion.ts
@@ -56,12 +56,14 @@ export function processNotionFilters(params?: {
     });
   }
 
-  if (params?.search) {
+  if (params?.projects) {
+    const repositories = REPO_LINK_TO_PAGE_ID_MAP[params.projects as unknown as ValidRepositoryLink];
+    console.log(repositories)
     filters.push({
       property: "Github Repo",
       relation: {
         contains:
-          REPO_LINK_TO_PAGE_ID_MAP[search as unknown as ValidRepositoryLink],
+          repositories,
       },
     });
   }

From fb00cff3b3f167a4fb823b21cf66d63f4fa0f0c5 Mon Sep 17 00:00:00 2001
From: Leandro Palazzolo <leapalazzolo@gmail.com>
Date: Mon, 8 Jan 2024 19:21:00 -0300
Subject: [PATCH 30/30] refactor: individual clear filter

---
 assets/icons.tsx                     | 12 +++++++++++-
 components/filters/select-filter.tsx |  6 +++++-
 components/filters/toolbar.tsx       | 21 +++------------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/assets/icons.tsx b/assets/icons.tsx
index 4e4b335..e2a7ac1 100644
--- a/assets/icons.tsx
+++ b/assets/icons.tsx
@@ -1,6 +1,16 @@
 import * as React from "react";
 import { IconSvgProps } from "@/types/index";
-
+export const CircledCross = ({ size = 24,
+  width,
+  height,
+  ...props }: IconSvgProps) => (
+  <svg
+    height={size || height}
+    viewBox="0 0 24 24"
+    width={size || width}
+    {...props}>
+    <path d="M12 2a10 10 0 1010 10A10.016 10.016 0 0012 2zm3.36 12.3a.754.754 0 010 1.06.748.748 0 01-1.06 0l-2.3-2.3-2.3 2.3a.748.748 0 01-1.06 0 .754.754 0 010-1.06l2.3-2.3-2.3-2.3A.75.75 0 019.7 8.64l2.3 2.3 2.3-2.3a.75.75 0 011.06 1.06l-2.3 2.3z" fill="currentColor"></path>  </svg>
+)
 export const HeartFilledIcon = ({
   size = 24,
   width,
diff --git a/components/filters/select-filter.tsx b/components/filters/select-filter.tsx
index 28e2df4..3eb094c 100644
--- a/components/filters/select-filter.tsx
+++ b/components/filters/select-filter.tsx
@@ -6,6 +6,7 @@ import { Select, SelectItem } from "@nextui-org/select";
 import { FilterOption } from "@/types/filters";
 import { createUrl } from "@/utils/url";
 import Emoji from "../emoji";
+import { CircledCross } from "@/assets/icons";
 
 interface ISelectFilterProps {
   placeholder: string;
@@ -39,7 +40,9 @@ export const SelectFilter = ({
     router.replace(optionUrl, { scroll: false });
 
   };
-
+  const resetFilter = () => {
+    handleSelectionChange("")
+  }
   return (
     <Select
       aria-label={`Select Filter ${placeholder}`}
@@ -49,6 +52,7 @@ export const SelectFilter = ({
       placeholder={placeholder}
       selectionMode="single"
       startContent={<Emoji emoji={mainEmoji} className="text-sm" />}
+      endContent={selectedKey && <CircledCross className="z-10 appearance-none outline-none select-none transition-opacity opacity-70 hover:opacity-100 cursor-pointer active:opacity-disabled tap-highlight-transparent text-large" onClick={resetFilter} />}
       selectedKeys={selectedKey ? new Set([selectedKey]) : new Set()}
       onSelectionChange={handleSelectionChange}
     >
diff --git a/components/filters/toolbar.tsx b/components/filters/toolbar.tsx
index 2a12b3f..60caefc 100644
--- a/components/filters/toolbar.tsx
+++ b/components/filters/toolbar.tsx
@@ -57,25 +57,10 @@ const Toolbar = ({ searchParams }: IToolbarProps) => {
         />
       </div>
 
-      {
-        numberOfFilters > 0 &&
-        <div className="flex justify-left items-stretch gap-4">
+      {numberOfFilters > 1 && (
+        <ClearFilters onClear={clearAllFilters} value="All filters" />
+      )}
 
-          {searchParams?.languages && (
-            <ClearFilters onClear={clearLanguagesFilter} value={searchParams.languages} param="languages" />
-          )}
-          {searchParams?.interests && (
-            <ClearFilters onClear={clearInterestsFilter} value={searchParams.interests} param="interests" />
-          )}
-          {searchParams?.projects && (
-            <ClearFilters onClear={clearProjectsFilter} value={searchParams.projects} param="projects" />
-          )}
-          {numberOfFilters > 1 && (
-            <ClearFilters onClear={clearAllFilters} value="All filters" />
-          )}
-        </div>
-
-      }
     </>
   );
 };