From 06c1686f5dbb690014d021fa7356d7641c0ab972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Tue, 28 Jan 2025 11:57:03 +0000
Subject: [PATCH 01/17] add confirmation for deliting auth method

---
 src/components/IrdomAuthButton.vue        | 26 +++++++++++++++++++++--
 src/views/profile/ProfileEditAuthView.vue |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index 6d4212d8..034d4bdc 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -20,6 +20,8 @@ const props = withDefaults(defineProps<Props>(), { unlink: false });
 
 const authUrl = ref<string | null>(null);
 
+const dialogVisible = ref(false);
+
 onMounted(async () => {
 	const { data } = await apiClient.GET(`/auth/${props.button.link}/auth_url`);
 	if (data) {
@@ -29,12 +31,20 @@ onMounted(async () => {
 
 async function clickHandler() {
 	if (props.unlink) {
-		await apiClient.DELETE(`/auth/${props.button.link}`);
-		location.reload(); // TODO: придумать нормальное решение
+		dialogVisible.value = true;
 	} else if (authUrl.value) {
 		window.open(authUrl.value, '_self');
 	}
 }
+
+async function confirmUnlink() {
+	await apiClient.DELETE(`/auth/${props.button.link}`);
+	location.reload(); // TODO: придумать нормальное решение
+}
+
+function cancelUnlink() {
+	dialogVisible.value = false;
+}
 </script>
 
 <template>
@@ -47,4 +57,16 @@ async function clickHandler() {
 
 		{{ button.name }}
 	</v-btn>
+
+	<!-- Модальное окно для подтверждения отвязки -->
+	<v-dialog v-model="dialogVisible" max-width="400">
+		<v-card>
+			<v-card-title class="headline">Вы точно хотите отвязать аккаунт?</v-card-title>
+			<v-card-actions>
+				<v-spacer />
+				<v-btn text @click="cancelUnlink">Не отвязывать</v-btn>
+				<v-btn color="red" @click="confirmUnlink">Отвязать</v-btn>
+			</v-card-actions>
+		</v-card>
+	</v-dialog>
 </template>
diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
index b3f574c4..72065806 100644
--- a/src/views/profile/ProfileEditAuthView.vue
+++ b/src/views/profile/ProfileEditAuthView.vue
@@ -44,7 +44,7 @@ const canUnlinked = computed(() =>
 					:key="button.method"
 					:button="button"
 					:disabled="profileStore.authMethods.length === 1"
-					unlink
+					:unlink="true"
 				/>
 			</div>
 		</section>

From 9d161b26128707e61baabf6274ff2befab158238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Tue, 28 Jan 2025 12:14:56 +0000
Subject: [PATCH 02/17] fix error for text label in vuetify modal window

---
 src/components/IrdomAuthButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index 034d4bdc..a6819708 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -64,7 +64,7 @@ function cancelUnlink() {
 			<v-card-title class="headline">Вы точно хотите отвязать аккаунт?</v-card-title>
 			<v-card-actions>
 				<v-spacer />
-				<v-btn text @click="cancelUnlink">Не отвязывать</v-btn>
+				<v-btn @click="cancelUnlink">Не отвязывать</v-btn>
 				<v-btn color="red" @click="confirmUnlink">Отвязать</v-btn>
 			</v-card-actions>
 		</v-card>

From 20c85f89441e4d16df50bbc113457f7f3e705217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Thu, 30 Jan 2025 12:33:44 +0000
Subject: [PATCH 03/17] change colours between buttons

---
 src/components/IrdomAuthButton.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index a6819708..3f7d20e3 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -64,8 +64,8 @@ function cancelUnlink() {
 			<v-card-title class="headline">Вы точно хотите отвязать аккаунт?</v-card-title>
 			<v-card-actions>
 				<v-spacer />
-				<v-btn @click="cancelUnlink">Не отвязывать</v-btn>
-				<v-btn color="red" @click="confirmUnlink">Отвязать</v-btn>
+				<v-btn color="red" @click="cancelUnlink">Не отвязывать</v-btn>
+				<v-btn @click="confirmUnlink">Отвязать</v-btn>
 			</v-card-actions>
 		</v-card>
 	</v-dialog>

From e5ef8174d011852a0981f8784fdaefe907fa8788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sat, 15 Feb 2025 22:16:31 +0000
Subject: [PATCH 04/17] add-confirmation-for-delete-auth-method.
 fix-auth-button-styles

---
 src/components/IrdomAuthButton.vue | 33 ++++++++++++++++++++++++++----
 src/views/auth/AuthView.vue        | 13 ++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index 3f7d20e3..0c318182 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { AuthMethodLink, AuthMethodName } from '@/models';
-
 import apiClient from '@/api/';
 
 export interface AuthButton {
@@ -15,11 +14,14 @@ export interface AuthButton {
 interface Props {
 	button: AuthButton;
 	unlink?: boolean;
+	location?: 'login' | 'auth-edit';
 }
-const props = withDefaults(defineProps<Props>(), { unlink: false });
+const props = withDefaults(defineProps<Props>(), {
+	unlink: false,
+	location: 'login', // Значение по умолчанию
+});
 
 const authUrl = ref<string | null>(null);
-
 const dialogVisible = ref(false);
 
 onMounted(async () => {
@@ -48,7 +50,14 @@ function cancelUnlink() {
 </script>
 
 <template>
-	<v-btn type="button" :color="button.color" @click="clickHandler">
+	<v-btn
+		type="button"
+		:color="button.color"
+		:variant="location === 'login' ? 'flat' : 'text'"
+		:size="location === 'login' ? 'large' : 'default'"
+		:class="location === 'login' ? 'oauth-button' : 'auth-edit-button'"
+		@click="clickHandler"
+	>
 		<template #prepend>
 			<svg width="24" height="24" class="icon">
 				<use :xlink:href="button.icon" />
@@ -70,3 +79,19 @@ function cancelUnlink() {
 		</v-card>
 	</v-dialog>
 </template>
+
+<style scoped>
+.oauth-button {
+	min-width: 250px;
+	width: 40%;
+	border-radius: 4px !important;
+	overflow: hidden;
+}
+
+.auth-edit-button {
+	min-width: auto;
+	width: auto;
+	border-radius: 4px !important;
+	overflow: hidden;
+}
+</style>
diff --git a/src/views/auth/AuthView.vue b/src/views/auth/AuthView.vue
index 49993435..12087051 100644
--- a/src/views/auth/AuthView.vue
+++ b/src/views/auth/AuthView.vue
@@ -26,7 +26,7 @@ async function clickShowMoreHandler() {
 	showButtonsCnt.value = authButtons.length;
 }
 
-// TODO: Разделить на 3 экрана
+// Переключение между шагами (логин, регистрация, восстановление пароля)
 const switchState = async (to: Step) => {
 	registerStep.value = to;
 	if (registerStep.value == Step.Login) {
@@ -43,32 +43,40 @@ toolbar.setup({ title: 'Вход в профиль' });
 
 <template>
 	<IrdomLayout class="container">
+		<!-- Форма регистрации -->
 		<RegistrationForm
 			v-if="registerStep == Step.Register"
 			class="loginform"
 			@success="switchState(Step.Login)"
 		/>
+
+		<!-- Форма входа -->
 		<LoginForm
 			v-if="registerStep == Step.Login"
 			class="loginform"
 			@reset-password="switchState(Step.ResetPassword)"
 		/>
+
+		<!-- Форма восстановления пароля -->
 		<ForgotPassordForm
 			v-if="registerStep == Step.ResetPassword"
 			class="loginform"
 			@success="switchState(Step.Login)"
 		/>
 
+		<!-- Список кнопок для авторизации через сторонние сервисы -->
 		<div class="oauth-button-list">
 			<IrdomAuthButton
 				v-for="i in showButtonsCnt"
 				:key="authButtons[i - 1].name"
 				type="button"
 				:button="authButtons[i - 1]"
+				:unlink="false"
+				location="login"
 				variant="flat"
 				size="large"
 				class="oauth-button"
-			/>
+			></IrdomAuthButton>
 			<v-btn
 				v-if="showMoreButton"
 				variant="flat"
@@ -82,6 +90,7 @@ toolbar.setup({ title: 'Вход в профиль' });
 			</v-btn>
 		</div>
 
+		<!-- Ссылки для переключения между формами -->
 		<div>
 			<div v-if="registerStep == Step.Login" class="link-text-register">
 				Еще нет профиля?

From abafc49b90fac6a03e78c6625160cd3315b8be8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sat, 15 Feb 2025 22:17:53 +0000
Subject: [PATCH 05/17] fix-close-bracket

---
 src/views/auth/AuthView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/auth/AuthView.vue b/src/views/auth/AuthView.vue
index 12087051..06a8cd3b 100644
--- a/src/views/auth/AuthView.vue
+++ b/src/views/auth/AuthView.vue
@@ -76,7 +76,7 @@ toolbar.setup({ title: 'Вход в профиль' });
 				variant="flat"
 				size="large"
 				class="oauth-button"
-			></IrdomAuthButton>
+			/>
 			<v-btn
 				v-if="showMoreButton"
 				variant="flat"

From cf31222feb2c4c123016ae755c4c6f448c036e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sat, 15 Feb 2025 22:22:20 +0000
Subject: [PATCH 06/17] delete-extra-comments-fix-styles

---
 src/components/IrdomAuthButton.vue |  2 +-
 src/views/auth/AuthView.vue        | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index 0c318182..5bde6e54 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -18,7 +18,7 @@ interface Props {
 }
 const props = withDefaults(defineProps<Props>(), {
 	unlink: false,
-	location: 'login', // Значение по умолчанию
+	location: 'login',
 });
 
 const authUrl = ref<string | null>(null);
diff --git a/src/views/auth/AuthView.vue b/src/views/auth/AuthView.vue
index 06a8cd3b..0b779460 100644
--- a/src/views/auth/AuthView.vue
+++ b/src/views/auth/AuthView.vue
@@ -26,7 +26,7 @@ async function clickShowMoreHandler() {
 	showButtonsCnt.value = authButtons.length;
 }
 
-// Переключение между шагами (логин, регистрация, восстановление пароля)
+// TODO: Разделить на 3 экрана
 const switchState = async (to: Step) => {
 	registerStep.value = to;
 	if (registerStep.value == Step.Login) {
@@ -43,28 +43,21 @@ toolbar.setup({ title: 'Вход в профиль' });
 
 <template>
 	<IrdomLayout class="container">
-		<!-- Форма регистрации -->
 		<RegistrationForm
 			v-if="registerStep == Step.Register"
 			class="loginform"
 			@success="switchState(Step.Login)"
 		/>
-
-		<!-- Форма входа -->
 		<LoginForm
 			v-if="registerStep == Step.Login"
 			class="loginform"
 			@reset-password="switchState(Step.ResetPassword)"
 		/>
-
-		<!-- Форма восстановления пароля -->
 		<ForgotPassordForm
 			v-if="registerStep == Step.ResetPassword"
 			class="loginform"
 			@success="switchState(Step.Login)"
 		/>
-
-		<!-- Список кнопок для авторизации через сторонние сервисы -->
 		<div class="oauth-button-list">
 			<IrdomAuthButton
 				v-for="i in showButtonsCnt"
@@ -89,8 +82,6 @@ toolbar.setup({ title: 'Вход в профиль' });
 				Другие сервисы
 			</v-btn>
 		</div>
-
-		<!-- Ссылки для переключения между формами -->
 		<div>
 			<div v-if="registerStep == Step.Login" class="link-text-register">
 				Еще нет профиля?

From f37c45304c3bb6ea722a233172323d579230a38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Tue, 18 Feb 2025 18:10:26 +0000
Subject: [PATCH 07/17] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=8F=D0=B2=D0=BD=D0=BE=D0=B5=20=D0=B2=D1=85=D0=BE=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20variant,=20size,=20class=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?IrdomAuthButton.vue=20=D0=B2=20AuthView.=20=D0=9D=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=BE=D0=B3=D0=BB=D0=BE=20=D0=BF=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8F=D1=82=D1=8C=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B2=D1=8F=D0=B7=D0=BA=D0=B5,=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BE=20=D0=B4=D1=83=D0=BC=D0=B0=D1=82=D1=8C=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D1=88=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IrdomAuthButton.vue | 2 +-
 src/views/auth/AuthView.vue        | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index 5bde6e54..806aef60 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -94,4 +94,4 @@ function cancelUnlink() {
 	border-radius: 4px !important;
 	overflow: hidden;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/auth/AuthView.vue b/src/views/auth/AuthView.vue
index 0b779460..412cadcc 100644
--- a/src/views/auth/AuthView.vue
+++ b/src/views/auth/AuthView.vue
@@ -66,9 +66,6 @@ toolbar.setup({ title: 'Вход в профиль' });
 				:button="authButtons[i - 1]"
 				:unlink="false"
 				location="login"
-				variant="flat"
-				size="large"
-				class="oauth-button"
 			/>
 			<v-btn
 				v-if="showMoreButton"

From 0355e216b87e8f684bad9e77ef1331ced54a0630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Thu, 20 Feb 2025 14:40:14 +0000
Subject: [PATCH 08/17] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=84=D0=B0=D0=B9=D0=BB,=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=83=D1=8E=20location=20=D0=BF=D1=80=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=8E=D1=89=D1=83=D1=8E=20=D0=B7=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20auth-edit=20=D0=B2=20=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=BC=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/profile/ProfileEditAuthView.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
index 72065806..50d48688 100644
--- a/src/views/profile/ProfileEditAuthView.vue
+++ b/src/views/profile/ProfileEditAuthView.vue
@@ -32,7 +32,12 @@ const canUnlinked = computed(() =>
 		<section v-if="profileStore.authMethods?.length !== 8" class="section">
 			<h2>Привязать аккаунт</h2>
 			<div class="buttons">
-				<IrdomAuthButton v-for="button of canLinked" :key="button.method" :button="button" />
+				<IrdomAuthButton 
+					v-for="button of canLinked"
+					:key="button.method"
+					:button="button"
+					location="auth-edit"
+				/>
 			</div>
 		</section>
 
@@ -43,6 +48,7 @@ const canUnlinked = computed(() =>
 					v-for="button of canUnlinked"
 					:key="button.method"
 					:button="button"
+					location="auth-edit"
 					:disabled="profileStore.authMethods.length === 1"
 					:unlink="true"
 				/>

From 3b543367d08d05117743dec3cf05b19044381c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Thu, 20 Feb 2025 14:40:55 +0000
Subject: [PATCH 09/17] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20location=20->=20=D0=BD=D0=B0=20props.location,=20?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=B8=D0=BC=D1=8F=20?=
 =?UTF-8?q?location=20=D0=B7=D0=B0=D1=80=D0=B5=D0=B7=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=20=D1=81=D0=B8=D1=81?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BC=D0=BE=D0=B9=20=D0=B5=D1=81=D0=BB=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D1=89=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20props?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IrdomAuthButton.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/IrdomAuthButton.vue b/src/components/IrdomAuthButton.vue
index 806aef60..eb6dc451 100644
--- a/src/components/IrdomAuthButton.vue
+++ b/src/components/IrdomAuthButton.vue
@@ -53,9 +53,9 @@ function cancelUnlink() {
 	<v-btn
 		type="button"
 		:color="button.color"
-		:variant="location === 'login' ? 'flat' : 'text'"
-		:size="location === 'login' ? 'large' : 'default'"
-		:class="location === 'login' ? 'oauth-button' : 'auth-edit-button'"
+		:variant="props.location === 'login' ? 'flat' : 'elevated'"
+		:size="props.location === 'login' ? 'large' : 'default'"
+		:class="props.location === 'login' ? 'oauth-button' : 'auth-edit-button'"
 		@click="clickHandler"
 	>
 		<template #prepend>
@@ -94,4 +94,4 @@ function cancelUnlink() {
 	border-radius: 4px !important;
 	overflow: hidden;
 }
-</style>
\ No newline at end of file
+</style>

From 00a2840b23eb7d88abf511054f2670a83a6f473b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Thu, 20 Feb 2025 14:43:29 +0000
Subject: [PATCH 10/17] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/profile/ProfileEditAuthView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/profile/ProfileEditAuthView.vue b/src/views/profile/ProfileEditAuthView.vue
index 50d48688..3f736152 100644
--- a/src/views/profile/ProfileEditAuthView.vue
+++ b/src/views/profile/ProfileEditAuthView.vue
@@ -32,7 +32,7 @@ const canUnlinked = computed(() =>
 		<section v-if="profileStore.authMethods?.length !== 8" class="section">
 			<h2>Привязать аккаунт</h2>
 			<div class="buttons">
-				<IrdomAuthButton 
+				<IrdomAuthButton
 					v-for="button of canLinked"
 					:key="button.method"
 					:button="button"

From d01195d478cc25e0ebac9ff76af22b16bf26b33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sun, 2 Mar 2025 22:23:08 +0000
Subject: [PATCH 11/17] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=20?=
 =?UTF-8?q?=D0=B8=20=D1=81=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20=D0=B8=D0=B7?=
 =?UTF-8?q?=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE=D0=B9=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/router/index.ts b/src/router/index.ts
index 90e480f0..f6f3963e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -21,6 +21,36 @@ const routes: RouteRecordRaw[] = [
 		path: '/apps/:id(\\d+)',
 		component: () => import('@/views/apps/ApplicationFrame.vue'),
 	},
+	//{
+	//	path: '/apps/44/lecturer', // на тесте 44, в раскатанном 62
+	//	redirect: to => {
+	//		const query = to.query; // забираем параметры из URL
+	//		const relativePath = to.path.slice(to.path.lastIndexOf('/') + 1); // это кривое решение, но так находим путь
+	//		return {
+	//			path: '/apps/44',
+	//			props: { lecturer: query.lecturer, relativePath: relativePath }, // передаем в props ссылку на страницу и query
+	//			query: {}, // чистим ссылку
+	//		};
+	//	},
+	//},
+
+	// по сути тот же вариант, но чуть лучше написанный
+	{
+		path: '/apps/44/lecturer', // на тесте 44, в раскатанном 62
+		redirect: to => {
+			return {
+				path: '/apps/44',
+				props: {
+					lecturerData: {
+						id: to.query.lecturer_id,
+						path: to.path.replace('/apps/62', ''),
+					},
+				},
+				query: {}, // Очищаем URL от параметров
+			};
+		},
+	},
+
 	{
 		path: '/timetable',
 		children: timetableRoutes,

From d94099be6260c98b68d1a409e9dd6efc182a7bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sun, 2 Mar 2025 22:23:51 +0000
Subject: [PATCH 12/17] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20url=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20props.=20=D0=98=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B8=20composeUrl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apps/ApplicationFrame.vue | 57 ++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index a417ff5f..1263eefb 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -16,6 +16,15 @@ const router = useRouter();
 const profileStore = useProfileStore();
 const appStore = useAppsStore();
 
+const props = defineProps<{
+	lecturerData?: {
+		id?: string;
+		path?: string;
+	};
+}>();
+
+
+
 enum AppState {
 	WaitLoad = 1,
 	Show = 2,
@@ -35,18 +44,51 @@ toolbar.setup({
 	backUrl: '/apps',
 });
 
-const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
+//const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
+//	if (props.relativePath) {
+//		url = new URL(props.relativePath, url); //|| ''
+//	}
+//	if (token !== null) {
+//		url.searchParams.set('token', token);
+//	}
+//	url.searchParams.set('scopes', scopes.join(','));
+//	if (!profileStore.id) {
+//		await AuthApi.getMe();
+//	}
+//	if (profileStore.id) {
+//		url.searchParams.set('user_id', profileStore.id.toString());
+//	}
+//	return url;
+//};
+
+const composeUrl = async (baseUrl: URL, token: string | null, scopes: string[]) => {
+	const targetUrl = new URL(baseUrl.href);
+
+	// 1. Добавляем путь из props
+	if (props.lecturerData?.path) {
+		targetUrl.pathname = `${targetUrl.pathname.replace(/\/$/, '')}${props.lecturerData.path}`;
+	}
+
+	// 2. Добавляем lecturer_id из props
+	if (props.lecturerData?.id) {
+		targetUrl.searchParams.set('lecturer_id', props.lecturerData.id);
+	}
+
 	if (token !== null) {
-		url.searchParams.set('token', token);
+		targetUrl.searchParams.set('token', token);
 	}
-	url.searchParams.set('scopes', scopes.join(','));
+	targetUrl.searchParams.set('scopes', scopes.join(','));
+
 	if (!profileStore.id) {
 		await AuthApi.getMe();
 	}
 	if (profileStore.id) {
-		url.searchParams.set('user_id', profileStore.id.toString());
+		targetUrl.searchParams.set('user_id', profileStore.id.toString());
 	}
-	return url;
+
+	targetUrl.pathname = targetUrl.pathname.replace(/\/+/g, '/');
+
+	return targetUrl;
 };
 
 // function showApproveScopesScreen() {
@@ -125,6 +167,11 @@ const openApp = async (data: ServiceData) => {
 		appState.value = AppState.Error;
 		return;
 	}
+
+	// Используем данные из props вместо route.query
+	if (props.lecturerData?.id) {
+		scopes.value.push('lecturer:read'); // Добавляем необходимый scope
+	}
 	url.value = new URL(data.link);
 	toolbar.title = data.name ?? 'Ошибка';
 

From 263527b98eda8edad3bcaac8b6e68fa6e13efd4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sun, 2 Mar 2025 22:51:19 +0000
Subject: [PATCH 13/17] =?UTF-8?q?=D0=B2=D1=81=D1=8F=20=D0=BB=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B0,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82,=20=D0=BD=D0=B0=D0=B4=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D1=83=D0=BC=D0=B0=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                 | 25 ++---------
 src/views/apps/ApplicationFrame.vue | 64 ++++++++---------------------
 2 files changed, 21 insertions(+), 68 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index f6f3963e..e698f9db 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -21,32 +21,15 @@ const routes: RouteRecordRaw[] = [
 		path: '/apps/:id(\\d+)',
 		component: () => import('@/views/apps/ApplicationFrame.vue'),
 	},
-	//{
-	//	path: '/apps/44/lecturer', // на тесте 44, в раскатанном 62
-	//	redirect: to => {
-	//		const query = to.query; // забираем параметры из URL
-	//		const relativePath = to.path.slice(to.path.lastIndexOf('/') + 1); // это кривое решение, но так находим путь
-	//		return {
-	//			path: '/apps/44',
-	//			props: { lecturer: query.lecturer, relativePath: relativePath }, // передаем в props ссылку на страницу и query
-	//			query: {}, // чистим ссылку
-	//		};
-	//	},
-	//},
-
-	// по сути тот же вариант, но чуть лучше написанный
 	{
 		path: '/apps/44/lecturer', // на тесте 44, в раскатанном 62
 		redirect: to => {
+			const query = to.query; // забираем параметры из URL
+			const relativePath = to.path.slice(to.path.lastIndexOf('/') + 1); // это кривое решение, но так находим путь
 			return {
 				path: '/apps/44',
-				props: {
-					lecturerData: {
-						id: to.query.lecturer_id,
-						path: to.path.replace('/apps/62', ''),
-					},
-				},
-				query: {}, // Очищаем URL от параметров
+				props: { lecturer: query.lecturer, relativePath: relativePath }, // передаем в props ссылку на страницу и query
+				query: {}, // чистим ссылку
 			};
 		},
 	},
diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index 1263eefb..717084fb 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -17,14 +17,10 @@ const profileStore = useProfileStore();
 const appStore = useAppsStore();
 
 const props = defineProps<{
-	lecturerData?: {
-		id?: string;
-		path?: string;
-	};
+	lecturer?: string;
+	relativePath: string;
 }>();
 
-
-
 enum AppState {
 	WaitLoad = 1,
 	Show = 2,
@@ -44,51 +40,21 @@ toolbar.setup({
 	backUrl: '/apps',
 });
 
-//const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
-//	if (props.relativePath) {
-//		url = new URL(props.relativePath, url); //|| ''
-//	}
-//	if (token !== null) {
-//		url.searchParams.set('token', token);
-//	}
-//	url.searchParams.set('scopes', scopes.join(','));
-//	if (!profileStore.id) {
-//		await AuthApi.getMe();
-//	}
-//	if (profileStore.id) {
-//		url.searchParams.set('user_id', profileStore.id.toString());
-//	}
-//	return url;
-//};
-
-const composeUrl = async (baseUrl: URL, token: string | null, scopes: string[]) => {
-	const targetUrl = new URL(baseUrl.href);
-
-	// 1. Добавляем путь из props
-	if (props.lecturerData?.path) {
-		targetUrl.pathname = `${targetUrl.pathname.replace(/\/$/, '')}${props.lecturerData.path}`;
+const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
+	if (props.relativePath) {
+		url = new URL(props.relativePath, url); //|| ''
 	}
-
-	// 2. Добавляем lecturer_id из props
-	if (props.lecturerData?.id) {
-		targetUrl.searchParams.set('lecturer_id', props.lecturerData.id);
-	}
-
 	if (token !== null) {
-		targetUrl.searchParams.set('token', token);
+		url.searchParams.set('token', token);
 	}
-	targetUrl.searchParams.set('scopes', scopes.join(','));
-
+	url.searchParams.set('scopes', scopes.join(','));
 	if (!profileStore.id) {
 		await AuthApi.getMe();
 	}
 	if (profileStore.id) {
-		targetUrl.searchParams.set('user_id', profileStore.id.toString());
+		url.searchParams.set('user_id', profileStore.id.toString());
 	}
-
-	targetUrl.pathname = targetUrl.pathname.replace(/\/+/g, '/');
-
-	return targetUrl;
+	return url;
 };
 
 // function showApproveScopesScreen() {
@@ -168,10 +134,6 @@ const openApp = async (data: ServiceData) => {
 		return;
 	}
 
-	// Используем данные из props вместо route.query
-	if (props.lecturerData?.id) {
-		scopes.value.push('lecturer:read'); // Добавляем необходимый scope
-	}
 	url.value = new URL(data.link);
 	toolbar.title = data.name ?? 'Ошибка';
 
@@ -202,6 +164,14 @@ const openApp = async (data: ServiceData) => {
 };
 
 onMounted(async () => {
+	//console.log('Received props:', props); // Выводим все props
+
+	//if (props.lecturer) {
+	//	console.log('Lecturer ID:', props.lecturer);
+	//}
+	//if (props.relativePath) {
+	//	console.log('Path:', props.relativePath);
+	//}
 	if (profileStore.token && !profileStore.id) {
 		await AuthApi.getMe(['session_scopes', 'user_scopes']);
 	}

From 8a0416bd2ea6616fa075f746ba757d3ee021d429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Sun, 2 Mar 2025 23:08:20 +0000
Subject: [PATCH 14/17] =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D1=81=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F,=20=D0=BD=D0=BE=20=D0=B2=20props=20=D0=BD=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B1=D1=80=D0=B0=D1=81=D1=8B=D0=B2=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20relativePath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                 | 17 ++++++++++++-----
 src/views/apps/ApplicationFrame.vue | 21 ++++++++++++---------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index e698f9db..5e18fd90 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -22,14 +22,21 @@ const routes: RouteRecordRaw[] = [
 		component: () => import('@/views/apps/ApplicationFrame.vue'),
 	},
 	{
-		path: '/apps/44/lecturer', // на тесте 44, в раскатанном 62
+		path: '/apps/44/lecturer',
 		redirect: to => {
-			const query = to.query; // забираем параметры из URL
-			const relativePath = to.path.slice(to.path.lastIndexOf('/') + 1); // это кривое решение, но так находим путь
+			const query = to.query;
+			const relativePath = to.path.slice(to.path.lastIndexOf('/') + 1);
+
+			console.log('[Router] RelativePath:', relativePath);
+			console.log('[Router] LecturerID from query:', query.lecturer_id);
+
 			return {
 				path: '/apps/44',
-				props: { lecturer: query.lecturer, relativePath: relativePath }, // передаем в props ссылку на страницу и query
-				query: {}, // чистим ссылку
+				props: {
+					lecturer: query.lecturer_id,
+					relativePath: relativePath,
+				},
+				query: {},
 			};
 		},
 	},
diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index 717084fb..f05c23f3 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -42,7 +42,7 @@ toolbar.setup({
 
 const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
 	if (props.relativePath) {
-		url = new URL(props.relativePath, url); //|| ''
+		url = new URL(props.relativePath, url);
 	}
 	if (token !== null) {
 		url.searchParams.set('token', token);
@@ -54,6 +54,14 @@ const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
 	if (profileStore.id) {
 		url.searchParams.set('user_id', profileStore.id.toString());
 	}
+	console.log('[AppFrame] Composed URL before params:', url.toString());
+	console.log('[AppFrame] Adding lecturer_id:', props.lecturer);
+
+	if (props.lecturer) {
+		url.searchParams.set('lecturer_id', props.lecturer);
+	}
+
+	console.log('[AppFrame] Final URL:', url.toString());
 	return url;
 };
 
@@ -164,14 +172,9 @@ const openApp = async (data: ServiceData) => {
 };
 
 onMounted(async () => {
-	//console.log('Received props:', props); // Выводим все props
-
-	//if (props.lecturer) {
-	//	console.log('Lecturer ID:', props.lecturer);
-	//}
-	//if (props.relativePath) {
-	//	console.log('Path:', props.relativePath);
-	//}
+	// Добавленные console.log
+	console.log('[AppFrame] Received relativePath:', props.relativePath);
+	console.log('[AppFrame] Received lecturerID:', props.lecturer);
 	if (profileStore.token && !profileStore.id) {
 		await AuthApi.getMe(['session_scopes', 'user_scopes']);
 	}

From cd55fa90877337ab0f94f1a7fb4b17bba0c9e55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Mon, 3 Mar 2025 14:42:55 +0000
Subject: [PATCH 15/17] =?UTF-8?q?=D0=9F=D0=BE=20=D0=BB=D0=BE=D0=B3=D0=B0?=
 =?UTF-8?q?=D0=BC,=20relativePath=20=D0=B8=20lecturer=5Fid=20=D0=BE=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=D1=8E=D1=82=D1=81=D1=8F,?=
 =?UTF-8?q?=20=D0=BD=D0=BE=20=D0=BD=D0=B0=20=D0=BC=D0=BE=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B5=20=D0=BF=D1=80=D0=BE=D0=BF=D0=B8=D1=81=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20lecturer=5Fid=20=D0=B2=20url,=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20?=
 =?UTF-8?q?lecturer=5Fid=20=3D=20undefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                 | 7 ++++++-
 src/views/apps/ApplicationFrame.vue | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 5e18fd90..469a1fa3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -20,7 +20,13 @@ const routes: RouteRecordRaw[] = [
 	{
 		path: '/apps/:id(\\d+)',
 		component: () => import('@/views/apps/ApplicationFrame.vue'),
+		props: route => ({
+			id: Number(route.params.id),
+			lecturer: route.query.lecturer_id,
+			relativePath: route.params.relativePath || '',
+		}),
 	},
+
 	{
 		path: '/apps/44/lecturer',
 		redirect: to => {
@@ -40,7 +46,6 @@ const routes: RouteRecordRaw[] = [
 			};
 		},
 	},
-
 	{
 		path: '/timetable',
 		children: timetableRoutes,
diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index f05c23f3..2c7b938f 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -173,8 +173,8 @@ const openApp = async (data: ServiceData) => {
 
 onMounted(async () => {
 	// Добавленные console.log
-	console.log('[AppFrame] Received relativePath:', props.relativePath);
-	console.log('[AppFrame] Received lecturerID:', props.lecturer);
+	//console.log('[AppFrame] Received relativePath:', props.relativePath);
+	//console.log('[AppFrame] Received lecturerID:', props.lecturer);
 	if (profileStore.token && !profileStore.id) {
 		await AuthApi.getMe(['session_scopes', 'user_scopes']);
 	}

From badd2336de148f85cf968cd0989e73c2899dfb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Wed, 5 Mar 2025 08:24:10 +0000
Subject: [PATCH 16/17] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8E=20composeUrl.=20=D0=92=20=D1=81=D0=BB=D1=83=D1=87=D0=B0?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=D0=BB=D1=87=D0=B8=D1=8F=20lecturer=3Flect?=
 =?UTF-8?q?urer=5Fid=3Dxxxx=20=D0=B2=20url=20=D0=B2=20=D1=8F=D0=B2=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D0=B2=D0=B8=D0=B4=D0=B5=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D1=8D=D1=82=D0=B8=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apps/ApplicationFrame.vue | 34 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/views/apps/ApplicationFrame.vue b/src/views/apps/ApplicationFrame.vue
index 2c7b938f..33ff1e11 100644
--- a/src/views/apps/ApplicationFrame.vue
+++ b/src/views/apps/ApplicationFrame.vue
@@ -16,10 +16,17 @@ const router = useRouter();
 const profileStore = useProfileStore();
 const appStore = useAppsStore();
 
-const props = defineProps<{
-	lecturer?: string;
-	relativePath: string;
-}>();
+router.replace({ query: undefined });
+
+const props = defineProps({
+	lecturer: { type: String, required: false, default: null },
+	relativePath: { type: String, required: false, default: null },
+});
+
+const relPath = props.relativePath;
+const lect_id = props.lecturer;
+
+console.log('props: ', props.lecturer, props.relativePath);
 
 enum AppState {
 	WaitLoad = 1,
@@ -34,15 +41,17 @@ const appState = ref(AppState.WaitLoad);
 const scopes: Ref<string[]> = ref([]);
 
 const scopeNamesToRequest: Ref<string[]> = ref([]);
-// const userScopeApproved: Ref<boolean | undefined> = ref();
 
 toolbar.setup({
 	backUrl: '/apps',
 });
 
 const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
-	if (props.relativePath) {
-		url = new URL(props.relativePath, url);
+	if (relPath) {
+		url = new URL(relPath, url);
+	}
+	if (lect_id) {
+		url = new URL(`?lecturer_id=${lect_id}`, url);
 	}
 	if (token !== null) {
 		url.searchParams.set('token', token);
@@ -54,14 +63,6 @@ const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
 	if (profileStore.id) {
 		url.searchParams.set('user_id', profileStore.id.toString());
 	}
-	console.log('[AppFrame] Composed URL before params:', url.toString());
-	console.log('[AppFrame] Adding lecturer_id:', props.lecturer);
-
-	if (props.lecturer) {
-		url.searchParams.set('lecturer_id', props.lecturer);
-	}
-
-	console.log('[AppFrame] Final URL:', url.toString());
 	return url;
 };
 
@@ -172,9 +173,6 @@ const openApp = async (data: ServiceData) => {
 };
 
 onMounted(async () => {
-	// Добавленные console.log
-	//console.log('[AppFrame] Received relativePath:', props.relativePath);
-	//console.log('[AppFrame] Received lecturerID:', props.lecturer);
 	if (profileStore.token && !profileStore.id) {
 		await AuthApi.getMe(['session_scopes', 'user_scopes']);
 	}

From b3b116f9b70197ca53b975c8fbbdad0b983536f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B5=D0=B2=D0=B8=D1=87?=
 <filipenkovda@it.profcomff.com>
Date: Wed, 5 Mar 2025 08:25:49 +0000
Subject: [PATCH 17/17] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=80=D0=BE=D1=83=D1=82=D0=B5=D1=80,?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B0=20lecturer=5Fi?=
 =?UTF-8?q?d=20=D0=B8=20relavePath=20=3D=20lecturer=20=D1=87=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B7=20query=20=D0=B2=20ApplicationFrame=20=D0=B8=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=83=D1=8E=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 469a1fa3..b23d9f69 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -23,8 +23,11 @@ const routes: RouteRecordRaw[] = [
 		props: route => ({
 			id: Number(route.params.id),
 			lecturer: route.query.lecturer_id,
-			relativePath: route.params.relativePath || '',
+			relativePath: route.query.relativePath || '',
 		}),
+		beforeEnter: route => {
+			console.log(route.params, route.query);
+		},
 	},
 
 	{
@@ -33,16 +36,12 @@ const routes: RouteRecordRaw[] = [
 			const query = to.query;
 			const relativePath = to.path.slice(to.path.lastIndexOf('/') + 1);
 
-			console.log('[Router] RelativePath:', relativePath);
-			console.log('[Router] LecturerID from query:', query.lecturer_id);
-
 			return {
 				path: '/apps/44',
-				props: {
-					lecturer: query.lecturer_id,
+				query: {
+					lecturer_id: query.lecturer_id,
 					relativePath: relativePath,
 				},
-				query: {},
 			};
 		},
 	},