From ef352a1f8625548c1d703050b01eb89cce5bd03c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9C=D0=B0?=
 =?UTF-8?q?=D1=80=D1=82=D1=8B=D0=BD=D0=BE=D0=B2?=
 <dmitrijmartynov@MacBook-Air-Dmitrij.local>
Date: Sat, 11 Jan 2025 17:07:09 +0300
Subject: [PATCH] upd

---
 src/App.vue                   |   4 +-
 src/components/Add.vue        |   2 +
 src/components/Footer.vue     |   4 +-
 src/components/LeftBar.vue    |  15 +++++
 src/components/LineChart.vue  |  75 +++++++++++++++------
 src/components/Name.vue       |   5 +-
 src/components/Now.vue        |   5 +-
 src/components/Settings.vue   | 121 ++++++++++++++++++++++++++++++++++
 src/components/Target.vue     |  61 ++++++++++-------
 src/components/TimeLine.vue   |   3 +-
 src/store/ComponentsHidden.js |  15 +++--
 src/store/Login.js            |  44 +++++--------
 12 files changed, 270 insertions(+), 84 deletions(-)
 create mode 100644 src/components/Settings.vue

diff --git a/src/App.vue b/src/App.vue
index 6243c82..25f795a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,6 +13,7 @@ import Footer from './components/Footer.vue'
 import Scales from './components/Scales.vue'
 import TimeLine from './components/TimeLine.vue'
 import LineChart from './components/LineChart.vue'
+import Settings from './components/Settings.vue'
 import { ref, watch } from 'vue';
 
 loginStore.getInfo()
