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.

Sign up for GitHub

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

Jump to bottom

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

Commits on Sep 30, 2024

  1. feat: Add initial Tailwind CSS and ShadCN dependencies configuration … 

    …to the project
    @marshjaja
    marshjaja committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    80daafc View commit details
    Browse the repository at this point in the history

  2. feat: Implement initial layout and add trial logo for navbar views on… 

    … desktop and mobile/tablet
    @marshjaja
    marshjaja committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    8f4790d View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. add: Add color for active NavLink selection and hover effect

    @marshjaja
    marshjaja committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    93b7a6a View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. fix: Fix the visibility issue of the Sign In element on tablet and mo… 

    …bile devices, add icons to navbar to match the design
    @marshjaja
    marshjaja committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1e47a47 View commit details
    Browse the repository at this point in the history

  2. feat: Implement initial dark and light mode with matching black and w… 

    …hite logos
    @marshjaja
    marshjaja committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ea7678a View commit details
    Browse the repository at this point in the history

  3. add: Add custom favicon, rename project to chosen name, improve trans… 

    …ition for light to dark mode switch, remove unnecessary button from homepage.
    @marshjaja
    marshjaja committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    508d6bb View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Relocated add item to list, implemented add item modal, and added ite… 

    …m quantity
    @Hudamabkhoot
    Hudamabkhoot committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    53f9c1d View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. applied the design changes

    @Hudamabkhoot
    Hudamabkhoot committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    bbfd685 View commit details
    Browse the repository at this point in the history

  2. Routes protected and styling added

    @joriordan332
    joriordan332 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    87f8060 View commit details
    Browse the repository at this point in the history

  3. share list modal + home styles

    @Wyna-7
    Wyna-7 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    ab1fa32 View commit details
    Browse the repository at this point in the history

  4. improve: add better hover effects for enhanced user feedback on icons… 

    … and apply custom colors to the project
    @marshjaja
    marshjaja committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    bd8ccdc View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. refactor: Move Navbar component to its own file and add tooltips to i… 

    …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)
    @marshjaja
    marshjaja committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    14d8866 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from the-collab-lab/hm-addItemForm-relocation-… 

    …and-modifications

