From ac42a8da7f10c4dec8b85840b234027138e4bc80 Mon Sep 17 00:00:00 2001
From: Arigii <kingll123m@mail.ru>
Date: Sat, 31 May 2025 11:41:28 +0500
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D1=83=20=D0=BA=D0=BE=D0=BC=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB/src/api/teams/createTeam.js |  23 +++
 WEB/src/api/teams/deleteTeam.js |  16 ++
 WEB/src/api/teams/updateTeam.js |  20 +-
 WEB/src/main.js                 |   5 +-
 WEB/src/pages/AdminPage.vue     | 314 ++++++++++++++++++++------------
 5 files changed, 257 insertions(+), 121 deletions(-)
 create mode 100644 WEB/src/api/teams/createTeam.js
 create mode 100644 WEB/src/api/teams/deleteTeam.js

diff --git a/WEB/src/api/teams/createTeam.js b/WEB/src/api/teams/createTeam.js
new file mode 100644
index 0000000..6f7c837
--- /dev/null
+++ b/WEB/src/api/teams/createTeam.js
@@ -0,0 +1,23 @@
+import axios from 'axios'
+import CONFIG from '@/core/config.js'
+
+const createTeam = async (team) => {
+    try {
+        const token = localStorage.getItem('access_token') // или другой способ
+        const response = await axios.post(
+            `${CONFIG.BASE_URL}/teams`,
+            team,
+            {
+                withCredentials: true,
+                headers: {
+                    Authorization: `Bearer ${token}`
+                }
+            }
+        )
+        return response.data
+    } catch (error) {
+        throw new Error(error.response?.data?.detail || error.message)
+    }
+}
+
+export default createTeam
diff --git a/WEB/src/api/teams/deleteTeam.js b/WEB/src/api/teams/deleteTeam.js
new file mode 100644
index 0000000..4203818
--- /dev/null
+++ b/WEB/src/api/teams/deleteTeam.js
@@ -0,0 +1,16 @@
+import axios from 'axios'
+import CONFIG from '@/core/config.js'
+
+const deleteTeam = async (teamId) => {
+    try {
+        const response = await axios.delete(
+            `${CONFIG.BASE_URL}/teams/${teamId}`,
+            { withCredentials: true }
+        )
+        return response.data
+    } catch (error) {
+        throw new Error(error.response?.data?.detail || error.message)
+    }
+}
+
+export default deleteTeam
diff --git a/WEB/src/api/teams/updateTeam.js b/WEB/src/api/teams/updateTeam.js
index 3cfd514..7a07193 100644
--- a/WEB/src/api/teams/updateTeam.js
+++ b/WEB/src/api/teams/updateTeam.js
@@ -3,11 +3,25 @@ import CONFIG from '@/core/config.js'
 
 const updateTeam = async (team) => {
     try {
+        const token = localStorage.getItem('access_token')
+
+        // Убираем id из тела запроса, он идет в URL
+        const { id, ...teamData } = team
+
+        console.log('Отправляем на сервер:', teamData)
+
         const response = await axios.put(
-            `${CONFIG.BASE_URL}/teams/${team.id}`,
-            team,
-            { withCredentials: true }
+            `${CONFIG.BASE_URL}/teams/${id}`,
+            teamData,
+            {
+                withCredentials: true,
+                headers: {
+                    Authorization: `Bearer ${token}`
+                }
+            }
         )
+
+        console.log('Ответ от сервера:', response.data)
         return response.data
     } catch (error) {
         throw new Error(error.response?.data?.detail || error.message)
diff --git a/WEB/src/main.js b/WEB/src/main.js
index 31ad124..a905d72 100644
--- a/WEB/src/main.js
+++ b/WEB/src/main.js
@@ -24,7 +24,8 @@ import {
     QSeparator,
     QCardActions,
     QDialog,
-    QIcon
+    QIcon,
+    QSpace
 } from 'quasar'
 
 
@@ -41,7 +42,7 @@ app.use(Quasar, {
         QInput, QBtn, QForm, QCard, QCardSection,
         QLayout, QPageContainer, QPage,
         QTabs, QTab, QTabPanels, QTabPanel, QHeader,QTable,
-        QSeparator, QCardActions, QDialog, QIcon
+        QSeparator, QCardActions, QDialog, QIcon, QSpace
     }
 })
 
diff --git a/WEB/src/pages/AdminPage.vue b/WEB/src/pages/AdminPage.vue
index e412d94..eefb0f7 100644
--- a/WEB/src/pages/AdminPage.vue
+++ b/WEB/src/pages/AdminPage.vue
@@ -29,7 +29,7 @@
                 :rows="users"
                 :columns="userColumns"
                 row-key="id"
-                @row-click="openEdit('users', $event)"
+                @row-click="onRowClick"
                 :loading="loadingUsers"
                 dense
                 flat
@@ -40,12 +40,22 @@
         <!-- Команды -->
         <q-tab-panel name="teams">
           <div class="violet-card q-pa-md">
+
+            <div class="q-gutter-sm q-mb-sm row items-center justify-between">
+              <q-btn
+                  label="Создание команды"
+                  color="primary"
+                  @click="createTeamHandler"
+              />
+
+            </div>
+
             <q-table
                 title="Команды"
                 :rows="teams"
                 :columns="teamColumns"
                 row-key="id"
-                @row-click="openEdit('teams', $event)"
+                @row-click="onRowClick"
                 :loading="loadingTeams"
                 dense
                 flat
@@ -53,6 +63,7 @@
           </div>
         </q-tab-panel>
 
+
         <!-- Проекты -->
         <q-tab-panel name="projects">
           <div class="violet-card q-pa-md">
@@ -61,7 +72,7 @@
                 :rows="projects"
                 :columns="projectColumns"
                 row-key="id"
-                @row-click="openEdit('projects', $event)"
+                @row-click="onRowClick"
                 :loading="loadingProjects"
                 dense
                 flat
@@ -77,7 +88,7 @@
                 :rows="contests"
                 :columns="contestColumns"
                 row-key="id"
-                @row-click="openEdit('contests', $event)"
+                @row-click="onRowClick"
                 :loading="loadingContests"
                 dense
                 flat
@@ -92,54 +103,128 @@
     <q-dialog v-model="dialogVisible" persistent>
       <q-card style="min-width: 350px; max-width: 700px;">
         <q-card-section>
-          <div class="text-h6">Редактирование {{ dialogType }}</div>
+          <div class="text-h6">
+            <template v-if="dialogType === 'teams'">
+              Редактирование команды {{ dialogData.title || '' }}
+            </template>
+            <template v-else-if="dialogType === 'users'">
+              Редактирование пользователя {{ dialogData.name || dialogData.login || '' }}
+            </template>
+            <template v-else-if="dialogType === 'projects'">
+              Редактирование проекта {{ dialogData.title || '' }}
+            </template>
+            <template v-else-if="dialogType === 'contests'">
+              Редактирование конкурса {{ dialogData.title || '' }}
+            </template>
+            <template v-else>
+              Редактирование {{ dialogType }}
+            </template>
+          </div>
         </q-card-section>
 
         <q-separator />
 
         <q-card-section>
-          <pre>{{ dialogData }}</pre>
+          <!-- Teams -->
+          <template v-if="dialogType === 'teams'">
+            <q-input v-model="dialogData.title" label="Название команды" dense autofocus clearable />
+            <q-input v-model="dialogData.description" label="Описание" dense clearable type="textarea" class="q-mt-sm" />
+            <q-input v-model="dialogData.logo" label="Логотип" dense clearable class="q-mt-sm" />
+            <q-input v-model="dialogData.git_url" label="Git URL" dense clearable class="q-mt-sm" />
+          </template>
+
+          <!-- Users -->
+          <template v-else-if="dialogType === 'users'">
+            <q-input v-model="dialogData.login" label="Логин" dense autofocus clearable />
+            <q-input v-model="dialogData.name" label="Имя" dense clearable class="q-mt-sm" />
+            <q-input v-model="dialogData.email" label="Email" dense clearable class="q-mt-sm" />
+            <!-- Добавь другие поля, которые нужны для пользователя -->
+          </template>
+
+          <!-- Projects -->
+          <template v-else-if="dialogType === 'projects'">
+            <q-input v-model="dialogData.title" label="Название проекта" dense autofocus clearable />
+            <q-input v-model="dialogData.description" label="Описание" dense clearable type="textarea" class="q-mt-sm" />
+            <q-input v-model="dialogData.repo_url" label="URL репозитория" dense clearable class="q-mt-sm" />
+            <!-- Другие поля проекта -->
+          </template>
+
+          <!-- Contests -->
+          <template v-else-if="dialogType === 'contests'">
+            <q-input v-model="dialogData.title" label="Название конкурса" dense autofocus clearable />
+            <q-input v-model="dialogData.description" label="Описание" dense clearable type="textarea" class="q-mt-sm" />
+            <q-input v-model="dialogData.start_date" label="Дата начала" dense clearable class="q-mt-sm" type="date" />
+            <q-input v-model="dialogData.end_date" label="Дата окончания" dense clearable class="q-mt-sm" type="date" />
+            <!-- Другие поля конкурса -->
+          </template>
+
+          <template v-else>
+            <pre>{{ dialogData }}</pre>
+          </template>
         </q-card-section>
 
         <q-card-actions align="right">
+          <q-btn
+              v-if="dialogType === 'teams'"
+              flat
+              label="Удалить"
+              color="negative"
+              @click="deleteTeam"
+          />
+          <q-btn
+              v-if="dialogType === 'users'"
+              flat
+              label="Удалить"
+              color="negative"
+              @click="deleteUser"
+          />
+          <q-btn
+              v-if="dialogType === 'projects'"
+              flat
+              label="Удалить"
+              color="negative"
+              @click="deleteProject"
+          />
+          <q-btn
+              v-if="dialogType === 'contests'"
+              flat
+              label="Удалить"
+              color="negative"
+              @click="deleteContest"
+          />
+          <q-space />
           <q-btn flat label="Закрыть" color="primary" @click="closeDialog" />
+          <q-btn
+              v-if="['teams', 'users', 'projects', 'contests'].includes(dialogType)"
+              flat
+              label="Сохранить"
+              color="primary"
+              @click="saveChanges"
+          />
         </q-card-actions>
       </q-card>
     </q-dialog>
   </q-layout>
 </template>
 
+
 <script setup>
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch, onMounted, onBeforeUnmount } from 'vue'
 
