Merge develop into main

.gitignore

@@ -27,6 +27,7 @@ with-nextjs/out
 
 # Websockets
 */backend/.env
+backend/.env
 
 # local env files
 */.env*.local

backend/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "semi": true,
+  "trailingComma": "es5"
+}

backend/controllers/clubsController.js

@@ -0,0 +1,88 @@
+import supabaseConnection from '../database.js';
+import clubs from '../models/clubs.js';
+
+const clubsController = {
+  getAllClubs: async (req, res) => {
+    try {
+      const data = await clubs.getAllClubs();
+      res.json(data);
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  },
+  getClubById: async (req, res) => {
+    try {
+      if (!req.params?.id) {
+        return res.status(400).json({ message: 'Club ID is required' });
+      }
+      const data = await clubs.getClubById(req.params.id);
+      if (!data) {
+        return res.status(404).json({ message: 'Club not found' });
+      }
+      res.json(data);
+    } catch (error) {
+      console.error('Error fetching clubs info:', error);
+      res.status(500).json({ message: 'Internal Server Error' });
+    }
+  },
+  getClubByAccountId: async (req, res) => {
+    try {
+      if (!req.params?.id) {
+        return res.status(400).json({ message: 'Club ID is required' });
+      }
+      const data = await clubs.getClubByAccountId(req.params.id);
+      if (!data) {
+        return res.status(404).json({ message: 'Club not found' });
+      }
+      res.json(data);
+    } catch (error) {
+      console.error('Error fetching clubs info:', error);
+      res.status(500).json({ message: 'Internal Server Error' });
+    }
+  },
+  updateClub: async (req, res) => {
+    try {
+      if (!req.params?.id) {
+        return res.status(400).json({ message: 'Club ID is required' });
+      }
+      const data = {};
+      const allowedFields = [
+        'name',
+        'location',
+        'campus',
+        'category',
+        'description',
+      ];
+      for (const field of allowedFields) {
+        if (req.body[field] !== undefined) {
+          data[field] = req.body[field];
+        }
+      }
+      await clubs.updateClubInfo(req.params.id, data);
+      res
+        .status(200)
+        .json({ message: 'Club information updated successfully', data });
+    } catch (error) {
+      console.error('Error updating club info:', error);
+      res.status(500).json({ message: 'Internal Server Error' });
+    }
+  },
+
+  getEventsClub: async (req, res) => {
+    try {
+      const clubId = req.params?.id;
+      if (!clubId) {
+        return res.status(400).json({ message: 'Club ID is required' });
+      }
+      const events = await supabaseConnection
+        .from('events')
+        .select('*')
+        .eq('hostClubId', clubId);
+      res.status(200).json(events);
+    } catch (error) {
+      console.error('Error updating club info:', error);
+      res.status(500).json({ message: 'Internal Server Error' });
+    }
+  },
+};
+export default clubsController;

backend/controllers/eventsController.js

@@ -0,0 +1,51 @@
+import supabaseConnection from '../database.js';
+
+export const createEvent = async (req, res) => {
+  if (req.method !== 'POST') {
+    return res.status(405).json({ error: 'Method Not Allowed' });
+  }
+
+  const {
+    title,
+    description,
+    hostClubId,
+    startTimestamp,
+    endTimestamp,
+    event_status,
+  } = req.body;
+
+  const { data, error } = await supabaseConnection.from('events').insert([
+    {
+      title,
+      description,
+      hostClubId: '4', // Hardcoded for now
+      startTimestamp,
+      endTimestamp,
+      event_status,
+    },
+  ]);
+
+  if (error) {
+    return res.status(500).json({ error: error.message });
+  }
+
+  return res.status(201).json({ data });
+};
+
+export const getEvents = async (req, res) => {
+  const { data, error } = await supabaseConnection.from('events').select(`
+      *,
+      hostClub: clubs (
+        id,
+        name,
+        description,
+        verified
+      )
+    `);
+
+  if (error) {
+    return res.status(500).json({ error: error.message });
+  }
+
+  return res.json(data);
+};

backend/database.js

@@ -0,0 +1,9 @@
+import 'dotenv/config';
+import { createClient } from '@supabase/supabase-js';
+
+const supabaseConnection = createClient(
+  process.env.EXPO_PUBLIC_SUPABASE_URL,
+  process.env.PRIVATE_API_KEY
+);
+
+export default supabaseConnection;

backend/eslint.config.mjs

@@ -0,0 +1,25 @@
+// ESLint config for Node.js backend (CommonJS/ESM)
+export default [
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2022,
+      sourceType: 'module',
+      globals: {
+        require: 'readonly',
+        module: 'readonly',
+        __dirname: 'readonly',
+        process: 'readonly',
+        console: 'readonly',
+      },
+    },
+    rules: {
+      'no-unused-vars': 'warn',
+      'no-undef': 'error',
+      semi: ['error', 'always'],
+      quotes: ['error', 'single'],
+      eqeqeq: 'warn',
+    },
+    ignores: ['node_modules/*', 'dist/*'],
+  },
+];

