File tree Expand file tree Collapse file tree 1 file changed +2
-6
lines changed
frontend/app/(restaurant) Expand file tree Collapse file tree 1 file changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -20,11 +20,10 @@ import { Skeleton } from "moti/skeleton";
2020import { getRestaurantReviews , getRestaurantReviewsByUser , getReviews } from "@/api/reviews" ;
2121import { TReview } from "@/types/review" ;
2222import { useUser } from "@/context/user-context" ;
23- < < << << < HEAD
2423import { TMenuItem } from "@/types/menu-item" ;
2524import { getMenuItemsByRestaurant } from "@/api/menu-items" ;
26- = === ===
27- >>> >>> > origin
25+ import { TMenuItem } from "@/types/menu-item" ;
26+ import { getMenuItemsByRestaurant } from "@/api/menu-items" ;
2827
2928export 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 ) ;
You can’t perform that action at this time.
0 commit comments