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

Merge dev branch into main #42

Merged
merged 73 commits into from
Oct 13, 2024
Merged

Merge dev branch into main #42

merged 73 commits into from
Oct 13, 2024

Conversation

marshjaja
Copy link
Collaborator

Description

In this PR, we have integrated Tailwind CSS and ShadCN into the project for styling, aligning the implementation with the Figma design. Key changes include:

  • Added modals and hover states for improved user interaction and feedback.
  • Enhanced general feedback mechanisms for user interactions with the app.
  • Refactored files to ensure styling consistency with the Figma design.
  • Added additional code improvements

Note:
While we've made significant progress in implementing the styling, the overall design still requires additional refinements and will need a thorough redesign to meet our final vision.

Related Issue

Closes #31 , #32, #33, #35

Acceptance Criteria

The acceptance criteria for this PR are specified in Issue #14.

Type of Changes

Use one or more labels to help your team understand the nature of the change(s) you’re proposing. E.g., bug fix or enhancement are common ones.

enhancement, bug fix, refactor, feature, style

Updates

Before

Screenshot 2024-10-06 at 14:39:14
Screenshot 2024-10-06 at 14:05:33 Screenshot 2024-10-06 at 14:05:52 Screenshot 2024-10-06 at 14:06:07

After

Screenshot 2024-10-06 at 14:44:14 Screenshot 2024-10-06 at 14:44:50 Screenshot 2024-10-06 at 14:45:06
Screenshot 2024-10-06 at 14:45:33
Screenshot 2024-10-06 at 14:46:00
Screenshot 2024-10-06 at 14:46:18
Screenshot 2024-10-06 at 14:46:42
Screenshot 2024-10-06 at 14:39:44
Screenshot 2024-10-06 at 14:40:07 Screenshot 2024-10-06 at 14:40:26 Screenshot 2024-10-06 at 14:43:46

Testing Steps / QA Criteria

After this PR is merged, ensure you're on the main branch.

  • Run git checkout main and pull the latest changes with git pull.
  • Run npm install to ensure all dependencies are up to date.

After this, you can check the app's functionality and basic styling.

Note: Some styling adjustments are still pending, and the overall design will require additional refinements in future updates following today's merge.

marshjaja and others added 30 commits September 30, 2024 13:41
…bile devices, add icons to navbar to match the design
…ition for light to dark mode switch, remove unnecessary button from homepage.
…cons

- Moved the Navbar component into its own dedicated file for better separation of concerns and maintainability
- Added basic tooltips to non-navbar icons (dark mode toggle, sign-in/sign-out buttons)
…and-modifications

Relocate Add Item Functionality to Modal on List Page
joriordan332 and others added 29 commits October 8, 2024 11:09
…-singlelist-styling

Mm feature/update listitem singlelist styling
al chnages and fixing the issue of listName being null
…te inactive share button style to match delete button.
Consistent dark and light theme throughout app
@Hudamabkhoot Hudamabkhoot merged commit 2e61834 into main Oct 13, 2024
2 checks passed
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.

Design Navbar layout (Mobile and Desktop)
5 participants