Merge remote-tracking branch 'upstream/main'

b01lers · Sep 15, 2024 · e99dc17 · e99dc17
2 parents 4e670f7 + 7cdd5d9
commit e99dc17
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/challenges/Filters.tsx b/app/challenges/Filters.tsx
@@ -48,7 +48,7 @@ export default function Filters(props: FiltersProps) {
             <h2 className="font-semibold mb-1">Filters</h2>
 
             <div className="flex flex-col gap-1 pl-2 mb-3">
-                {Object.keys(totals).map((c) => (
+                {Object.keys(totals).sort((a, b) => a.localeCompare(b)).map((c) => (
                     <FilterCategory
                         key={c}
                         category={c}

diff --git a/app/profile/ProfileStats.tsx b/app/profile/ProfileStats.tsx
@@ -29,7 +29,9 @@ export default function ProfileStats(props: ProfileData & { challs: Challenge[]
             res[c.category].solves++;
         }
 
-        return Object.entries(res).map(([name, data]) => ({ name, percent: data.solves / data.total }));
+        return Object.entries(res)
+            .sort((a, b) => a[0].localeCompare(b[0]))
+            .map(([name, data]) => ({ name, percent: data.solves / data.total }));
     }, [props.solves]);
 
     return (

diff --git a/components/FlagDispatchProvider.tsx b/components/FlagDispatchProvider.tsx
@@ -86,6 +86,8 @@ export default function FlagDispatchProvider(props: { children: ReactNode }) {
                 <video
                     className="fixed top-0 w-screen h-screen pointer-events-none z-50 object-cover object-center"
                     ref={appendToRejectVideos}
+                    onPlay={(e) => e.currentTarget.hidden = false}
+                    onEnded={(e) => e.currentTarget.hidden = true}
                     key={i}
                 >
                     <source src={`/assets/videos/failed${i + 1}-safari.mov`} type='video/mp4; codecs="hvc1"' />
@@ -96,6 +98,8 @@ export default function FlagDispatchProvider(props: { children: ReactNode }) {
                 <video
                     className="fixed top-0 w-screen h-screen pointer-events-none z-50 object-cover object-center"
                     ref={appendToAcceptVideos}
+                    onPlay={(e) => e.currentTarget.hidden = false}
+                    onEnded={(e) => e.currentTarget.hidden = true}
                     key={i}
                 >
                     <source src={`/assets/videos/success${i + 1}-safari.mov`} type='video/mp4; codecs="hvc1"' />
@@ -106,13 +110,17 @@ export default function FlagDispatchProvider(props: { children: ReactNode }) {
             <video
                 className="fixed top-0 w-screen h-screen pointer-events-none z-50 object-cover object-center"
                 ref={appleBottomJeansRef}
+                onPlay={(e) => e.currentTarget.hidden = false}
+                onEnded={(e) => e.currentTarget.hidden = true}
             >
                 <source src="/assets/videos/special-safari.mov" type='video/mp4; codecs="hvc1"' />
                 <source src="/assets/videos/special-chrome.webm" type="video/webm" />
             </video>
             <video
                 className="fixed top-0 w-screen h-screen pointer-events-none z-50 object-cover object-center"
                 ref={gunRef}
+                onPlay={(e) => e.currentTarget.hidden = false}
+                onEnded={(e) => e.currentTarget.hidden = true}
             >
                 <source src="/assets/videos/special2-safari.mov" type='video/mp4; codecs="hvc1"' />
                 <source src="/assets/videos/special2-chrome.webm" type="video/webm" />