From bc90956192f52b89ca131a3ea508ffabaf6861a6 Mon Sep 17 00:00:00 2001 From: quilin Date: Wed, 10 Dec 2025 23:07:21 +0100 Subject: [PATCH 1/2] [DM.Front] Increase line-height to grid size --- frontend/DM.Web.Modern.Temp/src/App.vue | 1 + frontend/DM.Web.Modern.Temp/src/assets/styles/Reset.sass | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/DM.Web.Modern.Temp/src/App.vue b/frontend/DM.Web.Modern.Temp/src/App.vue index 9f37bbef..d97ff5cc 100644 --- a/frontend/DM.Web.Modern.Temp/src/App.vue +++ b/frontend/DM.Web.Modern.Temp/src/App.vue @@ -80,6 +80,7 @@ onMounted(fetchUser); .content-body display: flex + line-height: Variables.$grid-step * 5 padding-bottom: Layout.$footer-height + Variables.$big .content-menu diff --git a/frontend/DM.Web.Modern.Temp/src/assets/styles/Reset.sass b/frontend/DM.Web.Modern.Temp/src/assets/styles/Reset.sass index d646c21c..2a84818f 100644 --- a/frontend/DM.Web.Modern.Temp/src/assets/styles/Reset.sass +++ b/frontend/DM.Web.Modern.Temp/src/assets/styles/Reset.sass @@ -31,7 +31,6 @@ html, body, #app, #application body font-family: "PT Sans", sans-serif font-size: Variables.$font-size - line-height: 1.3 word-wrap: break-word +Themes.theme(color, Themes.$text) From 7a76936c52860b74af2a0ea57c577186980a72c7 Mon Sep 17 00:00:00 2001 From: quilin Date: Thu, 11 Dec 2025 00:38:40 +0100 Subject: [PATCH 2/2] [DM.Polls] Add create poll functionality --- .../src/api/models/index.ts | 8 ++- .../src/components/ui-kit/DmIconButton.vue | 11 ++- .../src/views/pages/forum/CreateTopic.vue | 5 +- .../src/views/pages/polls/CreatePoll.vue | 67 +++++++++++++++++++ .../src/views/pages/polls/PollsPage.vue | 29 +++++++- .../src/views/pages/profile/ProfilePage.vue | 6 +- .../src/views/pages/profile/ProfileStat.vue | 3 - 7 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 frontend/DM.Web.Modern.Temp/src/views/pages/polls/CreatePoll.vue diff --git a/frontend/DM.Web.Modern.Temp/src/api/models/index.ts b/frontend/DM.Web.Modern.Temp/src/api/models/index.ts index 766f65cc..61163b33 100644 --- a/frontend/DM.Web.Modern.Temp/src/api/models/index.ts +++ b/frontend/DM.Web.Modern.Temp/src/api/models/index.ts @@ -11,9 +11,13 @@ type IfEquals = export type Id = Served; export type Post = { - [P in keyof T as IfEquals, never, P>]: T[P]; + [P in keyof T as IfEquals, never, P>]: T[P] extends Array< + infer U + > + ? Array> + : T[P]; }; export type Patch = { - [P in keyof T as IfEquals, never, P>]?: T[P]; + [P in keyof T as IfEquals, never, P>]?: Patch; }; diff --git a/frontend/DM.Web.Modern.Temp/src/components/ui-kit/DmIconButton.vue b/frontend/DM.Web.Modern.Temp/src/components/ui-kit/DmIconButton.vue index 94a0a48c..129e843a 100644 --- a/frontend/DM.Web.Modern.Temp/src/components/ui-kit/DmIconButton.vue +++ b/frontend/DM.Web.Modern.Temp/src/components/ui-kit/DmIconButton.vue @@ -1,11 +1,18 @@ diff --git a/frontend/DM.Web.Modern.Temp/src/views/pages/forum/CreateTopic.vue b/frontend/DM.Web.Modern.Temp/src/views/pages/forum/CreateTopic.vue index 6df9e53f..89ea3174 100644 --- a/frontend/DM.Web.Modern.Temp/src/views/pages/forum/CreateTopic.vue +++ b/frontend/DM.Web.Modern.Temp/src/views/pages/forum/CreateTopic.vue @@ -4,7 +4,6 @@ import { useForumStore } from "@/stores"; import type { Topic } from "@/api/models/forum"; import type { Post } from "@/api/models"; -import DmDialog from "@/components/ui-kit/DmDialog.vue"; const { createTopic, selectedForum } = useForumStore(); @@ -36,14 +35,14 @@ const tryCreateTopic = async () => { diff --git a/frontend/DM.Web.Modern.Temp/src/views/pages/polls/CreatePoll.vue b/frontend/DM.Web.Modern.Temp/src/views/pages/polls/CreatePoll.vue new file mode 100644 index 00000000..4a83ab6a --- /dev/null +++ b/frontend/DM.Web.Modern.Temp/src/views/pages/polls/CreatePoll.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/frontend/DM.Web.Modern.Temp/src/views/pages/polls/PollsPage.vue b/frontend/DM.Web.Modern.Temp/src/views/pages/polls/PollsPage.vue index 4777c12b..8fdeef93 100644 --- a/frontend/DM.Web.Modern.Temp/src/views/pages/polls/PollsPage.vue +++ b/frontend/DM.Web.Modern.Temp/src/views/pages/polls/PollsPage.vue @@ -1,12 +1,19 @@ diff --git a/frontend/DM.Web.Modern.Temp/src/views/pages/profile/ProfilePage.vue b/frontend/DM.Web.Modern.Temp/src/views/pages/profile/ProfilePage.vue index 1d4f5bcb..e84d12d5 100644 --- a/frontend/DM.Web.Modern.Temp/src/views/pages/profile/ProfilePage.vue +++ b/frontend/DM.Web.Modern.Temp/src/views/pages/profile/ProfilePage.vue @@ -9,6 +9,7 @@ import { useUserStore } from "@/stores"; import { useFetchData } from "@/composables/useFetchData"; import DmPictureUpload from "@/components/ui-kit/DmPictureUpload.vue"; import communityApi from "@/api/requests/communityApi"; +import SecondaryText from "@/components/layout/SecondaryText.vue"; const route = useRoute(); const { user: currentUser } = storeToRefs(useUserStore()); @@ -76,7 +77,10 @@ const uploadPicture = async (data: FormData) => { /> -
В сети:
+
+ В сети  + +