Merge pull request #96 from CS3219-AY2425S1/feat/user-profile

Add user profile operations and minor fixes

Author: Kurtyjlee

api-gateway/Dockerfile

@@ -9,7 +9,6 @@ WORKDIR /app
 
 # Copy package.json and pnpm-lock.yaml
 COPY package.json ./
-COPY pnpm-lock.yaml ./
 
 RUN pnpm install
 

docker-compose.prod.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   redis-server:
     image: redis:latest
@@ -75,7 +73,7 @@ services:
       target: production
     volumes:
       - ./api-gateway:/app
-      - ./api-gateway/node_modules:/app/node_modules
+      - /app/node_modules
     ports:
       - "8001:8001"
     networks:

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   redis-server:
     image: redis:latest
@@ -33,7 +31,7 @@ services:
       target: development
     volumes:
       - ./question-service:/app
-      - ./question-service/node_modules:/app/node_modules
+      - /app/node_modules
     ports:
       - "4001:4001"
     networks:
@@ -65,7 +63,7 @@ services:
       target: development
     volumes:
       - ./matching-service:/app
-      - ./matching-service/node_modules:/app/node_modules
+      - /app/node_modules
     ports:
       - "5001:5001"
     networks:
@@ -97,7 +95,7 @@ services:
       target: development
     volumes:
       - ./api-gateway:/app
-      - ./api-gateway/node_modules:/app/node_modules
+      - /app/node_modules
     ports:
       - "8001:8001"
     networks:

package.json

@@ -13,7 +13,8 @@
 		"question-service",
 		"peerprep-fe",
 		"user-service",
-		"matching-service"
+		"matching-service",
+		"api-gateway"
 	],
 	"dependencies": {
 		"cors": "^2.8.5",

peerprep-fe/.dockerignore

@@ -1,4 +1,5 @@
 ./node_modules
+node_modules
 .next
 .git
 .env*.local

peerprep-fe/package.json

@@ -16,6 +16,7 @@
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
     "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
     "@radix-ui/react-scroll-area": "^1.2.0",
     "@radix-ui/react-select": "^2.1.1",

peerprep-fe/pnpm-lock.yaml

@@ -34,7 +34,7 @@ export function FilterBadge({ filterType, value, onRemove }: FilterBadgeProps) {
       {`${filterType}: ${value}`}
       <button
         onClick={() => onRemove(filterType, value)}
-        className="ml-1 focus:outline-none"
+        className="ml-1 cursor-pointer focus:outline-none"
       >
         <X className="h-3 w-3" />
       </button>

peerprep-fe/src/app/(main)/components/filter/FilterBadge.tsx

@@ -30,7 +30,11 @@ export function FilterSelect({
       </SelectTrigger>
       <SelectContent>
         {options.map((option) => (
-          <SelectItem key={option.value} value={option.value}>
+          <SelectItem
+            key={option.value}
+            value={option.value}
+            className="cursor-pointer"
+          >
             {option.label}
           </SelectItem>
         ))}

peerprep-fe/src/app/(main)/components/filter/FilterSelect.tsx

@@ -62,7 +62,10 @@ export function TopicsPopover({
           <Input
             placeholder="Search topics..."
             value={searchTerm}
-            onChange={(e) => setSearchTerm(e.target.value)}
+            onChange={(e) => {
+              e.stopPropagation();
+              setSearchTerm(e.target.value);
+            }}
             className="mb-2"
           />
         </div>