Skip to content

Use common instrument search API in top page #3

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
rerrahkr merged 2 commits into from
Sep 14, 2025
Merged

Use common instrument search API in top page #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b47f8f3
Change max instrument count in search page
rerrahkr Sep 14, 2025
33d8f38
Use common instrument search API in top page
rerrahkr Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import type { Timestamp } from "firebase/firestore";
import {
getInstrumentDocsAndIdsMostLiked,
getInstrumentDocsAndIdsNewer,
} from "@/features/instrument/api";
import { searchInstruments } from "@/features/instrument/api";
import { getUidNameTable } from "@/features/user/api";
import { HomePageContent } from "./_components/content";
import type { InstrumentMetaInfo } from "./types";
Expand All @@ -11,8 +8,14 @@ const NEW_INSTRUMENT_COUNT = 6;
const LIKE_RANKING_COUNT = 5;

export default async function HomePage() {
const newest = await getInstrumentDocsAndIdsNewer(NEW_INSTRUMENT_COUNT);
const likes = await getInstrumentDocsAndIdsMostLiked(LIKE_RANKING_COUNT);
const { docs: newest } = await searchInstruments({
pageSize: NEW_INSTRUMENT_COUNT,
sortBy: "newest",
});
const { docs: likes } = await searchInstruments({
pageSize: LIKE_RANKING_COUNT,
sortBy: "likes",
});

const authorUids = [
...new Set([
Expand Down
2 changes: 1 addition & 1 deletion app/search/defines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const MAX_LIKE_COUNT = 500;

export const PAGE_SIZE = 6;
export const PAGE_SIZE = 18;
16 changes: 0 additions & 16 deletions features/instrument/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,6 @@ export async function getInstrumentDocsAndIdsByAuthor(
return querySnapshot.docs.map((doc) => [doc.data() as InstrumentDoc, doc.id]);
}

export async function getInstrumentDocsAndIdsNewer(
limitCount: number
): Promise<[InstrumentDoc, string][]> {
const q = query(collectionInstruments(), orderByNew, limit(limitCount));
const querySnapshot = await getDocs(q);
return querySnapshot.docs.map((doc) => [doc.data() as InstrumentDoc, doc.id]);
}

export async function getInstrumentDocsAndIdsMostLiked(
limitCount: number
): Promise<[InstrumentDoc, string][]> {
const q = query(collectionInstruments(), orderByLiked, limit(limitCount));
const querySnapshot = await getDocs(q);
return querySnapshot.docs.map((doc) => [doc.data() as InstrumentDoc, doc.id]);
}

export async function updateInstrumentDoc(
instrumentId: string,
metaInfo: EditableInstrumentMetaInfo
Expand Down