rebase & resolve conflicts

2025-12-10 13:57:46 +01:00
parent 7a532492ea
commit b710669ead
7 changed files with 1180 additions and 889 deletions
@@ -3,7 +3,7 @@ import {Link} from "react-router";
 import {useEffect, useState} from "react";
 import searchEvents from "../../utils/searchEvents.js";
 import searchUsers from "../../utils/searchUsers.js";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";


 function SearchBar() {