Skip to content

Commit

Permalink
Merge pull request VanshKing30#453 from Saksham2k3s/bug/fix-issue-431
Browse files Browse the repository at this point in the history
solved issue 431
  • Loading branch information
hustlerZzZ authored Jul 24, 2024
2 parents 867e06b + dd36594 commit 7c29c34
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { ThemeProvider } from "./themeContext";
import ContactUs from "./pages/ContactUs";
import EditProfile from "./pages/EditProfile";
import OtpVerify from "./pages/OtpVerify";
import Contributors from "./pages/Contributors";
// import Contributors from "./pages/Contributors";

import { Contributors } from "./pages/Contributors";
import Navbar from "./components/Navbar";
Expand Down
16 changes: 8 additions & 8 deletions src/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ export default function Footer() {
</div>
</footer>
)
<li className="mr-4 hover:underline md:mr-6 hover:text-orange-600">
<Link to="/contributors">Our Contributors</Link>
</li>
</ul>
<span className="text-sm text-white sm:text-center">© 2024-2025 <Link to="/" className="hover:underline">Foodies™</Link>. All Rights Reserved.</span>
</div>
</footer>
);
// <li className="mr-4 hover:underline md:mr-6 hover:text-orange-600">
// <Link to="/contributors">Our Contributors</Link>
// </li>
// </ul>
// <span className="text-sm text-white sm:text-center">© 2024-2025 <Link to="/" className="hover:underline">Foodies™</Link>. All Rights Reserved.</span>
// </div>
// </footer>
// );
}

11 changes: 6 additions & 5 deletions src/pages/MenuPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,9 @@ const handlestudentFeedbackSubmit = async () => {
console.log("this is canteen", canteenData.name);
return (
<div className="text-purple-800 min-h-screen pt-5 bg-transparent dark:bg-slate-200">
<Navbar />
<div className="container px-8 mx-auto p-4 mt-20 min-h-screen bg-transparent dark:bg-slate-200">

<Navbar />
<div className="container px-8 mx-auto p-4 mt-20 h-auto bg-transparent dark:bg-slate-200">
<div className="flex justify-center space-x-4 mb-8">
{['breakfast', 'lunch', 'dinner'].map((category) => (
<button
Expand All @@ -270,7 +271,7 @@ const handlestudentFeedbackSubmit = async () => {
/>
</div>
{searchTerm ? (
<div className="grid grid-cols-1 relative md:grid-cols-2 lg:grid-cols-3 gap-4 justify-center">
<div className=" grid grid-cols-1 relative md:grid-cols-2 lg:grid-cols-3 gap-4 justify-center">
{loading ? <Loader /> : renderSearchResults()}
</div>
) : (
Expand All @@ -279,14 +280,14 @@ const handlestudentFeedbackSubmit = async () => {
{loading ? (
<Loader />
) : (
<div className="grid grid-cols-1 relative md:grid-cols-2 lg:grid-cols-3 gap-4 justify-center">
<div className=" grid grid-cols-1 relative md:grid-cols-2 lg:grid-cols-3 gap-4 justify-center">
{renderMenuItems()}
</div>
)}
</>
)}
</div>
<div className="mt-8 text-purple-800 px-8 mb-4">
<div className=" mt-20 text-purple-800 px-8 mb-4">
<h2 className="text-2xl font-bold mb-4 text-white text-center dark:text-black">Meal Feedback</h2>
<textarea
className="w-full h-32 p-4 border border-purple-300 rounded mb-4"
Expand Down

0 comments on commit 7c29c34

Please sign in to comment.