Merge main: resolve merge conflict in analytics.ts

Merged main branch changes while preserving pagination parameter validation fix.
- Uses type-safe userId: request.user.id (from main)
- Retains pagination validation: Math.max(1, parseInt(...) || 1) (from fix/217)

Author: anshul23102

.env.example

@@ -4,6 +4,9 @@ DATABASE_URL=postgresql://devcard:devcard@localhost:5432/devcard?schema=public
 # ─── Redis ───
 REDIS_URL=redis://localhost:6379
 
+# ─── Set The Url ───
+PUBLIC_APP_URL=
+
 # ─── JWT ───
 # JWT_SECRET: any long random string, minimum 32 characters
 # Generate with: node -e "console.log(require('crypto').randomBytes(32).toString('hex'))"
@@ -29,4 +32,7 @@ MOBILE_REDIRECT_URI=devcard://oauth/callback
 
 # ─── Server ───
 PORT=3000
-NODE_ENV=development
+NODE_ENV=development
+
+# ─── Refresh Token Cleanup ───
+REFRESH_TOKEN_CLEANUP_INTERVAL_MS=86400000

.github/pull_request_template.md

@@ -43,10 +43,10 @@ Closes #
 
 ## Checklist
 
-- [ ] My code follows the project's coding style (`pnpm -r run lint` passes).
-- [ ] TypeScript compiles without errors (`pnpm -r run typecheck`).
+- [ ] My code follows the project's coding style (`npm run lint` passes).
+- [ ] TypeScript compiles without errors (`npm run typecheck --workspaces --if-present`).
 - [ ] I have added or updated tests for the changes I made.
-- [ ] All tests pass locally (`pnpm -r run test`).
+- [ ] All tests pass locally (`npm run test --workspaces --if-present`).
 - [ ] I have updated documentation where necessary.
 - [ ] No new `console.log` or debug statements left in the code.
 - [ ] Breaking changes are documented in this PR description.

.github/scripts/ciScript.js

@@ -0,0 +1,88 @@
+const isTestFile = (file) => /\.(test|spec)\.[jt]sx?$/.test(file);
+
+const deriveTestFiles = (files) => {
+  return files.map((file) => {
+    if (isTestFile(file)) return file;
+
+    const withoutExt = file.replace(/\.[jt]sx?$/, '');
+    const parts = withoutExt.split('/');
+    const baseName = parts[parts.length - 1];
+    const dir = parts.slice(0, -1).join('/');
+
+    return `${dir}/__tests__/${baseName}.test.ts`;
+  });
+};
+
+
+module.exports = async ({ github, context, core }) => {
+  const owner = context.repo.owner;
+  const repo = context.repo.repo;
+  const pr = context.payload.pull_request;
+  const prNumber = pr.number;
+  const prState = pr.state;
+
+  const backendFiles = [];
+  const mobileFiles = [];
+  const webFiles = [];
+  const dbFiles = [];
+
+  try {
+    if (prState === 'closed') {
+      console.log(`PR state is: ${prState}`);
+      return {
+        backendChanged: false,
+        mobileChanged: false,
+        webChanged: false
+      };
+    }
+
+    const changedFiles = await github.paginate(
+      github.rest.pulls.listFiles,
+      {
+        owner,
+        repo,
+        pull_number: prNumber
+      }
+    );
+
+    changedFiles.forEach((file) => {
+      const fileName = file.filename;
+
+      if (fileName.startsWith('apps/backend/')) {
+        backendFiles.push(fileName);
+      } else if (fileName.startsWith('apps/mobile/')) {
+        mobileFiles.push(fileName);
+      } else if (fileName.startsWith('apps/web/')) {
+        webFiles.push(fileName);
+      }else if(fileName.startsWith('apps/backend/prisma')){
+        dbFiles.push(fileName)
+      }else if(fileName.includes('schema.prisma') || fileName.includes('/migrations/')){
+        dbFiles.push(fileName)
+      }
+    });
+
+    const strippedBackend = backendFiles.map(f => f.replace('apps/backend/', ''));
+    const strippedMobile  = mobileFiles.map(f => f.replace('apps/mobile/', ''));
+
+    console.log({ backendFiles, mobileFiles, webFiles, dbFiles });
+
+    core.setOutput('backendFiles',     strippedBackend.join(' '));
+    core.setOutput('mobileFiles',      strippedMobile.join(' '));
+    core.setOutput('dbFiles', dbFiles.join(' '));
+    core.setOutput('webFiles',         webFiles.map(f => f.replace('apps/web/', '')).join(' '));
+    core.setOutput('backendTestFiles', deriveTestFiles(strippedBackend).join(' '));
+    core.setOutput('mobileTestFiles',  deriveTestFiles(strippedMobile).join(' '));
+    core.setOutput('backendChanged',   backendFiles.length > 0);
+    core.setOutput('mobileChanged',    mobileFiles.length > 0);
+    core.setOutput('webChanged',       webFiles.length > 0);
+
+  } catch (error) {
+    console.error(error);
+
+    return {
+      backendChanged: false,
+      mobileChanged: false,
+      webChanged: false
+    };
+  }
+};

