diff --git a/src/backend/InvenTree/web/tests.py b/src/backend/InvenTree/web/tests.py index 1fd1c604c8..e43d422795 100644 --- a/src/backend/InvenTree/web/tests.py +++ b/src/backend/InvenTree/web/tests.py @@ -87,11 +87,6 @@ class TemplateTagTest(InvenTreeTestCase): self.assertNotIn('show_server_selector', rsp) self.assertEqual(rsp['server_list'], ['aa', 'bb']) - def test_redirects(self): - """Test the redirect helper.""" - response = self.client.get('/assets/testpath') - self.assertEqual(response.url, '/static/web/assets/testpath') - class TestWebHelpers(InvenTreeAPITestCase): """Tests for the web helpers.""" diff --git a/src/backend/InvenTree/web/urls.py b/src/backend/InvenTree/web/urls.py index 6199abe264..618bc1fade 100644 --- a/src/backend/InvenTree/web/urls.py +++ b/src/backend/InvenTree/web/urls.py @@ -2,7 +2,6 @@ from django.conf import settings from django.http import JsonResponse -from django.shortcuts import redirect from django.urls import include, path, re_path from django.views.decorators.csrf import ensure_csrf_cookie from django.views.generic import TemplateView @@ -12,16 +11,6 @@ from rest_framework import permissions, serializers from InvenTree.mixins import RetrieveUpdateAPI -class RedirectAssetView(TemplateView): - """View to redirect to static asset.""" - - def get(self, request, *args, **kwargs): - """Redirect to static asset.""" - return redirect( - f'{settings.STATIC_URL}web/assets/{kwargs["path"]}', permanent=True - ) - - class PreferredSerializer(serializers.Serializer): """Serializer for the preferred serializer session setting.""" @@ -72,14 +61,12 @@ class PreferredUiView(RetrieveUpdateAPI): spa_view = ensure_csrf_cookie(TemplateView.as_view(template_name='web/index.html')) -assets_path = path('assets/', RedirectAssetView.as_view()) urlpatterns = [ path( f'{settings.FRONTEND_URL_BASE}/', include([ - assets_path, path( 'set-password?uid=&token=', spa_view, @@ -88,7 +75,6 @@ urlpatterns = [ re_path('.*', spa_view), ]), ), - assets_path, path(settings.FRONTEND_URL_BASE, spa_view, name='platform'), ] diff --git a/src/frontend/vite.config.ts b/src/frontend/vite.config.ts index 8e1e732a06..e8f4feeabf 100644 --- a/src/frontend/vite.config.ts +++ b/src/frontend/vite.config.ts @@ -48,6 +48,7 @@ export default defineConfig({ uploadToken: process.env.CODECOV_TOKEN }) ], + base: '', build: { manifest: true, outDir: '../../src/backend/InvenTree/web/static/web',