Merge pull request #106 from MargoMarm/bagfix/products/input-trim

Bagfix/products/input trim
MargoMarm · Sep 29, 2023 · da8e413 · da8e413
2 parents 87ac491 + 58262ce
commit da8e413
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/src/components/Modal/Modal.styled.jsx b/src/components/Modal/Modal.styled.jsx
@@ -29,7 +29,7 @@ export const ModalWrap = styled.div`
   ${mq.mobile} {
     width: 335px;
   }
-  padding: 48px 20px;
+  padding: 40px 20px;
   border-radius: 8px;
   background-color: ${colors.modalBlack};
   z-index: 1;
@@ -38,7 +38,7 @@ export const ModalWrap = styled.div`
     width: ${props => props.width}px;
     max-height: ${props => props.height[1]}px;
 
-    padding: 48px 32px;
+    padding: 40px 32px;
   }
 `;
 

diff --git a/src/components/ProductsFilter/ProductsFilter.jsx b/src/components/ProductsFilter/ProductsFilter.jsx
@@ -70,7 +70,7 @@ export default function ProductsFilter() {
   }, 500);
 
   const handleChangeQuery = event => {
-    const selectedValue = event.target.value;
+    const selectedValue = event.target.value.trim();
     debouncedHandleChange(selectedValue);
   };
   const handleChangeisReccomended = event => {

diff --git a/src/components/ProductsOrExercisesItem/ProductsOrExercisesItem.jsx b/src/components/ProductsOrExercisesItem/ProductsOrExercisesItem.jsx
@@ -178,7 +178,7 @@ const ProductsOrExercisesItem = ({ page, data }) => {
             page === 'product' ? toggleAddModal : closeModalWithoutData
           }
           width={page === 'product' ? 481 : 696}
-          height={page === 'product' ? [285, 286] : [405, 550]}
+          height={page === 'product' ? [285, 286] : [505, 550]}
         >
           {page === 'product' && (
             <AddProductForm

diff --git a/src/components/Scrollbar/Scrollbar.syled.jsx b/src/components/Scrollbar/Scrollbar.syled.jsx
@@ -10,6 +10,7 @@ export const ScrollContainer = styled.div`
 
   ${mq.tablet} {
     width: ${({ width }) => width?.tab + 'px' || '100%'};
+    height: 550px;
     scrollbar-color: ${colors.orange} ${colors.textWhite01};
     scrollbar-width: thin;
     ::-webkit-scrollbar {
@@ -27,6 +28,6 @@ export const ScrollContainer = styled.div`
   }
   ${mq.desktop} {
     width: ${({ width }) => width?.dt + 'px' || '100%'};
-    height: calc(100vh - 230px);
+    height: 570px;
   }
 `;
diff --git a/src/pages/Exercises/Exercises.styled.jsx b/src/pages/Exercises/Exercises.styled.jsx
@@ -32,11 +32,11 @@ export const ExercisesListContainer = styled.div`
 
 
   ${mq.tablet} {
-    padding: 32px 32px 48px 32px;
+    padding: 32px 32px 0px 32px;
   }
 
   ${mq.desktop} {
-    padding: 0px 81px 81px 96px;
+    padding: 0px 81px 0px 96px;
   }
 `;
 

diff --git a/src/pages/Products/Products.styled.jsx b/src/pages/Products/Products.styled.jsx
@@ -6,17 +6,17 @@ import imgProducts from '../../assets/images/imgProduct';
 export const ProductPageContainer = styled.div`
   display: flex;
   flex-direction: column;
-  padding: 40px 20px 80px 20px;
+  padding: 40px 20px 0px 20px;
   gap: 40px;
   position: relative;
-  height: 100vh;
+
   ${mq.tablet} {
     gap: 32px;
-    padding: 72px 32px 48px 32px;
+    padding: 72px 32px 0px 32px;
   }
 
   ${mq.desktop} {
-    padding: 68px 81px 81px 96px;
+    padding: 68px 81px 0px 96px;
 
     gap: 28px;