fix profile response, mobile profile edit, new question ui

bounswe · Nov 25, 2024 · 6b8e7e7 · 6b8e7e7
1 parent 6b2d9c5
commit 6b8e7e7
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 32 deletions.
diff --git a/...main/java/com/group1/programminglanguagesforum/DTOs/Responses/SelfProfileResponseDto.java b/...main/java/com/group1/programminglanguagesforum/DTOs/Responses/SelfProfileResponseDto.java
@@ -1,5 +1,5 @@
 package com.group1.programminglanguagesforum.DTOs.Responses;
-
+import com.group1.programminglanguagesforum.Entities.ExperienceLevel;
 import lombok.*;
 
 @Builder
@@ -19,4 +19,5 @@ public class SelfProfileResponseDto {
     private int followersCount;
     private int followingCount;
     private int reputationPoints;
+    private ExperienceLevel experienceLevel;
 }
diff --git a/mobile/.expo/types/router.d.ts b/mobile/.expo/types/router.d.ts
@@ -7,8 +7,8 @@ declare module 'expo-router' {
   export namespace ExpoRouter {
     export interface __routes<T extends string = string> extends Record<string, unknown> {
       StaticRoutes: `/` | `/(tabs)` | `/(tabs)/` | `/(tabs)/profile` | `/(tabs)/search` | `/_sitemap` | `/home` | `/login` | `/logout` | `/profile` | `/question/new` | `/search` | `/signup`;
-      DynamicRoutes: `/question/${Router.SingleRoutePart<T>}` | `/tags/${Router.SingleRoutePart<T>}` | `/users/${Router.SingleRoutePart<T>}`;
-      DynamicRouteTemplate: `/question/[questionId]` | `/tags/[tagId]` | `/users/[userId]`;
+      DynamicRoutes: `/question/${Router.SingleRoutePart<T>}` | `/question/${Router.SingleRoutePart<T>}/answer` | `/tags/${Router.SingleRoutePart<T>}` | `/users/${Router.SingleRoutePart<T>}`;
+      DynamicRouteTemplate: `/question/[questionId]` | `/question/[questionId]/answer` | `/tags/[tagId]` | `/users/[userId]`;
     }
   }
 }
diff --git a/mobile/app/(tabs)/profile.tsx b/mobile/app/(tabs)/profile.tsx
@@ -10,6 +10,16 @@ import {
   Input,
   InputField,
   ScrollView,
+  Select,
+  SelectBackdrop,
+  SelectContent,
+  SelectDragIndicator,
+  SelectDragIndicatorWrapper,
+  SelectIcon,
+  SelectInput,
+  SelectItem,
+  SelectPortal,
+  SelectTrigger,
   Text,
   Textarea,
   TextareaInput,
@@ -21,7 +31,7 @@ import {
 } from "@/services/api/programmingForumComponents";
 import useAuthStore from "@/services/auth";
 import { Link } from "expo-router";
-import { Plus } from "lucide-react-native";
+import { ChevronDownIcon, Plus } from "lucide-react-native";
 import { useEffect, useState } from "react";
 
 export default function Profile() {
@@ -38,6 +48,8 @@ export function UserProfile({ userId }: { userId: string }) {
 
   const [country, setCountry] = useState("");
   const [bio, setBio] = useState("");
+  const [experienceLevel, setExperienceLevel] =
+    useState<ExperienceLevel>("BEGINNER");
 
   useEffect(() => {
     if (!me) {
@@ -72,6 +84,7 @@ export function UserProfile({ userId }: { userId: string }) {
     if (data?.data) {
       setCountry(data.data.country || "");
       setBio(data.data.bio || "");
+      setExperienceLevel(data.data.experienceLevel || "BEGINNER");
     }
   }, [data?.data]);
 
@@ -146,6 +159,26 @@ export function UserProfile({ userId }: { userId: string }) {
                   placeholder="Bio"
                 />
               </Textarea>
+              <Select
+                selectedValue={experienceLevel}
+                onValueChange={setExperienceLevel}
+              >
+                <SelectTrigger variant="outline" size="md">
+                  <SelectInput placeholder="Experience Level" />
+                  <SelectIcon className="mr-3" as={ChevronDownIcon} />
+                </SelectTrigger>
+                <SelectPortal>
+                  <SelectBackdrop />
+                  <SelectContent>
+                    <SelectDragIndicatorWrapper>
+                      <SelectDragIndicator />
+                    </SelectDragIndicatorWrapper>
+                    <SelectItem label="Beginner" value="BEGINNER" />
+                    <SelectItem label="Intermediate" value="INTERMEDIATE" />
+                    <SelectItem label="Advanced" value="ADVANCED" />
+                  </SelectContent>
+                </SelectPortal>
+              </Select>
             </>
           ) : (
             <>
@@ -155,6 +188,9 @@ export function UserProfile({ userId }: { userId: string }) {
               >
                 {profile.bio ?? "Empty bio."}
               </Text>
+              <Text>
+                Experience: {profile.experienceLevel?.toString() || "Unknown"}
+              </Text>
             </>
           )}
 
@@ -171,8 +207,10 @@ export function UserProfile({ userId }: { userId: string }) {
                       ...profile,
                       country,
                       bio,
+                      experienceLevel,
                     },
                   });
+                  console.log(profile);
                 }}
               >
                 <ButtonText>{isPending ? "Saving..." : "Save"}</ButtonText>
@@ -186,7 +224,7 @@ export function UserProfile({ userId }: { userId: string }) {
             data?.data && <FollowButton profile={data?.data} />
           )}
         </VStack>