@@ -27,7 +28,7 @@ watch(hiddenStore, () => {
 
 
 function blurEdit() {
-  if (hiddenStore.login === true || hiddenStore.add === true || hiddenStore.scales === true) {
+  if (hiddenStore.login === true || hiddenStore.add === true || hiddenStore.scales === true || hiddenStore.settings === true) {
     blur.value = true
   }
   else {
@@ -69,6 +70,7 @@ function blurEdit() {
   <Scales />
   <Login />
   <Add />
+  <Settings />
 </template>
 
 <style scoped>
diff --git a/src/components/Add.vue b/src/components/Add.vue
index 5221299..bc7fde4 100644
--- a/src/components/Add.vue
+++ b/src/components/Add.vue
@@ -75,6 +75,7 @@ const regOrLogin = ref('register')
     right: 0;
     left: 0;
     z-index: 1050;
+
 }
 .x{
     float: right;
@@ -83,6 +84,7 @@ const regOrLogin = ref('register')
 }
 .nameLogin {
     margin-bottom: 10px;
+    
 }
 
 .login {
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index e3dd264..d2e58b5 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -21,10 +21,10 @@
 </svg>
 </div>
 
-<div class="blockItem"><svg class="icon1"  aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" viewBox="0 0 24 24">
+<div class="blockItem" @click="hiddenStore.showSettings()"><svg class="icon1"  aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" viewBox="0 0 24 24">
   <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12 21a9 9 0 1 0 0-18 9 9 0 0 0 0 18Zm0 0a8.949 8.949 0 0 0 4.951-1.488A3.987 3.987 0 0 0 13 16h-2a3.987 3.987 0 0 0-3.951 3.512A8.948 8.948 0 0 0 12 21Zm3-11a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
 </svg>
-<div class="textUnderIcon">Тест</div>
+<div class="textUnderIcon">Настройки</div>
 </div>
 
 <div class="blockItem"><svg class="icon1"  aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" viewBox="0 0 24 24">
diff --git a/src/components/LeftBar.vue b/src/components/LeftBar.vue
index 4a5e457..86f2ffc 100644
--- a/src/components/LeftBar.vue
+++ b/src/components/LeftBar.vue
@@ -28,7 +28,22 @@
                     d="M5 12h14m-7 7V5" />
             </svg>
             Добавить</div>
+
+
+            <div class="section" @click="hiddenStore.showSettings()"><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 13v-2a1 1 0 0 0-1-1h-.757l-.707-1.707.535-.536a1 1 0 0 0 0-1.414l-1.414-1.414a1 1 0 0 0-1.414 0l-.536.535L14 4.757V4a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v.757l-1.707.707-.536-.535a1 1 0 0 0-1.414 0L4.929 6.343a1 1 0 0 0 0 1.414l.536.536L4.757 10H4a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h.757l.707 1.707-.535.536a1 1 0 0 0 0 1.414l1.414 1.414a1 1 0 0 0 1.414 0l.536-.535 1.707.707V20a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.757l1.707-.708.536.536a1 1 0 0 0 1.414 0l1.414-1.414a1 1 0 0 0 0-1.414l-.535-.536.707-1.707H20a1 1 0 0 0 1-1Z"/>
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/>
+</svg>
+
+            <a>Настройки</a>
+        </div>
+
+
     </div>
+
+
+
+    
 </template>
 
 
diff --git a/src/components/LineChart.vue b/src/components/LineChart.vue
index 8b788f5..40029ca 100644
--- a/src/components/LineChart.vue
+++ b/src/components/LineChart.vue
@@ -1,15 +1,14 @@
 <template>
 
-            <div class="mainBlockLineChart">
 
-                <LineChart class="lineChart" :chartData="lineData" :options="options" />
-            </div>
 
-{{ loginStore.weightList }}
 
-{{ loginStore.getStoreWeights }}
+    <div class="mainBlockLineChart">
+
+        <LineChart class="lineChart" :chartData="lineData" :options="options" />
+    </div>
+
 
-<button @click="console.log(loginStore.getStoreWeights)">11</button>
 
 </template>
 <script setup>
@@ -29,15 +28,51 @@ defineProps({
 
 const page = ref([true, false, false])
 
-const info = ref([1, 2 ,3]) //значения в графике
-const date = ref([3, 4, 5]) //даты в графике
+const info = ref([]) //значения в графике
+const date = ref([]) //даты в графике
 const total = ref('загрузка...') //среднее значение
-const label = ref('загрузка...') //название графика
 
 const selectedRange = ref(false)
 
 
 
+
+
+function updateData() {
+
+    if (loginStore.weightList !== 'loading') {
+        info.value = loginStore.weightList.reduce(function (accumulator, item) {
+            accumulator.unshift(Number(item[2]))
+            return accumulator
+        }, [])
+
+
+
+        date.value = loginStore.weightList.reduce(function (accumulator, item) {
+            accumulator.unshift(item[0])
+            return accumulator
+        }, [])
+        if(info.value[0] === 0){
+            info.value.splice(0,1)
+            date.value.splice(0, 1)
+        }
+
+        total.value = 'Текущий вес: ' + info.value[info.value.length -1] + ' кг'
+
+    }
+}
+
+
+watch(loginStore, () => {
+    updateData()
+})
+
+
+
+
+
+
+
 const options = reactive({
     responsive: true,
     scales: {
@@ -71,7 +106,7 @@ const options = reactive({
             align: 'end',
             display: true,
             text: total,
-            color: 'rgb(199, 206, 223)',
+            color: 'rgb(199, 220, 223)',
             font: {
                 size: 16,
                 weight: 'bold',
@@ -87,10 +122,8 @@ const lineData = computed(() => ({
     boxWidth: 0,
     datasets: [
         {
-            // data: info.value,
-            data: loginStore.getStoreWeights,
-            label: loginStore.getStoreDates,
-
+            data: info.value,
+            label: 'Вес, кг',
             borderColor: 'rgb(255, 255, 255)', //цвет линии
             borderWidth: 2, // толщина линии
             backgroundColor: 'rgba(255, 255, 255)', //точки
@@ -104,17 +137,19 @@ console.log(loginStore.getStoreWeights)
 
 <style scope>
 
-.mainBlockLineChart{
-    margin-top: 20px;
-    margin-left: 10px;
-    margin-right: 10px;
+
+
+
+
+.mainBlockLineChart {
+
     background-color: #007aff;
     height: 120px;
     border-radius: 15px;
-    padding: 20px;
+    padding: 10px 20px 20px 20px;
 }
 
-.lineChart{
+.lineChart {
     height: 120px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/Name.vue b/src/components/Name.vue
index a39fa49..f82ff29 100644
--- a/src/components/Name.vue
+++ b/src/components/Name.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="blockName">{{ loginStore.login }}<a><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="none" viewBox="0 0 24 24">
+<div class="blockName">{{ loginStore.login }}<a><svg @click="hiddenStore.showSettings()" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="none" viewBox="0 0 24 24">
   <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 13v-2a1 1 0 0 0-1-1h-.757l-.707-1.707.535-.536a1 1 0 0 0 0-1.414l-1.414-1.414a1 1 0 0 0-1.414 0l-.536.535L14 4.757V4a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1v.757l-1.707.707-.536-.535a1 1 0 0 0-1.414 0L4.929 6.343a1 1 0 0 0 0 1.414l.536.536L4.757 10H4a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h.757l.707 1.707-.535.536a1 1 0 0 0 0 1.414l1.414 1.414a1 1 0 0 0 1.414 0l.536-.535 1.707.707V20a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.757l1.707-.708.536.536a1 1 0 0 0 1.414 0l1.414-1.414a1 1 0 0 0 0-1.414l-.535-.536.707-1.707H20a1 1 0 0 0 1-1Z"/>
   <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/>
 </svg>
@@ -11,6 +11,9 @@
   <script setup>
   import { useLogin } from '../store/Login';
   const loginStore = useLogin();
+
+  import { useComponents } from '../store/ComponentsHidden';
+const hiddenStore = useComponents();
   import { ref } from 'vue'
   
   defineProps({
diff --git a/src/components/Now.vue b/src/components/Now.vue
index b63ab9e..ebc8373 100644
--- a/src/components/Now.vue
+++ b/src/components/Now.vue
@@ -2,7 +2,7 @@
   <div class="blockNow">
     <a class="now">Калорий сегодня</a>
     <a class="update">обновлено 10 минут назад</a>
-    <div class="ccal">{{ loginStore.getSumCcalToday }} <svg
+    <div class="ccal">{{ loginStore.getSumCcalToday }} ккал<svg
         aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 24 24">
         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.4"
           d="M18 5V4a1 1 0 0 0-1-1H8.914a1 1 0 0 0-.707.293L4.293 7.207A1 1 0 0 0 4 7.914V20a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-5M9 3v4a1 1 0 0 1-1 1H4m11.383.772 2.745 2.746m1.215-3.906a2.089 2.089 0 0 1 0 2.953l-6.65 6.646L9 17.95l.739-3.692 6.646-6.646a2.087 2.087 0 0 1 2.958 0Z" />
@@ -61,7 +61,8 @@ defineProps({
 .ccal {
   margin-left: 15px;
   margin-top: 7px;
-  font-size: 20px;
+  font-size: 24px;
+  font-weight: 600;
 }
 
 svg {
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
new file mode 100644
index 0000000..fa26c93
--- /dev/null
+++ b/src/components/Settings.vue
@@ -0,0 +1,121 @@
+<template>
+
+    <div v-if="hiddenStore.settings" class="mainBlockSettings">
+
+<div class="close" @click="hiddenStore.settings = !hiddenStore.settings"><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="none" viewBox="0 0 24 24">
+  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18 17.94 6M18 18 6.06 6"/>
+</svg>
+</div>
+
+
+
+<div class="login" >
+    <div class="nameLogin">Желаемый вес</div>
+    <div> <input v-model="weight" placeholder="Вес кг"></div>
+    <div> <button @click="loginStore.editDesiredWeight(weight)" class="buttonGo">Изменить</button></div>
+</div>
+
+<div class="login" >
+    <div class="nameLogin">Лимит калорий</div>
+    <div> <input v-model="ccal" placeholder="Ккал"></div>
+    <div> <button @click="loginStore.editLimitCcal(ccal)" class="buttonGo">Изменить</button></div>
+</div>
+
+</div>
+</template>
+
+
+
+<script setup>
+import { ref } from 'vue'
+import { useComponents } from '../store/ComponentsHidden';
+const hiddenStore = useComponents();
+
+import { useLogin } from '../store/Login';
+const loginStore = useLogin();
+
+
+const weight = ref('')
+const ccal = ref('')
+
+
+
+defineProps({
+    msg: String,
+})
+const regOrLogin = ref('register')
+
+
+
+
+
+
+
+
+
+
+
+</script>
+
+
+
+<style scoped>
+
+.mainBlockSettings {
+    background-color: white;
+    border-radius: 5px;
+    max-width: 400px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 100%;
+    position: fixed; /* фиксированное положение */
+    top: 0;
+    right: 0;
+    left: 0;
+    z-index: 1050;
+}
+.close{
+    float: right;
+    margin: 10px;
+    color: #666666;
+}
+.nameLogin {
+    margin-bottom: 10px;
+}
+
+.login {
+    margin: 30px
+}
+
+.register {
+    margin: 30px
+}
+input{
+width: 100%;
+margin-top: 20px;
+height: 40px;
+border: solid;
+border-radius: 7px;
+border-width: 1px;
+border-color: #c7c7c7;
+background-color: #f9fafb;
+display: block;
+}
+::placeholder{
+    padding-left: 7px;
+    font-size: 14px;
+}
+.buttonGo{
+width: 100%;
+margin-top: 20px;
+height: 40px;
+border-radius: 7px;
+border: none;
+background-color: #007aff;
+color: white;
+font-size: 15px;
+font-weight: 500;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/src/components/Target.vue b/src/components/Target.vue
index 90c70e5..a95dc58 100644
--- a/src/components/Target.vue
+++ b/src/components/Target.vue
@@ -1,7 +1,9 @@
 <template>
-    Цели <svg class="imageMain" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-  <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 9h6m-6 3h6m-6 3h6M6.996 9h.01m-.01 3h.01m-.01 3h.01M4 5h16a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1Z"/>
-</svg>
+    Цели <svg class="imageMain" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
+        viewBox="0 0 24 24">
+        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+            d="M11 9h6m-6 3h6m-6 3h6M6.996 9h.01m-.01 3h.01m-.01 3h.01M4 5h16a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1Z" />
+    </svg>
 
     <div class="mainBlockTarget">
 
@@ -12,28 +14,33 @@
                     d="M8.597 3.2A1 1 0 0 0 7.04 4.289a3.49 3.49 0 0 1 .057 1.795 3.448 3.448 0 0 1-.84 1.575.999.999 0 0 0-.077.094c-.596.817-3.96 5.6-.941 10.762l.03.049a7.73 7.73 0 0 0 2.917 2.602 7.617 7.617 0 0 0 3.772.829 8.06 8.06 0 0 0 3.986-.975 8.185 8.185 0 0 0 3.04-2.864c1.301-2.2 1.184-4.556.588-6.441-.583-1.848-1.68-3.414-2.607-4.102a1 1 0 0 0-1.594.757c-.067 1.431-.363 2.551-.794 3.431-.222-2.407-1.127-4.196-2.224-5.524-1.147-1.39-2.564-2.3-3.323-2.788a8.487 8.487 0 0 1-.432-.287Z" />
             </svg>
             <a class="text1">Калории</a>
-            <a class="text2">еще {{ loginStore.limitCcal - loginStore.getSumCcalToday}}</a>
+            <a class="text2">осталось {{ loginStore.limitCcal - loginStore.getSumCcalToday }} ккал</a>
 
 
 
             <div class="line">
-                <div class="lineBlue" :style="{ width: loginStore.getSumCcalToday / loginStore.limitCcal  * 100 + '%'}"></div>
+                <div class="lineBlue" :style="{ width: loginStore.getSumCcalToday / loginStore.limitCcal * 100 + '%' }">
+                </div>
             </div>
 
         </div>
 
 
         <div class="blockTarget" v-if="loginStore.weightList[0].length > 1">
-            <svg class="image2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path fill-rule="evenodd" d="M12 4a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-2.952.462c-.483.19-.868.432-1.19.71-.363.315-.638.677-.831.93l-.106.14c-.21.268-.36.418-.574.527C6.125 6.883 5.74 7 5 7a1 1 0 0 0 0 2c.364 0 .696-.022 1-.067v.41l-1.864 4.2a1.774 1.774 0 0 0 .821 2.255c.255.133.538.202.825.202h2.436a1.786 1.786 0 0 0 1.768-1.558 1.774 1.774 0 0 0-.122-.899L8 9.343V8.028c.2-.188.36-.38.495-.553.062-.079.118-.15.168-.217.185-.24.311-.406.503-.571a1.89 1.89 0 0 1 .24-.177A3.01 3.01 0 0 0 11 7.829V20H5.5a1 1 0 1 0 0 2h13a1 1 0 1 0 0-2H13V7.83a3.01 3.01 0 0 0 1.63-1.387c.206.091.373.19.514.29.31.219.532.465.811.78l.025.027.02.023v1.78l-1.864 4.2a1.774 1.774 0 0 0 .821 2.255c.255.133.538.202.825.202h2.436a1.785 1.785 0 0 0 1.768-1.558 1.773 1.773 0 0 0-.122-.899L18 9.343v-.452c.302.072.633.109 1 .109a1 1 0 1 0 0-2c-.48 0-.731-.098-.899-.2-.2-.12-.363-.293-.651-.617l-.024-.026c-.267-.3-.622-.7-1.127-1.057a5.152 5.152 0 0 0-1.355-.678 3.001 3.001 0 0 0-5.896.04Z" clip-rule="evenodd"/>
-</svg>
+            <svg class="image2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24"
+                fill="currentColor" viewBox="0 0 24 24">
+                <path fill-rule="evenodd"
+                    d="M12 4a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-2.952.462c-.483.19-.868.432-1.19.71-.363.315-.638.677-.831.93l-.106.14c-.21.268-.36.418-.574.527C6.125 6.883 5.74 7 5 7a1 1 0 0 0 0 2c.364 0 .696-.022 1-.067v.41l-1.864 4.2a1.774 1.774 0 0 0 .821 2.255c.255.133.538.202.825.202h2.436a1.786 1.786 0 0 0 1.768-1.558 1.774 1.774 0 0 0-.122-.899L8 9.343V8.028c.2-.188.36-.38.495-.553.062-.079.118-.15.168-.217.185-.24.311-.406.503-.571a1.89 1.89 0 0 1 .24-.177A3.01 3.01 0 0 0 11 7.829V20H5.5a1 1 0 1 0 0 2h13a1 1 0 1 0 0-2H13V7.83a3.01 3.01 0 0 0 1.63-1.387c.206.091.373.19.514.29.31.219.532.465.811.78l.025.027.02.023v1.78l-1.864 4.2a1.774 1.774 0 0 0 .821 2.255c.255.133.538.202.825.202h2.436a1.785 1.785 0 0 0 1.768-1.558 1.773 1.773 0 0 0-.122-.899L18 9.343v-.452c.302.072.633.109 1 .109a1 1 0 1 0 0-2c-.48 0-.731-.098-.899-.2-.2-.12-.363-.293-.651-.617l-.024-.026c-.267-.3-.622-.7-1.127-1.057a5.152 5.152 0 0 0-1.355-.678 3.001 3.001 0 0 0-5.896.04Z"
+                    clip-rule="evenodd" />
+            </svg>
 
             <a class="text1">Вес</a>
-            <a class="text2">еще {{ loginStore.desiredWeight - loginStore.weightList[0][2][0]}} кг</a>
+            <a class="text2">осталось {{ loginStore.desiredWeight - loginStore.weightList[0][2][0] }} кг</a>
 
 
             <div class="line">
-                <div class="lineBlue" :style="{ width: loginStore.weightList[0][2][0] / loginStore.desiredWeight  * 100 + '%'}"></div>
+                <div class="lineBlue"
+                    :style="{ width: loginStore.weightList[0][2][0] / loginStore.desiredWeight * 100 + '%' }"></div>
             </div>
 
         </div>
@@ -60,15 +67,21 @@ defineProps({
 <style scoped>
 .mainBlockTarget {
     display: flex;
-}
-.imageMain{
+    overflow-x: scroll;
+    width: 100%;
+    white-space: nowrap;
 
+}
+.mainBlockTarget::-webkit-scrollbar {
+    display: none;
+}
+.imageMain {
     color: #007aff;
     float: right;
-    
-
 }
+
 .blockTarget {
+    display: inline-block;
     background-color: white;
     border-radius: 8px;
     margin-top: 10px;
@@ -76,6 +89,7 @@ defineProps({
     box-shadow: 0px 4px 5px 0px #dedee0;
     margin-right: 10px;
     padding-bottom: 13px;
+    margin-bottom: 15px;
 }
 
 .image1 {
@@ -85,18 +99,19 @@ defineProps({
     margin-left: 10px;
 }
 
-.text1{
+.text1 {
     font-size: 12px;
-    margin-left: 5px;
+    padding-left: 5px;
 }
-.text2{
+
+.text2 {
     color: #8a898e;
     font-size: 12px;
-    margin-left: 10px;
-    padding-right: 15px;
+    padding-left: 10px;
+    padding-right: 45px;
 }
 
-.line{
+.line {
     background-color: #dddddf;
     margin-left: 40px;
     margin-right: 15px;
@@ -104,7 +119,7 @@ defineProps({
     margin-top: 6px;
 }
 
-.lineBlue{
+.lineBlue {
     background-color: #007aff;
     height: 2px;
     margin-top: 6px;
@@ -112,8 +127,8 @@ defineProps({
 
 .image2 {
     color: #2f3945;
-    margin-top: 4px;
+    padding-top: 4px;
     float: left;
-    margin-left: 10px;
+    padding-left: 10px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/TimeLine.vue b/src/components/TimeLine.vue
index 30ee6e1..2dd9c8e 100644
--- a/src/components/TimeLine.vue
+++ b/src/components/TimeLine.vue
@@ -82,7 +82,6 @@ defineProps({
     width: 100%;
     margin-top: 10px;
     padding-top: 30px;
-    padding-bottom: 100px;
     box-shadow: 0px 4px 5px 0px #dedee0;
 }
 
@@ -104,7 +103,7 @@ defineProps({
 }
 
 .circle {
-    background-color: #8d44ad;
+    background-color: #1e9a82;
     width: 45px;
     height: 45px;
     border-radius: 100%;
diff --git a/src/store/ComponentsHidden.js b/src/store/ComponentsHidden.js
index d1f27e3..6fad98a 100644
--- a/src/store/ComponentsHidden.js
+++ b/src/store/ComponentsHidden.js
@@ -3,26 +3,31 @@ import axios from 'axios';
 import { ref, watch } from 'vue'
 
 export const useComponents = defineStore('hiddenStore', {
-    state: () => ({ login: false, add: false, scales: false }),
+    state: () => ({ login: false, add: false, scales: false, settings: false }),
     actions: {
         showLogin() {
             this.login = !this.login
             this.add = false
             this.scales = false
-            // this.adjustment = true
-            // this.obsl = true
+            this.settings = false
         },
         showAdd() {
             this.add = !this.add
             this.login = false
             this.scales = false
-            // this. adjustment = true
-            // this.obsl = true
+            this.settings = false
         },
         showScales(){
             this.scales = !this.scales
             this.login = false
             this.add = false
+            this.settings = false
+        },
+        showSettings(){
+            this.settings = !this.settings
+            this.scales = false
+            this.login = false
+            this.add = false
         }
     }
 }
diff --git a/src/store/Login.js b/src/store/Login.js
index 44ea577..94ecd54 100644
--- a/src/store/Login.js
+++ b/src/store/Login.js
@@ -15,33 +15,6 @@ export const useLogin = defineStore('loginStore', {
                 }, 0)
             }
         },
-
-        getStoreWeights: (state) => { //массив из всех весов
-            if (state.weightList !== 'loading') {
-
-  return state.weightList.reduce(function (accumulator, item) {
-                    accumulator.push(Number(item[2]))
-                    return accumulator
-                }, [])
-
-
-                itog.push(state.weightList.reduce(function (accumulator, item) {
-                    accumulator.push(item[0])
-                    return accumulator
-                }, []))
-                return itog
-            }
-        },
-
-        getStoreDates: (state) => { //массив из всех дат из весов
-            if (state.weightList !== 'loading') {
-                return state.weightList.reduce(function (accumulator, item) {
-                    accumulator.push(item[0])
-                    return accumulator
-                }, [])
-        
-            }
-        }
     },
 
 
@@ -166,7 +139,22 @@ export const useLogin = defineStore('loginStore', {
                         this.getInfo()
                     })
             })
-        }
+        },
+
+        editDesiredWeight(value){
+            axios.patch(`https://dexone.ru/backend_new/data/${this.id}`, { desiredWeight: Number(value) })
+            .then(response => {
+                this.getInfo()
+            })
+        },
+
+
+        editLimitCcal(value){
+            axios.patch(`https://dexone.ru/backend_new/data/${this.id}`, { limitCcal: Number(value) })
+            .then(response => {
+                this.getInfo()
+            })
+        },
 
     },
     persist: {