feat/profile-page

expo/app/(tabs)/profile/_layout.tsx

@@ -1,9 +1,14 @@
 import { Stack } from "expo-router";
 
+import { ProfileHeader } from "../../../components/profile/HeaderProfile";
+
 export default function ProfileTabLayout() {
   return (
     <Stack>
-      <Stack.Screen name="index" options={{ title: "Profil" }} />
+      <Stack.Screen
+        name="index"
+        options={{ title: "Profil", header: () => <ProfileHeader /> }}
+      />
       <Stack.Screen name="account" options={{ headerShown: false }} />
     </Stack>
   );

expo/app/(tabs)/profile/index.tsx

@@ -1,34 +1,17 @@
-import SignOut from "phosphor-react-native/src/icons/SignOut";
 import React from "react";
-import { StyleSheet } from "react-native";
+import { ScrollView } from "react-native";
 
-import Button from "../../../components/Button";
-import { View } from "../../../components/Tamed";
-import { supabase } from "../../../lib/supabase";
-import { useSupabaseUserHook } from "../../../lib/useSupabaseUser";
+import UserRoomHistory from "../../../components/UserRoomHistory";
 
 export default function TabsProfile() {
-  const user = useSupabaseUserHook();
-
   return (
-    <>
-      {user && (
-        <View style={styles.elements}>
-          <Button
-            prependIcon={<SignOut />}
-            onPress={() => supabase.auth.signOut()}
-          >
-            Se déconnecter
-          </Button>
-          <Button href="/(tabs)/profile/account">Gérer mon compte</Button>
-        </View>
-      )}
-    </>
+    <ScrollView
+      contentContainerStyle={{
+        paddingVertical: 32,
+        paddingHorizontal: 18,
+      }}
+    >
+      <UserRoomHistory limit={10} />
+    </ScrollView>
   );
 }
-
-const styles = StyleSheet.create({
-  elements: {
-    gap: 10,
-  },
-});

expo/components/RoomHistoryInfoCard.tsx

@@ -1,58 +1,34 @@
 import { MaterialIcons } from "@expo/vector-icons";
-import { Room } from "commons/database-types-utils";
 import { Link } from "expo-router";
-import { useEffect, useState } from "react";
 import { StyleSheet } from "react-native";
 
-import Alert from "./Alert";
 import { Text, View } from "./Themed";
-import { getUserProfileFromUserProfileId } from "../lib/userProfile";
 
 interface RoomHistoryInfoCardProps {
-  room: Room;
+  createdAt: string;
+  hostUsername: string;
+  roomId: string;
+  roomName: string;
 }
 export default function RoomHistoryInfoCard({
-  room,
+  createdAt,
+  hostUsername,
+  roomId,
+  roomName,
 }: RoomHistoryInfoCardProps) {
-  const [username, setUsername] = useState("");
-  const [formatedDate, setFormatedDate] = useState("");
-
-  const getUsername = async (userProfileId: string) => {
-    const user = await getUserProfileFromUserProfileId(userProfileId);
-    if (!user) {
-      Alert.alert("Erreur lors de la récupération de l'utilisateur");
-      return;
-    }
-    return user.username;
-  };
-  useEffect(() => {
-    (async () => {
-      const username = await getUsername(room.host_user_profile_id || "");
-      if (!username) {
-        Alert.alert("Erreur lors de la récupération du nom d'utilisateur");
-        return;
-      }
-      const formattedDate = new Date(room.created_at).toLocaleDateString(
-        "fr-FR",
-        {
-          year: "numeric",
-          month: "long",
-          day: "numeric",
-        }
-      );
-
-      setUsername(username);
-      setFormatedDate(formattedDate);
-    })();
-  }, []);
+  const formattedDate = new Date(createdAt).toLocaleDateString("fr-FR", {
+    year: "numeric",
+    month: "long",
+    day: "numeric",
+  });
 
   return (
-    <Link href={`/rooms/${room.id}`}>
+    <Link href={`/rooms/${roomId}`}>
       <View style={styles.layout}>
         <View style={styles.infos}>
-          <Text style={styles.roomName}>{room.name}</Text>
+          <Text style={styles.roomName}>{roomName}</Text>
           <Text style={styles.roomInfo}>
-            par {username} le {formatedDate}
+            par {hostUsername} le {formattedDate}
           </Text>
         </View>
         <MaterialIcons name="keyboard-arrow-right" size={32} color="black" />
@@ -67,11 +43,11 @@ const styles = StyleSheet.create({
     justifyContent: "space-between",
     alignItems: "center",
     width: "100%",
+    marginVertical: 8,
   },
 
   infos: {
     flexDirection: "column",
-    marginVertical: 8,
     gap: 4,
   },
 

expo/components/UserRoomHistory.tsx

@@ -1,47 +1,83 @@
-import { Room } from "commons/database-types-utils";
+import { QueryData } from "@supabase/supabase-js/dist/module/lib/types";
 import { useEffect, useState } from "react";
 import { FlatList, StyleSheet } from "react-native";
 
-import { supabase } from "../lib/supabase";
-import { useUserProfile } from "../lib/userProfile";
-import Alert from "./Alert";
 import RoomHistoryInfoCard from "./RoomHistoryInfoCard";
 import { Text, View } from "./Themed";
+import H2 from "./text/H2";
+import Colors from "../constants/Colors";
+import { supabase } from "../lib/supabase";
+import { useUserProfile } from "../lib/userProfile";
 
-export default function UserRoomHistory() {
-  const [rooms, setRooms] = useState<Room[]>([]);
+const historyRoom = supabase
+  .from("room_users")
+  .select("rooms!inner(created_at, name,id, host:user_profile(username))");
+
+type historyRoomType = QueryData<typeof historyRoom>;
+
+export default function UserRoomHistory({ limit = 5 }: { limit?: number }) {
+  const [rooms, setRooms] = useState<historyRoomType | null>([]);
   const user = useUserProfile();
+
   useEffect(() => {
-    (async () => {
-      if (!user) return;
-      const userId = user.user_profile_id;
-
-      const { error, data } = await supabase
-        .from("rooms")
-        .select("*, room_users(*)")
-        .eq("room_users.profile_id", userId)
-        .eq("is_active", false)
-        .order("created_at", { ascending: false })
-        .limit(5);
-
-      if (error) {
-        return Alert.alert(
-          "Erreur lors de la récupération des salles d'écoute"
-        );
+    if (!user) return;
+    /**
+     * Fetch all rooms where user is a member and the room is not active
+     * Tips : If the filter on a referenced table's column is not satisfied, the referenced
+     * table returns [] or null but the parent table is not filtered out.
+     * If you want to filter out the parent table rows, use the !inner hint
+     */
+    const fetchRoomHistory = async () => {
+      const { data } = await supabase
+        .from("room_users")
+        .select(
+          "rooms!inner(created_at, name, id, host:user_profile(username))"
+        )
+        .eq("rooms.is_active", false)
+        .eq("profile_id", user.user_profile_id)
+        .order("rooms(created_at)", { ascending: false })
+        .limit(limit);
+
+      if (!data || data.length === 0) {
+        return setRooms(null);
       }
 
       setRooms(data);
-    })();
+    };
+    fetchRoomHistory();
   }, [user]);
 
   return (
-    <View>
-      <Text style={styles.title}>Historique</Text>
+    <View style={{ gap: 10 }}>
+      <H2>Historique</H2>
+      {rooms == null && (
+        <Text
+          style={{
+            fontFamily: "Outfit-Regular",
+            fontSize: 16,
+            color: Colors.light.gray,
+          }}
+        >
+          Vous n'avez aucune salle dans votre historique
+        </Text>
+      )}
       <FlatList
         data={rooms}
-        keyExtractor={(item) => item.id}
+        keyExtractor={(item) => item.rooms?.id ?? ""}
         renderItem={({ item }) => {
-          return <RoomHistoryInfoCard room={item} />;
+          if (!item.rooms)
+            return <Text>Impossible de charger cette salle</Text>;
+          return (
+            <RoomHistoryInfoCard
+              createdAt={item.rooms.created_at}
+              hostUsername={
+                item.rooms.host?.username ??
+                "Impossible de récupérer le nom de l'hôte"
+              }
+              roomId={item.rooms.id}
+              roomName={item.rooms.name}
+            />
+          );
         }}
       />
     </View>

expo/components/profile/Avatar.tsx

@@ -1,5 +1,4 @@
 import { ImageStyle } from "expo-image";
-import User from "phosphor-react-native/src/regular/User";
 import { forwardRef, useEffect, useImperativeHandle, useState } from "react";
 import { Image, StyleProp, StyleSheet, View } from "react-native";
 
@@ -12,10 +11,12 @@ type AvatarProps = {
   id: string | undefined;
   tempoAvatarImage?: string; // if we want to pass an image url directly (on edit profile)
   style?: StyleProp<ImageStyle>;
+  noCache?: boolean;
+  radius?: number;
 };
 
 const Avatar = forwardRef<AvatarRemote, AvatarProps>(
-  ({ id, tempoAvatarImage, style }, ref) => {
+  ({ id, tempoAvatarImage, noCache, radius = 9999 }, ref) => {
     const [avatarUrl, setAvatarUrl] = useState<string>();
 
     useImperativeHandle(ref, () => ({
@@ -30,35 +31,41 @@ const Avatar = forwardRef<AvatarRemote, AvatarProps>(
     }, [id]);
 
     async function downloadUserImage() {
-      const path = `${id}.jpg`;
-      const { data } = supabase.storage
-        .from("avatars")
-        .getPublicUrl(path + "?avoidCache=" + Math.random());
+      let path = `${id}.jpg`;
+      if (noCache) path += "?avoidCache=" + Math.random();
+      const { data } = supabase.storage.from("avatars").getPublicUrl(path);
 
       setAvatarUrl(data.publicUrl);
     }
 
-    if (avatarUrl) {
-      return (
-        <Image
-          source={{ uri: tempoAvatarImage ?? avatarUrl }}
-          aria-aria-label="Avatar"
-          style={[styles.avatar, styles.image, style]}
-        />
-      );
-    } else {
-      return (
-        <View style={[styles.avatar, styles.noImage, style]}>
-          <User />
-        </View>
-      );
-    }
+    return (
+      <>
+        {avatarUrl ? (
+          <Image
+            source={{ uri: tempoAvatarImage ?? avatarUrl }}
+            aria-aria-label="Avatar"
+            style={[
+              { aspectRatio: 1, width: "100%", borderRadius: radius },
+              styles.avatar,
+              styles.image,
+            ]}
+          />
+        ) : (
+          <View
+            style={[
+              { aspectRatio: 1, width: "100%", borderRadius: radius },
+              styles.avatar,
+              styles.noImage,
+            ]}
+          />
+        )}
+      </>
+    );
   }
 );
 
 const styles = StyleSheet.create({
   avatar: {
-    borderRadius: 9999,
     overflow: "hidden",
     maxWidth: "100%",
     aspectRatio: 1,
@@ -72,7 +79,6 @@ const styles = StyleSheet.create({
   noImage: {
     backgroundColor: "red",
     border: "1px solid rgb(200, 200, 200)",
-    borderRadius: 5,
   },
 });
 

expo/components/profile/AvatarForm.tsx

@@ -6,7 +6,7 @@ import { Alert, Platform, Pressable, View } from "react-native";
 
 import Avatar, { AvatarRemote } from "./Avatar";
 import { supabase } from "../../lib/supabase";
-import { useSupabaseUserHook } from "../../lib/useSupabaseUser";
+import { useUserProfile } from "../../lib/userProfile";
 import Button from "../Button";
 import { formStyles } from "../ControlledInput";
 import { Text } from "../Themed";
@@ -21,7 +21,7 @@ interface AvatarProps {
  */
 const AvatarForm = forwardRef((props: AvatarProps, ref) => {
   const { onImageLoad } = props;
-  const user = useSupabaseUserHook();
+  const user = useUserProfile();
   const [uploading, setUploading] = useState(false);
   const [avatarUrl, setAvatarUrl] = useState<string | undefined>(undefined);
 
@@ -41,7 +41,8 @@ const AvatarForm = forwardRef((props: AvatarProps, ref) => {
         error: "No user or avatar",
       };
     }
-    const fileName = `${user.id}.jpg`;
+
+    const fileName = `${user.user_profile_id}.jpg`;
     const image = await getBase64Image(avatarUrl);
 
     const { error } = await supabase.storage
@@ -88,11 +89,16 @@ const AvatarForm = forwardRef((props: AvatarProps, ref) => {
     <View style={{ width: "100%", gap: 10 }}>
       <Text style={formStyles.label}>Photo de profil</Text>
       <Pressable onPress={selectAvatar}>
-        <Avatar id={user?.id} ref={avatarRef} tempoAvatarImage={avatarUrl} />
+        <Avatar
+          id={user?.user_profile_id}
+          ref={avatarRef}
+          tempoAvatarImage={avatarUrl}
+          noCache
+        />
       </Pressable>
       <Button
         onPress={selectAvatar}
-        disabled={uploading}
+        // disabled={uploading}
         block
         type="outline"
         size="small"