From c728b5e6b474cb04c927f09ce398856211627ca1 Mon Sep 17 00:00:00 2001
From: Dmatrushka19 <dmasik1903@gmail.com>
Date: Sat, 25 Oct 2025 00:08:54 +0300
Subject: [PATCH 1/5] =?UTF-8?q?=D0=9F=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D1=85=D0=BE=D0=B4=D0=B5=20=D0=B8=D0=B7=20=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D1=83=20=D1=8F=D0=B2=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=B5=D0=BC=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BE=D0=B1?=
 =?UTF-8?q?=20=D1=8D=D1=82=D0=BE=D0=BC.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20cursor:=20pointer.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../timetable/room/TimetableRoomView.vue      | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/timetable/room/TimetableRoomView.vue b/src/views/timetable/room/TimetableRoomView.vue
index d750681a..a94446c4 100644
--- a/src/views/timetable/room/TimetableRoomView.vue
+++ b/src/views/timetable/room/TimetableRoomView.vue
@@ -12,14 +12,20 @@ const toolbar = useToolbar();
 
 toolbar.setup({
 	title: 'Аудитория',
-	backUrl:
-		router.options.history.state.back &&
-		router.options.history.state.back.toString().startsWith('/timetable/event')
-			? undefined
-			: '/timetable',
 	backable: true,
+	backUrl: undefined,
 	share: true,
 });
+
+const goToMap = () => {
+	router.push({
+		path: '/apps/2',
+		state: {
+			fromTimetable: true,
+			roomId: route.params.id
+		}
+	});
+};
 </script>
 
 <template>
