diff --git a/backend/routers/search.py b/backend/routers/search.py index 57949fd..7ab9aaf 100644 --- a/backend/routers/search.py +++ b/backend/routers/search.py @@ -3,7 +3,7 @@ from fastapi import APIRouter, Depends, HTTPException, Query from sqlmodel import Session, select, col from sqlalchemy.orm import selectinload from database import get_session -from models import Show, Song, Venue, Tour, Group, Performance, PerformanceNickname, Comment, Review +from models import Show, Song, Venue, Tour, Group, Performance, PerformanceNickname, Comment, Review, Vertical router = APIRouter(prefix="/search", tags=["search"]) @@ -45,6 +45,13 @@ def global_search( .where(col(Group.name).ilike(q_str)) .limit(limit) ).all() + + # Search Verticals (Bands) + verticals = session.exec( + select(Vertical) + .where(col(Vertical.name).ilike(q_str)) + .limit(limit) + ).all() # Search Nicknames nicknames_raw = session.exec( @@ -115,6 +122,7 @@ def global_search( "venues": venues, "tours": tours, "groups": groups, + "verticals": verticals, "nicknames": nicknames, "performances": performances, "reviews": reviews, diff --git a/frontend/components/layout/navbar.tsx b/frontend/components/layout/navbar.tsx index 67e1f4e..217516d 100644 --- a/frontend/components/layout/navbar.tsx +++ b/frontend/components/layout/navbar.tsx @@ -6,14 +6,6 @@ import { Button } from "@/components/ui/button" import { SearchDialog } from "@/components/ui/search-dialog" import { NotificationBell } from "@/components/notifications/notification-bell" import { ThemeToggle } from "@/components/theme-toggle" -import { BandSelector } from "@/components/layout/band-selector" -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuSeparator, - DropdownMenuTrigger, -} from "@/components/ui/dropdown-menu" import { useAuth } from "@/contexts/auth-context" import { useVertical } from "@/contexts/vertical-context" @@ -38,8 +30,10 @@ export function Navbar() { return (
- {/* Band Selector - replaces logo */} - + {/* Brand Logo - Home Link */} + + Fediversion + {/* Desktop Navigation */}