archibald/business-card-site
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

сделал проекты

Browse Source
This commit is contained in:
Мельников Данил 2025-05-31 12:23:44 +05:00
parent ac42a8da7f
commit 5b1e74876d
11 changed files with 332 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
WEB/src/api/projects/createProject.js Normal file
View File

@ -0,0 +1,23 @@
import axios from 'axios'
import CONFIG from '@/core/config.js'
const createProject = async (project) => {
try {
const token = localStorage.getItem('access_token') // или другой способ получения токена
const response = await axios.post(
`${CONFIG.BASE_URL}/projects`,
project,
{
withCredentials: true,
headers: {
Authorization: `Bearer ${token}`
}
}
)
return response.data
} catch (error) {
throw new Error(error.response?.data?.detail || error.message)
}
}
export default createProject

22
WEB/src/api/projects/deleteProject.js Normal file
View File

@ -0,0 +1,22 @@
import axios from 'axios'
import CONFIG from '@/core/config.js'
const deleteProject = async (projectId) => {
try {
const token = localStorage.getItem('access_token') // получение токена
const response = await axios.delete(
`${CONFIG.BASE_URL}/projects/${projectId}`,
{
withCredentials: true,
headers: {
Authorization: `Bearer ${token}`
}
}
)
return response.data
} catch (error) {
throw new Error(error.response?.data?.detail || error.message)
}
}
export default deleteProject

8
WEB/src/api/projects/getProjects.js
View File

