Bugs

README.md

@@ -4,18 +4,20 @@
 2. Clone the repository on the `main` branch and open the project in VSCode.
 3. Install VSCode extensions Eslint and Prettier (for linting and formatting).
 
-## FrontEnd
-
-3. Go to the `project/frontend` directory.
-4. Run `npm install` to install all the node packages.
-5. Run `npm start` to run the React App and check if you can see the rendered site at http://localhost:3000/
+## Add .env files
+4. Ask Nikhil or Sithu for the contents of these files, which you will add to your local repository.
 
 ## BackEnd
 
-6. Go to the `project/backend` directory.
-7. Run `npm install` to install all the node packages.
-8. Run `npm start` to start the backend server and check there is no error in the terminal.
-9. Make a copy of the `.env.example` file and rename it `.env`.
+5. Go to the `project/backend` directory.
+6. Run `npm install` to install all the node packages.
+7. Run `npm start` to start the backend server and check there is no error in the terminal.
+
+## FrontEnd
+
+8. Go to the `project/frontend` directory.
+9. Run `npm install` to install all the node packages.
+10. Run `npm start` to run the React App and check if you can see the rendered site at http://localhost:3000/
 
 ## Development
 

backend/controllers/emailSubscription.js

@@ -6,7 +6,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;
 
 mailchimp.setConfig({
   apiKey: apikey,
-  server: "us13",
+  server: "us12",
 });
 
 // Audience ID: 968cfc7373

backend/controllers/eventController.js

@@ -55,6 +55,7 @@ export const eventList = asyncHandler(async (req, res) => {
         instagram_link,
         code,
         qrCode,
+        event_type,
       } = event;
       return {
         _id,
@@ -68,6 +69,7 @@ export const eventList = asyncHandler(async (req, res) => {
         instagram_link,
         code,
         qrCode,
+        event_type,
       };
     });
 
@@ -134,6 +136,11 @@ export const eventCreate = [
 
       throw new Error('Instagram link must be a valid URL.');
     }),
+  body('event_type')
+    .optional()
+    .customSanitizer((val) => val.trim())
+    .isIn(['General', 'Dev', 'Open Source', 'Innovate'])
+    .withMessage('Event type must be one of: General, Dev, Open Source, Innovate'),
 
   asyncHandler(async (req, res) => {
     // Extract the validation errors from a request.

backend/controllers/userController.js

@@ -177,6 +177,31 @@ export const getUserRank = asyncHandler(async (req, res) => {
   }
 });
 
+// Gets the points of the User right above current User (more points)
+// (i.e return 600 if B=600pts and A=500pts)
+export const getBeforeUserPoints = asyncHandler(async (req, res) => {
+  const { email } = req.params;
+  try {
+    // Find all users sorted by points
+    const allUsers = await User.find()
+      .sort({ points: -1 })
+      .select('name email profilePicture points')
+      .exec();
+    // Get the index of the current user in the sorted list
+    const currentUserIndex = allUsers.findIndex(user => user.email === email);
+    var beforeUserIndex = currentUserIndex - 1;
+    while(allUsers[currentUserIndex].points == allUsers[beforeUserIndex].points){
+      beforeUserIndex--;
+    }
+    const beforeUsersPoints = allUsers[beforeUserIndex].points;
+
+    res.status(200).json(beforeUsersPoints);
+  } catch (error) {
+    console.error('Error fetching user ranks: ', error);
+    res.status(500).json({ message: 'Server error' });
+  }
+});
+
 
 // POST request for creating new event entries for a user.
 export const userEventsUpdate = asyncHandler(async (req, res) => {
@@ -320,6 +345,7 @@ export default {
   userEventsUpdate,
   getTopMembers,
   getUserRank,
+  getBeforeUserPoints,
   redeemSmall,
   redeemMedium,
   redeemLarge,

backend/index.js

@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import connectDB from './database/connect-db.js';
 // import testDatabaseConnection from './database/db-test.js';
 import connectMailchimp from './mailchimp/connect-mailchimp.js';
-import { addContacts, getContacts } from './mailchimp/contacts.js';
+// import { addContacts, getContacts } from './mailchimp/contacts.js';
 
 // import routes
 import eventRoutes from './routes/event.js';
@@ -20,6 +20,7 @@ dotenv.config();
 
 app.use(bodyParser.json({ limit: '30mb', extended: true }));
 app.use(bodyParser.urlencoded({ limit: '30mb', extended: true }));
+
 app.use(cors());
 
 const PORT = process.env.PORT || 5000;
@@ -41,7 +42,7 @@ app.use(`${baseApi}`, eventRoutes);
 app.use(`${baseApi}/subscribers`, subscriptionRoutes);
 app.use(`${baseApi}/users`, userRoutes);
 
-var server = app.listen(PORT, function () {
+var server = app.listen(PORT, '0.0.0.0', function () {
   var port = server.address().port;
   console.log('Example app listening at http://localhost:%s', port);
 });

backend/mailchimp/connect-mailchimp.js

@@ -5,7 +5,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;
 
 mailchimp.setConfig({
   apiKey: apikey,
-  server: "us13",
+  server: 'us12',
 });
 
 async function connectMailchimp() {

backend/mailchimp/contacts.js

@@ -6,7 +6,7 @@ const apikey = process.env.MAILCHIMP_API_KEY;
 
 mailchimp.setConfig({
   apiKey: apikey,
-  server: "us13",
+  server: 'us12',
 });
 
 // Audience ID: 968cfc7373
@@ -19,7 +19,7 @@ const addContacts = async () => {
         json: (data) => console.log(data)
       })
     });
-    console.log(data)
+    console.log(data);
     for (const email of data) {
       const response = await mailchimp.lists.addListMember('968cfc7373', {
         email_address: email,
@@ -36,6 +36,6 @@ const addContacts = async () => {
 const getContacts = async() => {
   const response = await mailchimp.lists.getListMembersInfo('968cfc7373');
   console.log(response);
-}
+};
 
 export { addContacts, getContacts };

backend/models/event.js

@@ -11,6 +11,12 @@ const eventSchema = new Schema({
   instagram_link: String,
   code: { type: String },
   qrCode: { type: String },
+  event_type: {
+    type: String,
+    enum: ["General", "Dev", "Open Source", "Innovate"],
+    required: false,
+    default: "General",
+  },
 });
 
 // Export model