Merge branch 'main' into arpan/cc-1895-add-og-images-for-campus-pages

Author: Arpan-206

app/components/institution-page/claim-offer-button.ts

@@ -29,6 +29,12 @@ export default class ClaimOfferButton extends Component<Signature> {
 
   @action
   handleClick() {
+    if (!this.authenticator.isAuthenticated) {
+      this.authenticator.initiateLogin();
+
+      return;
+    }
+
     if (!this.isDisabled) {
       this.args.onClick();
     }

ember-cli-build.js

@@ -76,6 +76,17 @@ module.exports = function (defaults) {
 
         urls.push('/collections/rust-primer'); // will update if we get more collections
 
+        // Get institutions from the API
+        const institutionsResponse = await fetch(`${config.x.backendUrl}/api/v1/institutions`);
+
+        if (institutionsResponse.status !== 200) {
+          throw new Error(`Failed to load Institutions from the API, status: ${institutionsResponse.status}`);
+        }
+
+        const institutionsPayload = await institutionsResponse.json();
+
+        urls.push(...(institutionsPayload.data || []).map(({ attributes: { slug } }) => `/campus/${slug}`));
+
         // Return the full list of routes
         return urls;
       },

package-lock.json

@@ -60,8 +60,8 @@
     "@percy/ember": "^4.0.0",
     "@sentry/ember": "^9.6.0",
     "@sentry/webpack-plugin": "^3.6.1",
-    "@shikijs/rehype": "^3.9.1",
-    "@shikijs/transformers": "^3.9.1",
+    "@shikijs/rehype": "^3.9.2",
+    "@shikijs/transformers": "^3.9.2",
     "@tailwindcss/postcss": "^4.1.11",
     "@tailwindcss/typography": "^0.5.16",
     "@tsconfig/ember": "^3.0.11",
@@ -85,7 +85,7 @@
     "@types/ember__string": "^3.0.15",
     "@types/ember__template": "^4.0.7",
     "@types/ember__test": "^4.0.6",
-    "@types/ember__test-helpers": "^2.9.1",
+    "@types/ember__test-helpers": "^2.9.3",
     "@types/ember__utils": "^4.0.7",
     "@types/ember-cli-fastboot": "^2.2.6",
     "@types/ember-data": "^4.4.16",
@@ -105,7 +105,7 @@
     "@types/three": "^0.172.0",
     "@typescript-eslint/eslint-plugin": "^8.39.0",
     "@typescript-eslint/parser": "^8.29.1",
-    "@uiw/codemirror-theme-github": "^4.23.6",
+    "@uiw/codemirror-theme-github": "^4.25.1",
     "autoprefixer": "^10.4.21",
     "broccoli-asset-rev": "^3.0.0",
     "canvas-confetti": "^1.9.3",
@@ -215,7 +215,7 @@
     "mustache": "^4.2.0",
     "node-html-parser": "^7.0.1",
     "player.js": "^0.1.0",
-    "posthog-js": "^1.234.6",
+    "posthog-js": "^1.260.1",
     "seedrandom": "^3.0.5",
     "showdown": "^2.1.0",
     "three": "^0.172.0",

package.json

@@ -8,6 +8,8 @@ import { setupApplicationTest } from 'codecrafters-frontend/tests/helpers';
 import { setupWindowMock } from 'ember-window-mock/test-support';
 import { signIn } from 'codecrafters-frontend/tests/support/authentication-helpers';
 import createInstitution from 'codecrafters-frontend/mirage/utils/create-institution';
+import windowMock from 'ember-window-mock';
+import config from 'codecrafters-frontend/config/environment';
 
 module('Acceptance | institution-page | claim-offer-test', function (hooks) {
   setupApplicationTest(hooks);
@@ -64,5 +66,17 @@ module('Acceptance | institution-page | claim-offer-test', function (hooks) {
     assert.ok(applicationModal.verifyEmailStepContainer.isVisible, 'Verify email step should be visible');
   });
 
+  test('claim offer button click redirects to login page if user is not signed in', async function (assert) {
+    testScenario(this.server);
+    createInstitution(this.server, 'nus');
+
+    const expectedRedirectUrl = encodeURIComponent(`${window.origin}/campus/nus`);
+    const nextUrl = config.x.backendUrl + '/login?next=' + expectedRedirectUrl;
+
+    await institutionPage.visit({ institution_slug: 'nus' });
+    await institutionPage.claimOfferButtons[0].click();
+    assert.strictEqual(windowMock.location.href, nextUrl, 'should redirect to login URL with correct claim offer endpoint');
+  });
+
   // TODO: Test rejected application flow
 });

tests/acceptance/institution-page/claim-offer-test.js

@@ -0,0 +1 @@
+../_prerender-ember-route.func

vercel-functions/prerender/campus/[institution_slug].func

@@ -0,0 +1,5 @@
+{
+  "expiration": 86400,
+  "allowQuery": ["institution_slug"],
+  "passQuery": true
+}

vercel-functions/prerender/campus/[institution_slug].prerender-config.json

@@ -37,6 +37,7 @@
     }
   ],
   "rewrites": [
+    { "source": "/campus/:institution_slug", "destination": "/prerender/campus/[institution_slug]" },
     { "source": "/concepts/:concept", "destination": "/prerender/concepts/[concept]" },
     { "source": "/contests/:contest", "destination": "/prerender/contests/[contest]" },
     { "source": "/progress/:match*", "destination": "https://backend.codecrafters.io/progress/:match*" },