Skip to content

Commit 19aa52c

Browse files
marcodejonghmarcodejongh
committed
Finish UI
1 parent 39be21f commit 19aa52c

File tree

6 files changed

+180
-9
lines changed

6 files changed

+180
-9
lines changed

‎app/[board_name]/[layout_id]/[size_id]/[set_ids]/[angle]/list/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default async function DynamicResultsPage({
2929
fetchBoardDetails(parsedParams.board_name, parsedParams.layout_id, parsedParams.size_id, parsedParams.set_ids),
3030
]);
3131

32-
if (!fetchedResults || fetchedResults.climbs.length === 0) {
32+
if (!fetchedResults || fetchedResults.climbs?.length === 0) {
3333
notFound();
3434
}
3535

‎app/components/search-drawer/basic-search-form.tsx‎

Lines changed: 128 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
'use client';
22

33
import React from 'react';
4-
import { Form, InputNumber, Row, Col, Select, Input } from 'antd';
4+
import { Form, InputNumber, Row, Col, Select, Input, Switch, Alert, Typography } from 'antd';
55
import { TENSION_KILTER_GRADES } from '@/app/lib/board-data';
66
import { useUISearchParams } from '@/app/components/queue-control/ui-searchparams-provider';
77
import SearchClimbNameInput from './search-climb-name-input';
8+
import { useBoardProvider } from '../board-provider/board-provider-context';
9+
10+
const { Title } = Typography;
811

912
const BasicSearchForm: React.FC = () => {
1013
const { uiSearchParams, updateFilters } = useUISearchParams();
14+
const { user } = useBoardProvider();
15+
const userId = user?.id;
1116
const grades = TENSION_KILTER_GRADES;
1217

1318
const handleGradeChange = (type: 'min' | 'max', value: number | undefined) => {
@@ -18,6 +23,53 @@ const BasicSearchForm: React.FC = () => {
1823
}
1924
};
2025

26+
const renderLogbookSection = () => {
27+
if (!userId) {
28+
return (
29+
<Form.Item>
30+
<Alert
31+
message="Sign in to access your logbook"
32+
description="Login to your account to search for your favourite climbs, climbs you've done, or attempted."
33+
type="info"
34+
showIcon
35+
/>
36+
</Form.Item>
37+
);
38+
}
39+
40+
return (
41+
<>
42+
<Form.Item label="Climbs I have Done" valuePropName="checked">
43+
<Switch
44+
checked={uiSearchParams.showDone}
45+
onChange={(checked) => updateFilters({ showDone: checked })}
46+
/>
47+
</Form.Item>
48+
49+
<Form.Item label="Climbs I have Attempted" valuePropName="checked">
50+
<Switch
51+
checked={uiSearchParams.showAttempted}
52+
onChange={(checked) => updateFilters({ showAttempted: checked })}
53+
/>
54+
</Form.Item>
55+
56+
<Form.Item label="Climbs I have Not Attempted" valuePropName="checked">
57+
<Switch
58+
checked={uiSearchParams.showNotAttempted}
59+
onChange={(checked) => updateFilters({ showNotAttempted: checked })}
60+
/>
61+
</Form.Item>
62+
63+
<Form.Item label="Climbs I Liked" valuePropName="checked">
64+
<Switch
65+
checked={uiSearchParams.showOnlyLiked}
66+
onChange={(checked) => updateFilters({ showOnlyLiked: checked })}
67+
/>
68+
</Form.Item>
69+
</>
70+
);
71+
};
72+
2173
return (
2274
<Form labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
2375
<Form.Item label="Climb Name">
@@ -139,8 +191,82 @@ const BasicSearchForm: React.FC = () => {
139191
<Form.Item label="Setter Name">
140192
<Input value={uiSearchParams.settername} onChange={(e) => updateFilters({ settername: e.target.value })} />
141193
</Form.Item>
194+
195+
<Form.Item>
196+
<Title level={5}>Logbook</Title>
197+
</Form.Item>
198+
199+
{renderLogbookSection()}
200+
201+
<Form.Item label="Only Climbs with Beta Videos" valuePropName="checked">
202+
<Switch
203+
checked={uiSearchParams.onlyWithBeta}
204+
onChange={(checked) => updateFilters({ onlyWithBeta: checked })}
205+
/>
206+
</Form.Item>
207+
208+
<Form.Item>
209+
<Title level={5}>Climb Types</Title>
210+
</Form.Item>
211+
212+
<Form.Item label="Boulders" valuePropName="checked">
213+
<Switch
214+
checked={uiSearchParams.showBoulders}
215+
onChange={(checked) => updateFilters({ showBoulders: checked })}
216+
/>
217+
</Form.Item>
218+
219+
<Form.Item label="Routes" valuePropName="checked">
220+
<Switch
221+
checked={uiSearchParams.showRoutes}
222+
onChange={(checked) => updateFilters({ showRoutes: checked })}
223+
/>
224+
</Form.Item>
225+
226+
<Form.Item>
227+
<Title level={5}>Climb Status</Title>
228+
</Form.Item>
229+
230+
<Form.Item label="Established" valuePropName="checked">
231+
<Switch
232+
checked={uiSearchParams.showEstablished}
233+
onChange={(checked) => updateFilters({ showEstablished: checked })}
234+
/>
235+
</Form.Item>
236+
237+
<Form.Item label="Open Projects" valuePropName="checked">
238+
<Switch
239+
checked={uiSearchParams.showProjects}
240+
onChange={(checked) => updateFilters({ showProjects: checked })}
241+
/>
242+
</Form.Item>
243+
244+
<Form.Item label="Drafts" valuePropName="checked">
245+
<Switch
246+
checked={uiSearchParams.showDrafts}
247+
onChange={(checked) => updateFilters({ showDrafts: checked })}
248+
/>
249+
</Form.Item>
250+
251+
<Form.Item>
252+
<Title level={5}>Climb Size & Shape</Title>
253+
</Form.Item>
254+
255+
<Form.Item label="Only Tall Climbs" valuePropName="checked">
256+
<Switch
257+
checked={uiSearchParams.onlyTall}
258+
onChange={(checked) => updateFilters({ onlyTall: checked })}
259+
/>
260+
</Form.Item>
261+
262+
<Form.Item label="Only Side Climbs" valuePropName="checked">
263+
<Switch
264+
checked={uiSearchParams.onlySide}
265+
onChange={(checked) => updateFilters({ onlySide: checked })}
266+
/>
267+
</Form.Item>
142268
</Form>
143269
);
144270
};
145271

146-
export default BasicSearchForm;
272+
export default BasicSearchForm;

‎app/components/search-drawer/search-form.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ const SearchForm: React.FC<SearchFormProps> = ({ boardDetails }) => {
2323
);
2424
};
2525

26-
export default SearchForm;
26+
export default SearchForm;

‎app/lib/data-sync/aurora/shared-sync.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ export async function syncSharedData(board: BoardName): Promise<Record<string, {
349349
}
350350

351351
const upsertAllSharedTableData = async (board: BoardName, syncResults: SyncData) => {
352-
const results: Record<string, { synced: number }> = {};
352+
let results: Record<string, { synced: number }> = {};
353353

354354
await db.transaction(
355355
async (
@@ -372,9 +372,10 @@ const upsertAllSharedTableData = async (board: BoardName, syncResults: SyncData)
372372
console.log(`Updated ${tableName} with ${data.length} rows`);
373373
return [tableName, { synced: data.length }];
374374
});
375-
const results = Object.fromEntries(await Promise.all(promises));
375+
376+
results = Object.fromEntries(await Promise.all(promises));
376377
} catch (error) {
377-
//@ts-expect-error
378+
//@ts-expect-error TODO Fix later
378379
console.error('Failed to commit sync database transaction ', error.toString());
379380
tx.rollback();
380381
}

‎app/lib/types.ts‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,42 @@ export type HoldsFilter = Partial<Record<HoldFilterKey, HoldFilterValue>>;
7070
export type SearchRequest = {
7171
gradeAccuracy: number;
7272
maxGrade: number;
73-
minAscents: number;
7473
minGrade: number;
7574
minRating: number;
75+
minAscents: number;
7676
sortBy: 'ascents' | 'difficulty' | 'name' | 'quality';
7777
sortOrder: 'asc' | 'desc';
7878
name: string;
7979
onlyClassics: boolean;
8080
settername: string;
8181
setternameSuggestion: string;
82-
holdsFilter: HoldsFilter;
8382
[key: `hold_${number}`]: HoldFilterValue; // Allow dynamic hold keys directly in the search params
83+
holdsFilter: HoldStateFilter;
84+
holds: string;
85+
mirroredHolds: string;
86+
87+
// Logbook filters
88+
showDone: boolean;
89+
showAttempted: boolean;
90+
showNotAttempted: boolean;
91+
showOnlyLiked: boolean;
92+
onlyWithBeta: boolean;
93+
94+
// Climb Type filters
95+
showBoulders: boolean;
96+
showRoutes: boolean;
97+
98+
// Climb Status filters
99+
showEstablished: boolean;
100+
showProjects: boolean;
101+
showDrafts: boolean;
102+
103+
// Climb Size & Shape filters
104+
onlyTall: boolean;
105+
onlySide: boolean;
84106
};
85107

108+
// SearchRequestPagination remains the same structure
86109
export type SearchRequestPagination = SearchRequest & {
87110
page: number;
88111
pageSize: number;

‎app/lib/url-utils.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,27 @@ export const DEFAULT_SEARCH_PARAMS: SearchRequestPagination = {
9090
holdsFilter: {},
9191
page: 0,
9292
pageSize: PAGE_LIMIT,
93+
94+
// New filter defaults
95+
// Logbook defaults - start with everything visible
96+
showDone: true,
97+
showAttempted: true,
98+
showNotAttempted: true,
99+
showOnlyLiked: false,
100+
onlyWithBeta: false,
101+
102+
// Climb Type defaults - show all types initially
103+
showBoulders: true,
104+
showRoutes: true,
105+
106+
// Climb Status defaults - show established climbs by default
107+
showEstablished: true,
108+
showProjects: false,
109+
showDrafts: false,
110+
111+
// Climb Size & Shape defaults - show all climbs initially
112+
onlyTall: false,
113+
onlySide: false,
93114
};
94115

95116
export const urlParamsToSearchParams = (urlParams: URLSearchParams): SearchRequestPagination => {

0 commit comments

Comments
 (0)