-// Импорты API
 import fetchTeams from '@/api/teams/getTeams.js'
-import fetchUsers from '@/api/users/getUsers.js'
-import fetchProjects from '@/api/projects/getProjects.js'
-import fetchContests from '@/api/contests/getContests.js'
 import updateTeam from '@/api/teams/updateTeam.js'
+import deleteTeamById from '@/api/teams/deleteTeam.js'
+import createTeam from '@/api/teams/createTeam.js'
 
-// Активная вкладка
-const tab = ref('users')
 
-// Данные
-const users = ref([])
+const tab = ref('teams')
+
 const teams = ref([])
-const projects = ref([])
-const contests = ref([])
-
-// Загрузка
-const loadingUsers = ref(false)
 const loadingTeams = ref(false)
-const loadingProjects = ref(false)
-const loadingContests = ref(false)
 
-// Колонки
-const userColumns = [
-  { name: 'id', label: 'ID', field: 'id', sortable: true },
-  { name: 'name', label: 'Имя', field: 'name', sortable: true },
-  { name: 'email', label: 'Email', field: 'email', sortable: true },
-]
+const dialogVisible = ref(false)
+const dialogData = ref({})
+const dialogType = ref('')
 
 const teamColumns = [
   { name: 'title', label: 'Название команды', field: 'title', sortable: true },
@@ -148,110 +233,107 @@ const teamColumns = [
   { name: 'git_url', label: 'Git URL', field: 'git_url', sortable: true },
 ]
 
-
-const projectColumns = [
-  { name: 'id', label: 'ID', field: 'id', sortable: true },
-  { name: 'projectName', label: 'Проект', field: 'projectName', sortable: true },
-]
-
-const contestColumns = [
-  { name: 'id', label: 'ID', field: 'id', sortable: true },
-  { name: 'contestName', label: 'Конкурс', field: 'contestName', sortable: true },
-]
-
-// Модалка
-const dialogVisible = ref(false)
-const dialogData = ref({})
-const dialogType = ref('')
-
-// Функция открытия редактирования
 function openEdit(type, row) {
+  console.log('openEdit called with row:', row)
   dialogType.value = type
-  // Клонируем объект, чтобы не менять данные в таблице до сохранения
-  dialogData.value = JSON.parse(JSON.stringify(row))
-  dialogVisible.value = true
-}
-
-// Функция сохранения изменений
-async function saveChanges() {
-  if (dialogType.value === 'teams') {
-    try {
-      await updateTeam(dialogData.value)
-      // Обновляем локальные данные команды
-      const index = teams.value.findIndex(t => t.id === dialogData.value.id)
-      if (index !== -1) {
-        teams.value[index] = JSON.parse(JSON.stringify(dialogData.value))
-      }
-      closeDialog()
-    } catch (error) {
-      console.error('Ошибка при сохранении:', error.message)
-      // Можно добавить уведомление об ошибке
-    }
+  // Проверка на null или undefined
+  if (row) {
+    dialogData.value = JSON.parse(JSON.stringify(row))
+    dialogVisible.value = true
   }
 }
 
-// Закрыть модалку
+function onRowClick(event, row) {
+  console.log('event:', event)
+  console.log('row:', row)
+  openEdit('teams', row)
+}
+
 function closeDialog() {
   dialogVisible.value = false
 }
 
-// Загрузка данных
-async function loadData(name) {
-  switch (name) {
-    case 'users':
-      loadingUsers.value = true
-      try {
-        users.value = await fetchUsers() || []
-      } catch (error) {
-        users.value = []
-        console.error(error.message)
-      } finally {
-        loadingUsers.value = false
-      }
-      break
+async function saveChanges() {
+  if (dialogType.value === 'teams') {
+    try {
+      if (dialogData.value.id) {
+        // Формируем чистый объект с нужными полями
+        const teamToUpdate = {
+          id: dialogData.value.id,
+          title: dialogData.value.title,
+          description: dialogData.value.description,
+          logo: dialogData.value.logo,
+          git_url: dialogData.value.git_url
+        }
 
-    case 'teams':
-      loadingTeams.value = true
-      try {
-        teams.value = await fetchTeams() || []
-      } catch (error) {
-        teams.value = []
-        console.error(error.message)
-      } finally {
-        loadingTeams.value = false
-      }
-      break
+        console.log('Отправляем на сервер:', teamToUpdate)
+        await updateTeam(teamToUpdate)
 
-    case 'projects':
-      loadingProjects.value = true
-      try {
-        projects.value = await fetchProjects() || []
-      } catch (error) {
-        projects.value = []
-        console.error(error.message)
-      } finally {
-        loadingProjects.value = false
+        const index = teams.value.findIndex(t => t.id === teamToUpdate.id)
+        if (index !== -1) {
+          teams.value[index] = JSON.parse(JSON.stringify(teamToUpdate))
+        }
+      } else {
+        const newTeam = await createTeam(dialogData.value)
+        teams.value.push(newTeam)
       }
-      break
-
-    case 'contests':
-      loadingContests.value = true
-      try {
-        contests.value = await fetchContests() || []
-      } catch (error) {
-        contests.value = []
-        console.error(error.message)
-      } finally {
-        loadingContests.value = false
-      }
-      break
+      closeDialog()
+    } catch (error) {
+      console.error('Ошибка при сохранении:', error.message)
+    }
   }
 }
 
-// Начальная загрузка
-onMounted(() => loadData(tab.value))
 
-// Загрузка при смене вкладки
+async function loadData(name) {
+  if (name === 'teams') {
+    loadingTeams.value = true
+    try {
+      teams.value = await fetchTeams() || []
+    } catch (error) {
+      teams.value = []
+      console.error(error.message)
+    } finally {
+      loadingTeams.value = false
+    }
+  }
+  console.log('teams loaded:', teams.value)
+}
+
+async function deleteTeam() {
+  if (!dialogData.value.id) return
+  try {
+    await deleteTeamById(dialogData.value.id)
+    teams.value = teams.value.filter(t => t.id !== dialogData.value.id)
+    closeDialog()
+  } catch (error) {
+    console.error('Ошибка при удалении команды:', error.message)
+  }
+}
+
+function createTeamHandler() {
+  dialogType.value = 'teams'
+  dialogData.value = {
+    title: '',
+    description: '',
+    logo: '',
+    git_url: ''
+  }
+  dialogVisible.value = true
+}
+
+onMounted(() => {
+  loadData(tab.value)
+
+  const interval = setInterval(() => {
+    loadData(tab.value)
+  }, 5000)
+
+  onBeforeUnmount(() => {
+    clearInterval(interval)
+  })
+})
+
 watch(tab, (newTab) => {
   loadData(newTab)
 })