From 169a042075c66520a64c86f7a787549caf8a075a Mon Sep 17 00:00:00 2001
From: mfnefd <danilabal1119@gmail.com>
Date: Sun, 8 Dec 2024 23:50:09 +0400
Subject: [PATCH] =?UTF-8?q?fix:=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=86=D1=8B=20=D0=B8=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=8B=D0=B3=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B4=D1=8F=D1=82=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/App.vue                             | 15 ++++---
 front/src/components/pages/Groups.vue         | 39 ++++++++++---------
 front/src/components/pages/Home.vue           | 37 ++++++++++--------
 front/src/components/pages/Plans.vue          | 34 ++++++++--------
 .../support/ChangeRecordManager.vue           | 11 ++++--
 front/src/components/support/PlanManager.vue  |  9 +++--
 .../support/SpendingGroupManager.vue          |  8 +++-
 7 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/front/src/App.vue b/front/src/App.vue
index 5e62ec2..aa38b70 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -6,16 +6,21 @@ import Header from './components/main/Header.vue';
     <a-layout class="layout">
         <Header />
         <a-layout-content>
-            <a-flex gap="middle" vertical>
-                <RouterView />
-            </a-flex>            
+            <RouterView />
         </a-layout-content>
     </a-layout>
 </template>
 
 <style scoped>
 main {
-    padding: 36px;
-    margin: 14px;
+    display: flex;
+    justify-content: center;
+    padding: 5vh;
+}
+
+.base-page {
+    display: flex;
+    flex-direction: column;
+    min-width: 80dvw;
 }
 </style>
