sidebar fix and typo (#10)

AFK-AlignedFamKernel · Aug 6, 2024 · 375f191 · 375f191
1 parent 7002b51
commit 375f191
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 97 deletions.
diff --git a/apps/mobile/src/app/Router.tsx b/apps/mobile/src/app/Router.tsx
@@ -88,16 +88,16 @@ const HomeBottomTabNavigator: React.FC = () => {
       />
 
       <HomeBottomTabsStack.Screen
-        name="Search"
-        component={Search as any}
+        name="Games"
+        component={Games as any}
         // initialParams={{ publicKey }}
         options={{
           tabBarActiveTintColor: 'white',
           tabBarInactiveTintColor: 'grey',
           tabBarIcon: ({ focused }) => (
             <View style={styles.tabBarIcon}>
               <Icon
-                name="SearchIcon"
+                name="GameIcon"
                 size={24}
                 color={focused ? 'bottomBarActive' : 'bottomBarInactive'}
               />

diff --git a/apps/mobile/src/components/Layout/sidebar/index.tsx b/apps/mobile/src/components/Layout/sidebar/index.tsx
@@ -35,6 +35,11 @@ const Sidebar = () => {
         navigation.navigate("Games");
     };
 
+    const handleHomeScreen = () => {
+        navigation.navigate("Home");
+    };
+
+
     return (
         <View style={styles.sidebar}>
             <Text style={styles.sidebarText}>AFK</Text>
@@ -61,14 +66,28 @@ const Sidebar = () => {
 
             </Pressable> */}
 
+            <Pressable
+                onPress={handleHomeScreen}
+                style={styles.item}>
+                <Icon
+                    name="HomeIcon"
+                    size={24}
+                    style={{ backgroundColor: theme.theme.colors.background }}
+                />
+                <Text style={styles.textItem}>
+                    Home
+                </Text>
+
+            </Pressable>
+
 
             <Pressable
                 onPress={handleGameScreen}
                 style={styles.item}>
                 <Icon
                     name="GameIcon"
                     size={24}
-                    style={{backgroundColor:theme.theme.colors.background}}
+                    style={{ backgroundColor: theme.theme.colors.background }}
                 />
                 <Text style={styles.textItem}>
                     Gamefi

diff --git a/apps/mobile/src/components/Layout/sidebar/styles.ts b/apps/mobile/src/components/Layout/sidebar/styles.ts
@@ -7,10 +7,12 @@ export default ThemedStyleSheet((theme) => ({
         height: '100%',
         backgroundColor: theme.colors.background,
         padding: 20,
-        gap:1
+        gap:1,
+        borderRight:"1"
     },
     sidebarText: {
-        fontSize: 18
+        fontSize: 18,
+        color: theme.colors.text
     },
     title: {
         fontWeight: 'bold',

diff --git a/apps/mobile/src/components/Skeleton/RootScreenContainer.tsx b/apps/mobile/src/components/Skeleton/RootScreenContainer.tsx
@@ -9,7 +9,7 @@ export const RootScreenContainer: React.FC<ViewProps> = ({ style, children, ...p
   const styles = useStyles(stylesheet);
   const isWeb = Platform.OS === 'web';
   const windowWidth = Dimensions.get('window').width;
-  const shouldShowSidebar = isWeb && windowWidth >= 768;
+  const shouldShowSidebar = isWeb && windowWidth >= 1024;
   return (
     <View style={[styles.container, style]} {...props}>
       <View style={styles.content}>

diff --git a/apps/mobile/src/screens/Profile/Info/index.tsx b/apps/mobile/src/screens/Profile/Info/index.tsx
@@ -4,7 +4,6 @@ import {useQueryClient} from '@tanstack/react-query';
 import * as Clipboard from 'expo-clipboard';
 import {useState} from 'react';
 import {Pressable, View} from 'react-native';
-
 import {UserPlusIcon} from '../../../assets/icons';
 import {Button, IconButton, Menu, Text} from '../../../components';
 import {useContacts, useEditContacts, useProfile, useStyles, useTheme} from '../../../hooks';

diff --git a/apps/mobile/src/types/routes.ts b/apps/mobile/src/types/routes.ts
@@ -29,7 +29,7 @@ export type MainStackParams = {
   ChannelDetail: {postId: string; post?: NDKEvent};
   CreateForm: undefined;
   Defi: undefined;
-  Games:undefined
+  Games:undefined,
 };
 
 export type HomeBottomStackParams = {
@@ -38,6 +38,8 @@ export type HomeBottomStackParams = {
   Notifications: undefined;
   Tips: undefined;
   Search: undefined;
+  Games:undefined,
+
   // ChannelsFeed:undefined;
   // CreateChannel:undefined;
 };
@@ -92,6 +94,12 @@ export type SearchScreenProps = CompositeScreenProps<
   NativeStackScreenProps<RootStackParams>
 >;
 
+export type GamesScreenProps = CompositeScreenProps<
+  NativeStackScreenProps<HomeBottomStackParams, 'Games'>,
+  NativeStackScreenProps<RootStackParams>
+>;
+
+
 // export type CreateChannelScreenProps = CompositeScreenProps<
 //   NativeStackScreenProps<HomeBottomStackParams, 'CreateChannel'>,
 //   NativeStackScreenProps<RootStackParams>

diff --git a/apps/website/src/app/components/Footer.tsx b/apps/website/src/app/components/Footer.tsx
@@ -34,7 +34,7 @@ export function Footer() {
         </div>
         <div className="flex items-center gap-x-[14px] mt-5 tab:mt-0 self-center tab:self-end">
           <a href="https://x.com/AFK_AlignedFamK" target="_blank">
-            <img src="/assets/twitterIcon.svg" alt="AFK Algined Fam Community Twitter / X" />
+            <img src="/assets/twitterIcon.svg" alt="AFK Aligned Fam Community Twitter / X" />
           </a>
 
           {/* <a

diff --git a/turbo copy.json b/turbo copy.json
diff --git a/turbo.json b/turbo.json
@@ -31,7 +31,7 @@
         "PINATA_API_KEY",
         "PINATA_API_SECRET_KEY",
         "PINATA_JWT",
-        "LAUCHING_FACTORY",
+        "LAUNCHING_FACTORY",
         "PINATA_GATEWAY_KEY",
         "NEXT_PUBLIC_APP_URL"
       ]