From 26392fe55962d28cabf9626f16698bd58fd3df1c Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 17 Nov 2024 23:14:02 +0000
Subject: [PATCH 1/8] added @types/node for resolving @ symbols in import

---
 package.json   |  1 +
 pnpm-lock.yaml | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 9299c0d..8e2e7a3 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "@mdi/font": "^7.4.47",
     "@profcomff/api-uilib": "^2024.10.22",
     "@types/eslint__js": "^8.42.3",
+    "@types/node": "^22.9.0",
     "@typescript-eslint/eslint-plugin": "^8.13.0",
     "@typescript-eslint/parser": "^8.13.0",
     "@vitejs/plugin-vue": "^4.6.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bc2d096..e979af9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,9 @@ importers:
       '@types/eslint__js':
         specifier: ^8.42.3
         version: 8.42.3
+      '@types/node':
+        specifier: ^22.9.0
+        version: 22.9.0
       '@typescript-eslint/eslint-plugin':
         specifier: ^8.13.0
         version: 8.13.0(@typescript-eslint/parser@8.13.0(eslint@9.14.0)(typescript@5.6.3))(eslint@9.14.0)(typescript@5.6.3)
@@ -50,7 +53,7 @@ importers:
         version: 8.13.0(eslint@9.14.0)(typescript@5.6.3)
       '@vitejs/plugin-vue':
         specifier: ^4.6.2
-        version: 4.6.2(vite@4.5.5)(vue@3.5.12(typescript@5.6.3))
+        version: 4.6.2(vite@4.5.5(@types/node@22.9.0))(vue@3.5.12(typescript@5.6.3))
       '@vue/eslint-config-typescript':
         specifier: ^12.0.0
         version: 12.0.0(eslint-plugin-vue@9.30.0(eslint@9.14.0))(eslint@9.14.0)(typescript@5.6.3)
@@ -104,13 +107,13 @@ importers:
         version: 8.13.0(eslint@9.14.0)(typescript@5.6.3)
       vite:
         specifier: ^4.5.5
-        version: 4.5.5
+        version: 4.5.5(@types/node@22.9.0)
       vite-plugin-stylelint:
         specifier: ^5.3.1
-        version: 5.3.1(postcss@8.4.47)(rollup@3.29.5)(stylelint@15.11.0(typescript@5.6.3))(vite@4.5.5)
+        version: 5.3.1(postcss@8.4.47)(rollup@3.29.5)(stylelint@15.11.0(typescript@5.6.3))(vite@4.5.5(@types/node@22.9.0))
       vite-plugin-vuetify:
         specifier: ^2.0.4
-        version: 2.0.4(vite@4.5.5)(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4)
+        version: 2.0.4(vite@4.5.5(@types/node@22.9.0))(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4)
       vite-svg-loader:
         specifier: ^5.1.0
         version: 5.1.0(vue@3.5.12(typescript@5.6.3))
@@ -633,6 +636,9 @@ packages:
   '@types/minimist@1.2.5':
     resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
 
+  '@types/node@22.9.0':
+    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
+
   '@types/normalize-package-data@2.4.4':
     resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
 
@@ -2133,6 +2139,9 @@ packages:
   uc.micro@2.1.0:
     resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
+  undici-types@6.19.8:
+    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+
   upath@2.0.1:
     resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==}
     engines: {node: '>=4'}
@@ -2766,6 +2775,10 @@ snapshots:
 
   '@types/minimist@1.2.5': {}
 
+  '@types/node@22.9.0':
+    dependencies:
+      undici-types: 6.19.8
+
   '@types/normalize-package-data@2.4.4': {}
 
   '@types/semver@7.5.8': {}
@@ -2937,9 +2950,9 @@ snapshots:
       '@typescript-eslint/types': 8.13.0
       eslint-visitor-keys: 3.4.3
 
-  '@vitejs/plugin-vue@4.6.2(vite@4.5.5)(vue@3.5.12(typescript@5.6.3))':
+  '@vitejs/plugin-vue@4.6.2(vite@4.5.5(@types/node@22.9.0))(vue@3.5.12(typescript@5.6.3))':
     dependencies:
-      vite: 4.5.5
+      vite: 4.5.5(@types/node@22.9.0)
       vue: 3.5.12(typescript@5.6.3)
 
   '@volar/language-core@2.4.10':
@@ -4397,6 +4410,8 @@ snapshots:
 
   uc.micro@2.1.0: {}
 
+  undici-types@6.19.8: {}
+
   upath@2.0.1: {}
 
   update-browserslist-db@1.1.1(browserslist@4.24.2):
@@ -4418,25 +4433,25 @@ snapshots:
       spdx-correct: 3.2.0
       spdx-expression-parse: 3.0.1
 
-  vite-plugin-stylelint@5.3.1(postcss@8.4.47)(rollup@3.29.5)(stylelint@15.11.0(typescript@5.6.3))(vite@4.5.5):
+  vite-plugin-stylelint@5.3.1(postcss@8.4.47)(rollup@3.29.5)(stylelint@15.11.0(typescript@5.6.3))(vite@4.5.5(@types/node@22.9.0)):
     dependencies:
       '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
       chokidar: 3.6.0
       debug: 4.3.7(supports-color@9.4.0)
       stylelint: 15.11.0(typescript@5.6.3)