\ No newline at end of file
diff --git a/front/src/components/pages/Groups.vue b/front/src/components/pages/Groups.vue
index b544b72..8781ced 100644
--- a/front/src/components/pages/Groups.vue
+++ b/front/src/components/pages/Groups.vue
@@ -42,25 +42,28 @@ const onDelete = (key: string) => {
 </script>
 
 <template>
-    <SpendingGroupManager :refreshData="refreshData" />
-    <a-table :dataSource="state" :columns="columns" v-if="isReady">
-        <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'plans'">
-                <RouterLink :to="{ name: 'plans', params: { groupId: record.id } }" >Планы</RouterLink>
+    <div class="base-page">
+        <h1>Группы расходов</h1>
+        <SpendingGroupManager :refreshData="refreshData" />
+        <a-table :dataSource="state" :columns="columns" v-if="isReady">
+            <template #bodyCell="{ column, record }">
+                <template v-if="column.key === 'plans'">
+                    <RouterLink :to="{ name: 'plans', params: { groupId: record.id } }" >Планы</RouterLink>
+                </template>
+                <template v-else-if="column.dataIndex === 'operation'">
+                    <a-popconfirm
+                        v-if="state?.length"
+                        title="Точно удалить?"
+                        @confirm="onDelete(record.id)"
+                    >
+                        <a><DeleteOutlined /> Удалить</a>
+                    </a-popconfirm>
+                </template>
             </template>
-            <template v-else-if="column.dataIndex === 'operation'">
-                <a-popconfirm
-                    v-if="state?.length"
-                    title="Точно удалить?"
-                    @confirm="onDelete(record.id)"
-                >
-                    <a><DeleteOutlined /> Удалить</a>
-                </a-popconfirm>
-            </template>
-        </template>
-    </a-table>
-    <div v-else>
-        <a-spin size="large" />
+        </a-table>
+        <div v-else>
+            <a-spin size="large" />
+        </div>
     </div>
 </template>
 
diff --git a/front/src/components/pages/Home.vue b/front/src/components/pages/Home.vue
index 68045db..0285db5 100644
--- a/front/src/components/pages/Home.vue
+++ b/front/src/components/pages/Home.vue
@@ -47,25 +47,30 @@ const onDelete = (key: string) => {
 </script>
 
 <template>
-    <ChangeRecordMenu :refreshData="refreshData" />
-    <a-table :dataSource="state" :columns="columns" v-if="isReady" >
-        <template #bodyCell="{ column, record }">
-            <template v-if="column.dataIndex === 'operation'">
-                <a-popconfirm
-                    v-if="state?.length"
-                    title="Точно удалить?"
-                    @confirm="onDelete(record.id)"
-                >
-                    <a><DeleteOutlined /> Удалить</a>
-                </a-popconfirm>
+    <div class="base-page">
+        <h1>История изменений баланса</h1>
+        <ChangeRecordMenu :refreshData="refreshData" />
+        <a-table :dataSource="state" :columns="columns" v-if="isReady" >
+            <template #bodyCell="{ column, record }">
+                <template v-if="column.dataIndex === 'operation'">
+                    <a-popconfirm
+                        v-if="state?.length"
+                        title="Точно удалить?"
+                        @confirm="onDelete(record.id)"
+                    >
+                        <a><DeleteOutlined /> Удалить</a>
+                    </a-popconfirm>
+                </template>
             </template>
-        </template>
-    </a-table>
-    <div v-else>
-        <a-spin size="large" />
+        </a-table>
+        <div v-else>
+            <a-spin size="large" />
+        </div>
     </div>
 </template>
 
 <style scoped>
-
+.layout {
+    
+}
 </style>
\ No newline at end of file
diff --git a/front/src/components/pages/Plans.vue b/front/src/components/pages/Plans.vue
index e7e4226..bcdfeb9 100644
--- a/front/src/components/pages/Plans.vue
+++ b/front/src/components/pages/Plans.vue
@@ -52,23 +52,25 @@ const onDelete = (key: string) => {
 </script>
 
 <template>
-    <h1>Планы группы </h1>
-    <PlanManager :groupId="groupId" :refreshData="refreshData"/>
-    <a-table :dataSource="state" :columns="columns" v-if="isReady">
-        <template #bodyCell="{ column, record }">
-            <template v-if="column.dataIndex === 'operation'">
-                <a-popconfirm
-                    v-if="state?.length"
-                    title="Точно удалить?"
-                    @confirm="onDelete(record.id)"
-                >
-                    <a><DeleteOutlined /> Удалить</a>
-                </a-popconfirm>
+    <div class="base-page">
+        <h1>Планы группы</h1>
+        <PlanManager :groupId="groupId" :refreshData="refreshData"/>
+        <a-table :dataSource="state" :columns="columns" v-if="isReady">
+            <template #bodyCell="{ column, record }">
+                <template v-if="column.dataIndex === 'operation'">
+                    <a-popconfirm
+                        v-if="state?.length"
+                        title="Точно удалить?"
+                        @confirm="onDelete(record.id)"
+                    >
+                        <a><DeleteOutlined /> Удалить</a>
+                    </a-popconfirm>
+                </template>
             </template>
-        </template>
-    </a-table>
-    <div v-else>
-        <a-spin size="large" />
+        </a-table>
+        <div v-else>
+            <a-spin size="large" />
+        </div>
     </div>
 </template>
 
diff --git a/front/src/components/support/ChangeRecordManager.vue b/front/src/components/support/ChangeRecordManager.vue
index 8041ed9..fd7f4f7 100644
--- a/front/src/components/support/ChangeRecordManager.vue
+++ b/front/src/components/support/ChangeRecordManager.vue
@@ -20,6 +20,7 @@
                 label="Группа расходов"
                 name="spendingGroupId"
                 v-if="isReady"
+                :rules="[{ required: true, message: 'Пожалуйста, выберите группу расходов' }]"
             >
             
                 <a-select v-model:value="formState.spendingGroupId" :disabled="disabled">
@@ -35,12 +36,13 @@
             <a-form-item 
                 name="changedAt"
                 label="Дата"
+                :rules="[{ required: true, message: 'Пожалуйста, выберите дату' }]"
             >
                 <a-date-picker v-model:value="pickedChangedAt" />
             </a-form-item>
             
             <a-form-item>
-                <a-button html-type="submit" type="primary">Сохранить</a-button>
+                <a-button html-type="submit" :disabled="disabledForm" type="primary">Сохранить</a-button>
             </a-form-item>
         </a-form>
     </a-space>
@@ -49,7 +51,6 @@
 import { computed, inject, reactive, ref } from 'vue';
 import { ChangeRecordDto, SpendingGroupViewModel } from '../../core/api/data-contracts';
 import { useUserStore } from '../../store';
-import router from '../../router';
 import { ChangeRecordService } from '../../core/services/change-record-service';
 import { GroupService } from '../../core/services/group-service';
 import { useAsyncState } from '@vueuse/core';
@@ -70,7 +71,7 @@ const { state: groupList, isReady } = useAsyncState(() => groupService.getList()
 const pickedChangedAt = ref<Dayjs>();
 const formState = reactive<ChangeRecordDto>({
     userId: store.user.id,
-    sum: 0,
+    sum: -1,
     changedAt: new Date().toISOString(),
     spendingGroupId: null
 });
@@ -88,5 +89,7 @@ const onFinishFailed = (errorInfo: any) => {
 const disabled = computed(() => {
     return formState.sum && formState.sum >= 0;
 });
-
+const disabledForm = computed(() => {
+    return !(formState.sum && formState.changedAt && (formState.spendingGroupId || formState.sum > 0));
+})
 </script>
diff --git a/front/src/components/support/PlanManager.vue b/front/src/components/support/PlanManager.vue
index 2efe8cc..40578b9 100644
--- a/front/src/components/support/PlanManager.vue
+++ b/front/src/components/support/PlanManager.vue
@@ -33,15 +33,14 @@
             </a-form-item>
             
             <a-form-item>
-                <a-button html-type="submit" type="primary">Добавить</a-button>
+                <a-button :disabled="disabledForm" html-type="submit" type="primary">Добавить</a-button>
             </a-form-item>
         </a-form>
     </a-space>
 </template>
 <script setup lang="ts">
-import { inject, reactive, ref } from 'vue';
+import { computed, inject, reactive, ref } from 'vue';
 import {  SpendingPlanDto } from '../../core/api/data-contracts';
-import { ChangeRecordService } from '../../core/services/change-record-service';
 import { Dayjs } from 'dayjs';
 import { PlanService } from '../../core/services/plans-service';
 
@@ -74,4 +73,8 @@ const onFinish = async (values: any) => {
 const onFinishFailed = (errorInfo: any) => {
     console.log('Failed:', errorInfo);
 };
+
+const disabledForm = computed(() => {
+    return !(formState.sum && formState.startAt && formState.endAt);
+});
 </script>
diff --git a/front/src/components/support/SpendingGroupManager.vue b/front/src/components/support/SpendingGroupManager.vue
index 28a760a..c77aaff 100644
--- a/front/src/components/support/SpendingGroupManager.vue
+++ b/front/src/components/support/SpendingGroupManager.vue
@@ -15,13 +15,13 @@
                 <a-input v-model:value="formState.name" />
             </a-form-item>
             <a-form-item>
-                <a-button html-type="submit" type="primary">Сохранить</a-button>
+                <a-button :disabled="disabledForm" html-type="submit" type="primary">Сохранить</a-button>
             </a-form-item>
         </a-form>
     </a-space>
 </template>
 <script setup lang="ts">
-import { inject, reactive } from 'vue';
+import { computed, inject, reactive } from 'vue';
 import { useUserStore } from '../../store';
 import { GroupService } from '../../core/services/group-service';
 import { SpendingGroupDto } from '../../core/api/data-contracts';
@@ -50,4 +50,8 @@ const onFinish = async (values: any) => {
 const onFinishFailed = (errorInfo: any) => {
     console.log('Failed:', errorInfo);
 };
+
+const disabledForm = computed(() => {
+    return !formState.name;
+});
 </script>
\ No newline at end of file