From aebd7dc224e3724ebaa6370f3307e9108af95eac Mon Sep 17 00:00:00 2001 From: Aditya Choudhari Date: Sat, 15 Mar 2025 16:37:48 -0700 Subject: [PATCH] fix: Rename appv2 to app --- .../_components/flow-diagram/ApprovalCheck.tsx | 2 +- .../_components/flow-diagram/EnvironmentNode.tsx | 4 ++-- .../_components/flow-diagram/FlowDiagram.tsx | 6 +++--- .../checks/_components/flow-diagram/FlowNode.tsx | 0 .../_components/flow-diagram/FlowPolicyNode.tsx | 0 .../_components/flow-diagram/StatusIcons.tsx | 0 .../_components/flow-diagram/TriggerNode.tsx | 0 .../(raw)/releases/[releaseId]/checks/page.tsx | 2 +- .../(raw)/releases/[releaseId]/jobs/page.tsx | 0 .../jobs/release-table/EnvironmentApprovalRow.tsx | 2 +- .../jobs/release-table/EnvironmentRowDropdown.tsx | 2 +- .../jobs/release-table/ResourceReleaseTable.tsx | 14 +++++++------- .../(raw)/releases/[releaseId]/layout.tsx | 4 ++-- .../(raw)/releases/[releaseId]/page.tsx | 0 .../(raw)/releases/[releaseId]/properties/page.tsx | 4 ++-- .../(sidebar)/DeploymentPageContent.tsx | 8 ++++---- .../(sidebar)/_components/DeploymentCTA.tsx | 2 +- .../_components/release-cell/DeployButton.tsx | 0 .../_components/release-cell/JobHistoryPopover.tsx | 2 +- .../release-cell/ReleaseDistributionBarChart.tsx | 0 .../release-cell/ReleaseDistributionPopover.tsx | 0 .../release-cell/ReleaseEnvironmentCell.tsx | 6 +++--- .../_components/release-cell/TableCells.tsx | 6 +++--- .../channels/CreateReleaseChannelDialog.tsx | 4 ++-- .../(sidebar)/channels/ReleaseChannelsTable.tsx | 4 ++-- .../[deploymentSlug]/(sidebar)/channels/page.tsx | 0 .../(sidebar)/hooks/CreateHookDialog.tsx | 0 .../(sidebar)/hooks/DeleteHookDialog.tsx | 0 .../(sidebar)/hooks/EditHookDialog.tsx | 0 .../(sidebar)/hooks/HookActionsDropdown.tsx | 0 .../(sidebar)/hooks/HooksTable.tsx | 0 .../[deploymentSlug]/(sidebar)/hooks/page.tsx | 0 .../[deploymentSlug]/(sidebar)/layout.tsx | 4 ++-- .../[deploymentSlug]/(sidebar)/page.tsx | 0 .../properties/DeleteDeploymentSection.tsx | 0 .../properties/DeploymentResourcesDialog.tsx | 4 ++-- .../(sidebar)/properties/EditDeploymentSection.tsx | 2 +- .../[deploymentSlug]/(sidebar)/properties/page.tsx | 0 .../(sidebar)/variables/AddVariableValueDialog.tsx | 0 .../(sidebar)}/variables/ConfigFields.tsx | 4 ++-- .../(sidebar)/variables/CreateVariableDialog.tsx | 0 .../(sidebar)/variables/EditVariableDialog.tsx | 0 .../variables/VariableDeploymentInput.tsx | 0 .../(sidebar)/variables/VariableDropdown.tsx | 0 .../variables/VariableEnvironmentInput.tsx | 0 .../(sidebar)/variables/VariableInputs.tsx | 0 .../(sidebar)/variables/VariableResourceInput.tsx | 0 .../(sidebar)/variables/VariableTable.tsx | 2 +- .../(sidebar)/variables/VariableValueDropdown.tsx | 2 +- .../[deploymentSlug]/(sidebar)/variables/page.tsx | 0 .../(sidebar)/variables/variable-data.ts | 0 .../workflow/DeploymentJobAgentGithubConfig.tsx | 0 .../(sidebar)/workflow/JobAgentSection.tsx | 0 .../[deploymentSlug]/(sidebar)/workflow/page.tsx | 0 .../environments/[environmentId]/config/page.tsx | 0 .../[environmentId]/deployments/page.tsx | 2 +- .../insights/DailyResourcesCountGraph.tsx | 0 .../(raw)/environments/[environmentId]/layout.tsx | 4 ++-- .../(raw)/environments/[environmentId]/page.tsx | 0 .../[environmentId]/policies/PolicyTabs.tsx | 2 +- .../policies/approval/ApprovalAndGovernance.tsx | 0 .../[environmentId]/policies/approval/page.tsx | 0 .../policies/channels/ReleaseChannels.tsx | 0 .../[environmentId]/policies/channels/page.tsx | 0 .../policies/control/DeploymentControl.tsx | 0 .../[environmentId]/policies/control/page.tsx | 0 .../[environmentId]/policies/layout.tsx | 0 .../policies/management/ReleaseManagement.tsx | 0 .../[environmentId]/policies/management/page.tsx | 0 .../environments/[environmentId]/policies/page.tsx | 0 .../policies/rollout/RolloutAndTiming.tsx | 0 .../[environmentId]/policies/rollout/page.tsx | 0 .../[environmentId]/policies/useUpdatePolicy.ts | 0 .../[environmentId]/resources/EditFilterForm.tsx | 2 +- .../resources/EnvironmentResourcesTable.tsx | 4 ++-- .../[environmentId]/resources/page.tsx | 0 .../[environmentId]/settings/Overview.tsx | 2 +- .../environments/[environmentId]/settings/page.tsx | 0 .../[environmentId]/variables/page.tsx | 0 .../(sidebar)/_components/SystemBreadcrumb.tsx | 0 .../deployments/DeploymentGettingStarted.tsx | 2 +- .../(sidebar)/deployments/TableDeployments.tsx | 6 +++--- .../[systemSlug]/(sidebar)/deployments/page.tsx | 4 ++-- .../environments/CreateEnvironmentDialog.tsx | 0 .../environments/DeleteEnvironmentDialog.tsx | 0 .../(sidebar)/environments/EnvironmentDropdown.tsx | 0 .../(sidebar)/environments/EnvironmentRow.tsx | 0 .../[systemSlug]/(sidebar)/environments/page.tsx | 2 +- .../systems/[systemSlug]/(sidebar)/layout.tsx | 4 ++-- .../(raw)/systems/[systemSlug]/(sidebar)/page.tsx | 0 .../(sidebar)/policies/DeleteNodeDialog.tsx | 0 .../(sidebar)/policies/EnvFlowBuilder.tsx | 10 +++++----- .../(sidebar)/policies/EnvFlowPanel.tsx | 2 +- .../(sidebar)/policies/FlowNodeTypes.tsx | 0 .../(sidebar)/policies/SidepanelContext.tsx | 0 .../policies/TargetFilterUniquenessIndicator.tsx | 0 .../[systemSlug]/(sidebar)/policies/edges.ts | 0 .../[systemSlug]/(sidebar)/policies/page.tsx | 2 +- .../(sidebar)/policies/useMatchSorter.ts | 0 .../(sidebar)/runbooks/DeleteRunbookDialog.tsx | 0 .../(sidebar)/runbooks/EditRunbookDialog.tsx | 0 .../(sidebar)/runbooks/EditRunbookForm.tsx | 0 .../(sidebar)/runbooks/RunbookGettingStarted.tsx | 0 .../[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx | 0 .../(sidebar)/runbooks/TriggerRunbook.tsx | 0 .../_components}/variables/ConfigFields.tsx | 4 ++-- .../variables/VariableDeploymentInput.tsx | 0 .../variables/VariableEnvironmentInput.tsx | 0 .../_components/variables/VariableInputs.tsx | 0 .../variables/VariableResourceInput.tsx | 0 .../runbooks/create/CreateRunbookForm.tsx | 0 .../runbooks/create/RunbookVariableEditor.tsx | 0 .../(sidebar)/runbooks/create/page.tsx | 2 +- .../[systemSlug]/(sidebar)/runbooks/page.tsx | 2 +- .../(sidebar)/settings/DeleteButton.tsx | 0 .../(sidebar)/settings/GeneralSettings.tsx | 0 .../[systemSlug]/(sidebar)/settings/page.tsx | 4 ++-- .../variables/CreateVariableSetDialog.tsx | 0 .../variables/GettingStartedVariableSets.tsx | 0 .../(sidebar)/variables/VariableSetsTable.tsx | 2 +- .../[systemSlug]/(sidebar)/variables/page.tsx | 2 +- .../(deploy)/(sidebar)/agents/AgentCard.tsx | 0 .../(sidebar)/agents/_hooks/useJobStats.ts | 0 .../(deploy)/(sidebar)/agents/page.tsx | 2 +- .../(deploy)/(sidebar)/deployments/page.tsx | 6 +++--- .../(deploy)/(sidebar)/layout.tsx | 0 .../(deploy)/(sidebar)/systems/CreateSystem.tsx | 0 .../(deploy)/(sidebar)/systems/SystemSelector.tsx | 0 .../(sidebar)/systems/SystemsPageContent.tsx | 4 ++-- .../SystemDeploymentSkeleton.tsx | 0 .../SystemDeploymentTable.tsx | 4 ++-- .../system-deployment-table/TableDeployments.tsx | 4 ++-- .../(deploy)/(sidebar)/systems/page.tsx | 0 .../deployments/DeploymentDirectoryCell.tsx | 2 +- .../deployments/charts/DeploymentBarChart.tsx | 2 +- .../deployments/dropdown/DeleteDeployment.tsx | 0 .../dropdown/DeploymentOptionsDropdown.tsx | 0 .../deployments/dropdown/EditDeploymentDialog.tsx | 0 .../environment-cell/DeploymentEnvironmentCell.tsx | 4 ++-- .../deployments/environment-cell/ReleaseInfo.tsx | 6 +++--- .../deployments/environment-cell/StatusIcon.tsx | 0 .../_components/release/ApprovalDialog.tsx | 0 .../(deploy)/_components/release/CreateRelease.tsx | 2 +- .../_components/release/ReleaseDropdownMenu.tsx | 0 .../(deploy)/_utils/status-color.ts | 0 .../{(appv2) => (app)}/DeploymentsSidebarIcon.tsx | 0 .../[workspaceSlug]/{(appv2) => (app)}/TopNav.tsx | 0 .../{(appv2) => (app)}/TopNavSearch.tsx | 0 .../{(appv2) => (app)}/TopSidebarIcon.tsx | 0 .../{(appv2) => (app)}/UserAvatarMenu.tsx | 0 .../{(appv2) => (app)}/WorkspaceDropdown.tsx | 0 .../_components/ConfigEditor.tsx | 0 .../_components/CreateResource.tsx | 0 .../_components/MetadataInfo.tsx | 0 .../{(appv2) => (app)}/_components/PageHeader.tsx | 0 .../_components/TableSortHeader.tsx | 0 .../_components/channel/drawer/Overview.tsx | 6 +++--- .../channel/drawer/ReleaseChannelDrawer.tsx | 0 .../channel/drawer/ReleaseChannelDropdown.tsx | 0 .../_components/channel/drawer/Usage.tsx | 0 .../channel/drawer/useReleaseChannelDrawer.ts | 0 .../_components/deployments/Card.tsx | 0 .../_components/deployments/CreateDeployment.tsx | 0 .../deployments/DeploymentHistoryGraph.tsx | 0 .../deployments/deployment-table/DeploymentRow.tsx | 0 .../deployment-table/DeploymentTable.tsx | 2 +- .../deployments/deployment-table/SkeletonRow.tsx | 0 .../resource-drawer/DeploymentResourceDrawer.tsx | 0 .../deployments/resource-drawer/JobLinksCell.tsx | 0 .../deployments/resource-drawer/ReleaseTable.tsx | 0 .../deployments/resource-drawer/TableRow.tsx | 0 .../resource-drawer/useDeploymentResourceDrawer.ts | 0 .../_components/drawer/TabButton.tsx | 0 .../environment/drawer/EnvironmentDrawer.tsx | 2 +- .../environment/drawer/EnvironmentDropdownMenu.tsx | 0 .../_components/environment/drawer/Filter.tsx | 4 ++-- .../_components/environment/drawer/Overview.tsx | 0 .../drawer/policy-override/UpdateOverride.tsx | 10 +++++----- .../drawer/policy-override/useOverridePolicy.ts | 0 .../_components/environment/drawer/tabs.ts | 0 .../_components/filter/ChoiceConditionRender.tsx | 0 .../_components/filter/ColumnConditionRender.tsx | 0 .../_components/filter/DateConditionRender.tsx | 0 .../_components/filter/MetadataConditionRender.tsx | 0 .../_components/filter/NoFilterMatch.tsx | 0 .../_components/job/JobDropdownMenu.tsx | 0 .../_components/job/JobTableStatusIcon.tsx | 0 .../job/condition/DeploymentConditionRender.tsx | 0 .../job/condition/EnvironmentConditionRender.tsx | 0 .../job/condition/JobComparisonConditionRender.tsx | 0 .../job/condition/JobConditionBadge.tsx | 0 .../job/condition/JobConditionDialog.tsx | 0 .../job/condition/JobConditionRender.tsx | 0 .../job/condition/JobCreatedAtConditionRender.tsx | 0 .../job/condition/JobMetadataConditionRender.tsx | 0 .../job/condition/JobResourceConditionRender.tsx | 0 .../RunbookJobComparisonConditionRender.tsx | 0 .../job/condition/RunbookJobConditionDialog.tsx | 0 .../job/condition/RunbookJobConditionRender.tsx | 0 .../job/condition/StatusConditionRender.tsx | 0 .../job/condition/VersionConditionRender.tsx | 0 .../job/condition/job-condition-props.ts | 0 .../_components/job/drawer/Job.ts | 0 .../_components/job/drawer/JobAgent.tsx | 0 .../_components/job/drawer/JobDrawer.tsx | 2 +- .../_components/job/drawer/JobProperties.tsx | 0 .../_components/job/drawer/JobVariables.tsx | 0 .../_components/job/drawer/useJobDrawer.tsx | 0 .../_components/navigation/Tabs.tsx | 0 .../policy/drawer/EnvironmentPolicyDrawer.tsx | 12 ++++++------ .../_components/policy/drawer/Overview.tsx | 0 .../policy/drawer/PolicyDeleteDialog.tsx | 0 .../_components/policy/drawer/useUpdatePolicy.ts | 0 .../policy/form/ApprovalAndGovernance.tsx | 0 .../_components/policy/form/DeploymentControl.tsx | 0 .../_components/policy/form/ReleaseChannels.tsx | 0 .../_components/policy/form/ReleaseManagement.tsx | 0 .../_components/policy/form/RolloutAndTiming.tsx | 0 .../_components/reactflow/ArrowEdge.tsx | 0 .../_components/reactflow/ReactFlowProvider.tsx | 0 .../_components/reactflow/edges.ts | 0 .../_components/reactflow/layout.ts | 0 .../_components/release/ReleaseBadgeList.tsx | 0 .../condition/ComparisonConditionRender.tsx | 0 .../release/condition/ReleaseConditionBadge.tsx | 0 .../release/condition/ReleaseConditionDialog.tsx | 0 .../release/condition/ReleaseConditionRender.tsx | 0 .../condition/ReleaseCreatedAtConditionRender.tsx | 2 +- .../condition/ReleaseMetadataConditionRender.tsx | 2 +- .../condition/ReleaseVersionConditionRender.tsx | 2 +- .../release/condition/release-condition-props.ts | 0 .../release/condition/useReleaseFilter.ts | 0 .../_components/resources/EditResource.tsx | 2 +- .../_components/resources/ReleaseCell.tsx | 0 .../_components/resources/ResourceIcon.tsx | 0 .../condition/ComparisonConditionRender.tsx | 0 .../condition/IdentifierConditionRender.tsx | 0 .../resources/condition/KindConditionRender.tsx | 0 .../resources/condition/NameConditionRender.tsx | 0 .../condition/ProviderConditionRender.tsx | 0 .../resources/condition/ResourceConditionBadge.tsx | 0 .../condition/ResourceConditionDialog.tsx | 0 .../condition/ResourceConditionRender.tsx | 0 .../condition/ResourceCreatedAtConditionRender.tsx | 0 .../condition/ResourceLastSyncConditionRender.tsx | 0 .../resources/condition/ResourceList.tsx | 0 .../condition/ResourceMetadataConditionRender.tsx | 0 .../condition/ResourceViewActionsDropdown.tsx | 0 .../resources/condition/ResourceViewForm.tsx | 0 .../condition/resource-condition-props.ts | 0 .../resources/condition/useResourceFilter.ts | 0 .../drawer/CreateResourceVariableDialog.tsx | 0 .../drawer/DeleteResourceVariableDialog.tsx | 0 .../resources/drawer/DeploymentContent.tsx | 0 .../drawer/EditResourceVariableDialog.tsx | 0 .../_components/resources/drawer/JobsContent.tsx | 0 .../resources/drawer/OverviewContent.tsx | 4 ++-- .../resources/drawer/ResourceActionsDropdown.tsx | 0 .../resources/drawer/ResourceDrawer.tsx | 4 ++-- .../resources/drawer/ResourceVariableDropdown.tsx | 0 .../resources/drawer/VariablesContent.tsx | 0 .../resources/drawer/useResourceDrawer.ts | 0 .../_components/system/DeleteSystemDialog.tsx | 0 .../_components/variable-set/OverviewContent.tsx | 0 .../variable-set/VariableSetActionsDropdown.tsx | 0 .../_components/variable-set/VariableSetDrawer.tsx | 0 .../variable-set/useVariableSetDrawer.ts | 0 .../_hooks/channel/useReleaseChannel.ts | 0 .../{(appv2) => (app)}/_hooks/useFilter.ts | 0 .../{(appv2) => (app)}/insights/DailyJobsChart.tsx | 0 .../insights/DailyResourcesCountGraph.tsx | 0 .../insights/overview-cards/SuccessRate.tsx | 0 .../insights/overview-cards/TotalJobs.tsx | 0 .../insights/overview-cards/WorkspaceResources.tsx | 0 .../{(appv2) => (app)}/insights/page.tsx | 0 .../[workspaceSlug]/{(appv2) => (app)}/layout.tsx | 4 ++-- .../[workspaceSlug]/{(appv2) => (app)}/page.tsx | 0 .../deployments/ResourceDeploymentRow.tsx | 4 ++-- .../deployments/ResourceDeploymentRowSkeleton.tsx | 2 +- .../deployments/ResourceDeploymentTable.tsx | 2 +- .../(raw)/[resourceId]/deployments/page.tsx | 0 .../resources/(raw)/[resourceId]/layout.tsx | 2 +- .../resources/(raw)/[resourceId]/page.tsx | 0 .../(raw)/[resourceId]/properties/ConfigEditor.tsx | 0 .../(raw)/[resourceId]/properties/page.tsx | 2 +- .../variables/CreateResourceVariableDialog.tsx | 0 .../variables/DeleteResourceVariableDialog.tsx | 0 .../variables/EditResourceVariableDialog.tsx | 0 .../variables/ResourceVariableDropdown.tsx | 0 .../(raw)/[resourceId]/variables/page.tsx | 0 .../(raw)/[resourceId]/visualize/DepEdge.tsx | 0 .../visualize/ResourceVisualizationDiagram.tsx | 2 +- .../(raw)/[resourceId]/visualize/edges.ts | 0 .../visualize/nodes/DeploymentNode.tsx | 4 ++-- .../visualize/nodes/EnvironmentNode.tsx | 2 +- .../[resourceId]/visualize/nodes/ProviderNode.tsx | 0 .../[resourceId]/visualize/nodes/ResourceNode.tsx | 4 ++-- .../(raw)/[resourceId]/visualize/nodes/nodes.ts | 0 .../(raw)/[resourceId]/visualize/page.tsx | 0 .../resources/(sidebar)/SidebarKinds.tsx | 2 +- .../resources/(sidebar)/SidebarLink.tsx | 0 .../groupings/CreateMetadataGroupDialog.tsx | 0 .../groupings/DeleteMetadataGroupDialog.tsx | 0 .../groupings/EditMetadataGroupDialog.tsx | 0 .../(sidebar)/groupings/MetadataFilterInput.tsx | 0 .../(sidebar)/groupings/ResourceGroupTable.tsx | 0 .../ResourceMetadataGroupsGettingStarted.tsx | 0 .../groupings/[groupId]/CombincationsTable.tsx | 0 .../(sidebar)/groupings/[groupId]/page.tsx | 2 +- .../resources/(sidebar)/groupings/page.tsx | 2 +- .../resources/(sidebar)/layout.tsx | 0 .../(sidebar)/list/ResourceGettingStarted.tsx | 0 .../(sidebar)/list/ResourcePageContent.tsx | 10 +++++----- .../resources/(sidebar)/list/ResourcesTable.tsx | 2 +- .../resources/(sidebar)/list/export-resources.ts | 0 .../resources/(sidebar)/list/page.tsx | 0 .../providers/ProviderActionsDropdown.tsx | 0 .../providers/ResourceProvidersGettingStarted.tsx | 0 .../resources/(sidebar)/providers/_page.tsx | 0 .../providers/integrations/AwsActionButton.tsx | 0 .../providers/integrations/GoogleActionButton.tsx | 0 .../providers/integrations/SelfManaged.tsx | 0 .../providers/integrations/aws/AwsDialog.tsx | 0 .../integrations/aws/UpdateAwsProviderDialog.tsx | 0 .../azure/CreateAzureProviderDialog.tsx | 0 .../azure/UpdateAzureProviderDialog.tsx | 0 .../[resourceProviderId]/PermissionsButton.tsx | 0 .../azure/[resourceProviderId]/page.tsx | 0 .../providers/integrations/google/GoogleDialog.tsx | 0 .../google/UpdateGoogleProviderDialog.tsx | 0 .../(sidebar)/providers/integrations/page.tsx | 2 +- .../resources/(sidebar)/providers/page.tsx | 2 +- .../(sidebar)/views/ResourceViewsTable.tsx | 4 ++-- .../resources/(sidebar)/views/page.tsx | 4 ++-- .../{(appv2) => (app)}/resources/page.tsx | 0 .../settings/account/api/ApiSection.tsx | 0 .../settings/account/api/page.tsx | 0 .../account/profile/GithubRedirectButton.tsx | 0 .../settings/account/profile/page.tsx | 0 .../{(appv2) => (app)}/settings/layout.tsx | 0 .../{(appv2) => (app)}/settings/page.tsx | 0 .../workspace/general/WorkspaceDeleteSection.tsx | 0 .../workspace/general/WorkspaceUpdateSection.tsx | 0 .../settings/workspace/general/page.tsx | 0 .../(integration)/aws/AwsIntegration.tsx | 0 .../integrations/(integration)/aws/page.tsx | 0 .../github/DeleteGithubUserButton.tsx | 0 .../github/DisconnectDropdownActionButton.tsx | 0 .../(integration)/github/EntityActionDropdown.tsx | 0 .../(integration)/github/GithubAddEntityDialog.tsx | 0 .../github/GithubConnectedEntities.tsx | 0 .../github/GithubRemoveEntityDialog.tsx | 0 .../SelectPreconnectedEntityDialogContent.tsx | 0 .../integrations/(integration)/github/page.tsx | 0 .../(integration)/google/GoogleIntegration.tsx | 0 .../integrations/(integration)/google/page.tsx | 0 .../settings/workspace/integrations/page.tsx | 0 .../settings/workspace/members/MembersExport.tsx | 0 .../settings/workspace/members/MembersTable.tsx | 0 .../workspace/members/WorkspaceDomainMatching.tsx | 0 .../settings/workspace/members/page.tsx | 0 .../settings/workspace/overview/page.tsx | 0 .../{(appv2) => (app)}/settings/workspace/page.tsx | 0 363 files changed, 151 insertions(+), 151 deletions(-) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx (91%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx (90%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx (94%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx (91%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx (94%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeleteDeploymentSection.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components => (app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)}/variables/ConfigFields.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx (75%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/CreateEnvironmentDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx (90%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar) => (app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components}/variables/ConfigFields.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx (94%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx (87%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/agents/AgentCard.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/agents/_hooks/useJobStats.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/agents/page.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/deployments/page.tsx (84%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/layout.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/CreateSystem.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/SystemSelector.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/SystemsPageContent.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/(sidebar)/systems/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx (90%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx (94%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/release/ApprovalDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/release/CreateRelease.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_components/release/ReleaseDropdownMenu.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/(deploy)/_utils/status-color.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/DeploymentsSidebarIcon.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/TopNav.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/TopNavSearch.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/TopSidebarIcon.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/UserAvatarMenu.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/WorkspaceDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/ConfigEditor.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/CreateResource.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/MetadataInfo.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/PageHeader.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/TableSortHeader.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/channel/drawer/Overview.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/channel/drawer/ReleaseChannelDrawer.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/channel/drawer/ReleaseChannelDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/channel/drawer/Usage.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/channel/drawer/useReleaseChannelDrawer.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/Card.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/CreateDeployment.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/DeploymentHistoryGraph.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/deployment-table/DeploymentRow.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/deployment-table/DeploymentTable.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/deployment-table/SkeletonRow.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/resource-drawer/DeploymentResourceDrawer.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/resource-drawer/JobLinksCell.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/resource-drawer/ReleaseTable.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/resource-drawer/TableRow.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/deployments/resource-drawer/useDeploymentResourceDrawer.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/drawer/TabButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/EnvironmentDrawer.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/EnvironmentDropdownMenu.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/Filter.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/Overview.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/policy-override/UpdateOverride.tsx (80%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/policy-override/useOverridePolicy.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/environment/drawer/tabs.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/filter/ChoiceConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/filter/ColumnConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/filter/DateConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/filter/MetadataConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/filter/NoFilterMatch.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/JobDropdownMenu.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/JobTableStatusIcon.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/DeploymentConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/EnvironmentConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobComparisonConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobConditionBadge.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobConditionDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobCreatedAtConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobMetadataConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/JobResourceConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/RunbookJobComparisonConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/RunbookJobConditionDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/RunbookJobConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/StatusConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/VersionConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/condition/job-condition-props.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/drawer/Job.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/drawer/JobAgent.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/drawer/JobDrawer.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/drawer/JobProperties.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/drawer/JobVariables.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/job/drawer/useJobDrawer.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/navigation/Tabs.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/drawer/EnvironmentPolicyDrawer.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/drawer/Overview.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/drawer/PolicyDeleteDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/drawer/useUpdatePolicy.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/form/ApprovalAndGovernance.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/form/DeploymentControl.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/form/ReleaseChannels.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/form/ReleaseManagement.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/policy/form/RolloutAndTiming.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/reactflow/ArrowEdge.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/reactflow/ReactFlowProvider.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/reactflow/edges.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/reactflow/layout.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/ReleaseBadgeList.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ComparisonConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ReleaseConditionBadge.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ReleaseConditionDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ReleaseConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ReleaseCreatedAtConditionRender.tsx (87%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ReleaseMetadataConditionRender.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/ReleaseVersionConditionRender.tsx (94%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/release-condition-props.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/release/condition/useReleaseFilter.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/EditResource.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/ReleaseCell.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/ResourceIcon.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ComparisonConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/IdentifierConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/KindConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/NameConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ProviderConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceConditionBadge.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceConditionDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceCreatedAtConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceLastSyncConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceList.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceMetadataConditionRender.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceViewActionsDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/ResourceViewForm.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/resource-condition-props.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/condition/useResourceFilter.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/CreateResourceVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/DeleteResourceVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/DeploymentContent.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/EditResourceVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/JobsContent.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/OverviewContent.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/ResourceActionsDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/ResourceDrawer.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/ResourceVariableDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/VariablesContent.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/resources/drawer/useResourceDrawer.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/system/DeleteSystemDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/variable-set/OverviewContent.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/variable-set/VariableSetActionsDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/variable-set/VariableSetDrawer.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_components/variable-set/useVariableSetDrawer.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_hooks/channel/useReleaseChannel.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/_hooks/useFilter.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/insights/DailyJobsChart.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/insights/DailyResourcesCountGraph.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/insights/overview-cards/SuccessRate.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/insights/overview-cards/TotalJobs.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/insights/overview-cards/WorkspaceResources.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/insights/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/layout.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx (91%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/deployments/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/layout.tsx (97%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/properties/ConfigEditor.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/properties/page.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/variables/CreateResourceVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/variables/DeleteResourceVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/variables/EditResourceVariableDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/variables/ResourceVariableDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/variables/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/DepEdge.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/edges.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/nodes/ProviderNode.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx (85%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/nodes/nodes.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(raw)/[resourceId]/visualize/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/SidebarKinds.tsx (95%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/SidebarLink.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/CreateMetadataGroupDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/DeleteMetadataGroupDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/EditMetadataGroupDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/MetadataFilterInput.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/ResourceGroupTable.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/ResourceMetadataGroupsGettingStarted.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/[groupId]/CombincationsTable.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/[groupId]/page.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/groupings/page.tsx (96%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/layout.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/list/ResourceGettingStarted.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/list/ResourcePageContent.tsx (94%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/list/ResourcesTable.tsx (98%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/list/export-resources.ts (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/list/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/ProviderActionsDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/ResourceProvidersGettingStarted.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/_page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/AwsActionButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/GoogleActionButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/SelfManaged.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/aws/AwsDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/aws/UpdateAwsProviderDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/azure/CreateAzureProviderDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/azure/UpdateAzureProviderDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/PermissionsButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/google/GoogleDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/google/UpdateGoogleProviderDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/integrations/page.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/providers/page.tsx (99%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/views/ResourceViewsTable.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/(sidebar)/views/page.tsx (93%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/resources/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/account/api/ApiSection.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/account/api/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/account/profile/GithubRedirectButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/account/profile/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/layout.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/general/WorkspaceDeleteSection.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/general/WorkspaceUpdateSection.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/general/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/aws/AwsIntegration.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/aws/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/DeleteGithubUserButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/DisconnectDropdownActionButton.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/EntityActionDropdown.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/GithubAddEntityDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/GithubConnectedEntities.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/GithubRemoveEntityDialog.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/SelectPreconnectedEntityDialogContent.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/github/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/google/GoogleIntegration.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/(integration)/google/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/integrations/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/members/MembersExport.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/members/MembersTable.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/members/WorkspaceDomainMatching.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/members/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/overview/page.tsx (100%) rename apps/webservice/src/app/[workspaceSlug]/{(appv2) => (app)}/settings/workspace/page.tsx (100%) diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx index 85f316f00..8c2622c86 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/ApprovalCheck.tsx @@ -1,6 +1,6 @@ import { Button } from "@ctrlplane/ui/button"; -import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog"; +import { ApprovalDialog } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ApprovalDialog"; import { api } from "~/trpc/react"; import { Cancelled, Failing, Loading, Passing, Waiting } from "./StatusIcons"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx index 2e818cb72..8500af98e 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/EnvironmentNode.tsx @@ -24,8 +24,8 @@ import { } from "@ctrlplane/validators/conditions"; import { JobFilterType, JobStatus } from "@ctrlplane/validators/jobs"; -import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/channel/drawer/useReleaseChannelDrawer"; -import { useReleaseChannel } from "~/app/[workspaceSlug]/(appv2)/_hooks/channel/useReleaseChannel"; +import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(app)/_components/channel/drawer/useReleaseChannelDrawer"; +import { useReleaseChannel } from "~/app/[workspaceSlug]/(app)/_hooks/channel/useReleaseChannel"; import { api } from "~/trpc/react"; import { Cancelled, Failing, Loading, Passing, Waiting } from "./StatusIcons"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx similarity index 91% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx index 0f468a02f..fefa7be05 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowDiagram.tsx @@ -4,13 +4,13 @@ import type * as SCHEMA from "@ctrlplane/db/schema"; import type { NodeTypes } from "reactflow"; import ReactFlow, { useEdgesState, useNodesState } from "reactflow"; -import { ArrowEdge } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/ArrowEdge"; +import { ArrowEdge } from "~/app/[workspaceSlug]/(app)/_components/reactflow/ArrowEdge"; import { createEdgesFromPolicyDeployment, createEdgesFromPolicyToEnvironment, createEdgesWherePolicyHasNoEnvironment, -} from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/edges"; -import { useLayoutAndFitView } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/layout"; +} from "~/app/[workspaceSlug]/(app)/_components/reactflow/edges"; +import { useLayoutAndFitView } from "~/app/[workspaceSlug]/(app)/_components/reactflow/layout"; import { EnvironmentNode } from "./EnvironmentNode"; import { PolicyNode } from "./FlowPolicyNode"; import { TriggerNode } from "./TriggerNode"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowNode.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/FlowPolicyNode.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/StatusIcons.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/_components/flow-diagram/TriggerNode.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx index 1c1aee6e7..53cc08fc7 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/checks/page.tsx @@ -4,7 +4,7 @@ import { IconMenu2 } from "@tabler/icons-react"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { ReactFlowProvider } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/ReactFlowProvider"; +import { ReactFlowProvider } from "~/app/[workspaceSlug]/(app)/_components/reactflow/ReactFlowProvider"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { FlowDiagram } from "./_components/flow-diagram/FlowDiagram"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx similarity index 90% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx index c6aaed005..6e7375f7c 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentApprovalRow.tsx @@ -4,7 +4,7 @@ import type { EnvironmentPolicyApproval, User } from "@ctrlplane/db/schema"; import { Button } from "@ctrlplane/ui/button"; -import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog"; +import { ApprovalDialog } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ApprovalDialog"; type EnvironmentApprovalRowProps = { approval: EnvironmentPolicyApproval & { user?: User | null }; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx index 9f7245b9a..0c5342231 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/EnvironmentRowDropdown.tsx @@ -8,7 +8,7 @@ import { DropdownMenuTrigger, } from "@ctrlplane/ui/dropdown-menu"; -import { OverrideJobStatusDialog } from "~/app/[workspaceSlug]/(appv2)/_components/job/JobDropdownMenu"; +import { OverrideJobStatusDialog } from "~/app/[workspaceSlug]/(app)/_components/job/JobDropdownMenu"; export const EnvironmentRowDropdown: React.FC<{ jobIds: string[]; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx index 15cc1682d..6d6042f57 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/jobs/release-table/ResourceReleaseTable.tsx @@ -31,13 +31,13 @@ import { Table, TableBody, TableCell, TableRow } from "@ctrlplane/ui/table"; import { ReservedMetadataKey } from "@ctrlplane/validators/conditions"; import { JobStatus } from "@ctrlplane/validators/jobs"; -import { JobConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionBadge"; -import { JobConditionDialog } from "~/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionDialog"; -import { useJobDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/job/drawer/useJobDrawer"; -import { JobDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/_components/job/JobDropdownMenu"; -import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(appv2)/_components/job/JobTableStatusIcon"; -import { useReleaseChannel } from "~/app/[workspaceSlug]/(appv2)/_hooks/channel/useReleaseChannel"; -import { useFilter } from "~/app/[workspaceSlug]/(appv2)/_hooks/useFilter"; +import { JobConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionBadge"; +import { JobConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionDialog"; +import { useJobDrawer } from "~/app/[workspaceSlug]/(app)/_components/job/drawer/useJobDrawer"; +import { JobDropdownMenu } from "~/app/[workspaceSlug]/(app)/_components/job/JobDropdownMenu"; +import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(app)/_components/job/JobTableStatusIcon"; +import { useReleaseChannel } from "~/app/[workspaceSlug]/(app)/_hooks/channel/useReleaseChannel"; +import { useFilter } from "~/app/[workspaceSlug]/(app)/_hooks/useFilter"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/react"; import { EnvironmentApprovalRow } from "./EnvironmentApprovalRow"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx similarity index 94% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx index 1303babcd..1013eabb2 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/layout.tsx @@ -21,8 +21,8 @@ import { SidebarProvider, } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; -import { SidebarLink } from "~/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; +import { SidebarLink } from "~/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarLink"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { urls } from "~/app/urls"; import { api } from "~/trpc/server"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx index 9aee94257..f3b27d9ed 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(raw)/releases/[releaseId]/properties/page.tsx @@ -6,8 +6,8 @@ import yaml from "js-yaml"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; import { ReservedMetadataKey } from "@ctrlplane/validators/conditions"; -import { ConfigEditor } from "~/app/[workspaceSlug]/(appv2)/_components/ConfigEditor"; -import { MetadataInfo } from "~/app/[workspaceSlug]/(appv2)/_components/MetadataInfo"; +import { ConfigEditor } from "~/app/[workspaceSlug]/(app)/_components/ConfigEditor"; +import { MetadataInfo } from "~/app/[workspaceSlug]/(app)/_components/MetadataInfo"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx index 35b708d29..4858f0192 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/DeploymentPageContent.tsx @@ -40,10 +40,10 @@ import { } from "@ctrlplane/validators/conditions"; import { ReleaseStatus } from "@ctrlplane/validators/releases"; -import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionBadge"; -import { ReleaseConditionDialog } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionDialog"; -import { useReleaseFilter } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/useReleaseFilter"; -import { DeploymentDirectoryCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/DeploymentDirectoryCell"; +import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionBadge"; +import { ReleaseConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionDialog"; +import { useReleaseFilter } from "~/app/[workspaceSlug]/(app)/_components/release/condition/useReleaseFilter"; +import { DeploymentDirectoryCell } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/DeploymentDirectoryCell"; import { urls } from "~/app/urls"; import { api } from "~/trpc/react"; import { JobHistoryPopover } from "./_components/release-cell/JobHistoryPopover"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx similarity index 91% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx index 70eaa0c31..7b1925c3a 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/DeploymentCTA.tsx @@ -5,7 +5,7 @@ import { usePathname } from "next/navigation"; import { Button } from "@ctrlplane/ui/button"; -import { CreateReleaseDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease"; +import { CreateReleaseDialog } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/CreateRelease"; import { CreateReleaseChannelDialog } from "../channels/CreateReleaseChannelDialog"; import { CreateVariableDialog } from "../variables/CreateVariableDialog"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/DeployButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx similarity index 94% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx index afa340552..c413900ca 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/JobHistoryPopover.tsx @@ -7,7 +7,7 @@ import { Popover, PopoverContent, PopoverTrigger } from "@ctrlplane/ui/popover"; import { ColumnOperator } from "@ctrlplane/validators/conditions"; import { JobFilterType } from "@ctrlplane/validators/jobs"; -import { DailyJobsChart } from "~/app/[workspaceSlug]/(appv2)/insights/DailyJobsChart"; +import { DailyJobsChart } from "~/app/[workspaceSlug]/(app)/insights/DailyJobsChart"; import { api } from "~/trpc/react"; type JobHistoryPopoverProps = { diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionBarChart.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseDistributionPopover.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx index feff1e9d5..b12e2c002 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/ReleaseEnvironmentCell.tsx @@ -17,9 +17,9 @@ import { import { JobStatus } from "@ctrlplane/validators/jobs"; import { ReleaseStatus } from "@ctrlplane/validators/releases"; -import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/channel/drawer/useReleaseChannelDrawer"; -import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog"; -import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu"; +import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(app)/_components/channel/drawer/useReleaseChannelDrawer"; +import { ApprovalDialog } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ApprovalDialog"; +import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ReleaseDropdownMenu"; import { api } from "~/trpc/react"; import { DeployButton } from "./DeployButton"; import { Release } from "./TableCells"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx index 2a9ba93f0..72fb1cc27 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/_components/release-cell/TableCells.tsx @@ -39,12 +39,12 @@ import { JobStatus, } from "@ctrlplane/validators/jobs"; -import { DeploymentBarChart } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart"; -import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu"; +import { DeploymentBarChart } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/charts/DeploymentBarChart"; +import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ReleaseDropdownMenu"; import { getStatusColor, statusColor, -} from "~/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color"; +} from "~/app/[workspaceSlug]/(app)/(deploy)/_utils/status-color"; import { api } from "~/trpc/react"; const ReleaseIcon: React.FC<{ diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx index a409b3600..88d35ccba 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/CreateReleaseChannelDialog.tsx @@ -36,8 +36,8 @@ import { releaseCondition, } from "@ctrlplane/validators/releases"; -import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionBadge"; -import { ReleaseConditionDialog } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionDialog"; +import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionBadge"; +import { ReleaseConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionDialog"; import { urls } from "~/app/urls"; import { api } from "~/trpc/react"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx index c76072668..de7f1d33b 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/ReleaseChannelsTable.tsx @@ -12,8 +12,8 @@ import { TableRow, } from "@ctrlplane/ui/table"; -import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/channel/drawer/useReleaseChannelDrawer"; -import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionBadge"; +import { useReleaseChannelDrawer } from "~/app/[workspaceSlug]/(app)/_components/channel/drawer/useReleaseChannelDrawer"; +import { ReleaseConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionBadge"; type ReleaseChannel = SCHEMA.DeploymentVersionChannel & { total: number }; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/channels/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/CreateHookDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/DeleteHookDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/EditHookDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HookActionsDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/HooksTable.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/hooks/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx index d65ae280c..7f620b568 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/layout.tsx @@ -30,8 +30,8 @@ import { SidebarProvider, } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; -import { SidebarLink } from "~/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; +import { SidebarLink } from "~/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarLink"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { urls } from "~/app/urls"; import { api } from "~/trpc/server"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeleteDeploymentSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeleteDeploymentSection.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeleteDeploymentSection.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeleteDeploymentSection.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx index df5b38eef..be07d45c8 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/DeploymentResourcesDialog.tsx @@ -25,8 +25,8 @@ import { } from "@ctrlplane/validators/conditions"; import { isValidResourceCondition } from "@ctrlplane/validators/resources"; -import { ResourceConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender"; -import { ResourceList } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceList"; +import { ResourceConditionRender } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender"; +import { ResourceList } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceList"; import { api } from "~/trpc/react"; type Environment = { diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx index f4abd14ee..53898cff8 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/EditDeploymentSection.tsx @@ -45,7 +45,7 @@ import { isEmptyCondition, } from "@ctrlplane/validators/resources"; -import { ResourceConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender"; +import { ResourceConditionRender } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender"; import { api } from "~/trpc/react"; import { DeleteDeploymentSection } from "./DeleteDeploymentSection"; import { DeploymentResourcesDialog } from "./DeploymentResourcesDialog"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/properties/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/AddVariableValueDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx index 537af7b7b..c340813c1 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx @@ -30,8 +30,8 @@ import { isEmptyCondition, } from "@ctrlplane/validators/resources"; -import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionBadge"; -import { ResourceConditionDialog } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionDialog"; +import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge"; +import { ResourceConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionDialog"; export const ConfigTypeSelector: React.FC<{ value: string | undefined; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/CreateVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/EditVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDeploymentInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableEnvironmentInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableInputs.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableResourceInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx index 6aff1fc10..af69267a4 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableTable.tsx @@ -17,7 +17,7 @@ import { Input } from "@ctrlplane/ui/input"; import { Table, TableBody, TableCell, TableRow } from "@ctrlplane/ui/table"; import type { VariableData } from "./variable-data"; -import { ResourceIcon } from "~/app/[workspaceSlug]/(appv2)/_components/resources/ResourceIcon"; +import { ResourceIcon } from "~/app/[workspaceSlug]/(app)/_components/resources/ResourceIcon"; import { useMatchSorterWithSearch } from "~/utils/useMatchSorter"; import { VariableDropdown } from "./VariableDropdown"; import { VariableValueDropdown } from "./VariableValueDropdown"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx index 3f7ae4439..34e3e5d8b 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/VariableValueDropdown.tsx @@ -48,7 +48,7 @@ import { } from "@ctrlplane/validators/resources"; import type { VariableValue } from "./variable-data"; -import { ResourceConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender"; +import { ResourceConditionRender } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender"; import { api } from "~/trpc/react"; import { VariableBooleanInput, diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/variable-data.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/DeploymentJobAgentGithubConfig.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/JobAgentSection.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/workflow/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/config/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx similarity index 75% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx index dff9837c1..f83f3f5e7 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/deployments/page.tsx @@ -1,4 +1,4 @@ -import { DeploymentsCard } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/Card"; +import { DeploymentsCard } from "~/app/[workspaceSlug]/(app)/_components/deployments/Card"; export default async function DeploymentsPage(props: { params: Promise<{ environmentId: string }>; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/insights/DailyResourcesCountGraph.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx index 28f6d1108..3b65d1835 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/layout.tsx @@ -22,8 +22,8 @@ import { SidebarTrigger, } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; -import { SidebarLink } from "~/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; +import { SidebarLink } from "~/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarLink"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { DailyResourceCountGraph } from "./insights/DailyResourcesCountGraph"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx index 82faa0c1a..46fdbb998 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/PolicyTabs.tsx @@ -7,7 +7,7 @@ import { TabLink, Tabs, TabsList, -} from "~/app/[workspaceSlug]/(appv2)/_components/navigation/Tabs"; +} from "~/app/[workspaceSlug]/(app)/_components/navigation/Tabs"; const getActiveTab = (url: string) => { if (url.endsWith("/approval")) return "approval"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/ApprovalAndGovernance.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/approval/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/ReleaseChannels.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/channels/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/DeploymentControl.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/control/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/layout.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/ReleaseManagement.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/management/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/RolloutAndTiming.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/rollout/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/policies/useUpdatePolicy.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx index 76bb7ea2a..48ca9fcef 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EditFilterForm.tsx @@ -34,7 +34,7 @@ import { resourceCondition, } from "@ctrlplane/validators/resources"; -import { ResourceConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender"; +import { ResourceConditionRender } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender"; import { api } from "~/trpc/react"; import { EnvironmentResourceTable } from "./EnvironmentResourcesTable"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx index 1f489c9dc..fab623798 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/EnvironmentResourcesTable.tsx @@ -19,8 +19,8 @@ import { } from "@ctrlplane/ui/table"; import { JobStatus } from "@ctrlplane/validators/jobs"; -import { useDeploymentEnvResourceDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/useDeploymentResourceDrawer"; -import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(appv2)/_components/job/JobTableStatusIcon"; +import { useDeploymentEnvResourceDrawer } from "~/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/useDeploymentResourceDrawer"; +import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(app)/_components/job/JobTableStatusIcon"; import { api } from "~/trpc/react"; type HealthCellProps = { diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/resources/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx index 5747a1d2a..a27d93ea5 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/Overview.tsx @@ -15,7 +15,7 @@ import { import { Input } from "@ctrlplane/ui/input"; import { Textarea } from "@ctrlplane/ui/textarea"; -import { MetadataInfo } from "~/app/[workspaceSlug]/(appv2)/_components/MetadataInfo"; +import { MetadataInfo } from "~/app/[workspaceSlug]/(app)/_components/MetadataInfo"; import { api } from "~/trpc/react"; const name = z.string().min(1).max(100); diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/settings/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(raw)/environments/[environmentId]/variables/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/_components/SystemBreadcrumb.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx index ac298ec52..c195126b9 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/DeploymentGettingStarted.tsx @@ -3,7 +3,7 @@ import { IconRocket } from "@tabler/icons-react"; import { Button, buttonVariants } from "@ctrlplane/ui/button"; -import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment"; +import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment"; export const DeploymentGettingStarted: React.FC<{ workspaceSlug: string; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx index 5a2300e41..31b230c82 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/TableDeployments.tsx @@ -15,9 +15,9 @@ import { FilterType, } from "@ctrlplane/validators/conditions"; -import { DeploymentDirectoryCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/DeploymentDirectoryCell"; -import { DeploymentOptionsDropdown } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown"; -import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell"; +import { DeploymentDirectoryCell } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/DeploymentDirectoryCell"; +import { DeploymentOptionsDropdown } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown"; +import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell"; import { urls } from "~/app/urls"; import { api } from "~/trpc/react"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx index 78562950b..472ae6eb6 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/deployments/page.tsx @@ -2,8 +2,8 @@ import { notFound } from "next/navigation"; import { Button } from "@ctrlplane/ui/button"; -import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { api } from "~/trpc/server"; import { SystemBreadcrumb } from "../_components/SystemBreadcrumb"; import { DeploymentGettingStarted } from "./DeploymentGettingStarted"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/CreateEnvironmentDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/CreateEnvironmentDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/CreateEnvironmentDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/CreateEnvironmentDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/DeleteEnvironmentDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/EnvironmentRow.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx index 8fe918997..311bd4d3d 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/environments/page.tsx @@ -2,7 +2,7 @@ import { notFound } from "next/navigation"; import { Button } from "@ctrlplane/ui/button"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { api } from "~/trpc/server"; import { SystemBreadcrumb } from "../_components/SystemBreadcrumb"; import { CreateEnvironmentDialog } from "./CreateEnvironmentDialog"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx index 18eac0e26..6e6dea5c8 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/layout.tsx @@ -19,8 +19,8 @@ import { SidebarProvider, } from "@ctrlplane/ui/sidebar"; -import { SystemSelector } from "~/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemSelector"; -import { SidebarLink } from "~/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink"; +import { SystemSelector } from "~/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/SystemSelector"; +import { SidebarLink } from "~/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarLink"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/DeleteNodeDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx index 11ee1efef..d7ea5107a 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowBuilder.tsx @@ -22,15 +22,15 @@ import ReactFlow, { import colors from "tailwindcss/colors"; import { isPresent } from "ts-is-present"; -import { useEnvironmentDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer"; -import { useEnvironmentPolicyDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/policy/drawer/EnvironmentPolicyDrawer"; -import { ArrowEdge } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/ArrowEdge"; +import { useEnvironmentDrawer } from "~/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer"; +import { useEnvironmentPolicyDrawer } from "~/app/[workspaceSlug]/(app)/_components/policy/drawer/EnvironmentPolicyDrawer"; +import { ArrowEdge } from "~/app/[workspaceSlug]/(app)/_components/reactflow/ArrowEdge"; import { createEdgesFromPolicyDeployment, createEdgesWhereEnvironmentHasNoPolicy, createEdgesWherePolicyHasNoEnvironment, -} from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/edges"; -import { useLayoutAndFitView } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/layout"; +} from "~/app/[workspaceSlug]/(app)/_components/reactflow/edges"; +import { useLayoutAndFitView } from "~/app/[workspaceSlug]/(app)/_components/reactflow/layout"; import { api } from "~/trpc/react"; import { useDeleteNodeDialog } from "./DeleteNodeDialog"; import { useHandleEdgeDelete, useOnEdgeClick } from "./edges"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx index 57ef84e1c..d2e985b2e 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/EnvFlowPanel.tsx @@ -35,7 +35,7 @@ import { Input } from "@ctrlplane/ui/input"; import { Separator } from "@ctrlplane/ui/separator"; import { Textarea } from "@ctrlplane/ui/textarea"; -import { useEnvironmentDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer"; +import { useEnvironmentDrawer } from "~/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer"; import { api } from "~/trpc/react"; import { DeleteNodeDialog, useDeleteNodeDialog } from "./DeleteNodeDialog"; import { useHandleEdgeDelete } from "./edges"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/FlowNodeTypes.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/SidepanelContext.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/TargetFilterUniquenessIndicator.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/edges.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx similarity index 90% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx index 258fb7e9b..f8a8ad6bb 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/page.tsx @@ -1,4 +1,4 @@ -import { ReactFlowProvider } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/ReactFlowProvider"; +import { ReactFlowProvider } from "~/app/[workspaceSlug]/(app)/_components/reactflow/ReactFlowProvider"; import { api } from "~/trpc/server"; import { DeleteNodeDialogProvider } from "./DeleteNodeDialog"; import { EnvFlowBuilder } from "./EnvFlowBuilder"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/policies/useMatchSorter.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/DeleteRunbookDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/EditRunbookForm.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookGettingStarted.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/RunbookRow.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/TriggerRunbook.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx index 537af7b7b..c340813c1 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(raw)/deployments/[deploymentSlug]/(sidebar)/variables/ConfigFields.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/ConfigFields.tsx @@ -30,8 +30,8 @@ import { isEmptyCondition, } from "@ctrlplane/validators/resources"; -import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionBadge"; -import { ResourceConditionDialog } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionDialog"; +import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge"; +import { ResourceConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionDialog"; export const ConfigTypeSelector: React.FC<{ value: string | undefined; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableDeploymentInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableEnvironmentInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableInputs.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/_components/variables/VariableResourceInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/CreateRunbookForm.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/RunbookVariableEditor.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx index 737a54c4b..295f401f7 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/create/page.tsx @@ -13,7 +13,7 @@ import { import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { CreateRunbook } from "./CreateRunbookForm"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx similarity index 94% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx index c447ea320..9dee0b1c6 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/runbooks/page.tsx @@ -3,7 +3,7 @@ import { notFound } from "next/navigation"; import { buttonVariants } from "@ctrlplane/ui/button"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { api } from "~/trpc/server"; import { SystemBreadcrumb } from "../_components/SystemBreadcrumb"; import { RunbookGettingStarted } from "./RunbookGettingStarted"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/DeleteButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/GeneralSettings.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx similarity index 87% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx index 7b66281da..ced8e33d8 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/settings/page.tsx @@ -3,8 +3,8 @@ import { notFound } from "next/navigation"; import { Button } from "@ctrlplane/ui/button"; import { Separator } from "@ctrlplane/ui/separator"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; -import { DeleteSystemDialog } from "~/app/[workspaceSlug]/(appv2)/_components/system/DeleteSystemDialog"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; +import { DeleteSystemDialog } from "~/app/[workspaceSlug]/(app)/_components/system/DeleteSystemDialog"; import { api } from "~/trpc/server"; import { SystemBreadcrumb } from "../_components/SystemBreadcrumb"; import { GeneralSettings } from "./GeneralSettings"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/CreateVariableSetDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/GettingStartedVariableSets.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx index aaf041218..9eb5319ff 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/VariableSetsTable.tsx @@ -12,7 +12,7 @@ import { TableRow, } from "@ctrlplane/ui/table"; -import { useVariableSetDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/variable-set/useVariableSetDrawer"; +import { useVariableSetDrawer } from "~/app/[workspaceSlug]/(app)/_components/variable-set/useVariableSetDrawer"; type Environment = SCHEMA.VariableSetEnvironment & { environment: SCHEMA.Environment; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx index 48571ae02..511adfa60 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(raw)/systems/[systemSlug]/(sidebar)/variables/page.tsx @@ -1,6 +1,6 @@ import { notFound } from "next/navigation"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { api } from "~/trpc/server"; import { SystemBreadcrumb } from "../_components/SystemBreadcrumb"; import { VariableSetGettingStarted } from "./GettingStartedVariableSets"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/AgentCard.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/AgentCard.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/AgentCard.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/AgentCard.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/_hooks/useJobStats.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/_hooks/useJobStats.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/_hooks/useJobStats.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/_hooks/useJobStats.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/page.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/page.tsx index 636843587..d3781b890 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/agents/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/agents/page.tsx @@ -11,7 +11,7 @@ import { import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { AgentCard } from "./AgentCard"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/deployments/page.tsx similarity index 84% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/deployments/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/deployments/page.tsx index f357876fa..de9660872 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/deployments/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/deployments/page.tsx @@ -5,9 +5,9 @@ import { IconMenu2 } from "@tabler/icons-react"; import { Button } from "@ctrlplane/ui/button"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { DeploymentsCard } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/Card"; -import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { DeploymentsCard } from "~/app/[workspaceSlug]/(app)/_components/deployments/Card"; +import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/layout.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/layout.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/CreateSystem.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/CreateSystem.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/CreateSystem.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/CreateSystem.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemSelector.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/SystemSelector.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemSelector.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/SystemSelector.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx index 5681be613..709837981 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/SystemsPageContent.tsx @@ -38,8 +38,8 @@ import { Input } from "@ctrlplane/ui/input"; import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { api } from "~/trpc/react"; import { Sidebars } from "../../../../sidebars"; import { SystemDeploymentSkeleton } from "./_components/system-deployment-table/SystemDeploymentSkeleton"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentSkeleton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx index 696991e44..d84e5d12f 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/SystemDeploymentTable.tsx @@ -26,8 +26,8 @@ import { TooltipTrigger, } from "@ctrlplane/ui/tooltip"; -import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment"; -import { DeleteSystemDialog } from "~/app/[workspaceSlug]/(appv2)/_components/system/DeleteSystemDialog"; +import { CreateDeploymentDialog } from "~/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment"; +import { DeleteSystemDialog } from "~/app/[workspaceSlug]/(app)/_components/system/DeleteSystemDialog"; import { api } from "~/trpc/react"; import { urls } from "../../../../../../../urls"; import { SystemDeploymentSkeleton } from "./SystemDeploymentSkeleton"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx index 8f712b805..5868dacc6 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/_components/system-deployment-table/TableDeployments.tsx @@ -21,8 +21,8 @@ import { FilterType, } from "@ctrlplane/validators/conditions"; -import { DeploymentDirectoryCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/DeploymentDirectoryCell"; -import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell"; +import { DeploymentDirectoryCell } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/DeploymentDirectoryCell"; +import { LazyDeploymentEnvironmentCell } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell"; import { urls } from "~/app/urls"; import { api } from "~/trpc/react"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/(sidebar)/systems/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/(sidebar)/systems/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx index f238c3ee3..9ca5cf629 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/DeploymentDirectoryCell.tsx @@ -13,7 +13,7 @@ import { TooltipTrigger, } from "@ctrlplane/ui/tooltip"; -import { StatusIcon } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/StatusIcon"; +import { StatusIcon } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/StatusIcon"; import { urls } from "~/app/urls"; import { api } from "~/trpc/react"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx similarity index 90% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx index ead06d6c2..85c174c53 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/charts/DeploymentBarChart.tsx @@ -10,7 +10,7 @@ import { YAxis, } from "recharts"; -import { getStatusColor } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color"; +import { getStatusColor } from "~/app/[workspaceSlug]/(app)/(deploy)/_utils/status-color"; export const DeploymentBarChart: React.FC<{ data: { name: string; count: number }[]; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/DeleteDeployment.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/DeploymentOptionsDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/dropdown/EditDeploymentDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx index 37fea7e4c..d84588152 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/DeploymentEnvironmentCell.tsx @@ -13,8 +13,8 @@ import { useInView } from "react-intersection-observer"; import { Button } from "@ctrlplane/ui/button"; import { Skeleton } from "@ctrlplane/ui/skeleton"; -import { ApprovalDialog } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog"; -import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu"; +import { ApprovalDialog } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ApprovalDialog"; +import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ReleaseDropdownMenu"; import { api } from "~/trpc/react"; import { Release } from "./ReleaseInfo"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx similarity index 94% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx index a8c23e1dd..b35023e07 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/ReleaseInfo.tsx @@ -22,12 +22,12 @@ import { } from "@ctrlplane/ui/tooltip"; import { activeStatusType } from "@ctrlplane/validators/jobs"; -import { DeploymentBarChart } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/charts/DeploymentBarChart"; -import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu"; +import { DeploymentBarChart } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/charts/DeploymentBarChart"; +import { ReleaseDropdownMenu } from "~/app/[workspaceSlug]/(app)/(deploy)/_components/release/ReleaseDropdownMenu"; import { getStatusColor, statusColor, -} from "~/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color"; +} from "~/app/[workspaceSlug]/(app)/(deploy)/_utils/status-color"; import { api } from "~/trpc/react"; import { StatusIcon } from "./StatusIcon"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/deployments/environment-cell/StatusIcon.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/ApprovalDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ApprovalDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/ApprovalDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/CreateRelease.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/CreateRelease.tsx index 1bd284fc7..9c3da30f4 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/CreateRelease.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/CreateRelease.tsx @@ -48,7 +48,7 @@ import { ReleaseStatus, } from "@ctrlplane/validators/releases"; -import { ReleaseConditionDialog } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionDialog"; +import { ReleaseConditionDialog } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionDialog"; import { api } from "~/trpc/react"; const releaseDependency = z.object({ diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/ReleaseDropdownMenu.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_components/release/ReleaseDropdownMenu.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_components/release/ReleaseDropdownMenu.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_utils/status-color.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/(deploy)/_utils/status-color.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/(deploy)/_utils/status-color.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/DeploymentsSidebarIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/DeploymentsSidebarIcon.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/DeploymentsSidebarIcon.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/DeploymentsSidebarIcon.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/TopNav.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/TopNav.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/TopNav.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/TopNav.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/TopNavSearch.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/TopNavSearch.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/TopNavSearch.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/TopNavSearch.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/TopSidebarIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/TopSidebarIcon.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/TopSidebarIcon.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/TopSidebarIcon.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/UserAvatarMenu.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/UserAvatarMenu.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/UserAvatarMenu.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/UserAvatarMenu.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/WorkspaceDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/WorkspaceDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/WorkspaceDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/WorkspaceDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/ConfigEditor.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/ConfigEditor.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/ConfigEditor.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/ConfigEditor.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/CreateResource.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/CreateResource.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/CreateResource.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/CreateResource.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/MetadataInfo.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/MetadataInfo.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/MetadataInfo.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/MetadataInfo.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/PageHeader.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/PageHeader.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/PageHeader.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/PageHeader.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/TableSortHeader.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/TableSortHeader.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/TableSortHeader.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/TableSortHeader.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/Overview.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/Overview.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/Overview.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/Overview.tsx index 7834dcfd0..c4a5d340b 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/Overview.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/Overview.tsx @@ -32,9 +32,9 @@ import { releaseCondition, } from "@ctrlplane/validators/releases"; -import { ReleaseConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionRender"; -import { useReleaseFilter } from "~/app/[workspaceSlug]/(appv2)/_components/release/condition/useReleaseFilter"; -import { ReleaseBadgeList } from "~/app/[workspaceSlug]/(appv2)/_components/release/ReleaseBadgeList"; +import { ReleaseConditionRender } from "~/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionRender"; +import { useReleaseFilter } from "~/app/[workspaceSlug]/(app)/_components/release/condition/useReleaseFilter"; +import { ReleaseBadgeList } from "~/app/[workspaceSlug]/(app)/_components/release/ReleaseBadgeList"; import { api } from "~/trpc/react"; type OverviewProps = { diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/ReleaseChannelDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/ReleaseChannelDrawer.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/ReleaseChannelDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/ReleaseChannelDrawer.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/ReleaseChannelDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/ReleaseChannelDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/ReleaseChannelDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/ReleaseChannelDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/Usage.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/Usage.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/Usage.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/Usage.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/useReleaseChannelDrawer.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/useReleaseChannelDrawer.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/channel/drawer/useReleaseChannelDrawer.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/channel/drawer/useReleaseChannelDrawer.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/Card.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/Card.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/Card.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/Card.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/CreateDeployment.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/CreateDeployment.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/DeploymentHistoryGraph.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/DeploymentHistoryGraph.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/DeploymentHistoryGraph.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/DeploymentHistoryGraph.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/DeploymentRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/DeploymentRow.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/DeploymentRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/DeploymentRow.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/DeploymentTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/DeploymentTable.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/DeploymentTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/DeploymentTable.tsx index 9c7ea9d6d..816c1054b 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/DeploymentTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/DeploymentTable.tsx @@ -9,7 +9,7 @@ import { } from "@ctrlplane/ui/table"; import { StatsColumn } from "@ctrlplane/validators/deployments"; -import { TableSortHeader } from "~/app/[workspaceSlug]/(appv2)/_components/TableSortHeader"; +import { TableSortHeader } from "~/app/[workspaceSlug]/(app)/_components/TableSortHeader"; import { DeploymentRow } from "./DeploymentRow"; import { SkeletonRow } from "./SkeletonRow"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/SkeletonRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/SkeletonRow.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/deployment-table/SkeletonRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/deployment-table/SkeletonRow.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/DeploymentResourceDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/DeploymentResourceDrawer.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/DeploymentResourceDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/DeploymentResourceDrawer.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/JobLinksCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/JobLinksCell.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/JobLinksCell.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/JobLinksCell.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/ReleaseTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/ReleaseTable.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/ReleaseTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/ReleaseTable.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/TableRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/TableRow.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/TableRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/TableRow.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/useDeploymentResourceDrawer.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/useDeploymentResourceDrawer.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/useDeploymentResourceDrawer.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/useDeploymentResourceDrawer.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/drawer/TabButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/drawer/TabButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/drawer/TabButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/drawer/TabButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer.tsx index f5052b02f..8ca6c5ecf 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer.tsx @@ -18,7 +18,7 @@ import { import { Button } from "@ctrlplane/ui/button"; import { Drawer, DrawerContent, DrawerTitle } from "@ctrlplane/ui/drawer"; -import { TabButton } from "~/app/[workspaceSlug]/(appv2)/_components/drawer/TabButton"; +import { TabButton } from "~/app/[workspaceSlug]/(app)/_components/drawer/TabButton"; import { api } from "~/trpc/react"; import { EnvironmentDropdownMenu } from "./EnvironmentDropdownMenu"; import { EditFilterForm } from "./Filter"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDropdownMenu.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDropdownMenu.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDropdownMenu.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDropdownMenu.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/Filter.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/Filter.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/Filter.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/Filter.tsx index 3c7ef8e81..106399122 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/Filter.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/Filter.tsx @@ -32,8 +32,8 @@ import { resourceCondition, } from "@ctrlplane/validators/resources"; -import { ResourceConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender"; -import { ResourceList } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceList"; +import { ResourceConditionRender } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender"; +import { ResourceList } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceList"; import { api } from "~/trpc/react"; const ResourceViewsCombobox: React.FC<{ diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/Overview.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/Overview.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/Overview.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/Overview.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/policy-override/UpdateOverride.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/policy-override/UpdateOverride.tsx similarity index 80% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/policy-override/UpdateOverride.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/policy-override/UpdateOverride.tsx index 4542c79c9..15e1f72a3 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/policy-override/UpdateOverride.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/policy-override/UpdateOverride.tsx @@ -1,11 +1,11 @@ import type { RouterOutputs } from "@ctrlplane/api"; import type * as SCHEMA from "@ctrlplane/db/schema"; -import { ApprovalAndGovernance } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/ApprovalAndGovernance"; -import { DeploymentControl } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/DeploymentControl"; -import { ReleaseChannels } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseChannels"; -import { ReleaseManagement } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseManagement"; -import { RolloutAndTiming } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/RolloutAndTiming"; +import { ApprovalAndGovernance } from "~/app/[workspaceSlug]/(app)/_components/policy/form/ApprovalAndGovernance"; +import { DeploymentControl } from "~/app/[workspaceSlug]/(app)/_components/policy/form/DeploymentControl"; +import { ReleaseChannels } from "~/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseChannels"; +import { ReleaseManagement } from "~/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseManagement"; +import { RolloutAndTiming } from "~/app/[workspaceSlug]/(app)/_components/policy/form/RolloutAndTiming"; import { EnvironmentDrawerTab } from "../tabs"; import { useUpdateOverridePolicy } from "./useOverridePolicy"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/policy-override/useOverridePolicy.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/policy-override/useOverridePolicy.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/policy-override/useOverridePolicy.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/policy-override/useOverridePolicy.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/tabs.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/tabs.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/environment/drawer/tabs.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment/drawer/tabs.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/ChoiceConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/ChoiceConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/ChoiceConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/ChoiceConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/ColumnConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/ColumnConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/ColumnConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/ColumnConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/DateConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/DateConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/DateConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/DateConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/MetadataConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/MetadataConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/MetadataConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/MetadataConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/NoFilterMatch.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/NoFilterMatch.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/filter/NoFilterMatch.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/filter/NoFilterMatch.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/JobDropdownMenu.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/JobDropdownMenu.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/JobDropdownMenu.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/JobDropdownMenu.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/JobTableStatusIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/JobTableStatusIcon.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/JobTableStatusIcon.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/JobTableStatusIcon.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/DeploymentConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/DeploymentConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/DeploymentConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/DeploymentConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/EnvironmentConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/EnvironmentConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/EnvironmentConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/EnvironmentConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobComparisonConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobComparisonConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobComparisonConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobComparisonConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionBadge.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionBadge.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionBadge.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionBadge.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobCreatedAtConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobCreatedAtConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobCreatedAtConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobCreatedAtConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobMetadataConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobMetadataConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobMetadataConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobMetadataConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobResourceConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobResourceConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/JobResourceConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/JobResourceConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/RunbookJobComparisonConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/RunbookJobComparisonConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/RunbookJobComparisonConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/RunbookJobComparisonConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/RunbookJobConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/RunbookJobConditionDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/RunbookJobConditionDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/RunbookJobConditionDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/RunbookJobConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/RunbookJobConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/RunbookJobConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/RunbookJobConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/StatusConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/StatusConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/StatusConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/StatusConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/VersionConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/VersionConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/VersionConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/VersionConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/job-condition-props.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/job-condition-props.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/condition/job-condition-props.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/condition/job-condition-props.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/Job.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/Job.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/Job.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/Job.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobAgent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobAgent.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobAgent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobAgent.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobDrawer.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobDrawer.tsx index 70290fb58..3a2f0b25d 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobDrawer.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobDrawer.tsx @@ -13,7 +13,7 @@ import { Button, buttonVariants } from "@ctrlplane/ui/button"; import { Drawer, DrawerContent, DrawerTitle } from "@ctrlplane/ui/drawer"; import { ReservedMetadataKey } from "@ctrlplane/validators/conditions"; -import { useReleaseChannel } from "~/app/[workspaceSlug]/(appv2)/_hooks/channel/useReleaseChannel"; +import { useReleaseChannel } from "~/app/[workspaceSlug]/(app)/_hooks/channel/useReleaseChannel"; import { api } from "~/trpc/react"; import { MetadataInfo } from "../../MetadataInfo"; import { JobDropdownMenu } from "../JobDropdownMenu"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobProperties.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobProperties.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobProperties.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobProperties.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobVariables.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobVariables.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/JobVariables.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/JobVariables.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/useJobDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/useJobDrawer.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/job/drawer/useJobDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/job/drawer/useJobDrawer.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/navigation/Tabs.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/navigation/Tabs.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/navigation/Tabs.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/navigation/Tabs.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/EnvironmentPolicyDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/EnvironmentPolicyDrawer.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/EnvironmentPolicyDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/EnvironmentPolicyDrawer.tsx index 73eba1dbe..24e94b444 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/EnvironmentPolicyDrawer.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/EnvironmentPolicyDrawer.tsx @@ -23,12 +23,12 @@ import { DropdownMenuTrigger, } from "@ctrlplane/ui/dropdown-menu"; -import { TabButton } from "~/app/[workspaceSlug]/(appv2)/_components/drawer/TabButton"; -import { ApprovalAndGovernance } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/ApprovalAndGovernance"; -import { DeploymentControl } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/DeploymentControl"; -import { ReleaseChannels } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseChannels"; -import { ReleaseManagement } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseManagement"; -import { RolloutAndTiming } from "~/app/[workspaceSlug]/(appv2)/_components/policy/form/RolloutAndTiming"; +import { TabButton } from "~/app/[workspaceSlug]/(app)/_components/drawer/TabButton"; +import { ApprovalAndGovernance } from "~/app/[workspaceSlug]/(app)/_components/policy/form/ApprovalAndGovernance"; +import { DeploymentControl } from "~/app/[workspaceSlug]/(app)/_components/policy/form/DeploymentControl"; +import { ReleaseChannels } from "~/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseChannels"; +import { ReleaseManagement } from "~/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseManagement"; +import { RolloutAndTiming } from "~/app/[workspaceSlug]/(app)/_components/policy/form/RolloutAndTiming"; import { api } from "~/trpc/react"; import { Overview } from "./Overview"; import { DeleteEnvironmentPolicyDialog } from "./PolicyDeleteDialog"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/Overview.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/Overview.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/Overview.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/Overview.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/PolicyDeleteDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/PolicyDeleteDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/PolicyDeleteDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/PolicyDeleteDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/useUpdatePolicy.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/useUpdatePolicy.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/drawer/useUpdatePolicy.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/drawer/useUpdatePolicy.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/ApprovalAndGovernance.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/ApprovalAndGovernance.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/ApprovalAndGovernance.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/ApprovalAndGovernance.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/DeploymentControl.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/DeploymentControl.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/DeploymentControl.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/DeploymentControl.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseChannels.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseChannels.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseChannels.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseChannels.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseManagement.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseManagement.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/ReleaseManagement.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/ReleaseManagement.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/RolloutAndTiming.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/RolloutAndTiming.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/policy/form/RolloutAndTiming.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/policy/form/RolloutAndTiming.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/ArrowEdge.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/ArrowEdge.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/ArrowEdge.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/ArrowEdge.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/ReactFlowProvider.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/ReactFlowProvider.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/ReactFlowProvider.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/ReactFlowProvider.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/edges.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/edges.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/edges.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/edges.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/layout.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/layout.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/reactflow/layout.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/reactflow/layout.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/ReleaseBadgeList.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/ReleaseBadgeList.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/ReleaseBadgeList.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/ReleaseBadgeList.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ComparisonConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ComparisonConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ComparisonConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ComparisonConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionBadge.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionBadge.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionBadge.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionBadge.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseCreatedAtConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseCreatedAtConditionRender.tsx similarity index 87% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseCreatedAtConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseCreatedAtConditionRender.tsx index d507f8aaf..da96fba98 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseCreatedAtConditionRender.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseCreatedAtConditionRender.tsx @@ -4,7 +4,7 @@ import type { } from "@ctrlplane/validators/conditions"; import type { ReleaseConditionRenderProps } from "./release-condition-props"; -import { DateConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/filter/DateConditionRender"; +import { DateConditionRender } from "~/app/[workspaceSlug]/(app)/_components/filter/DateConditionRender"; export const CreatedAtConditionRender: React.FC< ReleaseConditionRenderProps diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseMetadataConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseMetadataConditionRender.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseMetadataConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseMetadataConditionRender.tsx index eacf742eb..2ec18fc4d 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseMetadataConditionRender.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseMetadataConditionRender.tsx @@ -2,7 +2,7 @@ import type { MetadataCondition } from "@ctrlplane/validators/conditions"; import { useParams } from "next/navigation"; import type { ReleaseConditionRenderProps } from "./release-condition-props"; -import { MetadataConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/filter/MetadataConditionRender"; +import { MetadataConditionRender } from "~/app/[workspaceSlug]/(app)/_components/filter/MetadataConditionRender"; import { api } from "~/trpc/react"; export const ReleaseMetadataConditionRender: React.FC< diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseVersionConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseVersionConditionRender.tsx similarity index 94% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseVersionConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseVersionConditionRender.tsx index bcada53ed..d17793d18 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/ReleaseVersionConditionRender.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/ReleaseVersionConditionRender.tsx @@ -5,7 +5,7 @@ import type { import React from "react"; import type { ReleaseConditionRenderProps } from "./release-condition-props"; -import { ColumnConditionRender } from "~/app/[workspaceSlug]/(appv2)/_components/filter/ColumnConditionRender"; +import { ColumnConditionRender } from "~/app/[workspaceSlug]/(app)/_components/filter/ColumnConditionRender"; export const ReleaseVersionConditionRender: React.FC< ReleaseConditionRenderProps diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/release-condition-props.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/release-condition-props.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/release-condition-props.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/release-condition-props.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/useReleaseFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/useReleaseFilter.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/release/condition/useReleaseFilter.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/release/condition/useReleaseFilter.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/EditResource.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/EditResource.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/EditResource.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/EditResource.tsx index 58e6a14c3..b5e8b326a 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/EditResource.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/EditResource.tsx @@ -31,7 +31,7 @@ import { import { Input } from "@ctrlplane/ui/input"; import { Label } from "@ctrlplane/ui/label"; -import { ConfigEditor } from "~/app/[workspaceSlug]/(appv2)/_components/ConfigEditor"; +import { ConfigEditor } from "~/app/[workspaceSlug]/(app)/_components/ConfigEditor"; import { api } from "~/trpc/react"; type ResourceWithMetadata = Resource & { diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/ReleaseCell.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/ReleaseCell.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ResourceIcon.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/ResourceIcon.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/ResourceIcon.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/ResourceIcon.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ComparisonConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ComparisonConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ComparisonConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ComparisonConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/IdentifierConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/IdentifierConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/IdentifierConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/IdentifierConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/KindConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/KindConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/KindConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/KindConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/NameConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/NameConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/NameConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/NameConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ProviderConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ProviderConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ProviderConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ProviderConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionBadge.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionBadge.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceCreatedAtConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceCreatedAtConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceCreatedAtConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceCreatedAtConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceLastSyncConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceLastSyncConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceLastSyncConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceLastSyncConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceList.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceList.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceList.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceList.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceMetadataConditionRender.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceMetadataConditionRender.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceMetadataConditionRender.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceMetadataConditionRender.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceViewActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceViewActionsDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceViewActionsDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceViewActionsDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceViewForm.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceViewForm.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceViewForm.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceViewForm.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/resource-condition-props.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/resource-condition-props.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/resource-condition-props.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/resource-condition-props.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/useResourceFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/useResourceFilter.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/condition/useResourceFilter.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/condition/useResourceFilter.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/CreateResourceVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/CreateResourceVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/CreateResourceVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/CreateResourceVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/DeleteResourceVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/DeleteResourceVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/DeleteResourceVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/DeleteResourceVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/DeploymentContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/DeploymentContent.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/DeploymentContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/DeploymentContent.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/EditResourceVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/EditResourceVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/EditResourceVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/EditResourceVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/JobsContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/JobsContent.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/JobsContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/JobsContent.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/OverviewContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/OverviewContent.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/OverviewContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/OverviewContent.tsx index 0bcc60991..263af6c27 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/OverviewContent.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/OverviewContent.tsx @@ -12,8 +12,8 @@ import { } from "@ctrlplane/ui/tooltip"; import { ReservedMetadataKey } from "@ctrlplane/validators/conditions"; -import { ConfigEditor } from "~/app/[workspaceSlug]/(appv2)/_components/ConfigEditor"; -import { MetadataInfo } from "~/app/[workspaceSlug]/(appv2)/_components/MetadataInfo"; +import { ConfigEditor } from "~/app/[workspaceSlug]/(app)/_components/ConfigEditor"; +import { MetadataInfo } from "~/app/[workspaceSlug]/(app)/_components/MetadataInfo"; const ResourceConfigInfo: React.FC<{ config: Record }> = ({ config, diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceActionsDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceActionsDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceActionsDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceDrawer.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceDrawer.tsx index 32a7b633b..2e22eadfb 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceDrawer.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceDrawer.tsx @@ -20,8 +20,8 @@ import { Button, buttonVariants } from "@ctrlplane/ui/button"; import { Drawer, DrawerContent, DrawerTitle } from "@ctrlplane/ui/drawer"; import { ReservedMetadataKey } from "@ctrlplane/validators/conditions"; -import { TabButton } from "~/app/[workspaceSlug]/(appv2)/_components/drawer/TabButton"; -import { EditResourceDialog } from "~/app/[workspaceSlug]/(appv2)/_components/resources/EditResource"; +import { TabButton } from "~/app/[workspaceSlug]/(app)/_components/drawer/TabButton"; +import { EditResourceDialog } from "~/app/[workspaceSlug]/(app)/_components/resources/EditResource"; // import { useTerminalSessions } from "~/app/terminal/TerminalSessionsProvider"; import { api } from "~/trpc/react"; import { DeploymentsContent } from "./DeploymentContent"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceVariableDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceVariableDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/ResourceVariableDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/ResourceVariableDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/VariablesContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/VariablesContent.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/VariablesContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/VariablesContent.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/useResourceDrawer.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/useResourceDrawer.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/resources/drawer/useResourceDrawer.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/resources/drawer/useResourceDrawer.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/system/DeleteSystemDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/system/DeleteSystemDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/system/DeleteSystemDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/system/DeleteSystemDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/OverviewContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/OverviewContent.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/OverviewContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/OverviewContent.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/VariableSetActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/VariableSetActionsDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/VariableSetActionsDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/VariableSetActionsDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/VariableSetDrawer.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/VariableSetDrawer.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/VariableSetDrawer.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/VariableSetDrawer.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/useVariableSetDrawer.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/useVariableSetDrawer.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_components/variable-set/useVariableSetDrawer.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_components/variable-set/useVariableSetDrawer.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_hooks/channel/useReleaseChannel.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_hooks/channel/useReleaseChannel.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_hooks/channel/useReleaseChannel.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_hooks/channel/useReleaseChannel.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/_hooks/useFilter.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/_hooks/useFilter.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/_hooks/useFilter.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/_hooks/useFilter.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/DailyJobsChart.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/insights/DailyJobsChart.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/DailyJobsChart.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/insights/DailyJobsChart.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/DailyResourcesCountGraph.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/insights/DailyResourcesCountGraph.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/DailyResourcesCountGraph.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/insights/DailyResourcesCountGraph.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/overview-cards/SuccessRate.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/insights/overview-cards/SuccessRate.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/overview-cards/SuccessRate.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/insights/overview-cards/SuccessRate.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/overview-cards/TotalJobs.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/insights/overview-cards/TotalJobs.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/overview-cards/TotalJobs.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/insights/overview-cards/TotalJobs.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/overview-cards/WorkspaceResources.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/insights/overview-cards/WorkspaceResources.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/overview-cards/WorkspaceResources.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/insights/overview-cards/WorkspaceResources.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/insights/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/insights/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/insights/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/layout.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/layout.tsx index d245278c7..c41ff6c09 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/layout.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/layout.tsx @@ -1,8 +1,8 @@ import React from "react"; import { IconChartBar, IconCube, IconSettings } from "@tabler/icons-react"; -import { EnvironmentDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer"; -import { EnvironmentPolicyDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/policy/drawer/EnvironmentPolicyDrawer"; +import { EnvironmentDrawer } from "~/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer"; +import { EnvironmentPolicyDrawer } from "~/app/[workspaceSlug]/(app)/_components/policy/drawer/EnvironmentPolicyDrawer"; import { ReleaseChannelDrawer } from "./_components/channel/drawer/ReleaseChannelDrawer"; import { DeploymentResourceDrawer } from "./_components/deployments/resource-drawer/DeploymentResourceDrawer"; import { JobDrawer } from "./_components/job/drawer/JobDrawer"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx index a063a4e5b..bbc4613c3 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRow.tsx @@ -14,8 +14,8 @@ import { } from "@ctrlplane/validators/conditions"; import { JobFilterType } from "@ctrlplane/validators/jobs"; -import { LazyDeploymentHistoryGraph } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/DeploymentHistoryGraph"; -import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(appv2)/_components/job/JobTableStatusIcon"; +import { LazyDeploymentHistoryGraph } from "~/app/[workspaceSlug]/(app)/_components/deployments/DeploymentHistoryGraph"; +import { JobTableStatusIcon } from "~/app/[workspaceSlug]/(app)/_components/job/JobTableStatusIcon"; import { api } from "~/trpc/react"; type DeploymentStats = diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx similarity index 91% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx index 92fb00719..c5dba3f0a 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentRowSkeleton.tsx @@ -1,6 +1,6 @@ import { Skeleton } from "@ctrlplane/ui/skeleton"; -import { HistorySkeleton } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/DeploymentHistoryGraph"; +import { HistorySkeleton } from "~/app/[workspaceSlug]/(app)/_components/deployments/DeploymentHistoryGraph"; export const ResourceDeploymentRowSkeleton: React.FC<{ opacity: number }> = ({ opacity, diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx index 791e64b8c..132ff5a3e 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/ResourceDeploymentTable.tsx @@ -15,7 +15,7 @@ import { } from "@ctrlplane/ui/table"; import { StatsColumn } from "@ctrlplane/validators/deployments"; -import { TableSortHeader } from "~/app/[workspaceSlug]/(appv2)/_components/TableSortHeader"; +import { TableSortHeader } from "~/app/[workspaceSlug]/(app)/_components/TableSortHeader"; import { api } from "~/trpc/react"; import { ResourceDeploymentRow } from "./ResourceDeploymentRow"; import { ResourceDeploymentRowSkeleton } from "./ResourceDeploymentRowSkeleton"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/deployments/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/deployments/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/layout.tsx similarity index 97% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/layout.tsx index a6fd1576a..89962ac42 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/layout.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/layout.tsx @@ -21,7 +21,7 @@ import { SidebarProvider, } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { SidebarLink } from "../../(sidebar)/SidebarLink"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/properties/ConfigEditor.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/properties/ConfigEditor.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/properties/ConfigEditor.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/properties/ConfigEditor.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/properties/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/properties/page.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/properties/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/properties/page.tsx index c47d0f32c..cc19a5264 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/properties/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/properties/page.tsx @@ -10,7 +10,7 @@ import { } from "@ctrlplane/ui/tooltip"; import { ReservedMetadataKey } from "@ctrlplane/validators/conditions"; -import { MetadataInfo } from "~/app/[workspaceSlug]/(appv2)/_components/MetadataInfo"; +import { MetadataInfo } from "~/app/[workspaceSlug]/(app)/_components/MetadataInfo"; import { api } from "~/trpc/server"; import { ConfigEditor } from "./ConfigEditor"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/CreateResourceVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/CreateResourceVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/CreateResourceVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/CreateResourceVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/DeleteResourceVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/DeleteResourceVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/DeleteResourceVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/DeleteResourceVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/EditResourceVariableDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/EditResourceVariableDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/EditResourceVariableDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/EditResourceVariableDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/ResourceVariableDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/ResourceVariableDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/ResourceVariableDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/ResourceVariableDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/variables/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/variables/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/DepEdge.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/DepEdge.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/DepEdge.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/DepEdge.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx index 5817aaa31..02dcb771c 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/ResourceVisualizationDiagram.tsx @@ -9,7 +9,7 @@ import ReactFlow, { useNodesState, } from "reactflow"; -import { useLayoutAndFitView } from "~/app/[workspaceSlug]/(appv2)/_components/reactflow/layout"; +import { useLayoutAndFitView } from "~/app/[workspaceSlug]/(app)/_components/reactflow/layout"; import { api } from "~/trpc/react"; import { edgeTypes, getEdges } from "./edges"; import { getNodes, nodeTypes } from "./nodes/nodes"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/edges.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/edges.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/edges.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/edges.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx index deb12b7de..acd04188d 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/DeploymentNode.tsx @@ -6,8 +6,8 @@ import { Handle, Position } from "reactflow"; import { cn } from "@ctrlplane/ui"; import { JobStatus, JobStatusReadable } from "@ctrlplane/validators/jobs"; -import { useDeploymentEnvResourceDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/deployments/resource-drawer/useDeploymentResourceDrawer"; -import { ReleaseIcon } from "~/app/[workspaceSlug]/(appv2)/_components/resources/ReleaseCell"; +import { useDeploymentEnvResourceDrawer } from "~/app/[workspaceSlug]/(app)/_components/deployments/resource-drawer/useDeploymentResourceDrawer"; +import { ReleaseIcon } from "~/app/[workspaceSlug]/(app)/_components/resources/ReleaseCell"; import { api } from "~/trpc/react"; type DeploymentNodeProps = NodeProps<{ diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx index b8010f136..8fa542a7f 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/EnvironmentNode.tsx @@ -6,7 +6,7 @@ import React from "react"; import { IconPlant } from "@tabler/icons-react"; import { Handle, Position } from "reactflow"; -import { useEnvironmentDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/environment/drawer/EnvironmentDrawer"; +import { useEnvironmentDrawer } from "~/app/[workspaceSlug]/(app)/_components/environment/drawer/EnvironmentDrawer"; type Environment = NonNullable< RouterOutputs["resource"]["relationships"] diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/ProviderNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/ProviderNode.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/ProviderNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/ProviderNode.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx similarity index 85% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx index 329fbf9c3..5cd61690d 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/ResourceNode.tsx @@ -3,8 +3,8 @@ import { Handle, Position } from "reactflow"; import { cn } from "@ctrlplane/ui"; -import { useResourceDrawer } from "~/app/[workspaceSlug]/(appv2)/_components/resources/drawer/useResourceDrawer"; -import { ResourceIcon } from "~/app/[workspaceSlug]/(appv2)/_components/resources/ResourceIcon"; +import { useResourceDrawer } from "~/app/[workspaceSlug]/(app)/_components/resources/drawer/useResourceDrawer"; +import { ResourceIcon } from "~/app/[workspaceSlug]/(app)/_components/resources/ResourceIcon"; type ResourceNodeProps = NodeProps<{ name: string; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/nodes.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/nodes.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/nodes/nodes.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/nodes/nodes.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(raw)/[resourceId]/visualize/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(raw)/[resourceId]/visualize/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarKinds.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarKinds.tsx similarity index 95% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarKinds.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarKinds.tsx index cef4bfb7b..81d089a75 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarKinds.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarKinds.tsx @@ -19,7 +19,7 @@ import { } from "@ctrlplane/validators/conditions"; import { ResourceFilterType } from "@ctrlplane/validators/resources"; -import { ResourceIcon } from "~/app/[workspaceSlug]/(appv2)/_components/resources/ResourceIcon"; +import { ResourceIcon } from "~/app/[workspaceSlug]/(app)/_components/resources/ResourceIcon"; import { api } from "~/trpc/react"; export const SidebarGroupKinds: React.FC<{ workspace: Workspace }> = ({ diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarLink.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/SidebarLink.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/SidebarLink.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/CreateMetadataGroupDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/CreateMetadataGroupDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/CreateMetadataGroupDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/CreateMetadataGroupDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/DeleteMetadataGroupDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/DeleteMetadataGroupDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/DeleteMetadataGroupDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/DeleteMetadataGroupDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/EditMetadataGroupDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/EditMetadataGroupDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/EditMetadataGroupDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/EditMetadataGroupDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/MetadataFilterInput.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/MetadataFilterInput.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/MetadataFilterInput.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/MetadataFilterInput.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/ResourceGroupTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/ResourceGroupTable.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/ResourceGroupTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/ResourceGroupTable.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/ResourceMetadataGroupsGettingStarted.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/ResourceMetadataGroupsGettingStarted.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/ResourceMetadataGroupsGettingStarted.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/ResourceMetadataGroupsGettingStarted.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/[groupId]/CombincationsTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/[groupId]/CombincationsTable.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/[groupId]/CombincationsTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/[groupId]/CombincationsTable.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/[groupId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/[groupId]/page.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/[groupId]/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/[groupId]/page.tsx index efc495737..a3617b8f5 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/[groupId]/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/[groupId]/page.tsx @@ -12,7 +12,7 @@ import { Button } from "@ctrlplane/ui/button"; import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { CreateMetadataGroupDialog } from "../CreateMetadataGroupDialog"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/page.tsx similarity index 96% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/page.tsx index e1f528157..570879aa3 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/groupings/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/groupings/page.tsx @@ -11,7 +11,7 @@ import { Button } from "@ctrlplane/ui/button"; import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { CreateMetadataGroupDialog } from "./CreateMetadataGroupDialog"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/layout.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/layout.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourceGettingStarted.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourceGettingStarted.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourceGettingStarted.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourceGettingStarted.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourcePageContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourcePageContent.tsx similarity index 94% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourcePageContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourcePageContent.tsx index 12c0ff3c9..7ef1c4d2f 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourcePageContent.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourcePageContent.tsx @@ -24,14 +24,14 @@ import { isEmptyCondition, } from "@ctrlplane/validators/resources"; -import { NoFilterMatch } from "~/app/[workspaceSlug]/(appv2)/_components/filter/NoFilterMatch"; -import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionBadge"; +import { NoFilterMatch } from "~/app/[workspaceSlug]/(app)/_components/filter/NoFilterMatch"; +import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge"; import { CreateResourceViewDialog, ResourceConditionDialog, -} from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionDialog"; -import { ResourceViewActionsDropdown } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceViewActionsDropdown"; -import { useResourceFilter } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/useResourceFilter"; +} from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionDialog"; +import { ResourceViewActionsDropdown } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceViewActionsDropdown"; +import { useResourceFilter } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/useResourceFilter"; import { api } from "~/trpc/react"; import { exportResources } from "./export-resources"; import { ResourceGettingStarted } from "./ResourceGettingStarted"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourcesTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourcesTable.tsx similarity index 98% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourcesTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourcesTable.tsx index f0e547b6e..eef2d10db 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/ResourcesTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/ResourcesTable.tsx @@ -34,7 +34,7 @@ import { TableRow, } from "@ctrlplane/ui/table"; -import { ResourceIcon } from "~/app/[workspaceSlug]/(appv2)/_components/resources/ResourceIcon"; +import { ResourceIcon } from "~/app/[workspaceSlug]/(app)/_components/resources/ResourceIcon"; import { api } from "~/trpc/react"; const columns: ColumnDef[] = [ diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/export-resources.ts b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/export-resources.ts similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/export-resources.ts rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/export-resources.ts diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/list/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/list/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/ProviderActionsDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/ProviderActionsDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/ProviderActionsDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/ProviderActionsDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/ResourceProvidersGettingStarted.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/ResourceProvidersGettingStarted.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/ResourceProvidersGettingStarted.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/ResourceProvidersGettingStarted.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/_page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/_page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/_page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/_page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/AwsActionButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/AwsActionButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/AwsActionButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/AwsActionButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/GoogleActionButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/GoogleActionButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/GoogleActionButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/GoogleActionButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/SelfManaged.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/SelfManaged.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/SelfManaged.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/SelfManaged.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/aws/AwsDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/aws/AwsDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/aws/AwsDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/aws/AwsDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/aws/UpdateAwsProviderDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/aws/UpdateAwsProviderDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/aws/UpdateAwsProviderDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/aws/UpdateAwsProviderDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/CreateAzureProviderDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/CreateAzureProviderDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/CreateAzureProviderDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/CreateAzureProviderDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/UpdateAzureProviderDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/UpdateAzureProviderDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/UpdateAzureProviderDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/UpdateAzureProviderDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/PermissionsButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/PermissionsButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/PermissionsButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/PermissionsButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/azure/[resourceProviderId]/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/google/GoogleDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/google/GoogleDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/google/GoogleDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/google/GoogleDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/google/UpdateGoogleProviderDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/google/UpdateGoogleProviderDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/google/UpdateGoogleProviderDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/google/UpdateGoogleProviderDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/page.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/page.tsx index f476ddade..ca8161531 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/integrations/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/integrations/page.tsx @@ -25,7 +25,7 @@ import { import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { env } from "~/env"; import { api } from "~/trpc/server"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/page.tsx similarity index 99% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/page.tsx index 255606a9f..379032068 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/providers/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/providers/page.tsx @@ -39,7 +39,7 @@ import { } from "@ctrlplane/ui/tooltip"; import { ResourceFilterType } from "@ctrlplane/validators/resources"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { ProviderActionsDropdown } from "./ProviderActionsDropdown"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/views/ResourceViewsTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/views/ResourceViewsTable.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/views/ResourceViewsTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/views/ResourceViewsTable.tsx index 3d92aa1fc..532dd2fdf 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/views/ResourceViewsTable.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/views/ResourceViewsTable.tsx @@ -14,8 +14,8 @@ import { TableRow, } from "@ctrlplane/ui/table"; -import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionBadge"; -import { ResourceViewActionsDropdown } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceViewActionsDropdown"; +import { ResourceConditionBadge } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionBadge"; +import { ResourceViewActionsDropdown } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceViewActionsDropdown"; export const ResourceViewsTable: React.FC<{ workspace: schema.Workspace; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/views/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/views/page.tsx similarity index 93% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/views/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/views/page.tsx index 6ee53e4fa..fadfc52ae 100644 --- a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/(sidebar)/views/page.tsx +++ b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/(sidebar)/views/page.tsx @@ -12,8 +12,8 @@ import { Button } from "@ctrlplane/ui/button"; import { Separator } from "@ctrlplane/ui/separator"; import { SidebarTrigger } from "@ctrlplane/ui/sidebar"; -import { PageHeader } from "~/app/[workspaceSlug]/(appv2)/_components/PageHeader"; -import { CreateResourceViewDialog } from "~/app/[workspaceSlug]/(appv2)/_components/resources/condition/ResourceConditionDialog"; +import { PageHeader } from "~/app/[workspaceSlug]/(app)/_components/PageHeader"; +import { CreateResourceViewDialog } from "~/app/[workspaceSlug]/(app)/_components/resources/condition/ResourceConditionDialog"; import { Sidebars } from "~/app/[workspaceSlug]/sidebars"; import { api } from "~/trpc/server"; import { ResourceViewsTable } from "./ResourceViewsTable"; diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/resources/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/resources/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/resources/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/api/ApiSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/api/ApiSection.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/api/ApiSection.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/api/ApiSection.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/api/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/api/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/api/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/api/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/profile/GithubRedirectButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/profile/GithubRedirectButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/profile/GithubRedirectButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/profile/GithubRedirectButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/profile/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/profile/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/account/profile/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/account/profile/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/layout.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/layout.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/layout.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/layout.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/general/WorkspaceDeleteSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/general/WorkspaceDeleteSection.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/general/WorkspaceDeleteSection.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/general/WorkspaceDeleteSection.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/general/WorkspaceUpdateSection.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/general/WorkspaceUpdateSection.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/general/WorkspaceUpdateSection.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/general/WorkspaceUpdateSection.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/general/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/general/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/general/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/general/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/aws/AwsIntegration.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/aws/AwsIntegration.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/aws/AwsIntegration.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/aws/AwsIntegration.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/aws/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/aws/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/aws/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/aws/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/DeleteGithubUserButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/DeleteGithubUserButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/DeleteGithubUserButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/DeleteGithubUserButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/DisconnectDropdownActionButton.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/DisconnectDropdownActionButton.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/DisconnectDropdownActionButton.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/DisconnectDropdownActionButton.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/EntityActionDropdown.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/EntityActionDropdown.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/EntityActionDropdown.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/EntityActionDropdown.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/GithubAddEntityDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/GithubAddEntityDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/GithubAddEntityDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/GithubAddEntityDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/GithubConnectedEntities.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/GithubConnectedEntities.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/GithubConnectedEntities.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/GithubConnectedEntities.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/GithubRemoveEntityDialog.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/GithubRemoveEntityDialog.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/GithubRemoveEntityDialog.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/GithubRemoveEntityDialog.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/SelectPreconnectedEntityDialogContent.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/SelectPreconnectedEntityDialogContent.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/SelectPreconnectedEntityDialogContent.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/SelectPreconnectedEntityDialogContent.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/github/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/github/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/google/GoogleIntegration.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/google/GoogleIntegration.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/google/GoogleIntegration.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/google/GoogleIntegration.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/google/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/google/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/(integration)/google/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/(integration)/google/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/integrations/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/integrations/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/MembersExport.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/MembersExport.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/MembersExport.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/MembersExport.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/MembersTable.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/MembersTable.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/MembersTable.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/MembersTable.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/WorkspaceDomainMatching.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/WorkspaceDomainMatching.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/WorkspaceDomainMatching.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/WorkspaceDomainMatching.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/members/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/members/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/overview/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/overview/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/overview/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/overview/page.tsx diff --git a/apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/page.tsx b/apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/page.tsx similarity index 100% rename from apps/webservice/src/app/[workspaceSlug]/(appv2)/settings/workspace/page.tsx rename to apps/webservice/src/app/[workspaceSlug]/(app)/settings/workspace/page.tsx