.github/scripts/commentResults.js

@@ -0,0 +1,98 @@
+module.exports = async ({
+  github,
+  context,
+  backend,
+  mobile,
+  web,
+  backendLint,
+  backendTest,
+  backendTypecheck,
+  mobileLint,
+  mobileTest,
+  webBuild,
+  backendLintOutput,
+  mobileLintOutput,
+}) => {
+  const owner = context.repo.owner;
+  const repo = context.repo.repo;
+  const prNumber = context.payload.pull_request.number;
+
+  const status = (s) => {
+    if (s === 'success') return 'PASS';
+    if (s === 'failure') return 'FAIL';
+    if (s === 'skipped') return 'SKIP';
+    return '-';
+  };
+
+  const lintDetails = (output) => {
+    if (!output || !output.trim()) return '';
+    return `\n<details>\n<summary>View lint errors</summary>\n\n\`\`\`\n${output.trim()}\n\`\`\`\n</details>`;
+  };
+
+  const anyFailure = [backend, mobile, web].includes('failure');
+  const title = anyFailure ? 'CI — Checks Failed' : 'CI — All Checks Passed';
+  const timestamp = new Date().toUTCString();
+
+  const body = `## ${title}
+
+### Backend — ${status(backend)}
+
+| Check | Result |
+|---|---|
+| Lint | ${status(backendLint)} |
+| Test | ${status(backendTest)} |
+| Typecheck | ${status(backendTypecheck)} |
+${backendLint === 'failure' ? lintDetails(backendLintOutput) : ''}
+
+### Mobile — ${status(mobile)}
+
+| Check | Result |
+|---|---|
+| Lint | ${status(mobileLint)} |
+| Test | ${status(mobileTest)} |
+${mobileLint === 'failure' ? lintDetails(mobileLintOutput) : ''}
+
+### Web — ${status(web)}
+
+| Check | Result |
+|---|---|
+| Build | ${status(webBuild)} |
+
+---
+Last updated: \`${timestamp}\``;
+
+  const COMMENT_MARKER = '## CI —';
+
+  try {
+    const comments = await github.paginate(
+      github.rest.issues.listComments,
+      {
+        owner,
+        repo,
+        issue_number: prNumber
+      }
+    );
+
+    const existing = comments.find(
+      c => c.body && c.body.startsWith(COMMENT_MARKER)
+    );
+
+    if (existing) {
+      await github.rest.issues.updateComment({
+        owner,
+        repo,
+        comment_id: existing.id,
+        body
+      });
+    } else {
+      await github.rest.issues.createComment({
+        owner,
+        repo,
+        issue_number: prNumber,
+        body
+      });
+    }
+  } catch (err) {
+    console.error(err);
+  }
+};

.github/scripts/discordPinReminder.js

