Skip to content
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.

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

feat: update skeleton ui in restaurants home page and restaurant overview page #51

Merged
merged 1 commit into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
IoPersonAddOutline,
} from "react-icons/io5";
import { useDispatch, useSelector } from "react-redux";
import { AppDispatch, IRootState } from "../../store";
import { getCurrentUserThunk } from "../../redux/auth/authSlice";
import { enqueueSnackbar } from "notistack";
import { getCurrentUserThunk } from "../../redux/auth/authSlice";
import { AppDispatch, IRootState } from "../../store";

const Header = () => {
const navigate = useNavigate();
Expand Down
48 changes: 33 additions & 15 deletions src/components/skeletonLoader/RestaurantDetailSkeletonLoader.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,37 @@
import ContentLoader from "react-content-loader";
import RestaurantOverviewButton from "../utils/buttons/RestaurantOverviewButton";

const RestaurantDetailSkeletonLoader: React.FC = () => (
<ContentLoader
speed={1}
width={340}
height={164}
viewBox="0 0 340 164"
backgroundColor="#f3f3f3"
foregroundColor="#ecebeb"
>
<rect x="5" y="1" rx="3" ry="3" width="140" height="21" />
<rect x="6" y="100" rx="3" ry="3" width="37" height="20" />
<rect x="6" y="59" rx="3" ry="3" width="260" height="36" />
<rect x="5" y="28" rx="0" ry="0" width="223" height="23" />
</ContentLoader>
);
const RestaurantDetailSkeletonLoader: React.FC = () => {
const buttons = ["Reviews", "Photos", "Menus"];

return (
<div className="max-w-5xl mx-auto py-3">
<ContentLoader
speed={1}
width={1180}
height={280}
viewBox="0 0 1180 280"
backgroundColor="#f3f3f3"
foregroundColor="#ecebeb"
>
<rect x="16" y="2" rx="6" ry="6" width="395" height="280" />
<rect x="444" y="6" rx="1" ry="1" width="227" height="26" />
<rect x="444" y="39" rx="1" ry="1" width="197" height="18" />
<rect x="444" y="62" rx="1" ry="1" width="82" height="21" />
<rect x="444" y="89" rx="1" ry="1" width="480" height="21" />
</ContentLoader>
<div className="flex justify-center">
<div className="flex gap-16">
<RestaurantOverviewButton button={"Reviews"} active={true} />
{buttons
.filter((button) => button !== "Reviews")
.map((button, index) => (
<RestaurantOverviewButton button={button} key={index} />
))}
</div>
</div>
</div>
);
};

export default RestaurantDetailSkeletonLoader;
14 changes: 11 additions & 3 deletions src/components/utils/buttons/RestaurantOverviewButton.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
const RestaurantOverviewButton: React.FC<{
button: string;
active: boolean;
setActive: React.Dispatch<React.SetStateAction<string>>;
active?: boolean;
setActive?: React.Dispatch<React.SetStateAction<string>>;
}> = ({ button, active, setActive }) => {
return (
<h1
className={`text-2xl font-bold mt-6 hover:text-orange-600 ${
active && "text-orange-400"
}`}
>
<button onClick={() => setActive(button)}>{button}</button>
<button
onClick={() => {
if (setActive) {
setActive(button);
}
}}
>
{button}
</button>
</h1>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/pages/restaurant/RestaurantHomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const RestaurantHomePage = () => {

useEffect(() => {
if (
restaurants.length > 0 &&
restaurants.length > 6 &&
(!searchParams.get("search") || !searchParams.get("dish"))
) {
setLoading(false);
Expand Down Expand Up @@ -103,7 +103,7 @@ const RestaurantHomePage = () => {
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 my-6">
{loading &&
Array.from({
length: 10,
length: 15,
}).map((_, index) => (
<RestaurantCardSkeletonLoader
key={`loader ${index}`}
Expand Down
10 changes: 6 additions & 4 deletions src/pages/restaurant/RestaurantOverviewPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ const RestaurantOverviewPage: React.FC = () => {
fetchRestaurantReview();
fetchReviewPhotos();
fetchMenuPhotos();
setLoading(false);
}, [id, dispatch]);
if (restaurantDetail?.restaurant_id || !id || !isUUID(id)) {
setLoading(false);
}
}, [id, dispatch, restaurantDetail]);

const openPopUp = (image: string, imageID: string) => {
setSelectedImage({ id: imageID, photo_url: image });
Expand Down Expand Up @@ -129,9 +131,9 @@ const RestaurantOverviewPage: React.FC = () => {
};
const buttons = ["Reviews", "Photos", "Menus"];

return !restaurantDetail && loading ? (
return loading ? (
<RestaurantDetailSkeletonLoader />
) : !restaurantDetail && !loading ? (
) : !restaurantDetail ? (
<ErrorPage />
) : (
restaurantDetail && (
Expand Down
7 changes: 6 additions & 1 deletion src/redux/restaurant/restaurantSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ export const createRestaurantThunk = createAsyncThunk(
const restaurantSlice = createSlice({
name: "restaurant",
initialState,
reducers: {},
reducers: {
resetRestaurant: (state) => {
state.restaurant = null;
},
},
extraReducers: (builder) => {
builder.addCase(getRestaurantsByQueryThunk.fulfilled, (state, action) => {
if (action.payload) {
Expand All @@ -82,4 +86,5 @@ const restaurantSlice = createSlice({
},
});

export const { resetRestaurant } = restaurantSlice.actions;
export default restaurantSlice.reducer;
Loading