-      vite: 4.5.5
+      vite: 4.5.5(@types/node@22.9.0)
     optionalDependencies:
       postcss: 8.4.47
       rollup: 3.29.5
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vuetify@2.0.4(vite@4.5.5)(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4):
+  vite-plugin-vuetify@2.0.4(vite@4.5.5(@types/node@22.9.0))(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4):
     dependencies:
       '@vuetify/loader-shared': 2.0.3(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4)
       debug: 4.3.7(supports-color@9.4.0)
       upath: 2.0.1
-      vite: 4.5.5
+      vite: 4.5.5(@types/node@22.9.0)
       vue: 3.5.12(typescript@5.6.3)
       vuetify: 3.7.4(typescript@5.6.3)(vite-plugin-vuetify@2.0.4)(vue@3.5.12(typescript@5.6.3))
     transitivePeerDependencies:
@@ -4447,12 +4462,13 @@ snapshots:
       svgo: 3.3.2
       vue: 3.5.12(typescript@5.6.3)
 
-  vite@4.5.5:
+  vite@4.5.5(@types/node@22.9.0):
     dependencies:
       esbuild: 0.18.20
       postcss: 8.4.47
       rollup: 3.29.5
     optionalDependencies:
+      '@types/node': 22.9.0
       fsevents: 2.3.3
 
   vscode-uri@3.0.8: {}
@@ -4501,7 +4517,7 @@ snapshots:
       vue: 3.5.12(typescript@5.6.3)
     optionalDependencies:
       typescript: 5.6.3
-      vite-plugin-vuetify: 2.0.4(vite@4.5.5)(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4)
+      vite-plugin-vuetify: 2.0.4(vite@4.5.5(@types/node@22.9.0))(vue@3.5.12(typescript@5.6.3))(vuetify@3.7.4)
 
   webidl-conversions@3.0.1: {}
 

From 792251c832c2fd701f12272284ba66e70ef4e5f5 Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 17 Nov 2024 23:14:38 +0000
Subject: [PATCH 2/8] added @ resolving in vite config

---
 vite.config.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vite.config.ts b/vite.config.ts
index 6e58cbb..fca931b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,6 +4,7 @@ import stylelint from 'vite-plugin-stylelint';
 import svgLoader from 'vite-svg-loader';
 import vue from '@vitejs/plugin-vue';
 import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
+import { fileURLToPath } from 'url';
 
 export default defineConfig({
 	plugins: [
@@ -32,4 +33,7 @@ export default defineConfig({
 			],
 		},
 	},
+	resolve: {
+		alias: [{ find: '@', replacement: fileURLToPath(new URL('./src', import.meta.url)) }],
+	},
 });

From c4c32698f538573a73b570aa4825b202ea60e349 Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 17 Nov 2024 23:15:12 +0000
Subject: [PATCH 3/8] general formating

---
 src/App.vue                              |   4 +-
 src/components/AdminReviewCard.vue       |   6 +-
 src/components/TheLecturerSearchCard.vue |   6 +-
 src/components/TheReviewCard.vue         |   4 +-
 src/components/TheSearchBar.vue          |   2 +-
 src/components/ToastList.vue             |  14 +--
 src/components/ToastView.vue             |  38 +++----
 src/main.ts                              |   8 +-
 src/pages/AdminPage.vue                  |  37 ++++---
 src/pages/LecturerPage.vue               |  16 +--
 src/pages/MainPage.vue                   |  22 ++--
 src/pages/ReviewPage.vue                 | 122 +++++++++++------------
 src/router/index.ts                      |  14 +--
 src/store/toastStore.ts                  |   2 +-
 src/utils/index.ts                       |   6 ++
 15 files changed, 150 insertions(+), 151 deletions(-)
 create mode 100644 src/utils/index.ts

diff --git a/src/App.vue b/src/App.vue
index 5d0ee7f..5c160d6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useProfileStore } from './store';
+import { useProfileStore } from '@/store';
 import { onMounted } from 'vue';
 import { setupAuth } from '@profcomff/api-uilib';
-import ToastList from './components/ToastList.vue';
+import ToastList from '@/components/ToastList.vue';
 
 const profileStore = useProfileStore();
 
diff --git a/src/components/AdminReviewCard.vue b/src/components/AdminReviewCard.vue
index 927f46d..74be2e4 100644
--- a/src/components/AdminReviewCard.vue
+++ b/src/components/AdminReviewCard.vue
@@ -52,10 +52,10 @@
 </template>
 
 <script setup lang="ts">
-import apiClient from "../api";
-import { ToastType } from "../models";
+import apiClient from "@/api";
+import { ToastType } from "@/models";
 // import { DataIteratorItem } from "/vuetify/src/components/items";
