From 2a6862a78cfa96e36260c9a88cd8a9d34008506b Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Tue, 20 Aug 2024 16:52:39 +0300
Subject: [PATCH] homelink

---
 front/src/assets/sidebar.scss          | 22 +++++++++++-----------
 front/src/components/Promo/main.vue    |  5 +++++
 front/src/components/Promo/sidebar.vue |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/front/src/assets/sidebar.scss b/front/src/assets/sidebar.scss
index 79ce8a6..75752b1 100644
--- a/front/src/assets/sidebar.scss
+++ b/front/src/assets/sidebar.scss
@@ -10,6 +10,11 @@ $primary: #E75B12;
 
     transition: right 300ms linear;
 
+    &.main {
+        right: auto;
+        left: 2rem;
+    }
+
     a {
         background-color: $bg;
         color: $textColor;
@@ -52,12 +57,12 @@ $primary: #E75B12;
     }
 
     &-inner {
-        max-height: calc(100vh - 38rem);
+        // max-height: calc(100vh - 38rem);
         overflow: auto;
     }
-    
+
     &-content {
-        max-height: 100%;
+        max-height: 50vh;
         overflow: auto;
 
         background-color: $bg;
@@ -70,9 +75,7 @@ $primary: #E75B12;
         font-family: 'main';
     }
 
-    &-list {
-
-    }
+    &-list {}
 
     &-list-item {
         font-size: 1.875rem;
@@ -83,7 +86,7 @@ $primary: #E75B12;
         input {
             margin-right: 2rem;
 
-            &.checked + label {
+            &.checked+label {
                 color: $primary;
             }
         }
@@ -98,10 +101,7 @@ $primary: #E75B12;
 
     p {
         font-size: 1rem;
-
-        &:not(:last-child) {
-            margin-bottom: 1rem;
-        }
+        margin-bottom: 1rem;
     }
 
     a {
diff --git a/front/src/components/Promo/main.vue b/front/src/components/Promo/main.vue
index 48c0196..207ee2a 100644
--- a/front/src/components/Promo/main.vue
+++ b/front/src/components/Promo/main.vue
@@ -81,6 +81,11 @@ const sidebarFunc = () => {
                     <i-mdi-chevron-left />
                 </a>
             </div>
+            <div class="homelink main" v-if="route.params.item">
+                <RouterLink :to="`/${route.params.item.toString()}`" @click.prevent="sidebarFunc">
+                    <i-mdi-home />
+                </RouterLink>
+            </div>
         </div>
         <Sidebar />
     </div>
diff --git a/front/src/components/Promo/sidebar.vue b/front/src/components/Promo/sidebar.vue
index 64df03b..b517fe8 100644
--- a/front/src/components/Promo/sidebar.vue
+++ b/front/src/components/Promo/sidebar.vue
@@ -40,7 +40,7 @@ watch(() => sidebar.$state.is_open, () => {
             <div class="sidebar-content" v-if="sidebar.title">
                 <h2>{{ sidebar.title }}</h2>
                 <div class="sidebar-inner" v-if="sidebar.description">
-                    <template v-for="p in sidebar.description.split('\n')">
+                    <template v-for="p in sidebar.description.replace(/(\n|\r)+/g, '\n').split('\n')">
                         <p>{{ p }}</p>
                     </template>
                 </div>