Skip to content

feed page nav #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JLetsGitIt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feed page nav #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bb5648
feed page nav
JLetsGitIt Apr 19, 2024
f45b861
Merge branch 'main' into updates-to-feed-frontend2
JLetsGitIt Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions frontend/components/Feed/FeedTopBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useNavigation } from '@react-navigation/native';
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';
// import FeedPage from '../../pages/FeedPage';
// import Follow from '../../pages/Follow';
import FeedPage from '../../pages/FeedPage';
import Follow from '../../pages/Follow';
import { AuthNavigationProp } from '../../types/navigationTypes';

type FeedBarProps = {
Expand All @@ -14,12 +14,10 @@ const FeedTopBar: React.FC<FeedBarProps> = ({ tab, setTab }) => {
const navigation = useNavigation<AuthNavigationProp>();

const handleButtonPress = () => {
setTab('Explore')
navigation.navigate('Feed');
};

const handleButtonPress2 = () => {
setTab('Explore')
navigation.navigate('Follow');
};

Expand Down
2 changes: 0 additions & 2 deletions frontend/components/Feed/Info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,4 @@ const Info: React.FC<PostProps> = ({ type, company, price, percent }) => {
}
};

// Define the styles for the component

export default Info;
8 changes: 4 additions & 4 deletions frontend/components/Feed/PostNew.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ const PostNew: React.FC<PostProps> = ({ post }) => {
{post.num_data < 250 ? (
<Info
type={1}
company={post.ticker_symbol} //post.ticker_symbol
price={post.num_data} //post.num_data
company={post.ticker_symbol}
price={post.num_data}
percent={17}
/>
) : (
<Info
type={2}
company={post.ticker_symbol} //post.ticker_symbol
price={post.num_data} //post.num_data
company={post.ticker_symbol}
price={post.num_data}
percent={17}
/>
)}
Expand Down
Loading