Relocate Add Item Functionality to Modal on List Page
    @Hudamabkhoot
    Hudamabkhoot authored Oct 5, 2024
    Configuration menu
    Copy the full SHA
    db0d0af View commit details
    Browse the repository at this point in the history

  3. fix: Add small code fix to display light / dark mode toggle on the bo… 

    …ttom-right of the page where it was before
    @marshjaja
    marshjaja committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    50a72fc View commit details
    Browse the repository at this point in the history

  4. Fixed: styling and refresh issue

    @joriordan332
    joriordan332 committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    c99a06f View commit details
    Browse the repository at this point in the history

  5. fix: Remove unnecessary imports in Layout

    @marshjaja
    marshjaja committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    403b121 View commit details
    Browse the repository at this point in the history

  6. Fixed the layout of list page

    @Hudamabkhoot
    Hudamabkhoot committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    fde8c2a View commit details
    Browse the repository at this point in the history

  7. fix: Add suggested change

    @marshjaja
    marshjaja committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    0f11d4e View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. fix: small code change

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    1768009 View commit details
    Browse the repository at this point in the history

  2. small fixes

    @Hudamabkhoot
    Hudamabkhoot committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    6688ed9 View commit details
    Browse the repository at this point in the history

  3. style modifications

    @Wyna-7
    Wyna-7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    260d834 View commit details
    Browse the repository at this point in the history

  4. conflicts resolved

    @Wyna-7
    Wyna-7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    0c4874d View commit details
    Browse the repository at this point in the history

  5. removed ManageList from index.js

    @Wyna-7
    Wyna-7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    42d3a6c View commit details
    Browse the repository at this point in the history

  6. removed ManageList route

    @Wyna-7
    Wyna-7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    b281cb9 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feat/setup-tailwind-shadcn' into mm-feature/navbar-layout

    @marshjaja
    marshjaja authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    2db3c44 View commit details
    Browse the repository at this point in the history

  8. fix: Resolve errors after merge conflict

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    0d68dfa View commit details
    Browse the repository at this point in the history

  9. fix: Resolved issues in package-lock.json and build issues

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    90e286b View commit details
    Browse the repository at this point in the history

  10. Merge pull request #40 from the-collab-lab/mm-feature/navbar-layout 

    Mm feature/navbar layout
    @Hudamabkhoot
    Hudamabkhoot authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    65b72a6 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feat/setup-tailwind-shadcn' into hm-list-layout

    @Hudamabkhoot
    Hudamabkhoot authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    b0f1226 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #41 from the-collab-lab/hm-list-layout 

    Implement design for list page
    @Hudamabkhoot
    Hudamabkhoot authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    1003bd0 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'feat/setup-tailwind-shadcn' into jo-home-page

    @marshjaja
    marshjaja authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    a1d33f1 View commit details
    Browse the repository at this point in the history

  14. fix: resolve merge conflict

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    60ffafc View commit details
    Browse the repository at this point in the history

  15. Merge pull request #39 from the-collab-lab/jo-home-page 

    Protect routes and create welcome page
    @marshjaja
    marshjaja authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    90db9c3 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'feat/setup-tailwind-shadcn' into refactor_homepage

    @marshjaja
    marshjaja authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    b52d3f6 View commit details
    Browse the repository at this point in the history

  17. fix: Resolve merge conflict

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    c755f0d View commit details
    Browse the repository at this point in the history

  18. fix: tailwind conflicts

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    46b86fc View commit details
    Browse the repository at this point in the history

  19. fix: CSS conflict

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    759e80b View commit details
    Browse the repository at this point in the history

  20. Merge pull request #38 from the-collab-lab/refactor_homepage 

    Relocate Share List func to modal + navigation to lists from Home + styled Home components
    @marshjaja
    marshjaja authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    01dbba4 View commit details
    Browse the repository at this point in the history

  21. fix: Add favicon back to project

    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    a3b1bed View commit details
    Browse the repository at this point in the history

  22. fix: Fix not being able to see some of the Tailwind styles due to inc… 

    …orrect formatting of the tailwind.config.js
    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    f2c26c2 View commit details
    Browse the repository at this point in the history

  23. fix: Restore lost Navbar, toggle and icons styles after merging confl… 

    …icts
    @marshjaja
    marshjaja committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    ee96b28 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. style: Re-apply missing styles to Home, List pages and elements w… 

    …ithin them after merge to match Figma design
    @marshjaja
    marshjaja committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    65885a3 View commit details
    Browse the repository at this point in the history

  2. add: Update styles and fix z-index issue on Home page for `SingleLi… 

    …st` element and `NavBar`
    @marshjaja
    marshjaja committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    27b8308 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Fixed: spacing issue and capitalize first letter

    @joriordan332
    joriordan332 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    2bd06e2 View commit details
    Browse the repository at this point in the history

  2. Fix: updated Regex to not allow numbers and special characters

    @joriordan332
    joriordan332 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    200d6a6 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Replace dropdown with radio buttons in AddItemForm

    @Hudamabkhoot
    Hudamabkhoot committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    efaa4cb View commit details
    Browse the repository at this point in the history

  2. close button color adjustment

    @Hudamabkhoot
    Hudamabkhoot committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    adec26e View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. fix: Adjust styling for Home and List views and related files to alig… 

    …n with Figma design
    @marshjaja
    marshjaja committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    b96f7d9 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge pull request #48 from the-collab-lab/jo-fix-spacing 

    Fix spacing issue
    @joriordan332
    joriordan332 authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    5d88730 View commit details
    Browse the repository at this point in the history

  2. Dark and light mode consistent now throughout each page of the app

    @joriordan332
    joriordan332 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    04f15a2 View commit details
    Browse the repository at this point in the history

  3. Removed unused useState code

    @joriordan332
    joriordan332 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    42cc59d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #50 from the-collab-lab/hm-add-item-radio-buttons

    @Hudamabkhoot
    Hudamabkhoot authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    e0db288 View commit details
    Browse the repository at this point in the history

  5. firebase delete list method

    @Wyna-7
    Wyna-7 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    fbd67b0 View commit details
    Browse the repository at this point in the history

  6. dfeat:delete list + remove from selected + disable delete for other u… 

    …ser lists
    @Wyna-7
    Wyna-7 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    57d60d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Updated tailwind styling on the login div

    @joriordan332
    joriordan332 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ea313a6 View commit details
    Browse the repository at this point in the history

  2. add: Requested changes

    @marshjaja
    marshjaja committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    deaad99 View commit details
    Browse the repository at this point in the history

  3. Created item edit feature

    @Hudamabkhoot
    Hudamabkhoot committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    d866df7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feat/setup-tailwind-shadcn' into mm-feature/update-list… 

    …item-singlelist-styling
    @marshjaja
    marshjaja authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    6a1fa8f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #51 from the-collab-lab/mm-feature/update-listitem… 

    …-singlelist-styling