@@ -0,0 +1,38 @@
+module.exports = async ({ github, context }) => {
+  const pr = context.payload.pull_request;
+  const ignoreUsers = [
+    'ShantKhatri',
+    'Harxhit',
+    'blankirigaya',
+  ];
+
+  try {
+    if (!pr || !pr.merged) {
+      console.log('PR not merged.');
+      return;
+    }
+
+    const prNumber = pr.number;
+    const contributor = pr.user.login;
+
+    if (ignoreUsers.includes(contributor)) {
+      console.log(`Ignoring PR #${prNumber} by ${contributor}`);
+      return;
+    }
+
+    await github.rest.issues.createComment({
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+      issue_number: prNumber,
+      body: `Congratulations @${contributor} on getting PR #${prNumber} merged!
+
+Thank you for your contribution to the project.
+
+To receive the appropriate GSSoC labels and recognition, please mention @Harxhit in the **#get-labels** channel on our Discord server and share your merged PR link.`,
+    });
+
+    console.log(`Comment added to PR #${prNumber}`);
+  } catch (error) {
+    console.error(error);
+  }
+};

.github/scripts/generateLeaderboard.js

@@ -0,0 +1,130 @@
+module.exports = async ({ github, context }) => {
+    const owner = context.repo.owner;
+    const repo = context.repo.repo;
+
+    const EXCLUDED = new Set([
+        'shantkhatri',
+        'harxhit',
+        'blankirigaya'
+    ]);
+
+    const contributors = new Map();
+
+    const ensure = (login, avatarUrl, profileUrl) => {
+        if (!contributors.has(login)) {
+            contributors.set(login, {
+                login,
+                avatarUrl,
+                profileUrl,
+                mergedPrs: 0,
+                openPrs: 0,
+                issues: 0
+            });
+        }
+
+        return contributors.get(login);
+    };
+
+    const mergedPrs = await github.paginate(
+        github.rest.pulls.list,
+        {
+            owner,
+            repo,
+            state: 'closed',
+            per_page: 100
+        }
+    );
+
+    for (const pr of mergedPrs) {
+        if (!pr.merged_at || !pr.user) continue;
+
+        const login = pr.user.login;
+
+        if (EXCLUDED.has(login.toLowerCase())) continue;
+
+        const user = ensure(
+            login,
+            pr.user.avatar_url,
+            pr.user.html_url
+        );
+
+        user.mergedPrs++;
+    }
+
+    const openPrs = await github.paginate(
+        github.rest.pulls.list,
+        {
+            owner,
+            repo,
+            state: 'open',
+            per_page: 100
+        }
+    );
+
+    for (const pr of openPrs) {
+        if (!pr.user) continue;
+
+        const login = pr.user.login;
+
+        if (EXCLUDED.has(login.toLowerCase())) continue;
+
+        const user = ensure(
+            login,
+            pr.user.avatar_url,
+            pr.user.html_url
+        );
+
+        user.openPrs++;
+    }
+
+    const issues = await github.paginate(
+        github.rest.issues.listForRepo,
+        {
+            owner,
+            repo,
+            state: 'all',
+            per_page: 100
+        }
+    );
+
+    for (const issue of issues) {
+        if (issue.pull_request || !issue.user) continue;
+
+        const login = issue.user.login;
+
+        if (EXCLUDED.has(login.toLowerCase())) continue;
+
+        const user = ensure(
+            login,
+            issue.user.avatar_url,
+            issue.user.html_url
+        );
+
+        user.issues++;
+    }
+
+    const leaderboard = [...contributors.values()].sort(
+        (a, b) =>
+            b.mergedPrs - a.mergedPrs ||
+            b.issues - a.issues ||
+            b.openPrs - a.openPrs ||
+            a.login.localeCompare(b.login)
+    );
+
+    const fs = require('fs');
+    const path = require('path');
+
+    const outputDir = path.join('apps', 'web', 'public');
+    const outputFile = path.join(outputDir, 'leaderboard.json');
+
+    fs.mkdirSync(outputDir, { recursive: true });
+
+    fs.writeFileSync(
+        outputFile,
+        JSON.stringify(leaderboard, null, 2),
+        'utf8'
+    );
+
+    console.log(`Generated ${leaderboard.length} contributors`);
+    console.log(`Leaderboard written to ${outputFile}`);
+};