google auth added + frontend stuff and fixed some UI

Author: simontijanic

app.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const session = require('express-session');
 const rateLimit = require('express-rate-limit');
+const passport = require("passport")
 
 const limiter = rateLimit({
   windowMs: 15 * 60 * 1000, // 15 minutes
@@ -53,6 +54,9 @@ app.use(
   })
 );
 
+app.use(passport.initialize());
+app.use(passport.session());
+
 // Routes
 app.use('/', defaultRoute);
 app.use('/', uploadRoute);

controllers/multerController.js

@@ -1,38 +1,49 @@
-const multer = require('multer');
-const path = require('path');
-const sharp = require('sharp');
+const multer = require("multer");
+const path = require("path");
+const sharp = require("sharp");
 
 const storage = multer.diskStorage({
-    destination: (req, file, cb) => {
-        const uploadDir = path.join(__dirname, '../images/uploads');
-        cb(null, uploadDir);
-    },
-    filename: (req, file, cb) => {
-        const uniqueName = `${Date.now()}-${file.originalname.replace(/\s+/g, '_')}`;
-        cb(null, uniqueName);
-    }
+  destination: (req, file, cb) => {
+    const uploadDir = path.join(__dirname, "../images/uploads");
+    cb(null, uploadDir);
+  },
+  filename: (req, file, cb) => {
+    const uniqueName = `${Date.now()}-${file.originalname.replace(
+      /\s+/g,
+      "_"
+    )}`;
+    cb(null, uniqueName);
+  },
 });
 
 const upload = multer({ storage });
 
 async function optimizeImage(filePath, qualityValue, resizeWidth = 800) {
-    const uploadDir = path.join(__dirname, '..', 'images', 'uploads');
-    const sanitizedFilename = `optimized-${Date.now()}-${path.basename(filePath).replace(/\s+/g, '_').replace(/[^a-zA-Z0-9.-_]/g, '')}`;
-    const outputFilePath = path.join(uploadDir, sanitizedFilename);
+  const uploadDir = path.join(__dirname, "..", "images", "uploads");
+  const sanitizedFilename = `optimized-${Date.now()}-${path
+    .basename(filePath)
+    .replace(/\s+/g, "_")
+    .replace(/[^a-zA-Z0-9.-_]/g, "")}`;
+  const outputFilePath = path.join(uploadDir, sanitizedFilename);
 
-    await sharp(filePath)
-        .resize(resizeWidth)
-        .toFormat('jpeg')
-        .jpeg({ quality: qualityValue })
-        .toFile(outputFilePath);
+  await sharp(filePath)
+    .resize(resizeWidth)
+    .toFormat("jpeg")
+    .jpeg({ quality: qualityValue })
+    .toFile(outputFilePath);
 
-    return sanitizedFilename;
+  return sanitizedFilename;
 }
 
 function sanitizeFileName(filePath) {
-    const ext = path.extname(filePath).toLowerCase();
-    const sanitizedFilename = `optimized-${Date.now()}-${Math.random().toString(36).substr(2, 9)}-${path.basename(filePath).replace(/\s+/g, '_').replace(/[^a-zA-Z0-9.-_]/g, '')}`;
-    return sanitizedFilename;
+  const ext = path.extname(filePath).toLowerCase();
+  const sanitizedFilename = `optimized-${Date.now()}-${Math.random()
+    .toString(36)
+    .substr(2, 9)}-${path
+    .basename(filePath)
+    .replace(/\s+/g, "_")
+    .replace(/[^a-zA-Z0-9.-_]/g, "")}`;
+  return sanitizedFilename;
 }
 
 module.exports = { upload, optimizeImage, sanitizeFileName };

controllers/profilepictureController.js

@@ -1,20 +1,28 @@
 function generateDefaultProfilePicture(username = "User") {
-    const initials = username
-        .split(' ')
-        .map(word => word.charAt(0).toUpperCase())
-        .join('');
-    const backgroundColor = '#3498db';
-    const textColor = '#ffffff'; 
+  const initials = username
+    .split(" ")
+    .map((word) => word.charAt(0).toUpperCase())
+    .join("");
+  const backgroundColor = "#3498db";
+  const textColor = "#ffffff";
 
-    return `https://ui-avatars.com/api/?name=${initials}&background=${backgroundColor.replace('#', '')}&color=${textColor.replace('#', '')}`;
+  return `https://ui-avatars.com/api/?name=${initials}&background=${backgroundColor.replace(
+    "#",
+    ""
+  )}&color=${textColor.replace("#", "")}`;
 }
 
 const getProfilePicture = (user) => {
-    const username = user.username || "User";
-    if (user.profilepicture && typeof user.profilepicture === 'string') {
-        return `/images/uploads/${user.profilepicture}`;
-    }
-    return generateDefaultProfilePicture(username);
+  if (!user || !user.username) {
+    // Handle the case when user is null or undefined
+    return generateDefaultProfilePicture(); // Default profile picture if no user or username is available
+  }
+
+  const username = user.username || "User";
+  if (user.profilepicture && typeof user.profilepicture === "string") {
+    return `/images/uploads/${user.profilepicture}`;
+  }
+  return generateDefaultProfilePicture(username);
 };
 
 module.exports = getProfilePicture;