Skip to content

feat: add tab bar display with category icons and kubb regeneration #253

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

Closed
hill-ol wants to merge 1 commit into from
Closed

feat: add tab bar display with category icons and kubb regeneration #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions frontend/api/activities/useAddCategoryToActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
*/

import fetch from "../client";
import type { Client, RequestConfig, ResponseErrorConfig } from "../client";
import type { RequestConfig, ResponseErrorConfig } from "../client";
import type {
UseMutationOptions,
UseMutationResult,
QueryClient,
} from "@tanstack/react-query";
import type {
AddCategoryToActivityMutationResponse,
AddCategoryToActivityPathParams,
Expand All @@ -15,11 +20,6 @@ import type {
AddCategoryToActivity422,
AddCategoryToActivity500,
} from "../../types/types.gen.ts";
import type {
UseMutationOptions,
UseMutationResult,
QueryClient,
} from "@tanstack/react-query";
import { mutationOptions, useMutation } from "@tanstack/react-query";

export const addCategoryToActivityMutationKey = () =>
Expand All @@ -42,7 +42,7 @@ export async function addCategoryToActivity(
tripID: AddCategoryToActivityPathParams["tripID"],
activityID: AddCategoryToActivityPathParams["activityID"],
categoryName: AddCategoryToActivityPathParams["categoryName"],
config: Partial<RequestConfig> & { client?: Client } = {},
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const { client: request = fetch, ...requestConfig } = config;

Expand All @@ -65,8 +65,8 @@ export async function addCategoryToActivity(
return res.data;
}

export function addCategoryToActivityMutationOptions<TContext = unknown>(
config: Partial<RequestConfig> & { client?: Client } = {},
export function addCategoryToActivityMutationOptions(
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const mutationKey = addCategoryToActivityMutationKey();
return mutationOptions<
Expand All @@ -84,7 +84,7 @@ export function addCategoryToActivityMutationOptions<TContext = unknown>(
activityID: AddCategoryToActivityPathParams["activityID"];
categoryName: AddCategoryToActivityPathParams["categoryName"];
},
TContext
typeof mutationKey
>({
mutationKey,
mutationFn: async ({ tripID, activityID, categoryName }) => {
Expand Down Expand Up @@ -117,7 +117,7 @@ export function useAddCategoryToActivity<TContext>(
},
TContext
> & { client?: QueryClient };
client?: Partial<RequestConfig> & { client?: Client };
client?: Partial<RequestConfig> & { client?: typeof fetch };
} = {},
) {
const { mutation = {}, client: config = {} } = options ?? {};
Expand Down
22 changes: 11 additions & 11 deletions frontend/api/activities/useCreateActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
*/

import fetch from "../client";
import type { Client, RequestConfig, ResponseErrorConfig } from "../client";
import type { RequestConfig, ResponseErrorConfig } from "../client";
import type {
UseMutationOptions,
UseMutationResult,
QueryClient,
} from "@tanstack/react-query";
import type {
CreateActivityMutationRequest,
CreateActivityMutationResponse,
Expand All @@ -16,11 +21,6 @@ import type {
CreateActivity422,
CreateActivity500,
} from "../../types/types.gen.ts";
import type {
UseMutationOptions,
UseMutationResult,
QueryClient,
} from "@tanstack/react-query";
import { mutationOptions, useMutation } from "@tanstack/react-query";

export const createActivityMutationKey = () =>
Expand All @@ -39,7 +39,7 @@ export async function createActivity(
tripID: CreateActivityPathParams["tripID"],
data: CreateActivityMutationRequest,
config: Partial<RequestConfig<CreateActivityMutationRequest>> & {
client?: Client;
client?: typeof fetch;
} = {},
) {
const { client: request = fetch, ...requestConfig } = config;
Expand All @@ -66,9 +66,9 @@ export async function createActivity(
return res.data;
}

export function createActivityMutationOptions<TContext = unknown>(
export function createActivityMutationOptions(
config: Partial<RequestConfig<CreateActivityMutationRequest>> & {
client?: Client;
client?: typeof fetch;
} = {},
) {
const mutationKey = createActivityMutationKey();
Expand All @@ -86,7 +86,7 @@ export function createActivityMutationOptions<TContext = unknown>(
tripID: CreateActivityPathParams["tripID"];
data: CreateActivityMutationRequest;
},
TContext
typeof mutationKey
>({
mutationKey,
mutationFn: async ({ tripID, data }) => {
Expand Down Expand Up @@ -119,7 +119,7 @@ export function useCreateActivity<TContext>(
TContext
> & { client?: QueryClient };
client?: Partial<RequestConfig<CreateActivityMutationRequest>> & {
client?: Client;
client?: typeof fetch;
};
} = {},
) {
Expand Down
22 changes: 11 additions & 11 deletions frontend/api/activities/useDeleteActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
*/

import fetch from "../client";
import type { Client, RequestConfig, ResponseErrorConfig } from "../client";
import type { RequestConfig, ResponseErrorConfig } from "../client";
import type {
UseMutationOptions,
UseMutationResult,
QueryClient,
} from "@tanstack/react-query";
import type {
DeleteActivityMutationResponse,
DeleteActivityPathParams,
Expand All @@ -14,11 +19,6 @@ import type {
DeleteActivity404,
DeleteActivity500,
} from "../../types/types.gen.ts";
import type {
UseMutationOptions,
UseMutationResult,
QueryClient,
} from "@tanstack/react-query";
import { mutationOptions, useMutation } from "@tanstack/react-query";

export const deleteActivityMutationKey = () =>
Expand All @@ -36,7 +36,7 @@ export type DeleteActivityMutationKey = ReturnType<
export async function deleteActivity(
tripID: DeleteActivityPathParams["tripID"],
activityID: DeleteActivityPathParams["activityID"],
config: Partial<RequestConfig> & { client?: Client } = {},
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const { client: request = fetch, ...requestConfig } = config;

Expand All @@ -58,8 +58,8 @@ export async function deleteActivity(
return res.data;
}

export function deleteActivityMutationOptions<TContext = unknown>(
config: Partial<RequestConfig> & { client?: Client } = {},
export function deleteActivityMutationOptions(
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const mutationKey = deleteActivityMutationKey();
return mutationOptions<
Expand All @@ -75,7 +75,7 @@ export function deleteActivityMutationOptions<TContext = unknown>(
tripID: DeleteActivityPathParams["tripID"];
activityID: DeleteActivityPathParams["activityID"];
},
TContext
typeof mutationKey
>({
mutationKey,
mutationFn: async ({ tripID, activityID }) => {
Expand Down Expand Up @@ -106,7 +106,7 @@ export function useDeleteActivity<TContext>(
},
TContext
> & { client?: QueryClient };
client?: Partial<RequestConfig> & { client?: Client };
client?: Partial<RequestConfig> & { client?: typeof fetch };
} = {},
) {
const { mutation = {}, client: config = {} } = options ?? {};
Expand Down
26 changes: 12 additions & 14 deletions frontend/api/activities/useGetActivitiesByTripID.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
*/

import fetch from "../client";
import type { Client, RequestConfig, ResponseErrorConfig } from "../client";
import type { RequestConfig, ResponseErrorConfig } from "../client";
import type {
QueryKey,
QueryClient,
QueryObserverOptions,
UseQueryResult,
} from "@tanstack/react-query";
import type {
GetActivitiesByTripIDQueryResponse,
GetActivitiesByTripIDPathParams,
Expand All @@ -15,17 +21,11 @@ import type {
GetActivitiesByTripID404,
GetActivitiesByTripID500,
} from "../../types/types.gen.ts";
import type {
QueryKey,
QueryClient,
QueryObserverOptions,
UseQueryResult,
} from "@tanstack/react-query";
import { queryOptions, useQuery } from "@tanstack/react-query";

export const getActivitiesByTripIDQueryKey = (
tripID: GetActivitiesByTripIDPathParams["tripID"],
params: GetActivitiesByTripIDQueryParams = {},
params?: GetActivitiesByTripIDQueryParams,
) =>
[
{ url: "/api/v1/trips/:tripID/activities", params: { tripID: tripID } },
Expand All @@ -44,7 +44,7 @@ export type GetActivitiesByTripIDQueryKey = ReturnType<
export async function getActivitiesByTripID(
tripID: GetActivitiesByTripIDPathParams["tripID"],
params?: GetActivitiesByTripIDQueryParams,
config: Partial<RequestConfig> & { client?: Client } = {},
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const { client: request = fetch, ...requestConfig } = config;

Expand All @@ -70,7 +70,7 @@ export async function getActivitiesByTripID(
export function getActivitiesByTripIDQueryOptions(
tripID: GetActivitiesByTripIDPathParams["tripID"],
params?: GetActivitiesByTripIDQueryParams,
config: Partial<RequestConfig> & { client?: Client } = {},
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const queryKey = getActivitiesByTripIDQueryKey(tripID, params);
return queryOptions<
Expand All @@ -88,9 +88,7 @@ export function getActivitiesByTripIDQueryOptions(
enabled: !!tripID,
queryKey,
queryFn: async ({ signal }) => {
if (!config.signal) {
config.signal = signal;
}
config.signal = signal;
return getActivitiesByTripID(tripID, params, config);
},
});
Expand Down Expand Up @@ -124,7 +122,7 @@ export function useGetActivitiesByTripID<
TQueryKey
>
> & { client?: QueryClient };
client?: Partial<RequestConfig> & { client?: Client };
client?: Partial<RequestConfig> & { client?: typeof fetch };
} = {},
) {
const { query: queryConfig = {}, client: config = {} } = options ?? {};
Expand Down
26 changes: 12 additions & 14 deletions frontend/api/activities/useGetActivitiesByTripIDSuspense.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
*/

import fetch from "../client";
import type { Client, RequestConfig, ResponseErrorConfig } from "../client";
import type { RequestConfig, ResponseErrorConfig } from "../client";
import type {
QueryKey,
QueryClient,
UseSuspenseQueryOptions,
UseSuspenseQueryResult,
} from "@tanstack/react-query";
import type {
GetActivitiesByTripIDQueryResponse,
GetActivitiesByTripIDPathParams,
Expand All @@ -15,17 +21,11 @@ import type {
GetActivitiesByTripID404,
GetActivitiesByTripID500,
} from "../../types/types.gen.ts";
import type {
QueryKey,
QueryClient,
UseSuspenseQueryOptions,
UseSuspenseQueryResult,
} from "@tanstack/react-query";
import { queryOptions, useSuspenseQuery } from "@tanstack/react-query";

export const getActivitiesByTripIDSuspenseQueryKey = (
tripID: GetActivitiesByTripIDPathParams["tripID"],
params: GetActivitiesByTripIDQueryParams = {},
params?: GetActivitiesByTripIDQueryParams,
) =>
[
{ url: "/api/v1/trips/:tripID/activities", params: { tripID: tripID } },
Expand All @@ -44,7 +44,7 @@ export type GetActivitiesByTripIDSuspenseQueryKey = ReturnType<
export async function getActivitiesByTripIDSuspense(
tripID: GetActivitiesByTripIDPathParams["tripID"],
params?: GetActivitiesByTripIDQueryParams,
config: Partial<RequestConfig> & { client?: Client } = {},
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const { client: request = fetch, ...requestConfig } = config;

Expand All @@ -70,7 +70,7 @@ export async function getActivitiesByTripIDSuspense(
export function getActivitiesByTripIDSuspenseQueryOptions(
tripID: GetActivitiesByTripIDPathParams["tripID"],
params?: GetActivitiesByTripIDQueryParams,
config: Partial<RequestConfig> & { client?: Client } = {},
config: Partial<RequestConfig> & { client?: typeof fetch } = {},
) {
const queryKey = getActivitiesByTripIDSuspenseQueryKey(tripID, params);
return queryOptions<
Expand All @@ -88,9 +88,7 @@ export function getActivitiesByTripIDSuspenseQueryOptions(
enabled: !!tripID,
queryKey,
queryFn: async ({ signal }) => {
if (!config.signal) {
config.signal = signal;
}
config.signal = signal;
return getActivitiesByTripIDSuspense(tripID, params, config);
},
});
Expand Down Expand Up @@ -122,7 +120,7 @@ export function useGetActivitiesByTripIDSuspense<
TQueryKey
>
> & { client?: QueryClient };
client?: Partial<RequestConfig> & { client?: Client };
client?: Partial<RequestConfig> & { client?: typeof fetch };
} = {},
) {
const { query: queryConfig = {}, client: config = {} } = options ?? {};
Expand Down
Loading
Loading