Merge branch 'master' into UC-1

src/components/BaseSelect.vue

@@ -0,0 +1,61 @@
+<template lang="pug">
+  .flex.gap-2.py-2.px-4.container(@click="selectOpen")
+    .relative.flex.flex-col
+      .not-italic.text-base.select {{optionData}}
+        .absolute.options(v-if="isOpen" :id="id" @click="(event)=>chooseOption(event)")
+          .not-italic.text-base.option(v-for="(responsible, index) in listData" :key="index" :id="index") {{responsible}}
+    .select-form-separator
+    .text-sm.icon-down-arrow.icon
+</template>
+
+<script>
+  export default {
+    name: "BaseSelect",
+    props: {
+      id: String,
+      optionData: String,
+      listData: Array,
+      chooseOption: Function,
+      isOpen: Boolean,
+      selectOpen: Function
+    }
+  }
+</script>
+
+<style lang="sass" scoped>
+  .container
+    align-items: center
+    cursor: pointer
+    border-radius: 4px
+    width: fit-content
+    background-color: var(--bg-ligth-blue-color)
+  .select
+    appearance: none
+    border: none
+    outline: none
+    cursor: pointer
+    color: rgba(9, 10, 21, 0.5)
+    background-color: rgba(9, 10, 21, 0)
+    &::-webkit-calendar-picker-indicator
+      display: none
+      -webkit-appearance: none
+  .options
+    z-index: 3
+    width: max-content
+    background-color: var(--bg-ligth-blue-color)
+  .option
+    color: var(--font-black-color)
+    &:hover
+      background-color: var(--btn-blue-color)
+  .select-form-separator
+    background-color: rgba(65, 105, 225, 0.2)
+    height: 24px
+    width: 1px
+    border-radius: 1px
+  .icon
+    text-align: center
+    color: var(--font-dark-blue-color)
+    &:hover
+      color: var(--btn-blue-color)
+</style>
+

src/components/TheSidebar.vue

@@ -1,13 +1,13 @@
 <template lang="pug">
-  .sidebar-container
-    .top-button-container
+  .sidebar.flex.flex-col.justify-between.flex-auto.py-6.box-border
+    .flex.flex-col.gap-y-6
       the-button-sidebar(id="home" path="#/")
         .icon-home
       the-button-sidebar(id="calendar" path="#/calendar")
         .icon-calendar-2
       the-button-sidebar(id="user" path="#/user")
         .icon-person-2
-    .bottom-button-container
+    .flex.text-4xl.flex-col.gap-y-6
       the-button-sidebar(id="settings" path="#/settings")
         .icon-settings
 </template>
@@ -22,21 +22,7 @@
 </script>
 
 <style lang="sass" scoped>
-  #person
-    font-style: normal
-  .sidebar-container
-    display: flex
-    flex-direction: column
-    justify-content: space-between
-    flex: auto
-    padding: 24px 0 24px 0
-    box-sizing: border-box
+  .sidebar
     max-width: 80px
     background-color: #F8F8FF
-
-  .top-button-container
-    display: flex
-    font-size: 40px
-    flex-direction: column
-    row-gap: 24px
 </style>

src/components/base/buttons/BaseAddEvent.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  button(class="add-button-event") Создать событие
+  button.event-button.not-italic.leading-5.text-base.py-3.px-4 Создать событие
 </template>
 
 <script>
@@ -9,16 +9,12 @@
 </script>
 
 <style lang="sass" scoped>
-  .add-button-event
+  .event-button
     outline: none
     border: none
     cursor: pointer
-    font-style: normal
-    line-height: 19px
-    font-size: 16px
     width: fit-content
     color: var(--bg-white-color)
     background-color: var(--btn-blue-color)
-    padding: 11px 16px 11px 16px
     border-radius: 4px
 </style>

src/components/base/buttons/BaseButtonPlus.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  button.icon-plus(class="button-plus")
+  button.icon-plus.button-plus.text-xs.pt-1
 </template>
 
 <script>
@@ -12,10 +12,11 @@
   .button-plus
     outline: none
     border: none
-    font-size: 12px
     cursor: pointer
+    width: 24px
+    height: 24px
+    max-height: 24px
     color: #4772F2
-    padding: 7px 7px 5px 7px
     background-color: rgba(65, 105, 225, 0.25)
     border-radius: 50%
 </style>

src/components/base/buttons/BaseSidebarButton.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   a(:href="path")
-    button(:id="id" class="button-icon-item")
+    button.button.text-4xl.py-3.pr-4.pl-3(:id="id")
       slot
 </template>
 
@@ -21,11 +21,9 @@
 </script>
 
 <style lang="sass" scoped>
-  .button-icon-item
+  .button
     width: fit-content
-    padding: 12px 16px 12px 12px
     cursor: pointer
-    font-size: 40px
     background-color: rgb(65, 105, 225, 0)
     border-radius: 0 4px 4px 0
     border-left-color: rgb(65, 105, 225, 0)
@@ -34,11 +32,11 @@
     border-top: none
     border-bottom: none
     border-left-style: solid
-  .button-icon-item:focus
+  .button:focus
     background-color: rgb(65, 105, 225, 0.3)
     border-left-color: rgb(65, 105, 225, 1)
     color: #4169E1
-  .button-icon-item:hover
+  .button:hover
     background-color: rgb(65, 105, 225, 0.3)
     border-left-color: rgb(65, 105, 225, 1)
     color: #4169E1