Run multiple world at same time (#246)

* use the same ico with eventyay-talk * update base path for webapp using basePath from config file * update route to run multiple world at ssame time * fix upload avatar, default theme * correct link when click to logo * fix code style/lint/black/flake8 --------- Co-authored-by: odkhang <[email protected]>
fossasia · Oct 12, 2024 · 4c2cd45 · 4c2cd45
1 parent d14de63
commit 4c2cd45
Show file tree

Hide file tree

Showing 11 changed files with 297 additions and 236 deletions.
diff --git a/server/tests/conftest.py b/server/tests/conftest.py
@@ -164,7 +164,6 @@ def _clear_db():
 
 
 @pytest.fixture(autouse=True)
-@pytest.mark.django_db
 async def clear_database(request):
     if "django_db" not in request.keywords:  # pragma: no cover
         return

diff --git a/server/venueless/control/views.py b/server/venueless/control/views.py
@@ -182,7 +182,6 @@ class WorldAdminToken(AdminBase, DetailView):
     success_url = "/control/worlds/"
 
     def get(self, request, *args, **kwargs):
-        base_path = settings.BASE_PATH
         world = self.get_object()
         jwt_config = world.config["JWT_secrets"][0]
         secret = jwt_config["secret"]
@@ -205,7 +204,7 @@ def get(self, request, *args, **kwargs):
             action_type="world.adminaccess",
             data={},
         )
-        return redirect(f"https://{world.domain}{base_path}/#token={token}")
+        return redirect(f"https://{world.domain}#token={token}")
 
 
 class FormsetMixin:

diff --git a/server/venueless/storage/urls.py b/server/venueless/storage/urls.py
@@ -3,9 +3,9 @@
 from . import views
 
 urlpatterns = [
-    path("upload/", views.UploadView.as_view(), name="upload"),
+    path("<str:world_id>/upload/", views.UploadView.as_view(), name="upload"),
     path(
-        "schedule_import/",
+        "<str:world_id>/schedule_import/",
         views.ScheduleImportView.as_view(),
         name="schedule_import",
     ),

diff --git a/server/venueless/storage/views.py b/server/venueless/storage/views.py
@@ -1,5 +1,4 @@
 import logging
-import re
 from io import BytesIO
 
 from asgiref.sync import async_to_sync
@@ -34,8 +33,8 @@ def dispatch(self, request, *args, **kwargs):
 
     @cached_property
     def world(self):
-        world_domain = re.sub(r":\d+$", "", self.request.get_host())
-        return get_object_or_404(World, domain=world_domain)
+        world_id = self.kwargs.get("world_id", None)
+        return get_object_or_404(World, id=world_id)
 
     @cached_property
     def user(self):

diff --git a/webapp/config.js b/webapp/config.js
@@ -5,12 +5,15 @@ if (ENV_DEVELOPMENT || !window.venueless) {
 	const hostname = window.location.hostname
 	const wsProtocol = window.location.protocol === 'https:' ? 'wss' : 'ws'
 	const httpProtocol = window.location.protocol
+	// Extract the world name from the URL path
+	const pathSegments = window.location.pathname.split('/')
+	const worldName = pathSegments.length > 2 ? pathSegments[2] : 'sample'
 	config = {
 		api: {
-			base: `${httpProtocol}//${hostname}:8443/api/v1/worlds/sample/`,
-			socket: `${wsProtocol}://${hostname}:8443/ws/world/sample/`,
-			upload: `${httpProtocol}//${hostname}:8443/storage/upload/`,
-			scheduleImport: `${httpProtocol}//${hostname}:8443/storage/schedule_import/`,
+			base: `${httpProtocol}//${hostname}:8443/api/v1/worlds/${worldName}/`,
+			socket: `${wsProtocol}://${hostname}:8443/ws/world/${worldName}/`,
+			upload: `${httpProtocol}//${hostname}:8443/storage/${worldName}/upload/`,
+			scheduleImport: `${httpProtocol}//${hostname}:8443/storage/${worldName}/schedule_import/`,
 			feedback: `${httpProtocol}//${hostname}:8443/_feedback/`,
 		},
 		defaultLocale: 'en',

diff --git a/webapp/src/components/AppBar.vue b/webapp/src/components/AppBar.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 .c-app-bar
 	bunt-icon-button(v-if="showActions", @click="$emit('toggleSidebar')", @touchend.native="$emit('toggleSidebar')") menu
-	router-link.logo(to="/", :class="{anonymous: isAnonymous}")
+	router-link.logo(:to="{name: 'home'}", :class="{anonymous: isAnonymous}")
 		img(:src="theme.logo.url", :alt="world.title")
 	.user(v-if="showUser")
 		p(v-if="isAnonymous") {{ $t('AppBar:user-anonymous') }}

diff --git a/webapp/src/components/RoomsSidebar.vue b/webapp/src/components/RoomsSidebar.vue
@@ -1,7 +1,7 @@
 <template lang="pug">
 transition(name="sidebar")
 	.c-rooms-sidebar(v-show="show && !snapBack", :style="style", role="navigation", @pointerdown="onPointerdown", @pointermove="onPointermove", @pointerup="onPointerup", @pointercancel="onPointercancel")
-		router-link.logo(to="/", v-if="$mq.above['m']", :class="{'fit-to-width': theme.logo.fitToWidth}")
+		router-link.logo(:to="{name: 'home'}", v-if="$mq.above['m']", :class="{'fit-to-width': theme.logo.fitToWidth}")
 			img(:src="theme.logo.url", :alt="world.title")
 		bunt-icon-button#btn-close-sidebar(v-else, @click="$emit('close')") menu
 		scrollbars(y)