Merge pull request #2363 from codecrafters-io/test-contest-navigation…

…-changesgs Refactor contest navigation to use navigable contests and add slugPrefix getter.
codecrafters-io · Oct 25, 2024 · 9b6c442 · 9b6c442
2 parents 6e30ca3 + 5131493
commit 9b6c442
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 25 deletions.
diff --git a/app/components/contest-page/leaderboard-entry.hbs b/app/components/contest-page/leaderboard-entry.hbs
@@ -1,7 +1,7 @@
 <a
   href="/users/{{@entry.user.username}}"
   target="_blank"
-  class="rounded-md w-full border {{this.colorClasses}} dark:hover:bg-gray-800 p-2.5 flex items-center justify-between group/leaderboard-entry"
+  class="rounded-md w-full border {{this.colorClasses}} dark:hover:bg-gray-700/40 p-2.5 flex items-center justify-between group/leaderboard-entry"
   ...attributes
   rel="noopener noreferrer"
 >

diff --git a/app/components/contest-page/leaderboard-entry.ts b/app/components/contest-page/leaderboard-entry.ts
@@ -21,10 +21,10 @@ export default class ContestPageLeaderboardEntryComponent extends Component<Sign
       if (this.args.entry.isBanned) {
         return 'dark:border-gray-500 opacity-25 grayscale';
       } else {
-        return 'dark:border-green-500';
+        return 'dark:border-green-500/70 dark:bg-green-500/5';
       }
     } else {
-      return 'dark:border-white/10 dark:hover:border-gray-700';
+      return 'dark:border-white/10 dark:hover:border-white/30';
     }
   }
 

diff --git a/app/components/contest-page/navigation.hbs b/app/components/contest-page/navigation.hbs
@@ -4,12 +4,12 @@
       @route="contest"
       @model={{this.previousContest.slug}}
       @disabled={{this.isPreviousContestDisabled}}
-      class="flex items-center rounded-l-md border border-r-[0.5px] border-gray-800 hover:border-gray-700 hover:bg-gray-800 px-2 py-1.5
+      class="flex items-center rounded-l-md border border-r-[0.5px] border-white/15 hover:border-white/20 hover:bg-white/5 pl-1.5 pr-2 py-1.5
         {{if this.isPreviousContestDisabled 'pointer-events-none opacity-50'}}"
       data-test-previous-contest-button
     >
       {{svg-jar "chevron-left" class="w-4 fill-current"}}
-      Previous
+      Prev
     </LinkTo>
   </div>
 
@@ -18,7 +18,7 @@
       @route="contest"
       @model={{this.nextContest.slug}}
       @disabled={{this.isNextContestDisabled}}
-      class="flex items-center rounded-r-md border border-l-[0.5px] border-gray-800 hover:border-gray-700 hover:bg-gray-800 px-2 py-1.5
+      class="flex items-center rounded-r-md border border-l-[0.5px] border-white/15 hover:border-white/20 hover:bg-white/5 pl-2 pr-1.5 py-1.5
         {{if this.isNextContestDisabled 'pointer-events-none opacity-50'}}"
       data-test-next-contest-button
     >

diff --git a/app/components/contest-page/navigation.ts b/app/components/contest-page/navigation.ts
@@ -16,7 +16,7 @@ export default class ContestPageNavigationComponent extends Component<Signature>
   @service declare date: DateService;
 
   get currentContestIndex(): number {
-    return this.sortedContests.indexOf(this.args.contest);
+    return this.sortedNavigableContests.indexOf(this.args.contest);
   }
 
   get isNextContestDisabled(): boolean {
@@ -27,31 +27,24 @@ export default class ContestPageNavigationComponent extends Component<Signature>
     return !this.previousContest;
   }
 
+  get navigableContests(): ContestModel[] {
+    return this.args.allContests.filter((contest) => contest.slugPrefix === this.args.contest.slugPrefix);
+  }
+
   get nextContest(): ContestModel | null {
-    if (this.currentContestIndex < this.sortedContests.length - 1) {
-      const nextContest = this.sortedContests[this.currentContestIndex + 1] as ContestModel;
-      const oneWeekFromNow = new Date(this.date.now() + 7 * 24 * 60 * 60 * 1000);
-
-      if (nextContest.startsAt < oneWeekFromNow) {
-        return nextContest;
-      } else {
-        return null;
-      }
-    } else {
-      return null;
-    }
+    return this.sortedNavigableContests[this.currentContestIndex + 1] || null;
   }
 
   get previousContest(): ContestModel | null {
     if (this.currentContestIndex > 0) {
-      return this.sortedContests[this.currentContestIndex - 1] as ContestModel;
+      return this.sortedNavigableContests[this.currentContestIndex - 1] || null;
     } else {
       return null;
     }
   }
 
-  get sortedContests(): ContestModel[] {
-    return this.args.allContests.sortBy('startsAt');
+  get sortedNavigableContests(): ContestModel[] {
+    return this.navigableContests.sortBy('startsAt');
   }
 }
 

diff --git a/app/models/contest.ts b/app/models/contest.ts
@@ -35,4 +35,8 @@ export default class ContestModel extends Model {
   get leaderboardEntriesRevealedAt(): Date {
     return new Date(this.startsAt.getTime() + 1000 * 60 * 60 * 24); // 24 hours after contest starts
   }
+
+  get slugPrefix(): string {
+    return this.slug.replace(/-\d+$/, '');
+  }
 }
diff --git a/tests/acceptance/contests-test.js b/tests/acceptance/contests-test.js
@@ -162,13 +162,19 @@ module('Acceptance | contests-test', function (hooks) {
     assert.strictEqual(currentURL(), '/contests/weekly-1', 'Previous button is disabled when there are no more previous contests');
 
     await contestsPage.headerNavigation.clickOnNextContestButton();
-    await contestsPage.headerNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-2', 'Next button works');
 
+    await contestsPage.headerNavigation.clickOnNextContestButton();
     assert.strictEqual(currentURL(), '/contests/weekly-3', 'Next button works');
 
     await contestsPage.headerNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-4', 'Next button works');
+
+    await contestsPage.headerNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-5', 'Next button works');
 
-    assert.strictEqual(currentURL(), '/contests/weekly-3', 'Next button is disabled when the next contest is the second contest from present');
+    await contestsPage.headerNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-5', 'Next button is disabled when contest is last');
   });
 
   test('prize details navigation buttons work', async function (assert) {
@@ -192,7 +198,12 @@ module('Acceptance | contests-test', function (hooks) {
     assert.strictEqual(currentURL(), '/contests/weekly-3', 'Next button works');
 
     await contestsPage.prizeDetailsNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-4', 'Next button works');
+
+    await contestsPage.prizeDetailsNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-5', 'Next button works');
 
-    assert.strictEqual(currentURL(), '/contests/weekly-3', 'Next button is disabled when the next contest is the second contest from present');
+    await contestsPage.prizeDetailsNavigation.clickOnNextContestButton();
+    assert.strictEqual(currentURL(), '/contests/weekly-5', 'Next button is disabled when contest is last');
   });
 });