From 3705dc1e311a849ccefd2d9de1e3de3d5f5d1137 Mon Sep 17 00:00:00 2001
From: Andrey Aratov <beg431@gmail.com>
Date: Sat, 17 Feb 2024 11:48:05 +0700
Subject: [PATCH] chore: update progress bar

---
 package.json                                  |  2 +-
 .../BaseExpensesList/BaseExpensesList.vue     | 36 +++++++++----------
 .../layouts/BaseLayout/BaseLayout.vue         |  5 +--
 src/views/HomeView.vue                        |  2 +-
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index beeba31..56c36a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budget.it",
-  "version": "0.3.7-beta",
+  "version": "0.3.8-beta",
   "description": "Another budget app, but this one is handy",
   "repository": "https://github.com/begprod/budget.it",
   "homepage": "",
diff --git a/src/components/BaseExpensesList/BaseExpensesList.vue b/src/components/BaseExpensesList/BaseExpensesList.vue
index 7a61911..0fc4b61 100644
--- a/src/components/BaseExpensesList/BaseExpensesList.vue
+++ b/src/components/BaseExpensesList/BaseExpensesList.vue
@@ -1,39 +1,39 @@
 <template>
   <BaseDateWrapper v-for="month in months" :key="month.id">
     <template #title>
-      <div
-        class="sticky top-[50px] flex flex-col py-4 text-2xl text-slate-700 font-bold bg-white select-none z-50"
-      >
-        {{ month.name }}
-
+      <div class="sticky top-[calc(100%-130px)] flex flex-col text-2xl bg-white select-none z-50">
         <BaseProgressBar
+          class="shadow-md"
           :label="`
-            ${getMonthlyExpenses(month.id)} / ${getDaysByMonthId(month.id).length * dailyBudget}
+            ${month.name} – ${getMonthlyExpenses(month.id)} / ${
+              getDaysByMonthId(month.id).length * dailyBudget
+            }
           `"
           :percentage="countProgressPercentage(month.id)"
-          :show-total="!month.isCurrent"
         />
       </div>
     </template>
 
     <template #content>
       <div class="grid gap-3">
-        <BaseDateWrapper v-for="day in getDaysByMonthId(month.id)" :key="day.id">
+        <BaseDateWrapper v-for="day in getDaysByMonthId(month.id)" :key="day.id" class="last:mb-10">
           <template #title>
             <div
-              class="sticky top-[110px] flex flex-col items-start py-3 bg-white font-bold select-none z-40"
+              class="sticky top-[52px] flex flex-col items-start py-1 bg-white font-bold select-none z-40"
               :class="{
                 'current-day': day.isCurrent,
               }"
             >
-              <div class="flex items-center">
-                {{ day.number }}
-                {{ day.name }}
-
-                <div
-                  v-if="day.isCurrent"
-                  class="shrink-0 w-2 h-2 ml-2 rounded-full bg-green-500 select-none animate-pulse"
-                />
+              <div class="flex">
+                <div class="flex flex-col">
+                  <div class="flex items-center text-sm">
+                    {{ day.number }} {{ day.name }}
+                    <div
+                      v-if="day.isCurrent"
+                      class="shrink-0 w-2 h-2 ml-2 rounded-full bg-green-500 select-none animate-pulse"
+                    />
+                  </div>
+                </div>
               </div>
 
               <div
@@ -108,6 +108,6 @@ const countProgressPercentage = (monthId: IMonth['id']) => {
 
 <style scoped lang="scss">
 .current-day {
-  scroll-margin-top: 120px;
+  scroll-margin-top: 52px;
 }
 </style>
diff --git a/src/components/layouts/BaseLayout/BaseLayout.vue b/src/components/layouts/BaseLayout/BaseLayout.vue
index ae97b91..1586854 100644
--- a/src/components/layouts/BaseLayout/BaseLayout.vue
+++ b/src/components/layouts/BaseLayout/BaseLayout.vue
@@ -1,10 +1,7 @@
 <template>
   <BaseHeader />
 
-  <main
-    class="container flex flex-col min-h-[calc(100vh-55px)] mx-auto px-5 pb-14 z-10"
-    :class="additionalClasses"
-  >
+  <main class="container flex flex-col mx-auto px-5 pb-14 z-10" :class="additionalClasses">
     <div class="grow">
       <slot />
     </div>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 3585e96..3c1834c 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,7 @@
 <template>
   <BaseLayout additional-classes="!pb-24">
     <BaseExpensesList />
-    <div class="container fixed left-0 right-0 bottom-14 w-full px-3 mx-auto z-[100]">
+    <div class="container fixed left-0 right-0 bottom-14 w-full px-5 mx-auto z-[100]">
       <BaseFormBar @submit="submitExpense(expense)" class="rounded-xl shadow-md">
         <template #input>
           <BaseInput