Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mmtftr committed Apr 30, 2024
2 parents 8b7cf98 + aec9070 commit f0cb50f
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 176 deletions.
133 changes: 52 additions & 81 deletions mobile/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"dependencies": {
"@expo/metro-runtime": "~3.1.3",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-navigation/native": "^6.1.17",
"@react-navigation/native-stack": "^6.9.26",
"@react-navigation/stack": "^6.3.29",
Expand All @@ -23,13 +24,12 @@
"react-dom": "18.2.0",
"react-native": "0.73.6",
"react-native-gesture-handler": "~2.14.0",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-web": "~0.19.6",
"react-navigation": "^5.0.0",
"react-navigation-stack": "^2.10.4",
"zod": "^3.23.5",
"zustand": "^4.5.2",
"react-native-screens": "~3.29.0",
"react-native-safe-area-context": "4.8.2"
"zustand": "^4.5.2"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand Down
10 changes: 4 additions & 6 deletions mobile/src/screens/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ import DishCard from "@/src/components/Dish";

export const Home = () => {
const [searchInput, setSearchInput] = useState("");
const [results, setResults] = useState([
{ name: "y", country: "y", image: "y" },
]);
const [results, setResults] = useState([]);
const [searchFocused, setSearchFocused] = useState(false);
return (
<ScrollView className="w-screen bg-white p-6 overflow-y-scroll">
Expand Down Expand Up @@ -50,15 +48,15 @@ export const Home = () => {
{/* <Trending /> */}
{results.map((dish) => (
<DishCard
key={dish.name}
key={dish.id}
dish={{
name: dish.name,
description: dish.country,
description: dish.description,
image: dish.image,
}}
/>
))}
<Popular />
{/* <Popular /> */}
</ScrollView>
);
};
Expand Down
Loading

0 comments on commit f0cb50f

Please sign in to comment.