Skip to content

Commit 1604a90

Browse files
abhikaboyDavidYu75benjaspet
authored
Menu item res (#111)
Co-authored-by: David Yu <yu.dav@northeastern.edu> Co-authored-by: Ben Petrillo <benpetrillo.bp@gmail.com>
1 parent dd966fc commit 1604a90

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

frontend/app/(restaurant)/[id].tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@ import { Skeleton } from "moti/skeleton";
2020
import { getRestaurantReviews, getRestaurantReviewsByUser, getReviews } from "@/api/reviews";
2121
import { TReview } from "@/types/review";
2222
import { useUser } from "@/context/user-context";
23-
<<<<<<< HEAD
2423
import { TMenuItem } from "@/types/menu-item";
2524
import { getMenuItemsByRestaurant } from "@/api/menu-items";
26-
=======
27-
>>>>>>> origin
25+
import { TMenuItem } from "@/types/menu-item";
26+
import { getMenuItemsByRestaurant } from "@/api/menu-items";
2827

2928
export default function Route() {
3029
const restaurantTags = ["Fast Food", "Fried Chicken", "Chicken Sandwiches", "Order Online"];
@@ -63,13 +62,10 @@ export default function Route() {
6362
setReviews(res);
6463
});
6564

66-
<<<<<<< HEAD
6765
getMenuItemsByRestaurant(id).then((res) => {
6866
setMenuItems(res);
6967
});
7068

71-
=======
72-
>>>>>>> origin
7369
getRestaurantReviewsByUser(id, user.id).then((res) => {
7470
console.log(res);
7571
setMyReviews(res);

0 commit comments

Comments
 (0)