Mm feature/update listitem singlelist styling
    @marshjaja
    marshjaja authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    7eba74b View commit details
    Browse the repository at this point in the history

  6. Pulled updates from dev branch

    @Hudamabkhoot
    Hudamabkhoot committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    a6acf6f View commit details
    Browse the repository at this point in the history

  7. fin 

    al chnages and fixing the issue of listName being null
    @Hudamabkhoot
    Hudamabkhoot committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    293f9bf View commit details
    Browse the repository at this point in the history

  8. Applied changes to the edit and delete icons colors and to the dialog… 

    … buttons opacity
    @Hudamabkhoot
    Hudamabkhoot committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    469508c View commit details
    Browse the repository at this point in the history

  9. delete confirmation + grey button tooltip

    @Wyna-7
    Wyna-7 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    368acea View commit details
    Browse the repository at this point in the history

  10. style: alert

    @Wyna-7
    Wyna-7 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    07e75a0 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feat/setup-tailwind-shadcn' into qg-feat-delete-list

    @Wyna-7
    Wyna-7 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ed975e4 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #53 from the-collab-lab/qg-feat-delete-list 

    Feat: Delete lists
    @Wyna-7
    Wyna-7 authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    83c0428 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. Matched the buttons in list page to home and added a loading state fo… 

    …r list items
    @Hudamabkhoot
    Hudamabkhoot committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    ab32d37 View commit details
    Browse the repository at this point in the history

  2. conflict with dev resolved, align home and list layout match and upda… 

    …te inactive share button style to match delete button.
    @Hudamabkhoot
    Hudamabkhoot committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    42e0379 View commit details
    Browse the repository at this point in the history

  3. Fixed: removed layout styling comment

    @joriordan332
    joriordan332 committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    71e6303 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #52 from the-collab-lab/jo-dark-light-login 

    Consistent dark and light theme throughout app
    @joriordan332
    joriordan332 authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    6dcc2cf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feat/setup-tailwind-shadcn' of https://github.com/the-c… 

    …ollab-lab/tcl-79-smart-shopping-list into hm-edit-listItem
    @Hudamabkhoot
    Hudamabkhoot committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    d61f50d View commit details
    Browse the repository at this point in the history

  6. Fixed the loading state and some minor design adjustments

    @Hudamabkhoot
    Hudamabkhoot committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    b8d5d5c View commit details
    Browse the repository at this point in the history

  7. Merge pull request #54 from the-collab-lab/hm-edit-listItem 

    Edit individual list items.
    @Hudamabkhoot
    Hudamabkhoot authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    3220f21 View commit details
    Browse the repository at this point in the history