Merge pull request #83 from CS196Illinois/thing

Thing
CS196Illinois · Dec 8, 2024 · 34c79aa · 34c79aa
2 parents 7bca55c + aafff9e
commit 34c79aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Project/backend/java-server/app/src/main/java/org/server/MatchingRoutes.java b/Project/backend/java-server/app/src/main/java/org/server/MatchingRoutes.java
@@ -60,13 +60,13 @@ public ResponseEntity<UserOutput> nextUser(@RequestBody JsonObject token) {
     PostgreSQLController pgController = new PostgreSQLController();
     String sessionToken = token.get("session_token").getAsString();
     String discordId = pgController.getDiscordId(sessionToken);
+    pgController.resetSeen(discordId);
     if (pgController.hasUserBeenCreated(discordId)) {
       try {
         Matching matching = new Matching(sessionToken);
         matching.newFillMatchList();
         List<User> matchList = matching.getMatchList();
         if (matchList.isEmpty()) {
-          pgController.resetSeen(discordId);
           matching.newFillMatchList();
           matchList = matching.getMatchList();
           if (matchList.isEmpty()) {

diff --git a/Project/frontend/app/matching/components/SwipeProfiles.tsx b/Project/frontend/app/matching/components/SwipeProfiles.tsx
@@ -171,9 +171,16 @@ const SwipeProfiles: React.FC<SwipeProfilesProps> = ({profiles, filters}) => {
                                 onMouseDown={handleMouseDown}
                             >
                                 <ProfileCard
-                                    {...profile}
+					name={profile.name}
+					age={profile.age}
+					image={profile.image}
+					bio={profile.bio}
+					pronouns={profile.pronouns}
+					riotId={profile.riotId}
+					discordId={profile.discordId}
+					description={profile.description}
+				    roles={profile.roles}
                                     rank={profile.rank}
-                                    description=""
                                 />
                             </div>
                         );