From 16e912e85f46fc3db67090eebf2930f05846e62f Mon Sep 17 00:00:00 2001 From: Serhii Pylypchuk Date: Tue, 25 Mar 2025 11:24:22 +0400 Subject: [PATCH 1/5] [dev] refactoring --- src/App.vue | 22 +- src/components/Content/Content.vue | 9 +- .../Content/LeftPanel/Accordion.vue | 84 - .../Content/LeftPanel/Calendars.vue | 57 +- src/components/Content/LeftPanel/Chart.vue | 60 + src/components/Content/LeftPanel/Grid.vue | 53 +- .../Content/LeftPanel/LeftContent.vue | 36 +- src/components/Content/LeftPanel/Ribbon.vue | 28 +- .../Content/LeftPanel/SlidersLayout.vue | 59 +- .../Content/LeftPanel/TicketsDataview.vue | 65 +- src/components/Content/LeftPanel/Tree.vue | 27 +- .../Content/RightPanel/ButtonsForm.vue | 43 +- src/components/Content/RightPanel/Chart.vue | 24 +- .../Content/RightPanel/Colorpicker.vue | 31 +- src/components/Content/RightPanel/Form.vue | 163 +- .../Content/RightPanel/MessageDataview.vue | 58 +- .../Content/RightPanel/RightContent.vue | 24 +- .../{ => MainContainer}/MainContainer.vue | 22 +- src/components/{ => MainContainer}/Tabbar.vue | 31 +- .../{ => MainContainer}/Toolbar.vue | 36 +- src/components/{ => Sidebar}/Sidebar.vue | 33 +- src/data.js | 1457 +++++++++++++++++ src/store.js | 1429 ---------------- 23 files changed, 1845 insertions(+), 2006 deletions(-) delete mode 100644 src/components/Content/LeftPanel/Accordion.vue create mode 100644 src/components/Content/LeftPanel/Chart.vue rename src/components/{ => MainContainer}/MainContainer.vue (85%) rename src/components/{ => MainContainer}/Tabbar.vue (56%) rename src/components/{ => MainContainer}/Toolbar.vue (71%) rename src/components/{ => Sidebar}/Sidebar.vue (56%) create mode 100644 src/data.js delete mode 100644 src/store.js diff --git a/src/App.vue b/src/App.vue index e09a79d..7a964e5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,23 +1,23 @@ - - + + - \ No newline at end of file + diff --git a/src/components/Content/LeftPanel/Accordion.vue b/src/components/Content/LeftPanel/Accordion.vue deleted file mode 100644 index f73f882..0000000 --- a/src/components/Content/LeftPanel/Accordion.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/Content/LeftPanel/Calendars.vue b/src/components/Content/LeftPanel/Calendars.vue index 6a12dea..98cf41a 100644 --- a/src/components/Content/LeftPanel/Calendars.vue +++ b/src/components/Content/LeftPanel/Calendars.vue @@ -1,56 +1,43 @@ - - + + \ No newline at end of file + diff --git a/src/components/Content/LeftPanel/Ribbon.vue b/src/components/Content/LeftPanel/Ribbon.vue index aed43bb..0246c59 100644 --- a/src/components/Content/LeftPanel/Ribbon.vue +++ b/src/components/Content/LeftPanel/Ribbon.vue @@ -1,33 +1,33 @@ - - + + \ No newline at end of file + diff --git a/src/components/Content/LeftPanel/SlidersLayout.vue b/src/components/Content/LeftPanel/SlidersLayout.vue index 49a28e7..e21b02c 100644 --- a/src/components/Content/LeftPanel/SlidersLayout.vue +++ b/src/components/Content/LeftPanel/SlidersLayout.vue @@ -1,29 +1,15 @@ - - \ No newline at end of file + + + diff --git a/src/components/Content/LeftPanel/TicketsDataview.vue b/src/components/Content/LeftPanel/TicketsDataview.vue index 2f09891..0856fea 100644 --- a/src/components/Content/LeftPanel/TicketsDataview.vue +++ b/src/components/Content/LeftPanel/TicketsDataview.vue @@ -1,59 +1,60 @@ - - + + \ No newline at end of file + diff --git a/src/components/Content/RightPanel/Form.vue b/src/components/Content/RightPanel/Form.vue index c98bba4..d4817ba 100644 --- a/src/components/Content/RightPanel/Form.vue +++ b/src/components/Content/RightPanel/Form.vue @@ -1,139 +1,15 @@ - - + + diff --git a/src/components/Content/RightPanel/MessageDataview.vue b/src/components/Content/RightPanel/MessageDataview.vue index 035ae63..a8845cd 100644 --- a/src/components/Content/RightPanel/MessageDataview.vue +++ b/src/components/Content/RightPanel/MessageDataview.vue @@ -1,51 +1,51 @@ - - + + \ No newline at end of file + diff --git a/src/components/Content/RightPanel/RightContent.vue b/src/components/Content/RightPanel/RightContent.vue index 780e921..31f4136 100644 --- a/src/components/Content/RightPanel/RightContent.vue +++ b/src/components/Content/RightPanel/RightContent.vue @@ -1,13 +1,3 @@ - - + + \ No newline at end of file + diff --git a/src/components/Content/RightPanel/ButtonsForm.vue b/src/components/Content/RightPanel/ButtonsForm.vue index 8de6cb0..789e711 100644 --- a/src/components/Content/RightPanel/ButtonsForm.vue +++ b/src/components/Content/RightPanel/ButtonsForm.vue @@ -19,7 +19,7 @@ export default { color: "primary", icon: "dxi dxi-plus", full: true, - size: "small", + size: "small" }, { padding: 5, @@ -29,7 +29,7 @@ export default { color: "primary", full: true, view: "link", - size: "small", + size: "small" }, { padding: 5, @@ -39,7 +39,7 @@ export default { color: "primary", full: true, disabled: true, - size: "small", + size: "small" } ] }, @@ -54,7 +54,7 @@ export default { color: "secondary", icon: "dxi dxi-plus", full: true, - size: "small", + size: "small" }, { padding: 5, @@ -64,7 +64,7 @@ export default { color: "secondary", full: true, size: "small", - view: "link", + view: "link" }, { padding: 5, @@ -74,7 +74,7 @@ export default { color: "secondary", full: true, size: "small", - disabled: true, + disabled: true } ] }, @@ -89,7 +89,7 @@ export default { color: "danger", icon: "dxi dxi-plus", full: true, - size: "small", + size: "small" }, { padding: 5, @@ -99,7 +99,7 @@ export default { color: "danger", full: true, size: "small", - view: "link", + view: "link" }, { padding: 5, @@ -109,7 +109,7 @@ export default { color: "danger", full: true, size: "small", - disabled: true, + disabled: true } ] }, @@ -124,7 +124,7 @@ export default { color: "success", icon: "dxi dxi-plus", full: true, - size: "small", + size: "small" }, { padding: 5, @@ -134,7 +134,7 @@ export default { color: "success", full: true, size: "small", - view: "link", + view: "link" }, { padding: 5, @@ -144,7 +144,7 @@ export default { color: "success", full: true, size: "small", - disabled: true, + disabled: true } ] } diff --git a/src/components/Content/RightPanel/Chart.vue b/src/components/Content/RightPanel/Chart.vue index d1b6770..6a9b1bd 100644 --- a/src/components/Content/RightPanel/Chart.vue +++ b/src/components/Content/RightPanel/Chart.vue @@ -7,6 +7,7 @@ export default { const { chartData } = getData(); return { chartData }; }, + mounted() { this.chart = new Chart(this.$refs.chart_container, { data: this.chartData, @@ -19,20 +20,20 @@ export default { opacity: "opacity", text: "month", stroke: "var(--dhx-background-primary)", - strokeWidth: 0, - }, + strokeWidth: 0 + } ], legend: { values: { id: "value", text: "id", - color: "color", + color: "color" }, // monochrome: "#0288D1", align: "right", valign: "middle", - width: 30, - }, + width: 30 + } }); }, diff --git a/src/components/Content/RightPanel/Colorpicker.vue b/src/components/Content/RightPanel/Colorpicker.vue index 7780b7c..1f51906 100644 --- a/src/components/Content/RightPanel/Colorpicker.vue +++ b/src/components/Content/RightPanel/Colorpicker.vue @@ -44,10 +44,11 @@ export default { return { h, s, - l, + l }; } }, + mounted() { this.colorpicker = new Colorpicker(this.$refs.colorpicker_container, { mode: "picker" }); this.colorpicker.setValue("#0288d1"); diff --git a/src/components/Content/RightPanel/Form.vue b/src/components/Content/RightPanel/Form.vue index d4817ba..fa10a01 100644 --- a/src/components/Content/RightPanel/Form.vue +++ b/src/components/Content/RightPanel/Form.vue @@ -21,10 +21,10 @@ export default { type: "input", label: "Name", placeholder: "Type text", - required: true, + required: true }, { - type: "spacer", + type: "spacer" }, { width: "48%", @@ -32,7 +32,7 @@ export default { type: "input", label: "Surname", placeholder: "Type text", - required: true, + required: true } ] }, @@ -43,27 +43,27 @@ export default { placeholder: "Click to select", multiselection: true, value: ["austria", "estonia"], - data: this.country, + data: this.country }, { name: "birth", type: "datepicker", label: "Date of Birth", placeholder: "Type text", - value: new Date(), + value: new Date() }, { name: "career", type: "input", label: "Career objective", placeholder: "Type text", - helpMessage: " Help information", + helpMessage: " Help information" }, { name: "motivation", type: "textarea", label: "Motivation", - placeholder: "Type text here", + placeholder: "Type text here" }, { name: "language", @@ -75,17 +75,17 @@ export default { { type: "radioButton", text: "Elementary", - value: "1", + value: "1" }, { type: "radioButton", text: "Intermediate", - value: "2", + value: "2" }, { type: "radioButton", text: "Advanced", - value: "2", + value: "2" } ] } @@ -94,7 +94,7 @@ export default { name: "backgroundColor", type: "colorpicker", label: "Background color", - placeholder: "Click to change", + placeholder: "Click to change" }, { name: "offices", @@ -102,12 +102,12 @@ export default { label: "Offices", placeholder: "You can select several offices", multiselection: true, - data: this.country, + data: this.country }, { name: "attachDocument", type: "simpleVault", - label: "Attach document", + label: "Attach document" }, { name: "howToContact", @@ -119,22 +119,22 @@ export default { id: "1", type: "checkbox", text: "Phone", - checked: true, + checked: true }, { id: "2", type: "checkbox", - text: "Mail", + text: "Mail" }, { id: "3", type: "checkbox", - text: "Messenger", + text: "Messenger" }, { id: "4", type: "checkbox", - text: "Your option", + text: "Your option" } ] } diff --git a/src/data.js b/src/data.js index efcbd65..4a7f300 100644 --- a/src/data.js +++ b/src/data.js @@ -160,7 +160,6 @@ export function getData() { }, ]; - // Data for grid const gridData = [ { time: new Date("Jan 28, 2021"), @@ -866,7 +865,6 @@ export function getData() { gridData.forEach((item) => (item.totalCost = item.nights * item.price)); - // Data for chart const chartData = [ { id: "Jan", @@ -898,7 +896,6 @@ export function getData() { }, ]; - // Hotels chart data const hotelsData = [ { month: "Jan.", "Won deals": 35, "Lost deals": 14, "All deals": 40 }, { month: "Feb.", "Won deals": 80, "Lost deals": 59, "All deals": 94 }, @@ -909,7 +906,6 @@ export function getData() { { month: "Jul.", "Won deals": 85, "Lost deals": 78, "All deals": 98 }, ]; - // Series chart data const seriesData = [ { id: 'A', @@ -937,7 +933,6 @@ export function getData() { } ]; - // Ribbon data const ribbonData = [ { id: "fileBlock", @@ -1032,7 +1027,6 @@ export function getData() { }, ]; - // Tickets Dataview Data const ticketsDataviewData = [ { title: "Ticket for Technical Support #T742", @@ -1096,7 +1090,6 @@ export function getData() { }, ]; - // Data for tree const treeData = [ { value: "Books", @@ -1454,4 +1447,4 @@ export function getData() { sidebarData, toolbarData }; -} \ No newline at end of file +} From 5b88960ea698ad0b3ae85dd857f701e81e22cde5 Mon Sep 17 00:00:00 2001 From: Sergey Blinov Date: Fri, 11 Apr 2025 16:19:57 +0300 Subject: [PATCH 4/5] styles refactoring --- src/App.vue | 16 +-- src/components/Content/Content.vue | 14 --- .../Content/LeftPanel/Calendars.vue | 10 -- src/components/Content/LeftPanel/Grid.vue | 15 +-- .../Content/LeftPanel/LeftContent.vue | 20 +--- src/components/Content/LeftPanel/Ribbon.vue | 7 -- .../Content/LeftPanel/SlidersLayout.vue | 2 +- .../Content/LeftPanel/TicketsDataview.vue | 6 -- src/components/Content/LeftPanel/Tree.vue | 2 +- .../Content/RightPanel/Colorpicker.vue | 7 -- .../Content/RightPanel/MessageDataview.vue | 6 -- .../Content/RightPanel/RightContent.vue | 12 --- .../MainContainer/MainContainer.vue | 11 +-- src/style.css | 97 ++++++++++++++++++- 14 files changed, 98 insertions(+), 127 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7a964e5..a57ddf3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,22 +12,8 @@ - - - - diff --git a/src/components/Content/Content.vue b/src/components/Content/Content.vue index 2dbbc67..cf96b2d 100644 --- a/src/components/Content/Content.vue +++ b/src/components/Content/Content.vue @@ -16,17 +16,3 @@ export default { } }; - - diff --git a/src/components/Content/LeftPanel/Calendars.vue b/src/components/Content/LeftPanel/Calendars.vue index 98cf41a..3bf416c 100644 --- a/src/components/Content/LeftPanel/Calendars.vue +++ b/src/components/Content/LeftPanel/Calendars.vue @@ -37,13 +37,3 @@ export default {
- - diff --git a/src/components/Content/LeftPanel/Grid.vue b/src/components/Content/LeftPanel/Grid.vue index d0875cf..d090d2e 100644 --- a/src/components/Content/LeftPanel/Grid.vue +++ b/src/components/Content/LeftPanel/Grid.vue @@ -69,21 +69,8 @@ export default { - - diff --git a/src/components/Content/LeftPanel/LeftContent.vue b/src/components/Content/LeftPanel/LeftContent.vue index 1926995..25140ce 100644 --- a/src/components/Content/LeftPanel/LeftContent.vue +++ b/src/components/Content/LeftPanel/LeftContent.vue @@ -25,7 +25,7 @@ export default { -
+
@@ -33,21 +33,3 @@ export default {
- - diff --git a/src/components/Content/LeftPanel/Ribbon.vue b/src/components/Content/LeftPanel/Ribbon.vue index 0246c59..acd1bbe 100644 --- a/src/components/Content/LeftPanel/Ribbon.vue +++ b/src/components/Content/LeftPanel/Ribbon.vue @@ -24,10 +24,3 @@ export default { - - diff --git a/src/components/Content/LeftPanel/SlidersLayout.vue b/src/components/Content/LeftPanel/SlidersLayout.vue index 6cf9e40..a6db7b6 100644 --- a/src/components/Content/LeftPanel/SlidersLayout.vue +++ b/src/components/Content/LeftPanel/SlidersLayout.vue @@ -108,5 +108,5 @@ export default { diff --git a/src/components/Content/LeftPanel/TicketsDataview.vue b/src/components/Content/LeftPanel/TicketsDataview.vue index bd37b3b..dd42aa7 100644 --- a/src/components/Content/LeftPanel/TicketsDataview.vue +++ b/src/components/Content/LeftPanel/TicketsDataview.vue @@ -54,9 +54,3 @@ export default { - - diff --git a/src/components/Content/LeftPanel/Tree.vue b/src/components/Content/LeftPanel/Tree.vue index 181ea02..0ccb912 100644 --- a/src/components/Content/LeftPanel/Tree.vue +++ b/src/components/Content/LeftPanel/Tree.vue @@ -25,5 +25,5 @@ export default { diff --git a/src/components/Content/RightPanel/Colorpicker.vue b/src/components/Content/RightPanel/Colorpicker.vue index 1f51906..d6f165a 100644 --- a/src/components/Content/RightPanel/Colorpicker.vue +++ b/src/components/Content/RightPanel/Colorpicker.vue @@ -74,10 +74,3 @@ export default { class="container colorpicker-container dhx_layout_colorpicker_cell" > - - diff --git a/src/components/Content/RightPanel/MessageDataview.vue b/src/components/Content/RightPanel/MessageDataview.vue index a8845cd..e993ee2 100644 --- a/src/components/Content/RightPanel/MessageDataview.vue +++ b/src/components/Content/RightPanel/MessageDataview.vue @@ -43,9 +43,3 @@ export default { - - diff --git a/src/components/Content/RightPanel/RightContent.vue b/src/components/Content/RightPanel/RightContent.vue index 31f4136..afc41ca 100644 --- a/src/components/Content/RightPanel/RightContent.vue +++ b/src/components/Content/RightPanel/RightContent.vue @@ -25,15 +25,3 @@ export default { - - \ No newline at end of file diff --git a/src/components/MainContainer/MainContainer.vue b/src/components/MainContainer/MainContainer.vue index 62f1163..8a0d333 100644 --- a/src/components/MainContainer/MainContainer.vue +++ b/src/components/MainContainer/MainContainer.vue @@ -13,18 +13,9 @@ export default { - - \ No newline at end of file diff --git a/src/style.css b/src/style.css index 9c6e44a..9acb916 100644 --- a/src/style.css +++ b/src/style.css @@ -8,7 +8,6 @@ body { width: 100vw; margin: 0; padding: 0; - } :root { @@ -17,7 +16,6 @@ body { font-weight: 400; display: flex; - font-synthesis: none; text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; @@ -38,6 +36,97 @@ body { width: 100%; } +.app_main { + height: 100%; + width: 100%; + display: flex; +} + +.main-container { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow: hidden; +} + +.wrapper-content { + display: flex; + flex-grow: 1; + overflow: auto; + padding: 12px; + gap: 12px; +} + +.left-content-wrapper { + display: flex; + height: 100%; + flex-grow: 1; + gap: 12px; + max-width: 800px; + flex-direction: column; +} + +.left-content-block { + display: flex; + gap: 12px; + width: 100%; + justify-content: space-between; +} + +.grid-block { + display: flex; + flex-direction: column; + border: var(--dhx-border); +} + +.grid_container { + min-height: 848px; + width: 798px; +} + +.calendars-wrapper { + display: flex; + height: fit-content; + flex-direction: row; + gap: 12px; + justify-content: space-between; +} + +.tickets-container { + background: var(--dhx-background-primary); +} + +.sliders-wrapper { + flex-grow: 2; +} + +.tree-container { + flex-grow: 1 +} + +.ribbon-container { + padding: 50px; + background: var(--dhx-background-primary); +} + +.right-content-wrapper { + display: flex; + height: 100%; + width: fit-content; + gap: 12px; + flex: 1; + min-width: 500px; + flex-direction: column; +} + +.container { + border: var(--dhx-border); +} + +.colorpicker-container { + display: flex; + justify-content: center; +} /* Grid styling */ .contact_email { @@ -48,7 +137,6 @@ body { border: none; } - /* Tickets dataview styling */ .dhx_dataview_template_a { display: -webkit-box; @@ -189,7 +277,6 @@ body { margin-left: 6px; } - /* Message dataview styling */ .dhx_dataview_template_b_box { background-color: var(--dhx-background-secondary) !important; @@ -376,4 +463,4 @@ body { .dhx-container, .dhx-container__widget { height: 100%; -} \ No newline at end of file +} From c127cb8adc48be9093ca211afa6f2b5ddc7d0a2f Mon Sep 17 00:00:00 2001 From: Serhii Pylypchuk Date: Mon, 12 May 2025 22:55:35 +0400 Subject: [PATCH 5/5] [update] styles --- .../Content/LeftPanel/SlidersLayout.vue | 2 +- src/components/Content/LeftPanel/Tree.vue | 2 +- src/components/MainContainer/Tabbar.vue | 2 +- src/style.css | 20 +++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/components/Content/LeftPanel/SlidersLayout.vue b/src/components/Content/LeftPanel/SlidersLayout.vue index a6db7b6..2bcc159 100644 --- a/src/components/Content/LeftPanel/SlidersLayout.vue +++ b/src/components/Content/LeftPanel/SlidersLayout.vue @@ -108,5 +108,5 @@ export default { diff --git a/src/components/Content/LeftPanel/Tree.vue b/src/components/Content/LeftPanel/Tree.vue index 0ccb912..706e6d1 100644 --- a/src/components/Content/LeftPanel/Tree.vue +++ b/src/components/Content/LeftPanel/Tree.vue @@ -25,5 +25,5 @@ export default { diff --git a/src/components/MainContainer/Tabbar.vue b/src/components/MainContainer/Tabbar.vue index ad4779b..241db03 100644 --- a/src/components/MainContainer/Tabbar.vue +++ b/src/components/MainContainer/Tabbar.vue @@ -23,5 +23,5 @@ export default { diff --git a/src/style.css b/src/style.css index 9acb916..563f389 100644 --- a/src/style.css +++ b/src/style.css @@ -464,3 +464,23 @@ body { .dhx-container__widget { height: 100%; } + +.tabbar_widget { + border-top: 1px solid rgb(226, 225, 225); +} + +.tree_widget { + padding: 10px; + background: white; + width: 50%; + flex-grow: 1; + border: var(--dhx-border); +} + +.sliders_widget { + padding: 10px; + background: white; + width: 50%; + flex-grow: 1; + border: var(--dhx-border); +}