Merge pull request #181 from Magrexy/fix/magrexy-app-structure

Reconcile AppModule imports, restore StoreProvider, and fix layout

Author: dzekojohn4

backend/scripts/audit-modules.ts

@@ -0,0 +1,58 @@
+/**
+ * Audit script to verify all backend modules are properly imported in AppModule.
+ * Run: npx ts-node scripts/audit-modules.ts
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+
+const SRC_DIR = path.resolve(__dirname, '../src');
+const APP_MODULE = path.join(SRC_DIR, 'app.module.ts');
+
+function getModuleDirectories(): string[] {
+  return fs
+    .readdirSync(SRC_DIR, { withFileTypes: true })
+    .filter((d) => d.isDirectory())
+    .map((d) => d.name)
+    .filter((name) => {
+      const moduleFile = path.join(SRC_DIR, name, `${name}.module.ts`);
+      return fs.existsSync(moduleFile);
+    });
+}
+
+function getImportedModules(): string[] {
+  const content = fs.readFileSync(APP_MODULE, 'utf-8');
+  const importRegex = /import\s*\{[^}]*\}\s*from\s*['"]\.\/([^/]+)\//g;
+  const modules: string[] = [];
+  let match;
+  while ((match = importRegex.exec(content)) !== null) {
+    modules.push(match[1]);
+  }
+  return modules;
+}
+
+function main() {
+  const moduleDirs = getModuleDirectories();
+  const imported = getImportedModules();
+
+  const missing = moduleDirs.filter((dir) => !imported.includes(dir));
+  const orphaned = imported.filter((dir) => !moduleDirs.includes(dir));
+
+  if (missing.length === 0 && orphaned.length === 0) {
+    console.log('All modules are properly imported in AppModule.');
+    process.exit(0);
+  }
+
+  if (missing.length > 0) {
+    console.log('Modules with .module.ts files but NOT imported in AppModule:');
+    missing.forEach((m) => console.log(`  - ${m}`));
+  }
+
+  if (orphaned.length > 0) {
+    console.log('\nModules imported in AppModule but missing directory:');
+    orphaned.forEach((m) => console.log(`  - ${m}`));
+  }
+
+  process.exit(1);
+}
+
+main();

backend/src/analytics/analytics.controller.ts

@@ -8,6 +8,7 @@ import {
   HttpStatus,
   Logger,
   Query,
+  OnModuleInit,
 } from '@nestjs/common';
 import { AnalyticsService } from './analytics.service';
 import type { PaginatedUserPuzzleHistory } from './analytics.service';
@@ -19,12 +20,12 @@ class RecordSolveDto {
 }
 
 @Controller('analytics')
-export class AnalyticsController {
+export class AnalyticsController implements OnModuleInit {
   private readonly logger = new Logger(AnalyticsController.name);
 
-  constructor(private readonly analyticsService: AnalyticsService) {
-    // Seed once on construction so the in-memory stats have something to
-    // show before the first POST /analytics/record-solve request arrives.
+  constructor(private readonly analyticsService: AnalyticsService) {}
+
+  onModuleInit() {
     this.analyticsService.seedData();
   }
 

backend/src/app.module.ts

@@ -16,20 +16,27 @@ import { AppService } from './app.service';
 import { ActivityModule } from './activity/activity.module';
 import { AnalyticsModule } from './analytics/analytics.module';
 import { ApiKeyModule } from './api-key/api-key.module';
+import { AuthModule } from './auth/auth.module';
 import { ContentModule } from './content/content.module';
 import { ContentRatingModule } from './content-rating/content-rating.module';
+import { HintModule } from './hint/hint.module';
 import { InAppNotificationsModule } from './in-app-notifications/in-app-notifications.module';
 import { MultiplayerQueueModule } from './multiplayer-queue/multiplayer-queue.module';
 import { NFTClaimModule } from './nft-claim/nft-claim.module';
 import { ProgressModule } from './progress/progress.module';
+import { PuzzleCategoryModule } from './puzzle-category/puzzle-category.module';
 import { PuzzleDependencyModule } from './puzzle-dependency/puzzle-dependency.module';
 import { PuzzleModule } from './puzzle/puzzle.module';
 import { PuzzleSubmissionModule } from './puzzle-submission/puzzle-submission.module';
 import { PuzzleTranslationModule } from './puzzle-translation/puzzle-translation.module';
+import { ReferralModule } from './referral/referral.module';
 import { ReportsModule } from './reports/reports.module';
 import { RewardShopModule } from './reward-shop/reward-shop.module';
+import { RewardsModule } from './rewards/rewards.module';
+import { StreakModule } from './streak/streak.module';
 import { TimeTrialModule } from './time-trial/time-trial.module';
 import { UserActivityLogModule } from './user-activity-log/user-activity-log.module';
+import { UserInventoryModule } from './user-inventory/user-inventory.module';
 import { UserRankingModule } from './user-ranking/user-ranking.module';
 import { UserReactionModule } from './user-reaction/user-reaction.module';
 import { UserReportCardModule } from './user-report-card/user-report-card.module';
@@ -60,20 +67,27 @@ import { UserReportCardModule } from './user-report-card/user-report-card.module
     ActivityModule,
     AnalyticsModule,
     ApiKeyModule,
+    AuthModule,
     ContentModule,
     ContentRatingModule,
+    HintModule,
     InAppNotificationsModule,
     MultiplayerQueueModule,
     NFTClaimModule,
     ProgressModule,
+    PuzzleCategoryModule,
     PuzzleDependencyModule,
     PuzzleModule,
     PuzzleSubmissionModule,
     PuzzleTranslationModule,
+    ReferralModule,
     ReportsModule,
     RewardShopModule,
+    RewardsModule,
+    StreakModule,
     TimeTrialModule,
     UserActivityLogModule,
+    UserInventoryModule,
     UserRankingModule,
     UserReactionModule,
     UserReportCardModule,

frontend/app/layout.js

@@ -1,7 +1,7 @@
 import localFont from "next/font/local";
 import "./globals.css";
 
-// import StoreProvider from "@/store/StoreProvider";
+import StoreProvider from "@/store/StoreProvider";
 import Providers from "@/lib/queryClient";
 import Navbar from "@/components/Navbar";
 
@@ -28,10 +28,10 @@ export default function RootLayout({ children }) {
         className={`${geistSans.variable} ${geistMono.variable} antialiased`}
       >
         <Providers>
-          {/* <StoreProvider> */}
-          <Navbar />
-          {children}
-          {/* </StoreProvider> */}
+          <StoreProvider>
+            <Navbar />
+            {children}
+          </StoreProvider>
         </Providers>
       </body>
     </html>