@ -3,13 +3,19 @@ import CONFIG from "@/core/config.js";
const fetchProjects = async () => {
try {
const token = localStorage.getItem("access_token");
const response = await axios.get(`${CONFIG.BASE_URL}/projects`, {
withCredentials: true,
headers: {
Authorization: `Bearer ${token}`,
},
});
return response.data;
} catch (error) {
if (error.response?.status === 401) {
throw new Error("Нет доступа к проектам (401)");
} else if (error.response?.status === 403) {
throw new Error("Доступ запрещён (403)");
}
throw new Error(error.message);
}

31
WEB/src/api/projects/updateProject.js Normal file
View File

@ -0,0 +1,31 @@
import axios from 'axios'
import CONFIG from '@/core/config.js'
const updateProject = async (project) => {
try {
const token = localStorage.getItem('access_token')
// Убираем id из тела запроса, он идет в URL
const { id, ...projectData } = project
console.log('Отправляем на сервер:', projectData)
const response = await axios.put(
`${CONFIG.BASE_URL}/projects/${id}`,
projectData,
{
withCredentials: true,
headers: {
Authorization: `Bearer ${token}`
}
}
)
console.log('Ответ от сервера:', response.data)
return response.data
} catch (error) {
throw new Error(error.response?.data?.detail || error.message)
}
}
export default updateProject

8
WEB/src/api/teams/deleteTeam.js
View File

@ -3,9 +3,15 @@ import CONFIG from '@/core/config.js'
const deleteTeam = async (teamId) => {
try {
const token = localStorage.getItem('access_token') // получение токена
const response = await axios.delete(
`${CONFIG.BASE_URL}/teams/${teamId}`,
{ withCredentials: true }
{
withCredentials: true,
headers: {
Authorization: `Bearer ${token}`
}
}
)
return response.data
} catch (error) {

26
WEB/src/components/SharedDialogWrapper.vue Normal file
View File

@ -0,0 +1,26 @@
<template>
<q-dialog v-model="visible" persistent>
<q-card style="min-width: 350px; max-width: 700px;">
<q-card-section>
<div class="text-h6">{{ title }}</div>
</q-card-section>
<q-separator />
<q-card-section>
<slot />
</q-card-section>
<q-card-actions align="right">
<slot name="actions" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script setup>
defineProps({
visible: Boolean,
title: String
})
</script>

37
WEB/src/components/dialogs/ContestDialog.vue Normal file
View File

@ -0,0 +1,37 @@
<template>
<SharedDialogWrapper :visible="visible" title="Редактирование конкурса">
<q-input v-model="data.title" label="Название конкурса" dense autofocus clearable />
<q-input v-model="data.description" label="Описание" dense clearable type="textarea" class="q-mt-sm" />
<q-input v-model="data.start_date" label="Дата начала" type="date" dense clearable class="q-mt-sm" />
<q-input v-model="data.end_date" label="Дата окончания" type="date" dense clearable class="q-mt-sm" />
<template #actions>
<q-btn flat label="Удалить" color="negative" @click="onDelete" v-if="showDelete" />
<q-space />
<q-btn flat label="Закрыть" color="primary" @click="onClose" />
<q-btn flat label="Сохранить" color="primary" @click="onSave" />
</template>
</SharedDialogWrapper>
</template>
<script setup>
import SharedDialogWrapper from './SharedDialogWrapper.vue'
defineProps({
visible: Boolean,
data: Object,
showDelete: Boolean
})
const emit = defineEmits(['save', 'close', 'delete'])
function onSave() {
emit('save')
}
function onClose() {
emit('close')
}
function onDelete() {
emit('delete')
}
</script>

36
WEB/src/components/dialogs/ProjectDialog.vue Normal file
View File

@ -0,0 +1,36 @@
<template>
<SharedDialogWrapper :visible="visible" title="Редактирование проекта">
<q-input v-model="data.title" label="Название проекта" dense autofocus clearable />
<q-input v-model="data.description" label="Описание" dense clearable type="textarea" class="q-mt-sm" />
<q-input v-model="data.repo_url" label="URL репозитория" dense clearable class="q-mt-sm" />
<template #actions>
<q-btn flat label="Удалить" color="negative" @click="onDelete" v-if="showDelete" />
<q-space />
<q-btn flat label="Закрыть" color="primary" @click="onClose" />
<q-btn flat label="Сохранить" color="primary" @click="onSave" />
</template>
</SharedDialogWrapper>
</template>
<script setup>
import SharedDialogWrapper from './SharedDialogWrapper.vue'
defineProps({
visible: Boolean,
data: Object,
showDelete: Boolean
})
const emit = defineEmits(['save', 'close', 'delete'])
function onSave() {
emit('save')
}
function onClose() {
emit('close')
}
function onDelete() {
emit('delete')
}
</script>

37
WEB/src/components/dialogs/TeamDialog.vue Normal file
View File

@ -0,0 +1,37 @@
<template>
<SharedDialogWrapper :visible="visible" title="Редактирование команды">
<q-input v-model="data.title" label="Название команды" dense autofocus clearable />
<q-input v-model="data.description" label="Описание" dense clearable type="textarea" class="q-mt-sm" />
<q-input v-model="data.logo" label="Логотип" dense clearable class="q-mt-sm" />
<q-input v-model="data.git_url" label="Git URL" dense clearable class="q-mt-sm" />
<template #actions>
<q-btn flat label="Удалить" color="negative" @click="onDelete" v-if="showDelete" />
<q-space />
<q-btn flat label="Закрыть" color="primary" @click="onClose" />
<q-btn flat label="Сохранить" color="primary" @click="onSave" />
</template>
</SharedDialogWrapper>
</template>
<script setup>
import SharedDialogWrapper from './SharedDialogWrapper.vue'
defineProps({
visible: Boolean,
data: Object,
showDelete: Boolean
})
const emit = defineEmits(['save', 'close', 'delete'])
function onSave() {
emit('save')
}
function onClose() {
emit('close')
}
function onDelete() {
emit('delete')
}
</script>

36
WEB/src/components/dialogs/UserDialog.vue Normal file
View File

@ -0,0 +1,36 @@
<template>
<SharedDialogWrapper :visible="visible" title="Редактирование пользователя">
<q-input v-model="data.login" label="Логин" dense autofocus clearable />
<q-input v-model="data.name" label="Имя" dense clearable class="q-mt-sm" />
<q-input v-model="data.email" label="Email" dense clearable class="q-mt-sm" />
<template #actions>
<q-btn flat label="Удалить" color="negative" @click="onDelete" v-if="showDelete" />
<q-space />
<q-btn flat label="Закрыть" color="primary" @click="onClose" />
<q-btn flat label="Сохранить" color="primary" @click="onSave" />
</template>
</SharedDialogWrapper>
</template>
<script setup>
import SharedDialogWrapper from '@/components/dialogs/SharedDialogWrapper.vue'
defineProps({
visible: Boolean,
data: Object,
showDelete: Boolean
})
const emit = defineEmits(['save', 'close', 'delete'])
function onSave() {
emit('save')
}
function onClose() {
emit('close')
}
function onDelete() {
emit('delete')
}
</script>

108
WEB/src/pages/AdminPage.vue
View File

@ -45,7 +45,7 @@
<q-btn
label="Создание команды"
color="primary"
@click="createTeamHandler"
@click="createHandler"
/>
</div>
@ -169,7 +169,7 @@
flat
label="Удалить"
color="negative"
@click="deleteTeam"
@click="deleteItem"
/>
<q-btn
v-if="dialogType === 'users'"
@ -216,16 +216,17 @@ import updateTeam from '@/api/teams/updateTeam.js'
import deleteTeamById from '@/api/teams/deleteTeam.js'
import createTeam from '@/api/teams/createTeam.js'
import fetchProjects from '@/api/projects/getProjects.js'
import updateProject from '@/api/projects/updateProject.js'
import deleteProjectById from '@/api/projects/deleteProject.js'
import createProject from '@/api/projects/createProject.js'
// Текущая вкладка — 'teams' или 'projects'
const tab = ref('teams')
// --- Teams ---
const teams = ref([])
const loadingTeams = ref(false)
const dialogVisible = ref(false)
const dialogData = ref({})
const dialogType = ref('')
const teamColumns = [
{ name: 'title', label: 'Название команды', field: 'title', sortable: true },
{ name: 'description', label: 'Описание', field: 'description', sortable: true },
@ -233,20 +234,37 @@ const teamColumns = [
{ name: 'git_url', label: 'Git URL', field: 'git_url', sortable: true },
]
// --- Projects ---
const projects = ref([])
const loadingProjects = ref(false)
const projectColumns = [
{ name: 'name', label: 'Название проекта', field: 'name', sortable: true },
{ name: 'summary', label: 'Описание', field: 'summary', sortable: true },
{ name: 'deadline', label: 'Дедлайн', field: 'deadline', sortable: true },
// добавьте нужные поля
]
// Общие состояния для диалогов
const dialogVisible = ref(false)
const dialogData = ref({})
const dialogType = ref('') // 'teams' или 'projects'
function openEdit(type, row) {
console.log('openEdit called with row:', row)
dialogType.value = type
// Проверка на null или undefined
if (row) {
dialogData.value = JSON.parse(JSON.stringify(row))
dialogVisible.value = true
} else {
if (type === 'teams') {
dialogData.value = { title: '', description: '', logo: '', git_url: '' }
} else if (type === 'projects') {
dialogData.value = { name: '', summary: '', deadline: '' }
}
}
dialogVisible.value = true
}
function onRowClick(event, row) {
console.log('event:', event)
console.log('row:', row)
openEdit('teams', row)
openEdit(tab.value, row)
}
function closeDialog() {
@ -254,36 +272,31 @@ function closeDialog() {
}
async function saveChanges() {
if (dialogType.value === 'teams') {
try {
if (dialogType.value === 'teams') {
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
}
console.log('Отправляем на сервер:', teamToUpdate)
await updateTeam(teamToUpdate)
const index = teams.value.findIndex(t => t.id === teamToUpdate.id)
if (index !== -1) {
teams.value[index] = JSON.parse(JSON.stringify(teamToUpdate))
}
await updateTeam(dialogData.value)
const idx = teams.value.findIndex(t => t.id === dialogData.value.id)
if (idx !== -1) teams.value[idx] = JSON.parse(JSON.stringify(dialogData.value))
} else {
const newTeam = await createTeam(dialogData.value)
teams.value.push(newTeam)
}
} else if (dialogType.value === 'projects') {
if (dialogData.value.id) {
await updateProject(dialogData.value)
const idx = projects.value.findIndex(p => p.id === dialogData.value.id)
if (idx !== -1) projects.value[idx] = JSON.parse(JSON.stringify(dialogData.value))
} else {
const newProject = await createProject(dialogData.value)
projects.value.push(newProject)
}
}
closeDialog()
} catch (error) {
console.error('Ошибка при сохранении:', error.message)
}
}
}
async function loadData(name) {
if (name === 'teams') {
@ -296,30 +309,37 @@ async function loadData(name) {
} finally {
loadingTeams.value = false
}
} else if (name === 'projects') {
loadingProjects.value = true
try {
projects.value = await fetchProjects() || []
} catch (error) {
projects.value = []
console.error(error.message)
} finally {
loadingProjects.value = false
}
}
console.log('teams loaded:', teams.value)
}
async function deleteTeam() {
async function deleteItem() {
if (!dialogData.value.id) return
try {
if (dialogType.value === 'teams') {
await deleteTeamById(dialogData.value.id)
teams.value = teams.value.filter(t => t.id !== dialogData.value.id)
} else if (dialogType.value === 'projects') {
await deleteProjectById(dialogData.value.id)
projects.value = projects.value.filter(p => p.id !== dialogData.value.id)
}
closeDialog()
} catch (error) {
console.error('Ошибка при удалении команды:', error.message)
console.error('Ошибка при удалении:', error.message)
}
}
function createTeamHandler() {
dialogType.value = 'teams'
dialogData.value = {
title: '',
description: '',
logo: '',
git_url: ''
}
dialogVisible.value = true
function createHandler() {
openEdit(tab.value, null)
}
onMounted(() => {