Merge pull request #1609 from canekg/fixAdaptive

[#1448] Page adaptation fixed
Hexlet · Jan 17, 2024 · eb9416d · eb9416d
2 parents b51d69f + 1c97207
commit eb9416d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/app/Helpers/ChartHelper.php b/app/Helpers/ChartHelper.php
@@ -25,7 +25,7 @@ public static function getChart(?int $userId = null): \Generator
                 return $group->count();
             });
 
-        $chart = CarbonPeriod::create(now()->subMonths(24), '1 day', now())
+        $chart = CarbonPeriod::create(now()->subMonths(12), '1 day', now())
             ->map(function (Carbon $dayDate) use ($countActivitiesByDays): int {
                 $day = $dayDate->format('Y-m-d');
                 $dayActivitiesCount = $countActivitiesByDays->get($day, 0);

diff --git a/resources/sass/_activity_chart.scss b/resources/sass/_activity_chart.scss
@@ -23,7 +23,8 @@
     grid-template-rows: repeat(7, var(--square-size));
     grid-auto-flow: column;
     grid-auto-columns: var(--square-size);
-    padding: 0;
+    padding: 0 0 5px 0;
+    overflow-x: auto;
 }
 
 .graph {

diff --git a/resources/sass/_custom.scss b/resources/sass/_custom.scss
@@ -34,4 +34,11 @@
     .bg-light {
         background-color: #343a40 !important;
     }
-}
+}
+
+@media (max-width: 576px) {
+    main.flex-grow-1 {
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+}
diff --git a/resources/views/components/activity_chart.blade.php b/resources/views/components/activity_chart.blade.php
@@ -1,5 +1,5 @@
-<div class="graph mt-4">
-  <div class="d-flex justify-content-end overflow-hidden m-4">
+<div class="container graph mt-4">
+  <div class="d-flex justify-content-center overflow-hidden m-4">
     <ul class="squares mb-0">
       @foreach ($chart as $square)
         <li data-level="{{ $square }}"></li>

diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php
@@ -45,8 +45,8 @@
             </a>
           </li>
         </ul>
-        <div class="container mt-2">
-          <div class="row text-center">
+        <div class="container m-0 p-0  mt-2">
+          <div class="row m-0 p-0  text-center">
             <div class="col mt-4">
               <p>{{ __('welcome.statistic.table.count_points') }}:</p>
               <h3>{{ $statisticTable['countPoints'] }}</h3>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -30,7 +30,7 @@
   @include('layouts._nav')
   @include('flash::message')
   @hasSection('content')
-    <main class='flex-grow-1 m-0'>
+    <main class='flex-grow-1'>
       <div class="container p-0">
         @yield('content')
       </div>