backend/index.js

@@ -0,0 +1,44 @@
+import express from 'express';
+import cors from 'cors';
+import supabaseConnection from './database.js';
+import clubsRouter from './routes/clubsRouter.js';
+import { eventsRouter } from './routes/eventsRouter.js';
+
+const app = express();
+const PORT = 3000;
+
+app.use(express.json());
+
+app.get('/', (req, res) => {
+  res.send('API running');
+});
+
+// Middleware
+const corsConfig = {
+  origin: 'http://localhost:8081',
+  credentials: true,
+};
+
+app.use(cors(corsConfig));
+
+app.use('/api/events', eventsRouter);
+app.use('/api/clubs', clubsRouter);
+
+const testSupabase = async () => {
+  console.log('Testing Supabase connection...');
+
+  const { data, error } = await supabaseConnection.from('Test').select('*');
+
+  if (error) {
+    console.error('Supabase error:', error.message);
+  } else if (!data || data.length === 0) {
+    console.warn('No data found in Test table.');
+  } else {
+    console.log('Data from Supabase:', data);
+  }
+};
+
+testSupabase();
+app.listen(PORT, () => {
+  console.log(`Server is running on port ${PORT}`);
+});

backend/models/clubs.js

@@ -0,0 +1,40 @@
+import supabaseConnection from '../database.js';
+
+const clubModel = {
+  getAllClubs: async () => {
+    const { data, error } = await supabaseConnection.from('clubs').select('*');
+    if (error) throw new Error(error.message);
+    return data || [];
+  },
+  getClubById: async (id) => {
+    const { data, error } = await supabaseConnection
+      .from('clubs')
+      .select('*')
+      .eq('id', id)
+      .maybeSingle();
+    if (error) throw new Error(error.message);
+    return data;
+  },
+  getClubByAccountId: async (accountId) => {
+    const { data, error } = await supabaseConnection
+      .from('clubs')
+      .select('*')
+      .eq('accountId', accountId)
+      .maybeSingle();
+    if (error) throw new Error(error.message);
+    return data;
+  },
+  updateClubInfo: async (id, updateData) => {
+    const { data, error } = await supabaseConnection
+      .from('clubs')
+      .update(updateData)
+      .eq('accountId', id);
+
+    if (error) {
+      throw new Error(error.message);
+    }
+    return data;
+  },
+};
+
+export default clubModel;

backend/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "backend",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "start": "node index.js",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint . --config eslint.config.mjs --fix",
+    "format": "prettier --write ."
+  },
+  "type": "module",
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "@supabase/supabase-js": "^2.50.0",
+    "cors": "^2.8.5",
+    "dotenv": "^16.5.0",
+    "express": "^5.1.0"
+  },
+  "devDependencies": {
+    "@types/next": "^8.0.7",
+    "eslint": "^9.29.0",
+    "next": "^15.3.3",
+    "prettier": "^3.5.3"
+  }
+}

backend/routes/clubsRouter.js

@@ -0,0 +1,12 @@
+import { Router } from 'express';
+import clubsController from '../controllers/clubsController.js';
+
+const router = Router();
+
+router.get('/', clubsController.getAllClubs);
+router.get('/me/:id', clubsController.getClubByAccountId);
+router.get('/:id', clubsController.getClubById);
+router.patch('/:id', clubsController.updateClub);
+router.get('/:id/events', clubsController.getEventsClub);
+
+export default router;

backend/routes/eventsRouter.js

@@ -0,0 +1,7 @@
+import express from 'express';
+import { createEvent, getEvents } from '../controllers/eventsController.js';
+
+export const eventsRouter = express.Router();
+
+eventsRouter.post('/createEvent', createEvent);
+eventsRouter.get('/', getEvents);

eslint.config.mjs

@@ -0,0 +1,13 @@
+import js from "@eslint/js";
+import globals from "globals";
+import tseslint from "typescript-eslint";
+import pluginReact from "eslint-plugin-react";
+import { defineConfig } from "eslint/config";
+
+
+export default defineConfig([
+  { files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], plugins: { js }, extends: ["js/recommended"] },
+  { files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], languageOptions: { globals: globals.browser } },
+  tseslint.configs.recommended,
+  pluginReact.configs.flat.recommended,
+]);

frontend/.gitignore

@@ -0,0 +1,41 @@
+# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files
+
+# dependencies
+node_modules/
+
+# Expo
+.expo/
+dist/
+web-build/
+expo-env.d.ts
+
+# Native
+.kotlin/
+*.orig.*
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+
+# Metro
+.metro-health-check*
+
+# debug
+npm-debug.*
+yarn-debug.*
+yarn-error.*
+
+# macOS
+.DS_Store
+*.pem
+
+# local env files
+.env*.local
+.env
+# typescript
+*.tsbuildinfo
+
+.vscode
+
+app-example

frontend/.prettierrc

@@ -0,0 +1,5 @@
+{
+  "singleQuote": true,
+  "semi": true,
+  "trailingComma": "es5"
+}