@@ -28,19 +34,21 @@ toolbar.setup({
 			<Suspense>
 				<AsyncRoomInfo :id="+route.params.id" />
 
-				<template #fallback> <FullscreenLoader /> </template>
+				<template #fallback>
+					<FullscreenLoader />
+				</template>
 			</Suspense>
 		</section>
 
 		<section class="section">
 			<h3 class="h3">Карта этажа</h3>
 
-			<RouterLink to="/apps/2" class="map">
+			<div @click="goToMap" class="map">
 				<span class="text">
 					Посмотреть на карте
 					<v-icon icon="open_in_new" />
 				</span>
-			</RouterLink>
+			</div>
 		</section>
 
 		<section class="section">
@@ -49,7 +57,9 @@ toolbar.setup({
 			</p>
 			<Suspense>
 				<AsyncRoomSchedule :id="+route.params.id" />
-				<template #fallback><FullscreenLoader /></template>
+				<template #fallback>
+					<FullscreenLoader />
+				</template>
 			</Suspense>
 		</section>
 	</IrdomLayout>
@@ -79,6 +89,7 @@ toolbar.setup({
 	justify-content: center;
 	align-items: center;
 	text-decoration: none;
+	cursor: pointer;
 }
 
 .text {
@@ -108,4 +119,4 @@ toolbar.setup({
 .section:last-child {
 	margin-bottom: 0;
 }
-</style>
+</style>
\ No newline at end of file

From c9b394bc10821aa710e1eaa7633190bc1965c0a4 Mon Sep 17 00:00:00 2001
From: Dmatrushka19 <dmasik1903@gmail.com>
Date: Sat, 25 Oct 2025 00:11:26 +0300
Subject: [PATCH 2/5] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BF=D0=B8=D1=81=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20=D0=BE?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20"=D0=BD=D0=B0=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

в toolbar.setup изменил явную директорию меню миниаппов на getBackUrl.

Зафиксировал стрелку backable: true
---
 src/views/apps/ApplicationFrame.vue | 36 +++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index ae3229aa..01014590 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -42,8 +42,19 @@ const scopes: Ref<string[]> = ref([]);
 
 const scopeNamesToRequest: Ref<string[]> = ref([]);
 
+// Определяем backUrl на основе истории навигации
+const getBackUrl = () => {
+	// Если есть состояние из расписания - используем router.back()
+	if (history.state?.fromTimetable) {
+		return undefined;
+	}
+	// Иначе - стандартное поведение (возврат в /apps)
+	return '/apps';
+};
+
 toolbar.setup({
-	backUrl: '/apps',
+	backUrl: getBackUrl(),
+	backable: true,
 });
 
 const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
@@ -144,7 +155,13 @@ const openApp = async (data: ServiceData) => {
 	}
 
 	url.value = new URL(data.link);
-	toolbar.title = data.name ?? 'Ошибка';
+
+	// Обновляем тулбар с учетом контекста навигации
+	toolbar.setup({
+		title: data.name ?? 'Ошибка',
+		backUrl: getBackUrl(),
+		backable: true,
+	});
 
 	scopes.value = data.scopes ? data.scopes : [];
 
@@ -190,13 +207,8 @@ onMounted(async () => {
 
 <template>
 	<v-main>
-		<iframe
-			v-if="appState == AppState.Show && url"
-			:src="url.toString()"
-			frameborder="0"
-			class="iframe"
-			allow="camera"
-		/>
+		<iframe v-if="appState == AppState.Show && url" :src="url.toString()" frameborder="0" class="iframe"
+			allow="camera" />
 		<FullscreenLoader v-else-if="appState == AppState.WaitLoad" />
 		<!-- Раскомментить, если появятся приложения от сторонних разработчиков -->
 		<!-- <div v-else-if="appState == AppState.WaitApprove" class="deligate-container">
@@ -236,7 +248,7 @@ v-main,
 	height: 100%;
 }
 
-.exception-container > * {
+.exception-container>* {
 	margin: 16px auto;
 }
 
@@ -251,7 +263,7 @@ v-main,
 	margin: 32px auto;
 	padding: 0 32px;
 
-	& > * {
+	&>* {
 		margin: 8px 0;
 	}
 
@@ -275,4 +287,4 @@ v-main,
 		white-space: nowrap;
 	}
 }
-</style>
+</style>
\ No newline at end of file

From 98009f7a6ff7494f2aeef26d9a91855aa23dd341 Mon Sep 17 00:00:00 2001
From: Dmatrushka19 <dmasik1903@gmail.com>
Date: Sun, 26 Oct 2025 23:34:17 +0300
Subject: [PATCH 3/5] =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83.=20=D0=A3=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D1=83=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apps/ApplicationFrame.vue            | 15 ++-------------
 src/views/timetable/room/TimetableRoomView.vue |  8 +-------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index 01014590..cb5722c0 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -42,18 +42,8 @@ const scopes: Ref<string[]> = ref([]);
 
 const scopeNamesToRequest: Ref<string[]> = ref([]);
 
-// Определяем backUrl на основе истории навигации
-const getBackUrl = () => {
-	// Если есть состояние из расписания - используем router.back()
-	if (history.state?.fromTimetable) {
-		return undefined;
-	}
-	// Иначе - стандартное поведение (возврат в /apps)
-	return '/apps';
-};
-
 toolbar.setup({
-	backUrl: getBackUrl(),
+	backUrl: undefined,
 	backable: true,
 });
 
@@ -156,10 +146,9 @@ const openApp = async (data: ServiceData) => {
 
 	url.value = new URL(data.link);
 
-	// Обновляем тулбар с учетом контекста навигации
 	toolbar.setup({
 		title: data.name ?? 'Ошибка',
-		backUrl: getBackUrl(),
+		backUrl: undefined,
 		backable: true,
 	});
 
diff --git a/src/views/timetable/room/TimetableRoomView.vue b/src/views/timetable/room/TimetableRoomView.vue
index a94446c4..78f7769e 100644
--- a/src/views/timetable/room/TimetableRoomView.vue
+++ b/src/views/timetable/room/TimetableRoomView.vue
@@ -18,13 +18,7 @@ toolbar.setup({
 });
 
 const goToMap = () => {
-	router.push({
-		path: '/apps/2',
-		state: {
-			fromTimetable: true,
-			roomId: route.params.id
-		}
-	});
+	router.push('/apps/2');
 };
 </script>
 

From b5c8de427600e2318e9d41ea7916cde1a481ad8f Mon Sep 17 00:00:00 2001
From: Dmatrushka19 <dmasik1903@gmail.com>
Date: Sun, 26 Oct 2025 23:48:32 +0300
Subject: [PATCH 4/5] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B2=D1=80=D1=83?=
 =?UTF-8?q?=D1=87=D0=BD=D1=83=D1=8E.=20=D0=9A=D0=B0=D0=BA=D0=BE=D0=B9-?=
 =?UTF-8?q?=D1=82=D0=BE=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apps/ApplicationFrame.vue            | 11 ++++++-----
 src/views/timetable/room/TimetableRoomView.vue |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index cb5722c0..60e5df7c 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -196,8 +196,9 @@ onMounted(async () => {
 
 <template>
 	<v-main>
-		<iframe v-if="appState == AppState.Show && url" :src="url.toString()" frameborder="0" class="iframe"
-			allow="camera" />
+		<iframe
+		v-if="appState == AppState.Show && url" :src="url.toString()" frameborder="0" class="iframe" allow="camera"
+		/>
 		<FullscreenLoader v-else-if="appState == AppState.WaitLoad" />
 		<!-- Раскомментить, если появятся приложения от сторонних разработчиков -->
 		<!-- <div v-else-if="appState == AppState.WaitApprove" class="deligate-container">
@@ -237,7 +238,7 @@ v-main,
 	height: 100%;
 }
 
-.exception-container>* {
+.exception-container > * {
 	margin: 16px auto;
 }
 
@@ -252,7 +253,7 @@ v-main,
 	margin: 32px auto;
 	padding: 0 32px;
 
-	&>* {
+	& > * {
 		margin: 8px 0;
 	}
 
@@ -276,4 +277,4 @@ v-main,
 		white-space: nowrap;
 	}
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/timetable/room/TimetableRoomView.vue b/src/views/timetable/room/TimetableRoomView.vue
index 78f7769e..c2838cc1 100644
--- a/src/views/timetable/room/TimetableRoomView.vue
+++ b/src/views/timetable/room/TimetableRoomView.vue
@@ -37,7 +37,7 @@ const goToMap = () => {
 		<section class="section">
 			<h3 class="h3">Карта этажа</h3>
 
-			<div @click="goToMap" class="map">
+			<div class="map" @click="goToMap">
 				<span class="text">
 					Посмотреть на карте
 					<v-icon icon="open_in_new" />
@@ -113,4 +113,4 @@ const goToMap = () => {
 .section:last-child {
 	margin-bottom: 0;
 }
-</style>
\ No newline at end of file
+</style>

From 80a19a12742c1fb4c633d7fd3e8b7d5f4faed52e Mon Sep 17 00:00:00 2001
From: Dmatrushka19 <dmasik1903@gmail.com>
Date: Sun, 26 Oct 2025 23:51:11 +0300
Subject: [PATCH 5/5] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=BF=D0=BE=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D0=B2=D1=80=D1=83=D1=87=D0=BD=D1=83=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apps/ApplicationFrame.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index 60e5df7c..09e870cb 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -197,7 +197,11 @@ onMounted(async () => {
 <template>
 	<v-main>
 		<iframe
-		v-if="appState == AppState.Show && url" :src="url.toString()" frameborder="0" class="iframe" allow="camera"
+			v-if="appState == AppState.Show && url"
+			:src="url.toString()"
+			frameborder="0"
+			class="iframe"
+			allow="camera"
 		/>
 		<FullscreenLoader v-else-if="appState == AppState.WaitLoad" />
 		<!-- Раскомментить, если появятся приложения от сторонних разработчиков -->