frontend/app/page.tsx

@@ -1,25 +1,71 @@
-// app/link-accounts/page.tsx
 "use client";
 
 import React from "react";
-import { signIn, useSession } from "next-auth/react";
+import Link from "next/link";
+import { useSession } from "next-auth/react";
 
-export default function LinkAccounts() {
+export default function HomePage() {
   const { data: session } = useSession();
 
   return (
-    <div className="p-6">
-      <h1 className="text-xl font-bold mb-4">Link your accounts</h1>
-      <div className="space-y-3">
-        <button onClick={() => signIn("github")} className="btn">
-          Link GitHub
-        </button>
-        <button onClick={() => signIn("twitter")} className="btn">
-          Link Twitter
-        </button>
-        <button onClick={() => signIn("discord")} className="btn">
-          Link Discord
-        </button>
+    <div className="min-h-screen flex flex-col items-center justify-center p-6">
+      <div className="max-w-2xl w-full text-center space-y-8">
+        <h1 className="text-4xl font-bold tracking-tight">
+          Welcome to StellarHunts
+        </h1>
+        <p className="text-lg text-gray-600">
+          Solve cryptographic puzzles and blockchain challenges to earn
+          on-chain NFT rewards while learning about web3 technologies.
+        </p>
+
+        <div className="grid grid-cols-1 sm:grid-cols-3 gap-4 mt-8">
+          <Link
+            href="/puzzles"
+            className="block p-6 rounded-lg border border-gray-200 hover:border-blue-500 hover:shadow-md transition-all"
+          >
+            <h2 className="text-xl font-semibold mb-2">Puzzles</h2>
+            <p className="text-sm text-gray-500">
+              Challenge yourself with blockchain riddles
+            </p>
+          </Link>
+
+          <Link
+            href="/leaderboard"
+            className="block p-6 rounded-lg border border-gray-200 hover:border-blue-500 hover:shadow-md transition-all"
+          >
+            <h2 className="text-xl font-semibold mb-2">Leaderboard</h2>
+            <p className="text-sm text-gray-500">
+              Compete with other players globally
+            </p>
+          </Link>
+
+          <Link
+            href="/rewards"
+            className="block p-6 rounded-lg border border-gray-200 hover:border-blue-500 hover:shadow-md transition-all"
+          >
+            <h2 className="text-xl font-semibold mb-2">Rewards</h2>
+            <p className="text-sm text-gray-500">
+              Claim your earned NFT badges
+            </p>
+          </Link>
+        </div>
+
+        {!session && (
+          <div className="mt-8">
+            <Link
+              href="/auth/login"
+              className="inline-block px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors"
+            >
+              Get Started
+            </Link>
+          </div>
+        )}
+
+        {session && (
+          <div className="mt-8 text-gray-600">
+            Signed in as {session.user?.email || session.user?.name}
+          </div>
+        )}
       </div>
     </div>
   );