Temp : Bug : Fix for redirect path

Author: kshitijrajsharma

core/urls.py

@@ -8,8 +8,6 @@
 from ui.views import authorized, login, logout, redirect_to_v3, v3, worker_dashboard
 
 urlpatterns = [
-    path("", redirect_to_v3, name="index"),
-    path("v3/", v3, name="v3"),
     path("worker-dashboard/", worker_dashboard, name="worker_dashboard"),
     path("login/", login, name="login"),
     path("logout/", logout, name="logout"),
@@ -41,6 +39,9 @@
         name="javascript-catalog",
     ),
     path("i18n/", include("django.conf.urls.i18n")),
+    path("v3/", v3, name="v3"),
+    path("", redirect_to_v3, name="index"),
+    re_path(r"^(?!(o/|osm/)).*$", v3),
 ]
 
 if settings.DEBUG:

ui/app/app.js

@@ -10,7 +10,7 @@ import it from "react-intl/locale-data/it";
 import pt from "react-intl/locale-data/pt";
 import nl from "react-intl/locale-data/nl";
 import { IntlProvider } from "react-intl";
-import { Route, Switch } from "react-router";
+import { Route, Switch } from "react-router-dom";
 import { ConnectedRouter } from "react-router-redux";
 
 import Auth from "./components/Auth";

ui/views.py

@@ -42,7 +42,7 @@ def logout(request):
     return redirect("/v3/")
 
 
-def v3(request):
+def v3(request, *args, **kwargs):
     try:
         ui_app = Application.objects.get(name="OSM Export Tool UI")
     except Application.DoesNotExist: