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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
80daafc
feat: Add initial Tailwind CSS and ShadCN dependencies configuration …
marshjaja Sep 30, 2024
8f4790d
feat: Implement initial layout and add trial logo for navbar views on…
marshjaja Sep 30, 2024
93b7a6a
add: Add color for active NavLink selection and hover effect
marshjaja Oct 1, 2024
1e47a47
fix: Fix the visibility issue of the Sign In element on tablet and mo…
marshjaja Oct 2, 2024
ea7678a
feat: Implement initial dark and light mode with matching black and w…
marshjaja Oct 2, 2024
508d6bb
add: Add custom favicon, rename project to chosen name, improve trans…
marshjaja Oct 2, 2024
53f9c1d
Relocated add item to list, implemented add item modal, and added ite…
Hudamabkhoot Oct 3, 2024
bbfd685
applied the design changes
Hudamabkhoot Oct 4, 2024
87f8060
Routes protected and styling added
joriordan332 Oct 4, 2024
ab1fa32
share list modal + home styles
Wyna-7 Oct 4, 2024
bd8ccdc
improve: add better hover effects for enhanced user feedback on icons…
marshjaja Oct 4, 2024
14d8866
refactor: Move Navbar component to its own file and add tooltips to i…
marshjaja Oct 5, 2024
db0d0af
Merge pull request #37 from the-collab-lab/hm-addItemForm-relocation-…
Hudamabkhoot Oct 5, 2024
50a72fc
fix: Add small code fix to display light / dark mode toggle on the bo…
marshjaja Oct 5, 2024
c99a06f
Fixed: styling and refresh issue
joriordan332 Oct 5, 2024
403b121
fix: Remove unnecessary imports in `Layout`
marshjaja Oct 5, 2024
fde8c2a
Fixed the layout of list page
Hudamabkhoot Oct 5, 2024
0f11d4e
fix: Add suggested change
marshjaja Oct 5, 2024
1768009
fix: small code change
marshjaja Oct 6, 2024
6688ed9
small fixes
Hudamabkhoot Oct 6, 2024
260d834
style modifications
Wyna-7 Oct 6, 2024
0c4874d
conflicts resolved
Wyna-7 Oct 6, 2024
42d3a6c
removed ManageList from index.js
Wyna-7 Oct 6, 2024
b281cb9
removed ManageList route
Wyna-7 Oct 6, 2024
2db3c44
Merge branch 'feat/setup-tailwind-shadcn' into mm-feature/navbar-layout
marshjaja Oct 6, 2024
0d68dfa
fix: Resolve errors after merge conflict
marshjaja Oct 6, 2024
90e286b
fix: Resolved issues in package-lock.json and build issues
marshjaja Oct 6, 2024
65b72a6
Merge pull request #40 from the-collab-lab/mm-feature/navbar-layout
Hudamabkhoot Oct 6, 2024
b0f1226
Merge branch 'feat/setup-tailwind-shadcn' into hm-list-layout
Hudamabkhoot Oct 6, 2024
1003bd0
Merge pull request #41 from the-collab-lab/hm-list-layout
Hudamabkhoot Oct 6, 2024
a1d33f1
Merge branch 'feat/setup-tailwind-shadcn' into jo-home-page
marshjaja Oct 6, 2024
60ffafc
fix: resolve merge conflict
marshjaja Oct 6, 2024
90db9c3
Merge pull request #39 from the-collab-lab/jo-home-page
marshjaja Oct 6, 2024
b52d3f6
Merge branch 'feat/setup-tailwind-shadcn' into refactor_homepage
marshjaja Oct 6, 2024
c755f0d
fix: Resolve merge conflict
marshjaja Oct 6, 2024
46b86fc
fix: tailwind conflicts
marshjaja Oct 6, 2024
759e80b
fix: CSS conflict
marshjaja Oct 6, 2024
01dbba4
Merge pull request #38 from the-collab-lab/refactor_homepage
marshjaja Oct 6, 2024
a3b1bed
fix: Add favicon back to project
marshjaja Oct 6, 2024
f2c26c2
fix: Fix not being able to see some of the Tailwind styles due to inc…
marshjaja Oct 6, 2024
ee96b28
fix: Restore lost Navbar, toggle and icons styles after merging confl…
marshjaja Oct 6, 2024
65885a3
style: Re-apply missing styles to `Home`, `List` pages and elements w…
marshjaja Oct 7, 2024
27b8308
add: Update styles and fix z-index issue on `Home` page for `SingleLi…
marshjaja Oct 7, 2024
2bd06e2
Fixed: spacing issue and capitalize first letter
joriordan332 Oct 8, 2024
200d6a6
Fix: updated Regex to not allow numbers and special characters
joriordan332 Oct 8, 2024
efaa4cb
Replace dropdown with radio buttons in AddItemForm
Hudamabkhoot Oct 9, 2024
adec26e
close button color adjustment
Hudamabkhoot Oct 9, 2024
b96f7d9
fix: Adjust styling for Home and List views and related files to alig…
marshjaja Oct 10, 2024
5d88730
Merge pull request #48 from the-collab-lab/jo-fix-spacing
joriordan332 Oct 11, 2024
04f15a2
Dark and light mode consistent now throughout each page of the app
joriordan332 Oct 11, 2024
42cc59d
Removed unused useState code
joriordan332 Oct 11, 2024
e0db288
Merge pull request #50 from the-collab-lab/hm-add-item-radio-buttons
Hudamabkhoot Oct 11, 2024
fbd67b0
firebase delete list method
Wyna-7 Oct 11, 2024
57d60d0
dfeat:delete list + remove from selected + disable delete for other u…
Wyna-7 Oct 11, 2024
ea313a6
Updated tailwind styling on the login div
joriordan332 Oct 12, 2024
deaad99
add: Requested changes
marshjaja Oct 12, 2024
d866df7
Created item edit feature
Hudamabkhoot Oct 12, 2024
6a1fa8f
Merge branch 'feat/setup-tailwind-shadcn' into mm-feature/update-list…
marshjaja Oct 12, 2024
7eba74b
Merge pull request #51 from the-collab-lab/mm-feature/update-listitem…
marshjaja Oct 12, 2024
a6acf6f
Pulled updates from dev branch
Hudamabkhoot Oct 12, 2024
293f9bf
fin
Hudamabkhoot Oct 12, 2024
469508c
Applied changes to the edit and delete icons colors and to the dialog…
Hudamabkhoot Oct 12, 2024
368acea
delete confirmation + grey button tooltip
Wyna-7 Oct 12, 2024
07e75a0
style: alert
Wyna-7 Oct 12, 2024
ed975e4
Merge branch 'feat/setup-tailwind-shadcn' into qg-feat-delete-list
Wyna-7 Oct 12, 2024
83c0428
Merge pull request #53 from the-collab-lab/qg-feat-delete-list
Wyna-7 Oct 12, 2024
ab32d37
Matched the buttons in list page to home and added a loading state fo…
Hudamabkhoot Oct 13, 2024
42e0379
conflict with dev resolved, align home and list layout match and upda…
Hudamabkhoot Oct 13, 2024
71e6303
Fixed: removed layout styling comment
joriordan332 Oct 13, 2024
6dcc2cf
Merge pull request #52 from the-collab-lab/jo-dark-light-login
joriordan332 Oct 13, 2024
d61f50d
Merge branch 'feat/setup-tailwind-shadcn' of https://github.com/the-c…
Hudamabkhoot Oct 13, 2024
b8d5d5c
Fixed the loading state and some minor design adjustments
Hudamabkhoot Oct 13, 2024
3220f21
Merge pull request #54 from the-collab-lab/hm-edit-listItem
Hudamabkhoot Oct 13, 2024
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
20 changes: 20 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": false,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/index.css",
"baseColor": "slate",
"cssVariables": false,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils",
"ui": "@/components/ui",
"lib": "@/lib",
"hooks": "@/hooks"
}
}
18 changes: 15 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
Expand All @@ -10,9 +10,21 @@
name="description"
content="A smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important."
/>
<link rel="icon" type="image/svg+xml" href="/src/favicon.ico" />
<link rel="icon" type="image/svg+xml" href="/src/favicon-cart.png" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap"
rel="stylesheet"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Monda:[email protected]&family=Montserrat:wght@700&family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap"
rel="stylesheet"
/>
<meta name="color-scheme" content="dark light" />
<title>Smart Shopping List</title>
<title>GrocerEase</title>
<script type="module" src="/src/index.jsx" async></script>
</head>
<body>
Expand Down
5 changes: 4 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"compilerOptions": {
"types": ["vitest/globals"]
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"]
}
}
}
Loading
Loading