Homepage redesign

Author: nathanielop

api/src/functions/get-streak.js

@@ -24,24 +24,53 @@ export default async ({ isWins, load, playerId }) => {
             .where({ playerId })
       ]
     )
+    .whereNotExists(query =>
+      query
+        .select()
+        .from('series as os')
+        .whereRaw(
+          isWins
+            ? `os."winningSeriesTeamId" = ??`
+            : `os."losingSeriesTeamId" = ??`,
+          [
+            query =>
+              query
+                .select('seriesTeams.id')
+                .from('seriesTeamMembers')
+                .join(
+                  'seriesTeams',
+                  'seriesTeams.id',
+                  'seriesTeamMembers.seriesTeamId'
+                )
+                .whereColumn('seriesTeams.seriesId', 'os.id')
+                .where({ playerId })
+          ]
+        )
+        .where('os.seasonId', currentSeason.id)
+        .whereColumn('os.completedAt', '<', 'series.completedAt')
+    )
     .where({ seasonId: currentSeason.id })
-    .orderBy('completedAt', 'desc')
+    .orderBy('completedAt', 'asc')
     .limit(1);
 
+  if (!last) return 0;
+
   const [{ count: currentStreak }] = await load.tx
-    .count()
+    .count('series.id')
     .from('series')
-    .join('seriesTeams', 'seriesTeams.id', 'series.id')
-    .join(
-      'seriesTeamMembers',
-      'seriesTeamMembers.seriesTeamId',
-      'seriesTeams.id'
+    .whereExists(query =>
+      query
+        .select('seriesTeams.id')
+        .from('seriesTeamMembers')
+        .join('seriesTeams', 'seriesTeams.id', 'seriesTeamMembers.seriesTeamId')
+        .whereColumn('seriesTeams.seriesId', 'series.id')
+        .where({ playerId })
     )
-    .where({ playerId, seasonId: currentSeason.id })
+    .where({ seasonId: currentSeason.id })
     .where(
       'series.completedAt',
       '>=',
-      new Date(last?.completedAt ?? 0).toISOString()
+      new Date(last.completedAt).toISOString()
     );
 
   return currentStreak;

www/src/components/button.js

@@ -1,10 +1,17 @@
 import clsx from 'clsx';
 
-export default ({ onclick, children, className, resetRounding }) => (
+export default ({
+  onclick,
+  children,
+  className,
+  resetRounding,
+  resetColor
+}) => (
   <button
     onclick={onclick}
     className={clsx(
-      'px-4 py-2 text-white text-center align-middle transition-[all] active:bg-gray-600 active:scale-[0.98] bg-gray-500',
+      'px-4 py-2 text-white text-center align-middle transition-[all]',
+      !resetColor && 'active:bg-gray-600 bg-gray-500',
       !resetRounding && 'rounded-md',
       className
     )}