feat: resolved merge issues

This commit is contained in:
=
2025-07-02 01:16:52 +05:30
parent b47846a780
commit bf8d60fcdc
6 changed files with 54 additions and 87 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ import { ProjectLayout } from '@app/layouts/ProjectLayout'
import { ProjectSelect } from '@app/layouts/ProjectLayout/components/ProjectSelect'
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_project-layout-fallback-approval',
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout',
)({
component: ProjectLayout,
beforeLoad: async ({ params, context }) => {
@@ -1,14 +1,14 @@
import { createFileRoute, redirect } from "@tanstack/react-router";
import { createFileRoute, redirect } from '@tanstack/react-router'
// this is done as part of migration for multi product inside project
export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_project-layout-fallback-approval/approval"
'/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/approval',
)({
beforeLoad: ({ params, search }) => {
throw redirect({
to: "/projects/$projectId/secret-manager/approval",
to: '/projects/$projectId/secret-manager/approval',
params,
search
});
}
});
search,
})
},
})