Merge pull request #117 from bambu-group-03/fixes

Fixes
bambu-group-03 · Dec 8, 2023 · 4c739ad · 4c739ad
2 parents 18a0fd7 + 7f34547
commit 4c739ad
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 45 deletions.
diff --git a/src/screens/chat/chat-list-body.tsx b/src/screens/chat/chat-list-body.tsx
@@ -72,7 +72,6 @@ const ChatListBody = ({
                   </Text>
                   {/* Uncomment if you want to display the last message */}
                   <Text className="text-base text-gray-600">
-                    Las msg sent
                     {/* {chat.last_message} */}
                   </Text>
                 </View>

diff --git a/src/screens/feed/compose.tsx b/src/screens/feed/compose.tsx
@@ -1,10 +1,3 @@
-import {
-  faCalendarAlt,
-  faImage,
-  faPollH,
-  faSmile,
-} from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Picker } from '@react-native-picker/picker';
 import { useNavigation } from '@react-navigation/native';
@@ -118,18 +111,13 @@ export const Compose = ({ user }: { user: UserType | undefined }) => {
         </View>
         <View className="flex flex-row items-center justify-between border-t border-gray-500  p-2 text-blue-400">
           <View className="flex flex-row pl-12">
-            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3">
-              <FontAwesomeIcon icon={faImage} />
-            </TouchableOpacity>
-            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3">
-              <FontAwesomeIcon icon={faPollH} />
-            </TouchableOpacity>
-            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3">
-              <FontAwesomeIcon icon={faSmile} />
-            </TouchableOpacity>
-            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3">
-              <FontAwesomeIcon icon={faCalendarAlt} />
-            </TouchableOpacity>
+            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3" />
+            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3" />
+            <TouchableOpacity className="flex items-center justify-center rounded-full bg-blue-100 p-3" />
+            <TouchableOpacity
+              className="flex items-center justify-center rounded-full bg-blue-100 p-3"
+              onPress={() => alert('AUCH')}
+            />
           </View>
           <View>
             <Button

diff --git a/src/screens/profile/components/card-profile.tsx b/src/screens/profile/components/card-profile.tsx
@@ -5,7 +5,7 @@ import { client } from '@/api/common';
 import { getUserState } from '@/core';
 import CardContent from '@/screens/feed/components/card/card-content';
 import CardFooter from '@/screens/feed/components/card/card-footer';
-import { Pressable, View } from '@/ui';
+import { TouchableOpacity, View } from '@/ui';
 
 import CardHeaderProfile from './card-header-profile';
 
@@ -82,7 +82,7 @@ export const CardProfile = ({
       ? 'bg-gray-100 border-transparent rounded-lg shadow-sm border border-gray-100 ml-4 mr-2'
       : '';
   return (
-    <Pressable
+    <TouchableOpacity
       className={`flex shrink-0 p-4 pb-0 ${cardHeaderClass}`}
       onPress={onPress}
     >
@@ -104,7 +104,7 @@ export const CardProfile = ({
           onFavBookmark={handleFavBookmark}
         />
       </View>
-    </Pressable>
+    </TouchableOpacity>
   );
 };
 

diff --git a/src/screens/profile/components/edit-profile-button.tsx b/src/screens/profile/components/edit-profile-button.tsx
@@ -20,7 +20,7 @@ export const EditProfileButton = ({
       <View className="flex justify-center px-2">
         <Button
           label="Edit"
-          className="mt-4 rounded-full bg-blue-400  px-4 py-2 text-center font-bold text-white shadow hover:bg-blue-500"
+          className="mt-4 rounded-full bg-blue-500  px-4 py-2 text-center font-bold text-white shadow hover:bg-blue-500"
           onPress={() => {
             navigation.navigate('EditProfile', { user: currentUser });
           }}

diff --git a/src/screens/profile/components/stadistics-button.tsx b/src/screens/profile/components/stadistics-button.tsx
@@ -20,7 +20,7 @@ export const StadisticsButton = ({
       <View className="flex justify-center px-2">
         <Button
           label="Stats"
-          className="mt-4 rounded-full bg-violet-400 px-4 py-2 text-center font-bold text-white shadow"
+          className="mt-4 rounded-full bg-blue-500 px-4 py-2 text-center font-bold text-white shadow"
           onPress={() => {
             navigate('Stadistics');
           }}

diff --git a/src/screens/profile/components/verify-button.tsx b/src/screens/profile/components/verify-button.tsx
@@ -20,7 +20,7 @@ export const VerifyButton = ({
       <View className=" flex justify-center">
         <Button
           label="Verify"
-          className="mt-4 rounded-full bg-green-400 px-4 py-2 text-center font-bold text-white shadow"
+          className="mt-4 rounded-full bg-blue-500 px-4 py-2 text-center font-bold text-white shadow"
           onPress={() => {
             navigate('Verify');
           }}

diff --git a/src/screens/profile/fav-snaps-screen.tsx b/src/screens/profile/fav-snaps-screen.tsx
@@ -29,7 +29,7 @@ const FavoriteSnapScreen = () => {
     <View>
       <FocusAwareStatusBar />
       <FlatList
-        data={snaps}
+        data={snaps.reverse()}
         renderItem={renderItem}
         keyExtractor={(item) => item.id}
         onEndReachedThreshold={0.8}

diff --git a/src/screens/profile/profile-navigator.tsx b/src/screens/profile/profile-navigator.tsx
@@ -1,9 +1,10 @@
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import * as React from 'react';
 
-import type { Snap } from '@/api';
+import type { Snap as SnapType } from '@/api';
 import type { UserType } from '@/core/auth/utils';
 import { SignInComplete } from '@/navigation/signin-complete';
+import { Snap } from '@/screens';
 
 import type { Chat } from '../chat/chat-list-screen';
 import ChatScreen from '../chat/chat-screen';
@@ -17,12 +18,13 @@ export type ProfileStackParamList = {
   Profile: { user: UserType };
   Followers: { users: UserType[] | undefined };
   Following: { users: UserType[] | undefined };
-  FavSnaps: { snaps: Snap[] };
+  FavSnaps: { snaps: SnapType[] };
   EditProfile: { user: UserType | undefined };
   Chat: {
     chat: Chat | undefined;
     user: UserType;
   };
+  Snap: { snap: SnapType };
   Stadistics: undefined;
   Verify: undefined;
 };
@@ -37,6 +39,7 @@ export const ProfileNavigator = () => {
       <Stack.Screen name="Following" component={InteractionsScreen} />
       <Stack.Screen name="FavSnaps" component={FavoriteSnapScreen} />
       <Stack.Screen name="EditProfile" component={SignInComplete} />
+      <Stack.Screen name="Snap" component={Snap} />
       <Stack.Screen name="Chat" component={ChatScreen} />
       <Stack.Screen name="Stadistics" component={StadisticsScreen} />
       <Stack.Screen name="Verify" component={VerifyScreen} />

diff --git a/src/screens/profile/profile-snaps-view.tsx b/src/screens/profile/profile-snaps-view.tsx
@@ -1,3 +1,4 @@
+import { useNavigation } from '@react-navigation/native';
 import React, { useCallback } from 'react';
 import { FlatList, RefreshControl } from 'react-native';
 
@@ -36,8 +37,14 @@ const ProfileSnapsView = ({
     hasNextPage && fetchNextPage();
   };
 
+  const { navigate } = useNavigation();
+
   const renderItem = ({ item }: { item: Snap }) => (
-    <CardProfile snap={item} username={user?.username || ''} />
+    <CardProfile
+      snap={item}
+      username={user?.username || ''}
+      onPress={() => navigate('Snap', { snap: item })}
+    />
   );
 
   if (isLoading && !data) {

diff --git a/src/screens/search/form-for-search.tsx b/src/screens/search/form-for-search.tsx
@@ -65,11 +65,18 @@ export const FormForSearch: React.FC<SearchFormProps> = ({
           </View>
         </View>
       </View>
-      <ControlledInput testID="search-input" control={control} name="search" />
+      <ControlledInput
+        testID="search-input"
+        control={control}
+        className="w-50 h-10 border-spacing-0 resize-none rounded-md border border-gray-300 px-3 text-xl focus:border-blue-500 focus:outline-none"
+        placeholder={'Search by ' + type}
+        name="search"
+      />
 
       <Button
         testID="search-button"
         label="Search"
+        className=" flex items-center justify-center rounded-full bg-blue-500 px-4 py-2 font-bold text-white shadow"
         onPress={handleSubmit(onSearchSubmit)}
         variant="primary"
       />

diff --git a/src/screens/search/search-navigator.tsx b/src/screens/search/search-navigator.tsx
@@ -1,9 +1,10 @@
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import * as React from 'react';
 
-import type { Snap } from '@/api';
+import type { Snap as SnapType } from '@/api';
 import type { UserType } from '@/core/auth/utils';
 import { SignInComplete } from '@/navigation/signin-complete';
+import { Snap } from '@/screens';
 
 import type { Chat } from '../chat/chat-list-screen';
 import ChatScreen from '../chat/chat-screen';
@@ -20,8 +21,9 @@ export type SearchStackParamList = {
   Users: { users: UserType[] | undefined };
   Followers: { users: UserType[] | undefined };
   Following: { users: UserType[] | undefined };
-  SnapList: { snaps: Snap[] };
-  FavSnaps: { snaps: Snap[] };
+  SnapList: { snaps: SnapType[] };
+  Snap: { snap: SnapType };
+  FavSnaps: { snaps: SnapType[] };
   EditProfile: { user: UserType | undefined };
   Chat: {
     chat: Chat | undefined;
@@ -40,6 +42,7 @@ export const SearchNavigator = () => {
       <Stack.Screen name="Followers" component={InteractionsScreen} />
       <Stack.Screen name="Following" component={InteractionsScreen} />
       <Stack.Screen name="SnapList" component={SnapList} />
+      <Stack.Screen name="Snap" component={Snap} />
       <Stack.Screen name="FavSnaps" component={FavoriteSnapScreen} />
       <Stack.Screen name="EditProfile" component={SignInComplete} />
       <Stack.Screen name="Chat" component={ChatScreen} />

diff --git a/src/screens/search/search-view.tsx b/src/screens/search/search-view.tsx
@@ -63,17 +63,23 @@ const SearchView = () => {
       <SearchBar />
       <View className="flex flex-row flex-wrap p-4">
         <Text className="w-full text-lg font-bold">Trending Topics</Text>
-        {recentTrends.map((topic) => (
-          <TouchableOpacity
-            key={topic.id}
-            onPress={() => handleTopicSelect(topic)}
-            className="m-1 rounded-full bg-blue-100 px-4 py-2"
-          >
-            <Text className="text-blue-500">
-              {topic.name} ({topic.times_used}){' '}
-            </Text>
-          </TouchableOpacity>
-        ))}
+        {recentTrends.length === 0 ? (
+          <View className="p-2 text-center">
+            <Text>No current trending topics</Text>
+          </View>
+        ) : (
+          recentTrends.map((topic) => (
+            <TouchableOpacity
+              key={topic.id}
+              onPress={() => handleTopicSelect(topic)}
+              className="m-1 rounded-full bg-blue-100 px-4 py-2"
+            >
+              <Text className="text-blue-500">
+                {topic.name} ({topic.times_used}){' '}
+              </Text>
+            </TouchableOpacity>
+          ))
+        )}
       </View>
     </>
   );