From d2fefaca9704f53694cd4a563d50d0f95363a6fe Mon Sep 17 00:00:00 2001
From: Chen Asraf <casraf@pm.me>
Date: Tue, 22 Oct 2024 01:35:34 +0300
Subject: [PATCH] fix: screenshots count+pos, sidebar theme

---
 frontend/package.json.md5                              |  2 +-
 .../src/components/ScreenshotImg/ScreenshotImg.tsx     |  6 ++----
 .../ScreenshotsCarouselModal.tsx                       | 10 ++++------
 frontend/src/components/Sidebar/Sidebar.tsx            |  2 +-
 screenshots/screenshots.go                             |  2 +-
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/frontend/package.json.md5 b/frontend/package.json.md5
index 2db6281..20fd3fd 100755
--- a/frontend/package.json.md5
+++ b/frontend/package.json.md5
@@ -1 +1 @@
-0d0c98b49fd99dd2c835289a5056e043
\ No newline at end of file
+b3720f3ac2572fdca396795bb24a2756
\ No newline at end of file
diff --git a/frontend/src/components/ScreenshotImg/ScreenshotImg.tsx b/frontend/src/components/ScreenshotImg/ScreenshotImg.tsx
index 40c714b..a93cfdd 100644
--- a/frontend/src/components/ScreenshotImg/ScreenshotImg.tsx
+++ b/frontend/src/components/ScreenshotImg/ScreenshotImg.tsx
@@ -6,10 +6,8 @@ export function ScreenshotImg({
   className,
   screenshot,
   ...rest
-}: HtmlProps<'div'> & { screenshot: screenshots.ScreenshotEntry }) {
+}: Omit<HtmlProps<'img'>, 'src'> & { screenshot: screenshots.ScreenshotEntry }) {
   return (
-    <div className={cn('', rest.onClick && 'cursor-pointer', className)} {...rest}>
-      <img className="rounded-md" src={screenshot.base64} alt={screenshot.name} />
-    </div>
+    <img className={cn('rounded-md', rest.onClick && 'cursor-pointer', className)} src={screenshot.base64} alt={screenshot.name} {...rest} />
   )
 }
diff --git a/frontend/src/components/ScreenshotsCarouselModal/ScreenshotsCarouselModal.tsx b/frontend/src/components/ScreenshotsCarouselModal/ScreenshotsCarouselModal.tsx
index b2f5615..7db9ad0 100644
--- a/frontend/src/components/ScreenshotsCarouselModal/ScreenshotsCarouselModal.tsx
+++ b/frontend/src/components/ScreenshotsCarouselModal/ScreenshotsCarouselModal.tsx
@@ -22,14 +22,12 @@ export function ScreenshotsCarouselModal({
 }) {
   return (
     <div className={cn('', className)} {...rest}>
-      <DialogContent className="max-w-[calc(100%_-_128px)]">
+      <DialogContent className="max-w-[calc(100%_-_128px)] max-h-[calc(100%_-_64px)]">
         <Carousel opts={{ startIndex: activeIndex ?? undefined }}>
-          <CarouselContent>
+          <CarouselContent className="max-w-full max-h-full">
             {screenshots.map((scr) => (
-              <CarouselItem key={scr.path}>
-                <div className="h-full flex items-center">
-                  <ScreenshotImg screenshot={scr} />
-                </div>
+              <CarouselItem key={scr.path} className="flex items-center justify-center">
+                <ScreenshotImg screenshot={scr} className="max-h-[calc(100vh_-_128px)] object-cover mx-auto" />
               </CarouselItem>
             ))}
           </CarouselContent>
diff --git a/frontend/src/components/Sidebar/Sidebar.tsx b/frontend/src/components/Sidebar/Sidebar.tsx
index a281d34..fea2276 100644
--- a/frontend/src/components/Sidebar/Sidebar.tsx
+++ b/frontend/src/components/Sidebar/Sidebar.tsx
@@ -6,7 +6,7 @@ import { cva } from 'class-variance-authority'
 
 export function Sidebar({ className, ...rest }: HtmlProps<'div'>) {
   return (
-    <div className={cn('py-3 bg-bg-950 h-screen overflow-y-auto', className)} {...rest}>
+    <div className={cn('py-3 bg-black/30 h-screen overflow-y-auto', className)} {...rest}>
       <ul>
         <ListItem label="Games" to="/games" match={(p) => p === '/' || p.startsWith('/games')} />
         <ListItem
diff --git a/screenshots/screenshots.go b/screenshots/screenshots.go
index a78ff54..23cc6ad 100644
--- a/screenshots/screenshots.go
+++ b/screenshots/screenshots.go
@@ -74,7 +74,7 @@ func NewScreenshotsDirFromPath(path string, limit int) ScreenshotCollection {
 			continue
 		}
 		s.TotalCount++
-		if limit > 0 && i >= limit {
+		if limit > 0 && i > limit {
 			continue
 		}
 		b64 += base64.StdEncoding.EncodeToString(bytes)