Style fixes for dropdown, favorites query logic

sandboxnu · Jul 31, 2024 · fbe414b · fbe414b
1 parent c3cf991
commit fbe414b
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 57 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/nucarpool.iml b/.idea/nucarpool.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -208,7 +208,7 @@ const Home: NextPage<any> = () => {
     }
   }, [user, geoJsonUsers]);
 
-  // seperate use effect for user location rendering
+  // separate use effect for user location rendering
   useEffect(() => {
     if (mapState) {
       updateUserLocation(
@@ -261,6 +261,18 @@ const Home: NextPage<any> = () => {
           className="flex-1 pt-4"
         />
       </div>
+      <div className="flex items-center space-x-4">
+        <VisibilityToggle
+          map={mapState}
+          style={{
+            width: "100%",
+            marginTop: "20px",
+            backgroundColor: "white",
+            borderRadius: "8px",
+            borderColor: "black",
+          }}
+        />
+      </div>
     </div>
   );
   return (
@@ -307,22 +319,6 @@ const Home: NextPage<any> = () => {
                   className={"h-full w-full flex-auto"}
                 >
                   {user.role === "VIEWER" && viewerBox}
-                  {user.role === "VIEWER" && (
-                    <VisibilityToggle
-                      map={mapState}
-                      style={{
-                        position: "absolute",
-                        top: "10px",
-                        right: "10px",
-                        zIndex: 9999,
-                        padding: "10px",
-                        paddingRight: "25px",
-                        backgroundColor: "white",
-                        boxShadow: "0 2px 6px rgba(0,0,0,0.3)",
-                        borderRadius: "8px",
-                      }}
-                    />
-                  )}
                   <MapLegend role={user.role} />
                   <MapConnectPortal
                     otherUser={popupUser}

diff --git a/src/server/router/user/favorites.ts b/src/server/router/user/favorites.ts
@@ -10,6 +10,7 @@ export const favoritesRouter = router({
     const user = await ctx.prisma.user.findUnique({
       where: { id },
       select: {
+        role: true,
         favorites: true,
       },
     });
@@ -21,8 +22,11 @@ export const favoritesRouter = router({
         message: `No profile with id '${id}'`,
       });
     }
-
-    return user.favorites.map(convertToPublic);
+    const userRole = user.role;
+    const filteredFavorites = user.favorites.filter(
+      (favorite) => favorite.role !== userRole
+    );
+    return filteredFavorites.map(convertToPublic);
   }),
   edit: protectedRouter
     .input(