Merge branch 'main' into loading

This commit is contained in:
dyhj625 2025-03-07 13:13:04 +09:00
parent b222e606c2
commit 39dd213949
3 changed files with 3 additions and 21 deletions

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="container-xxl flex-grow-1 container-p-y"> <div class="container-xxl flex-grow-1 container-p-y">
<LoadingSpinner v-if="isLoading" /> <div class="row">
<div v-else class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<!-- 프로필 헤더 --> <!-- 프로필 헤더 -->
@ -132,8 +131,6 @@
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useUserInfoStore } from '@/stores/useUserInfoStore'; import { useUserInfoStore } from '@/stores/useUserInfoStore';
import axios from '@api'; import axios from '@api';
import LoadingSpinner from "@v/LoadingPage.vue";
const isLoading = ref(true);
// //
const profileName = ref(''); const profileName = ref('');
const boardTitle = ref('제목 없음'); const boardTitle = ref('제목 없음');
@ -227,7 +224,6 @@
// //
const fetchBoardDetails = async () => { const fetchBoardDetails = async () => {
try { try {
isLoading.value = true;
const response = await axios.get(`board/${currentBoardId.value}`); const response = await axios.get(`board/${currentBoardId.value}`);
const data = response.data.data; const data = response.data.data;
@ -245,8 +241,6 @@
attachments.value = data.attachments || []; attachments.value = data.attachments || [];
} catch (error) { } catch (error) {
alert('게시물 데이터를 불러오는 중 오류가 발생했습니다.'); alert('게시물 데이터를 불러오는 중 오류가 발생했습니다.');
} finally {
isLoading.value = false;
} }
}; };

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="container-xxl flex-grow-1 container-p-y"> <div class="container-xxl flex-grow-1 container-p-y">
<LoadingSpinner v-if="isLoading" /> <div class="card app-calendar-wrapper">
<div v-else class="card app-calendar-wrapper">
<div class="row g-0"> <div class="row g-0">
<!-- Sidebar: 사이드바 영역 --> <!-- Sidebar: 사이드바 영역 -->
<div class="col-3 app-calendar-sidebar border-end" id="app-calendar-sidebar"> <div class="col-3 app-calendar-sidebar border-end" id="app-calendar-sidebar">
@ -87,9 +86,6 @@ import { useToastStore } from '@s/toastStore';
// //
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import LoadingSpinner from "@v/LoadingPage.vue";
const isLoading = ref(true);
const router = useRouter(); const router = useRouter();
// //
const toastStore = useToastStore(); const toastStore = useToastStore();
@ -268,7 +264,6 @@ const handleProfileClick = async (user) => {
}; };
// //
const fetchUserList = async () => { const fetchUserList = async () => {
isLoading.value = true;
try { try {
await userListStore.fetchUserList(); await userListStore.fetchUserList();
userList.value = userListStore.userList; userList.value = userListStore.userList;
@ -282,8 +277,6 @@ const fetchUserList = async () => {
}); });
} catch (error) { } catch (error) {
console.error("📌 사용자 목록 불러오기 오류:", error); console.error("📌 사용자 목록 불러오기 오류:", error);
} finally{
isLoading.value = false;
} }
}; };
// //

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="container-xxl flex-grow-1 container-p-y"> <div class="container-xxl flex-grow-1 container-p-y">
<LoadingSpinner v-if="isLoading" /> <div class="row g-3">
<div v-else class="row g-3">
<div class="mt-8"> <div class="mt-8">
<!-- 투표 작성 --> <!-- 투표 작성 -->
<WriteBtn @click="voteWrite" /> <WriteBtn @click="voteWrite" />
@ -52,8 +51,6 @@ import Quill from 'quill';
import WriteBtn from '@c/button/WriteBtn.vue'; import WriteBtn from '@c/button/WriteBtn.vue';
import voteList from '@c/voteboard/voteCardList.vue'; import voteList from '@c/voteboard/voteCardList.vue';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import LoadingSpinner from "@v/LoadingPage.vue";
const isLoading = ref(true);
const toastStore = useToastStore(); const toastStore = useToastStore();
const category = ref('0'); const category = ref('0');
@ -81,7 +78,6 @@ const changeCheck = () =>{
} }
// //
const getvoteList = async () => { const getvoteList = async () => {
isLoading.value = true;
const response = await $api.get('vote/getVoteList',{ const response = await $api.get('vote/getVoteList',{
params: params:
{ {
@ -93,7 +89,6 @@ const getvoteList = async () => {
if (response.data.status === "OK") { if (response.data.status === "OK") {
PageData.value = response.data.data; PageData.value = response.data.data;
voteListCardData.value = response.data.data.list; voteListCardData.value = response.data.data.list;
isLoading.value = false;
} }
}; };
const selectHandler = () =>{ const selectHandler = () =>{