mian

backend/controllers/profileController.js

@@ -38,7 +38,8 @@ const updateProfile = async (req, res, next) => {
 const updateProfilePic = async (req, res, next) => {
   try {
     const { id } = req.session.user;
-    const { profile_pic } = req.body;
+    // const { profile_pic } = req.body;
+    const profile_pic = req.file.buffer;
     const profile = await profileService.updateProfilePic({
       id,
       profile_pic,

backend/controllers/userController.js

@@ -1,6 +1,6 @@
 const userService = require('../services/userService');
 
-const getLikedPokemonsByUserId = async (req, res, next) => {
+const getLikedPokemonsByUser = async (req, res, next) => {
   try {
     const { id } = req.session.user;
     const pokemons = await userService.getLikedPokemonsByUserId(id);
@@ -10,7 +10,7 @@ const getLikedPokemonsByUserId = async (req, res, next) => {
   }
 }
 
-const getDislikedPokemonsByUserId = async (req, res, next) => {
+const getDislikedPokemonsByUser = async (req, res, next) => {
   try {
     const { id } = req.session.user;
     const pokemons = await userService.getDislikedPokemonsByUserId(id);
@@ -20,6 +20,26 @@ const getDislikedPokemonsByUserId = async (req, res, next) => {
   }
 }
 
+const getLikedPokemonsByUserId = async (req, res, next) => {
+  try {
+    const { user_id } = req.params
+    const pokemons = await userService.getLikedPokemonsByUserId(user_id);
+    res.status(200).json(pokemons);
+  } catch (error) {
+    next(error);
+  }
+}
+
+const getDislikedPokemonsByUserId = async (req, res, next) => {
+  try {
+    const { user_id } = req.params;
+    const pokemons = await userService.getDislikedPokemonsByUserId(user_id);
+    res.status(200).json(pokemons);
+  } catch (error) {
+    next(error);
+  }
+}
+
 const searchUsers = async (req, res, next) => {
   try {
     const { username } = req.query;
@@ -31,6 +51,8 @@ const searchUsers = async (req, res, next) => {
 }
 
 module.exports = {
+  getLikedPokemonsByUser,
+  getDislikedPokemonsByUser,
   getLikedPokemonsByUserId,
   getDislikedPokemonsByUserId,
   searchUsers,

backend/database/init.sql

@@ -4,7 +4,7 @@ CREATE TYPE relationship_type AS ENUM ('like', 'dislike');
 CREATE TABLE users (
     id SERIAL PRIMARY KEY,
     username VARCHAR(100) UNIQUE NOT NULL,
-    email VARCHAR(100) UNIQUE NOT NULL,
+    email VARCHAR(100) UNIQUE,
     password VARCHAR(100) NOT NULL,  -- Encrypted password
     role VARCHAR(20) DEFAULT 'user',  -- 'guest', 'user', 'admin'
     created_at TIMESTAMP DEFAULT NOW(),

backend/models/pokemonModel.js

@@ -18,13 +18,13 @@ const insertLikedPokemon = async (user_id, pokemon_id) => {
     INSERT INTO user_pokemons (pokemon_id, user_id, relationship)
     VALUES ($1, $2, 'like')
     ON CONFLICT (pokemon_id, user_id)
-    DO UPDATE SET 
-      relationship = CASE 
-        WHEN user_pokemons.relationship = 'dislike' THEN 'like' 
-        ELSE user_pokemons.relationship 
+    DO UPDATE SET
+      relationship = CASE
+        WHEN user_pokemons.relationship = 'dislike' THEN 'like'
+        ELSE user_pokemons.relationship
       END
     RETURNING user_id, pokemon_id`;
-    
+
   const values = [pokemon_id, user_id];
   const result = await db.query(text, values);
   return result;
@@ -36,10 +36,10 @@ const insertDislikedPokemon = async (user_id, pokemon_id) => {
   INSERT INTO user_pokemons (pokemon_id, user_id, relationship)
   VALUES ($1, $2, 'dislike')
   ON CONFLICT (pokemon_id, user_id)
-  DO UPDATE SET 
-    relationship = CASE 
-      WHEN user_pokemons.relationship = 'like' THEN 'dislike' 
-      ELSE user_pokemons.relationship 
+  DO UPDATE SET
+    relationship = CASE
+      WHEN user_pokemons.relationship = 'like' THEN 'dislike'
+      ELSE user_pokemons.relationship
     END
   RETURNING user_id, pokemon_id`;
   const values = [pokemon_id, user_id];
@@ -50,9 +50,6 @@ const insertDislikedPokemon = async (user_id, pokemon_id) => {
 const likedPokemon = async (user_id, pokemon_id, name) => {
   await insertPokemon(pokemon_id, name);
   const result = await insertLikedPokemon(user_id, pokemon_id);
-/*   if (result.rows.length === 0) {
-    throw new ValidationError("Pokemon already liked");
-  } */
   return result.rows[0];
 };
 
@@ -61,18 +58,12 @@ const unlikePokemon = async (user_id, pokemon_id) => {
     "DELETE FROM user_pokemons WHERE user_id = $1 AND pokemon_id = $2 AND relationship = 'like' RETURNING user_id, pokemon_id";
   const values = [user_id, pokemon_id];
   const result = await db.query(text, values);
-/*   if (result.rows.length === 0) {
-    throw new ValidationError("Pokemon already unliked");
-  } */
   return result.rows[0];
 };
 
 const dislikedPokemon = async (user_id, pokemon_id, name) => {
   await insertPokemon(pokemon_id, name);
   const result = await insertDislikedPokemon(user_id, pokemon_id);
-/*   if (result.rows.length === 0) {
-    throw new ValidationError("Pokemon already disliked");
-  } */
   return result.rows[0];
 };
 
@@ -81,9 +72,6 @@ const undislikePokemon = async (user_id, pokemon_id) => {
     "DELETE FROM user_pokemons WHERE user_id = $1 AND pokemon_id = $2 AND relationship = 'dislike' RETURNING user_id, pokemon_id";
   const values = [user_id, pokemon_id];
   const result = await db.query(text, values);
-/*   if (result.rows.length === 0) {
-    throw new ValidationError("Pokemon already undisliked");
-  } */
   return result.rows[0];
 };
 

backend/models/profileModel.js

@@ -23,7 +23,7 @@ const updateProfile = async (id, name, bio, profile_pic) => {
 
 const updateProfilePic = async (id, profile_pic) => {
   const result = await db.query(
-    "UPDATE profiles SET profile_pic = $1, updated_at = NOW() WHERE _user_id = $2 RETURNING *",
+    "UPDATE profiles SET profile_pic = $1, updated_at = NOW() WHERE user_id = $2 RETURNING *",
     [profile_pic, id]
   );
   if (result.rows.length === 0) {

backend/models/userModel.js

@@ -44,7 +44,7 @@ const getDislikedPokemonsByUserId = async (userId) => {
   if (result.rows.length === 0) {
     throw new NotFoundError("User not found");
   }
-  return result.rows; // Return the array of disliked Pokémon
+  return result.rows[0]; // Return the array of disliked Pokémon
 }
 
 const searchUsers = async (query) => {

backend/routes/profileRoutes.js

@@ -14,7 +14,7 @@ router.get("/:id", isAuthenticated, profileController.getProfileById);
   profileController.createProfile
 ); */
 router.put("/me/update", isAuthenticated, profileController.updateProfile);
-router.patch(
+router.post(
   "/me/update/profile_pic",
   upload.single("profile_pic"),
   profileController.updateProfilePic

backend/routes/userRoutes.js

@@ -13,6 +13,9 @@ router.get(
   isAuthenticated,
   userController.getDislikedPokemonsByUserId
 );
+
+router.get("/:user_id/liked_pokemons", isAuthenticated, userController.getLikedPokemonsByUserId);
+router.get("/:user_id/disliked_pokemons", isAuthenticated, userController.getDislikedPokemonsByUserId);
 router.get("/search", isAuthenticated, userController.searchUsers);
 
 module.exports = router;

backend/services/profileService.js

@@ -1,9 +1,9 @@
 const userModel = require("../models/profileModel");
 
-const fs = require('fs');
+const fs = require("fs");
 
 // Read the default profile picture file
-const defaultProfilePic = fs.readFileSync('./database/profile_pic.png');
+const defaultProfilePic = fs.readFileSync("./database/profile_pic.png");
 
 // Convert it to a binary format
 const defaultProfilePicBinary = Buffer.from(defaultProfilePic);
@@ -12,8 +12,15 @@ const createProfile = async ({ user_id, name, bio }) => {
   try {
     console.log("creating profile");
     console.log(user_id, name, bio, defaultProfilePicBinary);
-    const profile = await userModel.createProfile(user_id, name, bio, defaultProfilePicBinary);
-    const base64Image = profile.profile_pic ? profile.profile_pic.toString('base64') : null;
+    const profile = await userModel.createProfile(
+      user_id,
+      name,
+      bio,
+      defaultProfilePicBinary
+    );
+    const base64Image = profile.profile_pic
+      ? profile.profile_pic.toString("base64")
+      : null;
     profile.profile_pic = base64Image;
     console.log("creating profile successful:", profile);
     return profile;
@@ -28,11 +35,12 @@ const updateProfile = async ({ id, name, bio, profile_pic }) => {
     console.log("updating profile");
     console.log(id, name, bio, profile_pic);
     const profile = await userModel.updateProfile(id, name, bio, profile_pic);
-    const base64Image = profile.profile_pic ? profile.profile_pic.toString('base64') : null;
+    const base64Image = profile.profile_pic
+      ? profile.profile_pic.toString("base64")
+      : null;
     profile.profile_pic = base64Image;
     console.log("updating profile successful:", profile);
     return profile;
-
   } catch (error) {
     console.log("error updating profile:", error.message);
     throw error;
@@ -44,7 +52,9 @@ const updateProfilePic = async ({ id, profile_pic }) => {
     console.log("updating profile pic");
     console.log(id, profile_pic);
     const profile = await userModel.updateProfilePic(id, profile_pic);
-    const base64Image = profile.profile_pic ? profile.profile_pic.toString('base64') : null;
+    const base64Image = profile.profile_pic
+      ? profile.profile_pic.toString("base64")
+      : null;
     profile.profile_pic = base64Image;
     console.log("updating profile pic successful:", profile);
     return profile;
@@ -85,7 +95,9 @@ const getProfileById = async (id) => {
     console.log("fetching profile");
     console.log(id);
     const profile = await userModel.getProfileById(id);
-    const base64Image = profile.profile_pic ? profile.profile_pic.toString('base64') : null;
+    const base64Image = profile.profile_pic
+      ? profile.profile_pic.toString("base64")
+      : null;
     profile.profile_pic = base64Image;
     console.log("fetching profile successful:", profile);
     return profile;
@@ -99,8 +111,12 @@ const getProfiles = async () => {
   try {
     console.log("fetching profiles");
     const profiles = await userModel.getProfiles();
-    const base64Image = profile.profile_pic ? profile.profile_pic.toString('base64') : null;
-    profile.profile_pic = base64Image;
+    profiles.map((profile) => {
+      const base64Image = profile.profile_pic
+        ? profile.profile_pic.toString("base64")
+        : null;
+      profile.profile_pic = base64Image;
+    });
     console.log("fetching profiles successful:", profiles);
     return profiles;
   } catch (error) {
@@ -113,16 +129,18 @@ const searchProfiles = async (name) => {
   try {
     console.log("searching profiles");
     console.log(name);
-    const profiles = await userModel.searchProfiles(name);
-    const base64Image = profile.profile_pic ? profile.profile_pic.toString('base64') : null;
+    const profile = await userModel.searchProfiles(name);
+    const base64Image = profile.profile_pic
+      ? profile.profile_pic.toString("base64")
+      : null;
     profile.profile_pic = base64Image;
-    console.log("searching profiles successful:", profiles);
+    console.log("searching profiles successful:", profile);
     return profiles;
   } catch (error) {
     console.log("error searching profiles:", error.message);
     throw error;
   }
-}
+};
 
 module.exports = {
   createProfile,

frontend/pokedex_app/package.json

@@ -12,6 +12,8 @@
   "proxy": "http://localhost:3000",
   "dependencies": {
     "@heroicons/react": "^2.1.5",
+    "holy-loader": "^2.3.8",
+    "lucide-react": "^0.453.0",
     "prettier": "^3.3.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

frontend/pokedex_app/src/App.jsx

@@ -12,11 +12,12 @@ import PrivacyPolicy from "./pages/PrivacyPolicy";
 import TermsOfService from "./pages/TermsOfService";
 import ErrorBoundary from "./ErrorBoundary";
 import { AuthProvider } from "./AuthContext"; // Import AuthProvider
+import Community from "./components/Community";
 
 function App() {
   return (
-    <AuthProvider>
-      <Router>
+    <Router>
+      <AuthProvider>
         <div id="root">
           <Navbar />
           <main>
@@ -35,12 +36,13 @@ function App() {
               <Route path="/pokemon/:name" element={<PokemonProfile />} />
               <Route path="/privacy-policy" element={<PrivacyPolicy />} />
               <Route path="/terms" element={<TermsOfService />} />
+              <Route path="/Community" element={<Community />} />
             </Routes>
           </main>
           <Footer />
         </div>
-      </Router>
-    </AuthProvider>
+      </AuthProvider>
+    </Router>
   );
 }