Skip to content

Commit e6c1143

Browse files
authored
Merge pull request #458 from hotosm/develop
Production Release
2 parents 33eb3b7 + c7b5858 commit e6c1143

File tree

30 files changed

+1096
-335
lines changed

30 files changed

+1096
-335
lines changed

src/frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"@radix-ui/react-slot": "^1.0.2",
1010
"@radix-ui/react-switch": "^1.0.3",
1111
"@radix-ui/react-tooltip": "^1.0.6",
12+
"@react-spring/web": "^9.7.5",
1213
"@reduxjs/toolkit": "^1.9.3",
1314
"@tailwindcss/container-queries": "^0.1.1",
1415
"@tanstack/react-query": "^4.32.6",

src/frontend/src/App.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export default function App() {
5050
// add routes where you dont want navigation bar
5151
const routesWithoutNavbar = [
5252
'/',
53+
'/tutorials',
5354
'/login',
5455
'/forgot-password',
5556
'/complete-profile',

src/frontend/src/api/tasks.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable import/prefer-default-export */
22
import {
33
getIndividualTask,
4-
// getTaskAssetsInfo,
4+
getTaskAssetsInfo,
55
getTaskWaypoint,
66
} from '@Services/tasks';
77
import { useQuery, UseQueryOptions } from '@tanstack/react-query';
@@ -35,16 +35,16 @@ export const useGetIndividualTaskQuery = (
3535
});
3636
};
3737

38-
// export const useGetTaskAssetsInfo = (
39-
// projectId: string,
40-
// taskId: string,
41-
// queryOptions?: Partial<UseQueryOptions>,
42-
// ) => {
43-
// return useQuery({
44-
// queryKey: ['task-assets-info'],
45-
// enabled: !!taskId,
46-
// queryFn: () => getTaskAssetsInfo(projectId, taskId),
47-
// select: (res: any) => res.data,
48-
// ...queryOptions,
49-
// });
50-
// };
38+
export const useGetTaskAssetsInfo = (
39+
projectId: string,
40+
taskId: string,
41+
queryOptions?: Partial<UseQueryOptions>,
42+
) => {
43+
return useQuery({
44+
queryKey: ['task-assets-info'],
45+
enabled: !!taskId,
46+
queryFn: () => getTaskAssetsInfo(projectId, taskId),
47+
select: (res: any) => res.data,
48+
...queryOptions,
49+
});
50+
};
71.2 KB
Loading
74.6 KB
Loading
91.2 KB
Loading
84.6 KB
Loading
79.8 KB
Loading
82.2 KB
Loading
85.1 KB
Loading

0 commit comments

Comments
 (0)