-
+        {/*
         <HStack space="md">
           <Button
             variant={activeTab === "questions" ? "solid" : "outline"}
@@ -200,7 +238,7 @@ export function UserProfile({ userId }: { userId: string }) {
           >
             <ButtonText>Answers</ButtonText>
           </Button>
-        </HStack>
+        </HStack> */}
 
         {activeTab === "questions" ? (
           <VStack space="md">

diff --git a/mobile/app/question/new.tsx b/mobile/app/question/new.tsx
@@ -1,23 +1,33 @@
-import { Input, InputField } from "@/components/ui/input";
-import { FullscreenLoading } from "@/components/FullscreenLoading";
 import ErrorAlert from "@/components/ErrorAlert";
-import { useCreateQuestion, useSearchTags } from "@/services/api/programmingForumComponents";
-import { useLocalSearchParams, useRouter } from "expo-router";
-import useAuthStore from "@/services/auth";
-import { useState } from "react";
+import { FullscreenLoading } from "@/components/FullscreenLoading";
 import {
   Button,
   ButtonText,
   HStack,
-  Text,
-  View,
-  VStack,
   Icon,
+  ScrollView,
+  Text,
   Textarea,
   TextareaInput,
+  View,
+  VStack,
 } from "@/components/ui";
+import { Input, InputField } from "@/components/ui/input";
+import {
+  useCreateQuestion,
+  useSearchTags,
+} from "@/services/api/programmingForumComponents";
+import {
+  DifficultyLevel,
+  EASY,
+  HARD,
+  MEDIUM,
+  TagSummary,
+} from "@/services/api/programmingForumSchemas";
+import useAuthStore from "@/services/auth";
+import { useLocalSearchParams, useRouter } from "expo-router";
 import { X } from "lucide-react-native";
-import { EASY, MEDIUM, HARD, DifficultyLevel, TagSummary } from "@/services/api/programmingForumSchemas";
+import { useState } from "react";
 
 export default function NewQuestionPage() {
   const { tagId } = useLocalSearchParams<{ tagId: string }>();
@@ -46,7 +56,11 @@ export default function NewQuestionPage() {
     );
   }
 
-  const { data: searchResult, isLoading, error: searchError } = useSearchTags(
+  const {
+    data: searchResult,
+    isLoading,
+    error: searchError,
+  } = useSearchTags(
     {
       queryParams: { q: searchQuery },
     },
@@ -80,10 +94,20 @@ export default function NewQuestionPage() {
       console.log("Title:", title);
       console.log("Content:", content);
       console.log("Difficulty:", difficulty);
-      console.log("Selected Tags:", selectedTags.map((tag) => tag.name));
+      console.log(
+        "Selected Tags:",
+        selectedTags.map((tag) => tag.name)
+      );
 
       await createQuestion({
-        body: { title, content, difficulty, tagIds: selectedTags.map((tag) => tag.id).filter((id): id is number => id !== undefined) },
+        body: {
+          title,
+          content,
+          difficulty,
+          tagIds: selectedTags
+            .map((tag) => tag.id)
+            .filter((id): id is number => id !== undefined),
+        },
       });
       alert("Question created successfully!");
       router.push(`/tags/${tagId}`);
@@ -97,12 +121,14 @@ export default function NewQuestionPage() {
   }
 
   return (
-    <View style={{ padding: 32, flex: 1, marginVertical: 16 }}>
+    <ScrollView style={{ padding: 32, flex: 1, marginVertical: 16 }}>
       <VStack style={{ gap: 16, flex: 1 }}>
-        <Text style={{ fontSize: 24, fontWeight: "bold" }}>Create New Question</Text>
-
+        <Text style={{ fontSize: 24, fontWeight: "bold" }}>
+          Create New Question
+        </Text>
+
         {error && <ErrorAlert error={error} />}
-        
+
         {/* Title Input */}
         <VStack style={{ gap: 8 }}>
           <Text style={{ fontSize: 16 }}>Title</Text>
@@ -135,7 +161,7 @@ export default function NewQuestionPage() {
             {contentLength} characters
           </Text>
         </VStack>
-        
+
         {searchError && <ErrorAlert error={searchError} />}
 
         {/* Tag Search Input */}
@@ -154,11 +180,11 @@ export default function NewQuestionPage() {
 
         {/* Display selected tags */}
         <Text style={{ fontSize: 16 }}>
-          {selectedTags.length > 0
-            ? `Selected tags:`
-            : "No tags selected"}
+          {selectedTags.length > 0 ? `Selected tags:` : "No tags selected"}
         </Text>
-        <View style={{ flexDirection: "row", flexWrap: "wrap", marginVertical: 8 }}>
+        <View
+          style={{ flexDirection: "row", flexWrap: "wrap", marginVertical: 8 }}
+        >
           {selectedTags.map((tag) => (
             <HStack
               key={tag.name}
@@ -183,7 +209,7 @@ export default function NewQuestionPage() {
         </View>
 
         {/* Tag List */}
-        { (
+        {
           <View style={{ marginVertical: 8 }}>
             <Text style={{ fontSize: 16 }}>Matching Tags</Text>
             <VStack style={{ gap: 8 }}>
@@ -198,7 +224,7 @@ export default function NewQuestionPage() {
               ))}
             </VStack>
           </View>
-        )}
+        }
 
         {/* Difficulty Selector */}
         <VStack style={{ gap: 8 }}>
@@ -234,6 +260,6 @@ export default function NewQuestionPage() {
           </Button>
         </HStack>
       </VStack>
-    </View>
+    </ScrollView>
   );
-}
+}