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

Merged the changes from the deployment branch into the Site-Wide Meta Tags branch #67

Open
wants to merge 55 commits into
base: Add-Site-Wide-Meta-Tags
Choose a base branch
from

Conversation

Mateo-Benzien
Copy link
Collaborator

Merged the changes from deployment to update the Site-Wide Meta Tags branch.

-Ran into a conflict with merging in the Layout.js, It seemed to be resolved as it said there was 0 conflicts later after attempting to fix the issue. (I would appreciate it if someone could double check)

The Site-Wide Meta Tags have been completed.

Phillip-tech and others added 30 commits October 21, 2024 14:37
- Added 'use client' directive to enable client-side rendering
- Imported React, useState, and useEffect hooks
- Integrated RecipeCards component for displaying recipe data
- Added useState to store and manage fetched recipes
- Set up initial state for recipes as an empty array
- Prepared RecipeGrid for client-side data fetching
- Implemented useEffect to fetch recipes from the API
- Fetched recipe data from 'https://dummyjson.com/recipes'
- Updated state with fetched recipes and handled potential errors
- Display RecipeCards using a responsive grid with Tailwind CSS
- Passed recipe data to RecipeCards component
- Utilized grid layout for different screen sizes with padding and spacing
- Rendered recipe image, title, prep time, cook time, and rating
- Styled the card with Tailwind CSS using shadow, rounded corners, and padding
- Displayed rating with a star icon and appropriate formatting
Merge pull request #57 from CodeSpace-Academy/deployment
… additional recipe details, and reformatted JSX code"
change title to name for recipe name display
…b state, and rearranged layout with new CSS classes"
…RecipeGrid component, and updated dependencies in package.json"
Phillip-tech and others added 24 commits October 22, 2024 10:31
- Fixed title, prep and cook time display
…nd search overlay, and refactored code organization
- Renamed the file to 'Navbar.js' for better organization
- Updated import statement to use 'react' instead of 'use client'
- Added 'export default Navbar' at the end of the component for proper exporting
- Refactored the code to follow React best practices and conventions
- Fixed the issue with the initial state of 'isSearchOpen' to be false
- Improved the logic for handling drag events for better user experience
- Enhanced the styling and responsiveness of the Navbar component
- Ensured consistent naming conventions and indentation throughout the component
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants