Merge pull request #8 from AlekseiBestuzhev/fix/review-edits

Fix/review edits
AlekseiBestuzhev · Dec 3, 2023 · f8df64e · f8df64e
2 parents ccc2579 + 076b20e
commit f8df64e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/assets/images/default-image.jpg b/src/assets/images/default-image.jpg
diff --git a/src/features/packs/ui/pack-row/pack-row.module.scss b/src/features/packs/ui/pack-row/pack-row.module.scss
@@ -8,7 +8,9 @@
   padding-block: 0;
 
   .cover {
+    max-width: 100px;
     height: 50px;
+    object-fit: cover;
   }
 
   &:hover h3 {

diff --git a/src/features/packs/ui/pack-row/pack-row.tsx b/src/features/packs/ui/pack-row/pack-row.tsx
@@ -4,6 +4,7 @@ import { Link, useNavigate } from 'react-router-dom'
 
 import s from './pack-row.module.scss'
 
+import defaultCover from '@/assets/images/default-image.jpg'
 import { ROUTES } from '@/common/consts'
 import { Button } from '@/components/ui/button'
 import { Icon } from '@/components/ui/icon/icon.tsx'
@@ -31,7 +32,7 @@ export const PackRow: FC<Props> = memo(({ pack, authUserId }) => {
     <Table.Row key={pack.id} className={s.root}>
       <Table.Cell>
         <Button as={Link} to={pack.id} variant="link" className={s.link}>
-          {pack.cover && <img src={pack.cover} alt="Pack cover" className={s.cover} />}
+          <img src={pack.cover || defaultCover} alt="Pack cover" className={s.cover} />
           <Typography as="h3" variant="body2">
             {pack.name}
           </Typography>

diff --git a/src/pages/learn/learn.module.scss b/src/pages/learn/learn.module.scss
@@ -1,8 +1,9 @@
 @import '@/styles/mixins';
 
 .cover {
-  align-self: center;
+  width: 100%;
   height: 180px;
+  object-fit: contain;
 }
 
 .root {
@@ -21,11 +22,6 @@
 
       word-break: break-word;
 
-      .questionImg {
-        align-self: center;
-        height: 180px;
-      }
-
       .caption {
         color: var(--color-dark-100);
       }

diff --git a/src/pages/packs/packs.tsx b/src/pages/packs/packs.tsx
@@ -42,8 +42,12 @@ export const Packs = () => {
     itemsPerPage: pageSize,
   })
 
+  const totalCards = packs?.data?.maxCardsCount
+
   useEffect(() => {
-    setCurrentPage(1)
+    if (totalCards && totalCards / pageSize < currentPage) {
+      setCurrentPage(1)
+    }
   }, [debouncedSearchName, debouncedSliderValue, pageSize, tabValue])
 
   const [createDeck] = useCreateDeckMutation()