-import { useToastStore } from "../store/toastStore";
+import { useToastStore } from "@/store/toastStore";
 
 const props = defineProps({
   photo: { type: String, required: true },
diff --git a/src/components/TheLecturerSearchCard.vue b/src/components/TheLecturerSearchCard.vue
index f8e9641..a48a702 100644
--- a/src/components/TheLecturerSearchCard.vue
+++ b/src/components/TheLecturerSearchCard.vue
@@ -28,10 +28,10 @@
             size="small"
           ></v-chip>
         </v-chip-group>
-        <div>отзывы: {{ lecturer.comments?.length ?? "нет" }}</div>
+        <div>отзывы: {{ lecturer.comments?.length ?? "—" }}</div>
         <div>
           оценка: {{ lecturer.mark_general > 0 ? "+" : ""
-          }}{{ lecturer.mark_general?.toFixed(2) ?? "нет" }}
+          }}{{ lecturer.mark_general?.toFixed(2) ?? "—" }}
         </div>
       </div>
     </template>
@@ -52,7 +52,7 @@
 </template>
 
 <script setup lang="ts">
-import { router } from "../router";
+import { router } from "@/router";
 import { useDisplay } from "vuetify";
 
 const { mobile } = useDisplay();
diff --git a/src/components/TheReviewCard.vue b/src/components/TheReviewCard.vue
index 84198b1..8a2e70c 100644
--- a/src/components/TheReviewCard.vue
+++ b/src/components/TheReviewCard.vue
@@ -64,9 +64,9 @@
 </template>
 
 <script setup lang="ts">
-import apiClient from "../api";
+import apiClient from "@/api";
 import { ref } from "vue";
-import { useProfileStore } from "../store";
+import { useProfileStore } from "@/store";
 
 const profileStore = useProfileStore();
 const isUserAdmin = ref(false);
diff --git a/src/components/TheSearchBar.vue b/src/components/TheSearchBar.vue
index d26b4f9..74f00bf 100644
--- a/src/components/TheSearchBar.vue
+++ b/src/components/TheSearchBar.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script setup lang="ts">
-import { SUBJECTS } from "../constants";
+import { SUBJECTS } from "@/constants";
 defineProps({
   isAdmin: { type: Boolean, required: true },
 });
diff --git a/src/components/ToastList.vue b/src/components/ToastList.vue
index 8f5b5e2..021bda4 100644
--- a/src/components/ToastList.vue
+++ b/src/components/ToastList.vue
@@ -1,10 +1,3 @@
-<script setup lang="ts">
-import { useToastStore } from "../store/toastStore";
-import ToastView from "./ToastView.vue";
-
-const toastStore = useToastStore();
-</script>
-
 <template>
   <div class="toast-list">
     <ToastView
@@ -16,6 +9,13 @@ const toastStore = useToastStore();
   </div>
 </template>
 
