diff --git a/client/src/App.jsx b/client/src/App.jsx
index 9585ef2415..4466d703eb 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -45,7 +45,6 @@ import LazyRootV2 from "./features/rootV2/LazyRootV2";
import { useGetUserQuery } from "./features/usersV2/api/users.api";
import LazyAnonymousHome from "./landing/LazyAnonymousHome";
import { FooterNavbar, RenkuNavBar } from "./landing/NavBar";
-import LazyNotFound from "./not-found/LazyNotFound";
import NotificationsManager from "./notifications/NotificationsManager";
import Cookie from "./privacy/Cookie";
import LazyProjectView from "./project/LazyProjectView";
@@ -122,9 +121,6 @@ function CentralContentContainer({ user, socket }) {
-
-
-
{userInfo?.isLoggedIn && userInfo.is_admin && (
@@ -133,7 +129,7 @@ function CentralContentContainer({ user, socket }) {
)}
-
+
diff --git a/client/src/components/navbar/NavBarItems.tsx b/client/src/components/navbar/NavBarItems.tsx
index b3232c7235..1fc95e04af 100644
--- a/client/src/components/navbar/NavBarItems.tsx
+++ b/client/src/components/navbar/NavBarItems.tsx
@@ -307,7 +307,7 @@ export function RenkuToolbarItemUser({
}
const userSecretsUrl = isV2
- ? ABSOLUTE_ROUTES.v2.secrets
+ ? ABSOLUTE_ROUTES.secrets
: ABSOLUTE_ROUTES.v1.secrets;
return (
@@ -345,7 +345,7 @@ export function RenkuToolbarItemUser({
{isV2 && (
<>
Integrations
diff --git a/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx b/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx
index bb99d53c40..9d182d08b7 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContent/CodeRepositories/CodeRepositoryDisplay.tsx
@@ -792,7 +792,7 @@ function RepositoryPermissionsAlert({
Your user account is not currently connected to{" "}
{provider.display_name}. See{" "}
-
+
connected services
.
@@ -819,7 +819,7 @@ function RepositoryPermissionsAlert({
Your user account is not currently connected to{" "}
{provider.display_name}. See{" "}
-
+
connected services
.
diff --git a/client/src/features/dashboardV2/DashboardV2.tsx b/client/src/features/dashboardV2/DashboardV2.tsx
index 6ce7b0a54e..2f2c267a36 100644
--- a/client/src/features/dashboardV2/DashboardV2.tsx
+++ b/client/src/features/dashboardV2/DashboardV2.tsx
@@ -567,16 +567,17 @@ function ViewAllLink({
noItems: boolean;
total: number;
}) {
+ const searchUrl = ABSOLUTE_ROUTES.search;
return noItems ? (
View other {type === "project" ? "projects" : "groups"}
) : (
View all my {total > 5 ? total : ""}{" "}
@@ -586,6 +587,7 @@ function ViewAllLink({
}
function EmptyProjectsButtons() {
+ const searchUrl = ABSOLUTE_ROUTES.search;
return (
diff --git a/client/src/features/platform/components/StatusBanner.tsx b/client/src/features/platform/components/StatusBanner.tsx
index c0f12b8997..8512da66d3 100644
--- a/client/src/features/platform/components/StatusBanner.tsx
+++ b/client/src/features/platform/components/StatusBanner.tsx
@@ -299,10 +299,7 @@ function StatusPageMaintenance({
);
const location = useLocation();
- const isDashboard =
- (userLogged && location.pathname === "/") ||
- location.pathname === "/v2" ||
- location.pathname === "/v2/";
+ const isDashboard = userLogged && location.pathname === "/";
// 1. There is a scheduled maintenance in < 48 hours: show it on all pages except the landing page
// 2. There is a scheduled maintenance in < 7 days: show it on the v1 Dashboard and the v2 Dashboard
diff --git a/client/src/features/rootV2/NavbarV2.tsx b/client/src/features/rootV2/NavbarV2.tsx
index 6a336a68c5..51f12401f7 100644
--- a/client/src/features/rootV2/NavbarV2.tsx
+++ b/client/src/features/rootV2/NavbarV2.tsx
@@ -98,7 +98,7 @@ function NavbarItemHelp() {
Help
@@ -187,11 +187,7 @@ export default function NavbarV2() {
navbar
>
-
+ Search
diff --git a/client/src/features/rootV2/RootV2.tsx b/client/src/features/rootV2/RootV2.tsx
index c00d9e312a..8fb525c3cc 100644
--- a/client/src/features/rootV2/RootV2.tsx
+++ b/client/src/features/rootV2/RootV2.tsx
@@ -101,7 +101,7 @@ export default function RootV2() {
element={}
/>
@@ -109,7 +109,7 @@ export default function RootV2() {
}
/>
@@ -117,7 +117,7 @@ export default function RootV2() {
}
/>
@@ -125,7 +125,7 @@ export default function RootV2() {
}
/>
diff --git a/client/src/features/searchV2/components/SearchV2Bar.tsx b/client/src/features/searchV2/components/SearchV2Bar.tsx
index a35ad60914..c9831f9526 100644
--- a/client/src/features/searchV2/components/SearchV2Bar.tsx
+++ b/client/src/features/searchV2/components/SearchV2Bar.tsx
@@ -29,7 +29,7 @@ export default function SearchV2Bar() {
const { searchBarQuery } = useAppSelector(({ searchV2 }) => searchV2);
const navigate = useNavigate();
const location = useLocation();
- const isSearchPage = location.pathname === ABSOLUTE_ROUTES.v2.search;
+ const isSearchPage = location.pathname === ABSOLUTE_ROUTES.search;
const { register, handleSubmit, setFocus, setValue } = useForm(
{
@@ -50,7 +50,7 @@ export default function SearchV2Bar() {
q: `type:project ${data.searchBarQuery}`,
});
navigate({
- pathname: ABSOLUTE_ROUTES.v2.search,
+ pathname: ABSOLUTE_ROUTES.search,
search: search.toString(),
});
}
diff --git a/client/src/landing/NavBar.jsx b/client/src/landing/NavBar.jsx
index e7b4f3cea1..889f9b5d1b 100644
--- a/client/src/landing/NavBar.jsx
+++ b/client/src/landing/NavBar.jsx
@@ -96,7 +96,7 @@ function FooterNavbarAnonymousLinks() {
function FooterNavbarLoggedInLinks({ location, privacyLink }) {
const helpLocation =
location && location.pathname.startsWith("/v2")
- ? ABSOLUTE_ROUTES.v2.help.root
+ ? ABSOLUTE_ROUTES.help.root
: Url.pages.help.base;
return (
<>
@@ -157,7 +157,7 @@ function FooterNavbarInner({ location }) {
const isRenkuV1 = isRenkuLegacy(location.pathname);
const releaseLocation = isRenkuV1
? ABSOLUTE_ROUTES.v1.help.release
- : ABSOLUTE_ROUTES.v2.help.release;
+ : ABSOLUTE_ROUTES.help.release;
const footer = (