+<script setup lang="ts">
+import { useToastStore } from "@/store/toastStore";
+import ToastView from "./ToastView.vue";
+
+const toastStore = useToastStore();
+</script>
+
 <style scoped>
 .toast-list {
   position: fixed;
diff --git a/src/components/ToastView.vue b/src/components/ToastView.vue
index 8bafcf3..2eb6a4f 100644
--- a/src/components/ToastView.vue
+++ b/src/components/ToastView.vue
@@ -1,5 +1,23 @@
+<template>
+  <div class="toast">
+    <v-icon :icon="icon" />
+    <div class="description">
+      <h6 class="title">{{ props.toast.title }}</h6>
+      <p>{{ props.toast.description }}</p>
+    </div>
+    <v-btn
+      type="button"
+      class="close"
+      icon="close"
+      size="xs"
+      variant="plain"
+      @click="$emit('close')"
+    />
+  </div>
+</template>
+
 <script setup lang="ts">
-import { Toast, ToastType } from "../models";
+import { Toast, ToastType } from "@/models";
 import { computed } from "vue";
 
 const props = defineProps<{
@@ -22,24 +40,6 @@ const icon = computed(() => {
 });
 </script>
 
-<template>
-  <div class="toast">
-    <v-icon :icon="icon" />
-    <div class="description">
-      <h6 class="title">{{ props.toast.title }}</h6>
-      <p>{{ props.toast.description }}</p>
-    </div>
-    <v-btn
-      type="button"
-      class="close"
-      icon="close"
-      size="xs"
-      variant="plain"
-      @click="$emit('close')"
-    />
-  </div>
-</template>
-
 <style scoped>
 .toast {
   display: flex;
diff --git a/src/main.ts b/src/main.ts
index 6620a0a..44f9f30 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,8 +1,8 @@
 import { createApp } from 'vue';
-import App from './App.vue';
-import { router } from './router';
-import { pinia } from './pinia';
-import { vuetify } from './vuetify';
+import App from '@/App.vue';
+import { router } from '@/router';
+import { pinia } from '@/pinia';
+import { vuetify } from '@/vuetify';
 import 'vuetify/styles';
 
 createApp(App).use(router).use(pinia).use(vuetify).mount('#app');
diff --git a/src/pages/AdminPage.vue b/src/pages/AdminPage.vue
index 58addcd..d3be1e0 100644
--- a/src/pages/AdminPage.vue
+++ b/src/pages/AdminPage.vue
@@ -1,24 +1,9 @@
-<template>
-	<v-container>
-		<v-btn class="mb-4" color="primary" text="На главную" @click="router.push('/')"></v-btn>
-		<v-data-iterator v-if="comments && comments?.comments.length > 0" :items="comments.comments">
-			<template #default="{ items }">
-				<template v-for="(item, i) in items" :key="i">
-					<AdminReviewCard :comment="item" :photo="Placeholder" @decided="loadComments" />
-				</template>
-			</template>
-		</v-data-iterator>
-		<div v-else>Нет комментариев</div>
-	</v-container>
-</template>
-
 <script setup lang="ts">
 import { ref } from 'vue';
-import apiClient from '../api';
-import Placeholder from '../assets/profile_image_placeholder.webp';
-import { Comment } from '../models';
-import AdminReviewCard from '../components/AdminReviewCard.vue';
-import { router } from '../router';
+import apiClient from '@/api';
+import Placeholder from '@/assets/profile_image_placeholder.webp';
+import { Comment } from '@/models';
+import AdminReviewCard from '@/components/AdminReviewCard.vue';
 
 const comments = ref<Comment | undefined>();
 await loadComments(0);
@@ -38,3 +23,17 @@ async function loadComments(offset: number) {
 	comments.value = res.data;
 }
 </script>
+
+<template>
+	<v-container>
+		<v-btn class="mb-4" color="primary" text="На главную" @click="$router.push('/')"></v-btn>
+		<v-data-iterator v-if="comments && comments?.comments.length > 0" :items="comments.comments">
+			<template #default="{ items }">
+				<template v-for="(item, i) in items" :key="i">
+					<AdminReviewCard :comment="item" :photo="Placeholder" @decided="loadComments" />
+				</template>
+			</template>
+		</v-data-iterator>
+		<div v-else>Нет комментариев</div>
+	</v-container>
+</template>
diff --git a/src/pages/LecturerPage.vue b/src/pages/LecturerPage.vue
index 17fbdca..fe87cac 100644
--- a/src/pages/LecturerPage.vue
+++ b/src/pages/LecturerPage.vue
@@ -2,13 +2,13 @@
 import { useRouter } from 'vue-router';
 import { useDisplay } from 'vuetify';
 import { ref } from 'vue';
-import { PHOTO_BASE_PATH } from '../constants';
-// import Markdown from '../components/AppMarkdownRenderer.vue';
-import apiClient from '../api';
-import Placeholder from '../assets/profile_image_placeholder.webp';
-import AppRatingBar from '../components/AppRatingBar.vue';
-import TheReviewCard from '../components/TheReviewCard.vue';
-import LecturerHeaderCard from '../components/LecturerHeaderCard.vue';
+// import Markdown from '@/components/AppMarkdownRenderer.vue';
+import apiClient from '@/api';
+import Placeholder from '@/assets/profile_image_placeholder.webp';
+import AppRatingBar from '@/components/AppRatingBar.vue';
+import TheReviewCard from '@/components/TheReviewCard.vue';
+import LecturerHeaderCard from '@/components/LecturerHeaderCard.vue';
+import { getPhoto } from '@/utils';
 
 const { mobile } = useDisplay();
 
@@ -45,7 +45,7 @@ let howKind = lecturer?.mark_kindness ?? 0;
 let howFree = lecturer?.mark_freebie ?? 0;
 let howClear = lecturer?.mark_clarity ?? 0;
 
-const lecturerPhoto = avatarLink.value ? `${PHOTO_BASE_PATH}${avatarLink.value}` : Placeholder;
+const lecturerPhoto = getPhoto(avatarLink.value);
 // const lecturerInfo = description.value ?? 'Информации нет';
 </script>
 
diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue
index 829bb08..3065fdc 100644
--- a/src/pages/MainPage.vue
+++ b/src/pages/MainPage.vue
@@ -1,14 +1,13 @@
 <script async setup lang="ts">
-import { router } from '../router';
+import { router } from '@/router';
 import { ref, Ref } from 'vue';
-import apiClient from '../api';
-import { useProfileStore } from '../store';
-import Placeholder from '../assets/profile_image_placeholder.webp';
-import TheSearchBar from '../components/TheSearchBar.vue';
-import TheLecturerSearchCard from '../components/TheLecturerSearchCard.vue';
-import { Lecturer, Order, Subject } from '../models';
-import { PHOTO_BASE_PATH } from '../constants';
-// import { useGoTo } from 'vuetify';
+import apiClient from '@/api';
+import { useProfileStore } from '@/store';
+import Placeholder from '@/assets/profile_image_placeholder.webp';
+import TheSearchBar from '@/components/TheSearchBar.vue';
+import TheLecturerSearchCard from '@/components/TheLecturerSearchCard.vue';
+import { Lecturer, Order, Subject } from '@/models';
+import { getPhoto } from '@/utils';
 
 const profileStore = useProfileStore();
 
@@ -49,6 +48,7 @@ async function loadLecturers(nameQuery: string, offset: number, orderQuery: Ref<
 	totalPages.value = res.data?.total ? Math.ceil(res.data?.total / itemsPerPage) : 1;
 	loadPhotos();
 }
+
 async function loadNextLecturers() {
 	offset += itemsPerPage;
 	loadLecturers(query.value, offset, orderValues, subject);
@@ -60,9 +60,7 @@ async function loadPrevLecturers() {
 }
 
 function loadPhotos() {
-	lecturersPhotos.value = lecturers.value?.map(item =>
-		item.avatar_link ? `${PHOTO_BASE_PATH}${item.avatar_link}` : Placeholder,
-	) ?? [Placeholder];
+	lecturersPhotos.value = lecturers.value?.map(item => getPhoto(item.avatar_link)) ?? [Placeholder];
 }
 
 async function findLecturer() {
diff --git a/src/pages/ReviewPage.vue b/src/pages/ReviewPage.vue
index dba9c59..0348567 100644
--- a/src/pages/ReviewPage.vue
+++ b/src/pages/ReviewPage.vue
@@ -1,66 +1,13 @@
-<template>
-	<v-container>
-		<v-btn
-			class="mb-4"
-			color="primary"
-			text="К лектору"
-			@click="
-				router.push({
-					path: 'lecturer',
-					query: { lecturer_id: lecturerId },
-				})
-			"
-		></v-btn>
-		<LecturerHeaderCard
-			class="mb-2"
-			:photo="photo"
-			:first-name="firstName ?? 'Ошибка'"
-			:last-name="lastName ?? 'Ошибка'"
-			:middle-name="middleName ?? 'Ошибка'"
-		/>
-
-		<v-combobox
-			v-model="subject"
-			:error-messages="warningMessage"
-			hide-details="auto"
-			label="Выберите предмет"
-			required
-			:items="SUBJECTS"
-		/>
-
-		<the-review-buttons v-model:review="kindReview" property="Доброта"></the-review-buttons>
-		<the-review-buttons v-model:review="freebieReview" property="Халявность"></the-review-buttons>
-		<the-review-buttons v-model:review="clearReview" property="Понятность"></the-review-buttons>
-
-		<div class="mx-2 mt-2">
-			<v-textarea
-				v-model="reviewText"
-				density="compact"
-				label="Ваше мнение о преподавателе (необязательно)"
-				hide-details
-			></v-textarea>
-			<div class="d-flex align-center mt-4">
-				<v-icon :icon="'mdi-star'"></v-icon>
-				<div class="ml-2 text-body-1">
-					Общая оценка: {{ Number(generalReview) > 0 ? '+' + generalReview : generalReview }}
-				</div>
-			</div>
-
-			<v-btn color="secondary" class="mt-3" rounded="pill" text="отправить" @click="sendReview"></v-btn>
-		</div>
-	</v-container>
-</template>
-
 <script setup lang="ts">
 import { ref, computed } from 'vue';
-import apiClient from '../api';
-import Placeholder from '../assets/profile_image_placeholder.webp';
-import TheReviewButtons from '../components/TheReviewButtons.vue';
-import LecturerHeaderCard from '../components/LecturerHeaderCard.vue';
-import { useToastStore } from '../store/toastStore';
-import { ToastType } from '../models';
-import { router } from '../router';
-import { PHOTO_BASE_PATH, SUBJECTS } from '../constants';
+import apiClient from '@/api';
+import Placeholder from '@/assets/profile_image_placeholder.webp';
+import TheReviewButtons from '@/components/TheReviewButtons.vue';
+import LecturerHeaderCard from '@/components/LecturerHeaderCard.vue';
+import { useToastStore } from '@/store/toastStore';
+import { ToastType } from '@/models';
+import { router } from '@/router';
+import { PHOTO_BASE_PATH, SUBJECTS } from '@/constants';
 
 const toastStore = useToastStore();
 
@@ -150,6 +97,59 @@ async function sendReview() {
 }
 </script>
 
+<template>
+	<v-container>
+		<v-btn
+			class="mb-4"
+			color="primary"
+			text="К лектору"
+			@click="
+				router.push({
+					path: 'lecturer',
+					query: { lecturer_id: lecturerId },
+				})
+			"
+		></v-btn>
+		<LecturerHeaderCard
+			class="mb-2"
+			:photo="photo"
+			:first-name="firstName ?? 'Ошибка'"
+			:last-name="lastName ?? 'Ошибка'"
+			:middle-name="middleName ?? 'Ошибка'"
+		/>
+
+		<v-combobox
+			v-model="subject"
+			:error-messages="warningMessage"
+			hide-details="auto"
+			label="Выберите предмет"
+			required
+			:items="SUBJECTS"
+		/>
+
+		<the-review-buttons v-model:review="kindReview" property="Доброта"></the-review-buttons>
+		<the-review-buttons v-model:review="freebieReview" property="Халявность"></the-review-buttons>
+		<the-review-buttons v-model:review="clearReview" property="Понятность"></the-review-buttons>
+
+		<div class="mx-2 mt-2">
+			<v-textarea
+				v-model="reviewText"
+				density="compact"
+				label="Ваше мнение о преподавателе (необязательно)"
+				hide-details
+			></v-textarea>
+			<div class="d-flex align-center mt-4">
+				<v-icon :icon="'mdi-star'"></v-icon>
+				<div class="ml-2 text-body-1">
+					Общая оценка: {{ Number(generalReview) > 0 ? '+' + generalReview : generalReview }}
+				</div>
+			</div>
+
+			<v-btn color="secondary" class="mt-3" rounded="pill" text="отправить" @click="sendReview"></v-btn>
+		</div>
+	</v-container>
+</template>
+
 <style scoped>
 .contact a {
 	display: table;
diff --git a/src/router/index.ts b/src/router/index.ts
index 9631b24..b611a91 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,22 +1,22 @@
 import { RouteRecordRaw, createRouter, createWebHistory } from 'vue-router';
-import { useProfileStore } from '../store';
+import { useProfileStore } from '@/store';
 
 const routes: RouteRecordRaw[] = [
 	{
 		path: '/',
-		component: () => import('../pages/MainPage.vue'),
+		component: () => import('@/pages/MainPage.vue'),
 	},
 	{
 		path: '/lecturer',
-		component: () => import('../pages/LecturerPage.vue'),
+		component: () => import('@/pages/LecturerPage.vue'),
 	},
 	{
 		path: '/review',
-		component: () => import('../pages/ReviewPage.vue'),
+		component: () => import('@/pages/ReviewPage.vue'),
 	},
 	{
 		path: '/admin',
-		component: () => import('../pages/AdminPage.vue'),
+		component: () => import('@/pages/AdminPage.vue'),
 		beforeEnter: adminValidation,
 	},
 ];
@@ -34,7 +34,3 @@ async function adminValidation() {
 		return { path: '/' };
 	}
 }
-
-router.beforeEach(to => {
-	console.log(to);
-});
diff --git a/src/store/toastStore.ts b/src/store/toastStore.ts
index df46468..45f142a 100644
--- a/src/store/toastStore.ts
+++ b/src/store/toastStore.ts
@@ -1,4 +1,4 @@
-import { Toast } from '../models';
+import { Toast } from '@/models';
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..3655abb
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,6 @@
+import { PHOTO_BASE_PATH } from '@/constants';
+import Placeholder from '@/assets/profile_image_placeholder.webp';
+
+export function getPhoto(link: string | null | undefined) {
+	return link === 'NULL' ? Placeholder : `${PHOTO_BASE_PATH}${link}`;
+}

From 530b08502d69c61ab111ba8be789fe17c2330aa2 Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 17 Nov 2024 23:17:28 +0000
Subject: [PATCH 4/8] default order by = general

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

diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue
index 3065fdc..b489f14 100644
--- a/src/pages/MainPage.vue
+++ b/src/pages/MainPage.vue
@@ -11,8 +11,8 @@ import { getPhoto } from '@/utils';
 
 const profileStore = useProfileStore();
 
-const orderValues: Ref<Order> = ref(['']);
-let order: Ref<string> = ref('');
+const orderValues: Ref<Order> = ref(['general']);
+let order: Ref<string> = ref('по общей оценке');
 let offset = 0;
 const query = ref('');
 const subject: Ref<Subject> = ref('');

From a284f3135fec4874bd417749feda56cd35358bd2 Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 17 Nov 2024 23:24:04 +0000
Subject: [PATCH 5/8] removed markdown-it

---
 package.json   |  1 -
 pnpm-lock.yaml | 39 ---------------------------------------
 2 files changed, 40 deletions(-)

diff --git a/package.json b/package.json
index 8e2e7a3..36358e8 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-vue": "^9.30.0",
     "globals": "^15.12.0",
-    "markdown-it": "^14.1.0",
     "openapi-typescript": "^7.4.2",
     "postcss-html": "^1.7.0",
     "postcss-preset-env": "^9.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e979af9..afb29a6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,9 +69,6 @@ importers:
       globals:
         specifier: ^15.12.0
         version: 15.12.0
-      markdown-it:
-        specifier: ^14.1.0
-        version: 14.1.0
       openapi-typescript:
         specifier: ^7.4.2
         version: 7.4.2(typescript@5.6.3)
@@ -1478,9 +1475,6 @@ packages:
   lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  linkify-it@5.0.0:
-    resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
-
   locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
@@ -1512,10 +1506,6 @@ packages:
     resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
     engines: {node: '>=8'}
 
-  markdown-it@14.1.0:
-    resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==}
-    hasBin: true
-
   mathml-tag-names@2.1.3:
     resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
 
@@ -1525,9 +1515,6 @@ packages:
   mdn-data@2.0.30:
     resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
 
-  mdurl@2.0.0:
-    resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==}
-
   meow@10.1.5:
     resolution: {integrity: sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -1890,10 +1877,6 @@ packages:
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
-  punycode.js@2.3.1:
-    resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==}
-    engines: {node: '>=6'}
-
   punycode@2.3.1:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
@@ -2136,9 +2119,6 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  uc.micro@2.1.0:
-    resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
-
   undici-types@6.19.8:
     resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
 
@@ -3697,10 +3677,6 @@ snapshots:
 
   lines-and-columns@1.2.4: {}
 
-  linkify-it@5.0.0:
-    dependencies:
-      uc.micro: 2.1.0
-
   locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
@@ -3725,23 +3701,12 @@ snapshots:
 
   map-obj@4.3.0: {}
 
-  markdown-it@14.1.0:
-    dependencies:
-      argparse: 2.0.1
-      entities: 4.5.0
-      linkify-it: 5.0.0
-      mdurl: 2.0.0
-      punycode.js: 2.3.1
-      uc.micro: 2.1.0
-
   mathml-tag-names@2.1.3: {}
 
   mdn-data@2.0.28: {}
 
   mdn-data@2.0.30: {}
 
-  mdurl@2.0.0: {}
-
   meow@10.1.5:
     dependencies:
       '@types/minimist': 1.2.5
@@ -4151,8 +4116,6 @@ snapshots:
 
   proxy-from-env@1.1.0: {}
 
-  punycode.js@2.3.1: {}
-
   punycode@2.3.1: {}
 
   query-string@8.2.0:
@@ -4408,8 +4371,6 @@ snapshots:
 
   typescript@5.6.3: {}
 
-  uc.micro@2.1.0: {}
-
   undici-types@6.19.8: {}
 
   upath@2.0.1: {}

From e08469e33bb1fd0698d8dc567154c437085811aa Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 17 Nov 2024 23:40:05 +0000
Subject: [PATCH 6/8] adapting numerals and removing markdown-it

---
 src/pages/LecturerPage.vue | 14 +++++---------
 src/utils/index.ts         | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/LecturerPage.vue b/src/pages/LecturerPage.vue
index fe87cac..f09dcf9 100644
--- a/src/pages/LecturerPage.vue
+++ b/src/pages/LecturerPage.vue
@@ -2,13 +2,12 @@
 import { useRouter } from 'vue-router';
 import { useDisplay } from 'vuetify';
 import { ref } from 'vue';
-// import Markdown from '@/components/AppMarkdownRenderer.vue';
 import apiClient from '@/api';
 import Placeholder from '@/assets/profile_image_placeholder.webp';
 import AppRatingBar from '@/components/AppRatingBar.vue';
 import TheReviewCard from '@/components/TheReviewCard.vue';
 import LecturerHeaderCard from '@/components/LecturerHeaderCard.vue';
-import { getPhoto } from '@/utils';
+import { adaptNumeral, getPhoto } from '@/utils';
 
 const { mobile } = useDisplay();
 
@@ -25,7 +24,6 @@ const firstName = ref(lecturer?.first_name);
 const lastName = ref(lecturer?.last_name);
 const middleName = ref(lecturer?.middle_name);
 const avatarLink = ref(lecturer?.avatar_link);
-// const description = ref(null); // ref(lecturer?.description);
 
 async function loadLecturer() {
 	const res = await apiClient.GET(`/rating/lecturer/{id}`, {
@@ -46,7 +44,6 @@ let howFree = lecturer?.mark_freebie ?? 0;
 let howClear = lecturer?.mark_clarity ?? 0;
 
 const lecturerPhoto = getPhoto(avatarLink.value);
-// const lecturerInfo = description.value ?? 'Информации нет';
 </script>
 
 <template>
@@ -71,7 +68,10 @@ const lecturerPhoto = getPhoto(avatarLink.value);
 							<v-icon :icon="'mdi-tree-outline'"></v-icon>
 						</template>
 						<template #title>{{ lecturer?.mark_general?.toFixed(2) ?? 'нет оценки' }}</template>
-						<template #text>{{ lecturer?.comments?.length ?? 'нет' }} отзыва</template>
+						<template #text
+							>{{ lecturer?.comments?.length ?? 'нет' }}
+							{{ adaptNumeral(lecturer?.comments?.length, 'отзыв', 'отзыва', 'отзывов') }}</template
+						>
 					</v-card>
 				</v-col>
 				<v-col cols="xs-2">
@@ -83,10 +83,6 @@ const lecturerPhoto = getPhoto(avatarLink.value);
 				</v-col>
 			</v-row>
 		</div>
-		<!-- 
-		<div class="justify-start">
-			<Markdown :text="lecturerInfo" />
-		</div> -->
 
 		<div v-if="lecturer?.comments">
 			<v-data-iterator class="mr-0 pa-0" :page="page" :items="lecturer?.comments" :items-per-page="itemsPerPage">
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 3655abb..e97dd27 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -4,3 +4,17 @@ import Placeholder from '@/assets/profile_image_placeholder.webp';
 export function getPhoto(link: string | null | undefined) {
 	return link === 'NULL' ? Placeholder : `${PHOTO_BASE_PATH}${link}`;
 }
+
+export function adaptNumeral(number: number | undefined, singular: string, plural_small: string, plural_big: string) {
+	if (!number) {
+		return plural_big;
+	} else {
+		if (number % 10 == 1 && number % 100 != 11) {
+			return singular;
+		} else if (number % 10 >= 2 && number % 10 <= 4 && (number % 100 < 10 || number % 100 >= 20)) {
+			return plural_small;
+		} else {
+			return plural_big;
+		}
+	}
+}

From 4bc84000d616ee45c78e9ef8d2b2aade2f4e3162 Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 24 Nov 2024 15:06:01 +0000
Subject: [PATCH 7/8] fix sorting in get lecturers

---
 src/components/TheSearchBar.vue |  9 ++++++-
 src/models/index.ts             |  2 +-
 src/pages/MainPage.vue          | 46 +++++++++++++++++++++++----------
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/components/TheSearchBar.vue b/src/components/TheSearchBar.vue
index 74f00bf..3d340e6 100644
--- a/src/components/TheSearchBar.vue
+++ b/src/components/TheSearchBar.vue
@@ -41,7 +41,7 @@
               v-model="order"
               class="text-body-1"
               label="Сортировка"
-              :items="['', 'по общей оценке']"
+              :items="orderTypes"
               density="compact"
               @click.stop
             />
@@ -70,6 +70,13 @@ defineProps({
 const searchQuery = defineModel("searchQuery", { type: String });
 const subject = defineModel("subject", { type: String });
 const order = defineModel("order", { type: String });
+const orderTypes = [
+  "по общей оценке",
+  "по доброте",
+  "по халявности",
+  "по понятности",
+  "по фамилии",
+];
 
 const emits = defineEmits({
   "find-lecturer": () => {
diff --git a/src/models/index.ts b/src/models/index.ts
index d42e0bd..7b43340 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -15,6 +15,6 @@ export interface Toast {
 	description?: string;
 }
 
-export type Order = ('general' | '')[];
+export type Order = ('mark_general' | 'mark_kindness' | 'mark_freebie' | 'mark_clarity' | 'last_name')[];
 export type Subject = string;
 export type Lecturer = components['schemas']['LecturerGet'];
diff --git a/src/pages/MainPage.vue b/src/pages/MainPage.vue
index b489f14..f47c3b1 100644
--- a/src/pages/MainPage.vue
+++ b/src/pages/MainPage.vue
@@ -11,7 +11,7 @@ import { getPhoto } from '@/utils';
 
 const profileStore = useProfileStore();
 
-const orderValues: Ref<Order> = ref(['general']);
+const orderValues: Ref<Order> = ref(['mark_general']);
 let order: Ref<string> = ref('по общей оценке');
 let offset = 0;
 const query = ref('');
@@ -51,12 +51,12 @@ async function loadLecturers(nameQuery: string, offset: number, orderQuery: Ref<
 
 async function loadNextLecturers() {
 	offset += itemsPerPage;
-	loadLecturers(query.value, offset, orderValues, subject);
+	await loadLecturers(query.value, offset, orderValues, subject);
 }
 
 async function loadPrevLecturers() {
 	offset -= itemsPerPage;
-	loadLecturers(query.value, offset, orderValues, subject);
+	await loadLecturers(query.value, offset, orderValues, subject);
 }
 
 function loadPhotos() {
@@ -70,7 +70,23 @@ async function findLecturer() {
 
 async function orderLecturers() {
 	page.value = 1;
-	orderValues.value[0] = order.value == 'по общей оценке' ? 'general' : '';
+	switch (order.value) {
+		case 'по общей оценке':
+			orderValues.value[0] = 'mark_general';
+			break;
+		case 'по доброте':
+			orderValues.value[0] = 'mark_kindness';
+			break;
+		case 'по халявности':
+			orderValues.value[0] = 'mark_freebie';
+			break;
+		case 'по понятности':
+			orderValues.value[0] = 'mark_clarity';
+			break;
+		case 'по фамилии':
+			orderValues.value[0] = 'last_name';
+			break;
+	}
 	await loadLecturers(query.value, 0, orderValues, subject);
 }
 
@@ -110,16 +126,18 @@ async function filterLecturers() {
 			</template>
 
 			<template #footer>
-				<v-pagination
-					v-model="page"
-					active-color="primary"
-					variant="elevated"
-					:length="totalPages"
-					:total-visible="2"
-					:show-first-last-page="false"
-					@next="loadNextLecturers"
-					@prev="loadPrevLecturers"
-				></v-pagination>
+				<div v-if="lecturers">
+					<v-pagination
+						v-model="page"
+						active-color="primary"
+						variant="elevated"
+						:length="totalPages"
+						:total-visible="2"
+						:show-first-last-page="false"
+						@next="loadNextLecturers"
+						@prev="loadPrevLecturers"
+					/>
+				</div>
 			</template>
 		</v-data-iterator>
 	</v-container>

From e7f7bd9efb46da908c4c6c6fb5e197497026f794 Mon Sep 17 00:00:00 2001
From: default <batuev.io18@physics.msu.ru>
Date: Sun, 24 Nov 2024 15:22:54 +0000
Subject: [PATCH 8/8] changed filter icon in search bar

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

diff --git a/src/components/TheSearchBar.vue b/src/components/TheSearchBar.vue
index 3d340e6..4fe80d5 100644
--- a/src/components/TheSearchBar.vue
+++ b/src/components/TheSearchBar.vue
@@ -20,7 +20,7 @@
         <template #activator="{ props }">
           <v-btn
             v-bind="props"
-            :icon="'mdi-table-of-contents'"
+            :icon="'mdi-filter-variant'"
             color="grey"
             variant="flat"
             focused