From ab1fa3221a359f0b7a703d4c69f67e2d520f0342 Mon Sep 17 00:00:00 2001 From: wyna Date: Fri, 4 Oct 2024 19:16:12 +0200 Subject: [PATCH 1/7] share list modal + home styles --- index.html | 16 +- package-lock.json | 439 ++++++++++++++++++ package.json | 2 + src/App.jsx | 17 +- src/api/firebase.js | 1 - src/components/CreateShoppingList.jsx | 31 +- .../ManageListForms/ShareListForm.jsx | 27 -- src/components/ShareModal.jsx | 63 +++ src/components/SingleList.css | 21 - src/components/SingleList.jsx | 39 +- src/components/ui/dialog.jsx | 104 +++++ src/index.css | 4 + src/views/Home.css | 0 src/views/Home.jsx | 60 ++- src/views/Layout.css | 27 -- src/views/Layout.jsx | 14 +- src/views/ManageList.jsx | 4 +- tailwind.config.js | 10 +- 18 files changed, 749 insertions(+), 130 deletions(-) delete mode 100644 src/components/ManageListForms/ShareListForm.jsx create mode 100644 src/components/ShareModal.jsx delete mode 100644 src/components/SingleList.css create mode 100644 src/components/ui/dialog.jsx delete mode 100644 src/views/Home.css diff --git a/index.html b/index.html index 5016fc3..283e442 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -11,8 +11,20 @@ content="A smart shopping list that learns your purchase habits and makes suggestions, so you don't forget to buy what's important." /> + + + + + + - Smart Shopping List + GrocerEase diff --git a/package-lock.json b/package-lock.json index 14dde38..00ab9e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "": { "name": "smart-shopping-list-next", "dependencies": { + "@radix-ui/react-dialog": "^1.1.1", "@radix-ui/react-slot": "^1.1.0", "@the-collab-lab/shopping-list-utils": "^2.2.0", "class-variance-authority": "^0.7.0", @@ -15,6 +16,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-hot-toast": "^2.4.1", + "react-icons": "^5.3.0", "react-router-dom": "^6.26.0", "tailwind-merge": "^2.5.2", "tailwindcss-animate": "^1.0.7" @@ -3309,6 +3311,12 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, + "node_modules/@radix-ui/primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.0.tgz", + "integrity": "sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==", + "license": "MIT" + }, "node_modules/@radix-ui/react-compose-refs": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz", @@ -3323,6 +3331,213 @@ } } }, + "node_modules/@radix-ui/react-context": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz", + "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dialog": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.1.tgz", + "integrity": "sha512-zysS+iU4YP3STKNS6USvFVqI4qqx8EpiwmT5TuCApVEBca+eRCbONi4EgzfNSuVnOXvC5UPHHMjs8RXO6DH9Bg==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.0", + "@radix-ui/react-dismissable-layer": "1.1.0", + "@radix-ui/react-focus-guards": "1.1.0", + "@radix-ui/react-focus-scope": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-portal": "1.1.1", + "@radix-ui/react-presence": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-slot": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.5.7" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dismissable-layer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.0.tgz", + "integrity": "sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-escape-keydown": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-guards": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.0.tgz", + "integrity": "sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-scope": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz", + "integrity": "sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-id": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", + "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-portal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.1.tgz", + "integrity": "sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-presence": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.0.tgz", + "integrity": "sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz", + "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-slot": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", @@ -3340,6 +3555,72 @@ } } }, + "node_modules/@radix-ui/react-use-callback-ref": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", + "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-controllable-state": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", + "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-escape-keydown": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", + "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", + "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@remix-run/router": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.0.tgz", @@ -4383,6 +4664,18 @@ "dev": true, "license": "Python-2.0" }, + "node_modules/aria-hidden": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz", + "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/aria-query": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", @@ -5440,6 +5733,12 @@ "node": ">=6" } }, + "node_modules/detect-node-es": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", + "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", + "license": "MIT" + }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -6520,6 +6819,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-nonce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", + "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/get-own-enumerable-property-symbols": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", @@ -6912,6 +7220,15 @@ "node": ">= 0.4" } }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -8943,6 +9260,15 @@ "react-dom": ">=16" } }, + "node_modules/react-icons": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.3.0.tgz", + "integrity": "sha512-DnUk8aFbTyQPSkCfF8dbX6kQjXA9DktMeJqfjrg6cK9vwQVMxmcA3BfP4QoiztVmEHtwlTgLFsPuH2NskKT6eg==", + "license": "MIT", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -8960,6 +9286,53 @@ "node": ">=0.10.0" } }, + "node_modules/react-remove-scroll": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.7.tgz", + "integrity": "sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==", + "license": "MIT", + "dependencies": { + "react-remove-scroll-bar": "^2.3.4", + "react-style-singleton": "^2.2.1", + "tslib": "^2.1.0", + "use-callback-ref": "^1.3.0", + "use-sidecar": "^1.1.2" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-remove-scroll-bar": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz", + "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==", + "license": "MIT", + "dependencies": { + "react-style-singleton": "^2.2.1", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/react-router": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.0.tgz", @@ -8990,6 +9363,29 @@ "react-dom": ">=16.8" } }, + "node_modules/react-style-singleton": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz", + "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==", + "license": "MIT", + "dependencies": { + "get-nonce": "^1.0.0", + "invariant": "^2.2.4", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -10612,6 +11008,49 @@ "requires-port": "^1.0.0" } }, + "node_modules/use-callback-ref": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz", + "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/use-sidecar": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz", + "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==", + "license": "MIT", + "dependencies": { + "detect-node-es": "^1.1.0", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index a18ea28..74b55ea 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "npm": ">=8.19.0" }, "dependencies": { + "@radix-ui/react-dialog": "^1.1.1", "@radix-ui/react-slot": "^1.1.0", "@the-collab-lab/shopping-list-utils": "^2.2.0", "class-variance-authority": "^0.7.0", @@ -16,6 +17,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-hot-toast": "^2.4.1", + "react-icons": "^5.3.0", "react-router-dom": "^6.26.0", "tailwind-merge": "^2.5.2", "tailwindcss-animate": "^1.0.7" diff --git a/src/App.jsx b/src/App.jsx index 5fa9782..670ab10 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,7 +6,10 @@ import { useAuth, useShoppingListData, useShoppingLists } from './api'; import { useStateWithStorage } from './utils'; +import { useState } from 'react'; + export function App() { + const [isModalOpen, setIsModalOpen] = useState(false); /** * This custom hook takes the path of a shopping list * in our database and syncs it with localStorage for later use. @@ -40,6 +43,11 @@ export function App() { */ const data = useShoppingListData(listPath); + const handleShareModalClick = () => { + console.log('isModalOpen', isModalOpen); + setIsModalOpen(!isModalOpen); + }; + return ( @@ -47,7 +55,14 @@ export function App() { + } /> - - setListName(e.target.value)} - required - /> - +
+
+ + setListName(e.target.value)} + required + /> +
+ +
); } diff --git a/src/components/ManageListForms/ShareListForm.jsx b/src/components/ManageListForms/ShareListForm.jsx deleted file mode 100644 index 925b6c2..0000000 --- a/src/components/ManageListForms/ShareListForm.jsx +++ /dev/null @@ -1,27 +0,0 @@ -import { useState } from 'react'; -import { shareList } from '../../api'; - -export default function ShareListForm({ listPath, user }) { - const [recipientEmail, setRecipientEmail] = useState(''); - const currentUserId = user?.uid; - - const handleSubmit = async (event) => { - event.preventDefault(); - await shareList(listPath, currentUserId, recipientEmail); - setRecipientEmail(''); - }; - - return ( -
handleSubmit(event)}> - - setRecipientEmail(e.target.value)} - /> - -
- ); -} diff --git a/src/components/ShareModal.jsx b/src/components/ShareModal.jsx new file mode 100644 index 0000000..c5cd10a --- /dev/null +++ b/src/components/ShareModal.jsx @@ -0,0 +1,63 @@ +/* eslint-disable react/no-unescaped-entities */ +/* eslint-disable jsx-a11y/no-static-element-interactions */ +/* eslint-disable jsx-a11y/click-events-have-key-events */ +import { useState } from 'react'; +import { shareList } from '@/api'; + +export default function ShareModal({ + handleShareModalClick, + listPath, + user, + name, +}) { + const [recipientEmail, setRecipientEmail] = useState(''); + const currentUserId = user?.uid; + + const handleSubmit = async (event) => { + event.preventDefault(); + await shareList(listPath, currentUserId, recipientEmail); + setRecipientEmail(''); + }; + + return ( +
+
+
+
handleSubmit(event)} + className="absolute top-1/4 left-1/4 text-black bg-slate-50 z-10 rounded p-5 w-1/2 h-1/2 flex flex-col justify-between items-center" + > +

You're sharing {name}

+
+ + setRecipientEmail(e.target.value)} + /> +
+
+ + +
+
+
+
+ ); +} diff --git a/src/components/SingleList.css b/src/components/SingleList.css deleted file mode 100644 index ce9c3d4..0000000 --- a/src/components/SingleList.css +++ /dev/null @@ -1,21 +0,0 @@ -.SingleList { - align-items: baseline; - display: flex; - flex-direction: row; - font-size: 1.2em; -} - -.SingleList-label { - margin-left: 0.2em; -} - -.ListItem { - display: flex; - flex-direction: row; - justify-content: flex-start; -} - -.TimeBadge { - margin: 8px; - font-size: small; -} diff --git a/src/components/SingleList.jsx b/src/components/SingleList.jsx index 49d1885..849c4de 100644 --- a/src/components/SingleList.jsx +++ b/src/components/SingleList.jsx @@ -1,13 +1,44 @@ -import './SingleList.css'; +import { FaShareNodes } from 'react-icons/fa6'; +import { RiDeleteBin5Fill } from 'react-icons/ri'; +import { useNavigate } from 'react-router-dom'; +export function SingleList({ + name, + path, + setListPath, + handleShareModalClick, + setSelectedItem, +}) { + const navigate = useNavigate(); -export function SingleList({ name, path, setListPath }) { function handleClick() { setListPath(path); + navigate(`/list`); } + const handleShareClick = () => { + setSelectedItem(name); + handleShareModalClick(); + }; + return ( -
  • - +
  • + +
    + + +
    • ); } diff --git a/src/components/ui/dialog.jsx b/src/components/ui/dialog.jsx new file mode 100644 index 0000000..8751f6a --- /dev/null +++ b/src/components/ui/dialog.jsx @@ -0,0 +1,104 @@ +import * as React from 'react'; +import * as DialogPrimitive from '@radix-ui/react-dialog'; +import { X } from 'lucide-react'; + +import { cn } from '@/lib/utils'; + +const Dialog = DialogPrimitive.Root; + +const DialogTrigger = DialogPrimitive.Trigger; + +const DialogPortal = DialogPrimitive.Portal; + +const DialogClose = DialogPrimitive.Close; + +const DialogOverlay = React.forwardRef(({ className, ...props }, ref) => ( + +)); +DialogOverlay.displayName = DialogPrimitive.Overlay.displayName; + +const DialogContent = React.forwardRef( + ({ className, children, ...props }, ref) => ( + + + + {children} + + + Close + + + + ), +); +DialogContent.displayName = DialogPrimitive.Content.displayName; + +const DialogHeader = ({ className, ...props }) => ( +
    +); +DialogHeader.displayName = 'DialogHeader'; + +const DialogFooter = ({ className, ...props }) => ( +
    +); +DialogFooter.displayName = 'DialogFooter'; + +const DialogTitle = React.forwardRef(({ className, ...props }, ref) => ( + +)); +DialogTitle.displayName = DialogPrimitive.Title.displayName; + +const DialogDescription = React.forwardRef(({ className, ...props }, ref) => ( + +)); +DialogDescription.displayName = DialogPrimitive.Description.displayName; + +export { + Dialog, + DialogPortal, + DialogOverlay, + DialogClose, + DialogTrigger, + DialogContent, + DialogHeader, + DialogFooter, + DialogTitle, + DialogDescription, +}; diff --git a/src/index.css b/src/index.css index b5c61c9..7d918e4 100644 --- a/src/index.css +++ b/src/index.css @@ -1,3 +1,7 @@ @tailwind base; @tailwind components; @tailwind utilities; + +#root { + background-color: #201c24; +} diff --git a/src/views/Home.css b/src/views/Home.css deleted file mode 100644 index e69de29..0000000 diff --git a/src/views/Home.jsx b/src/views/Home.jsx index 4e16305..427610a 100644 --- a/src/views/Home.jsx +++ b/src/views/Home.jsx @@ -1,30 +1,46 @@ +import { useState } from 'react'; import { SingleList } from '../components'; -import './Home.css'; import CreateShoppingList from '../components/CreateShoppingList'; -import { Button } from '@/components/ui/button'; - -export function Home({ user, data, setListPath }) { +import ShareModal from '../components/ShareModal'; +export function Home({ + user, + data, + listPath, + setListPath, + isModalOpen, + handleShareModalClick, +}) { + const [selectedItem, setSelectedItem] = useState(''); return ( -
    -

    - Hello from the home (/) page! -

    -
    - +
    +
    +

    + Your Lists +

    -
      - {data?.map((item, index) => ( - - ))} -
    + {isModalOpen && ( + + )} +
    +
      + {data?.map((item, index) => ( + + ))} +
    +
    ); } diff --git a/src/views/Layout.css b/src/views/Layout.css index 85be734..d8fbf62 100644 --- a/src/views/Layout.css +++ b/src/views/Layout.css @@ -7,33 +7,6 @@ * * @see: https://developer.mozilla.org/en-US/docs/Web/CSS/env */ -.Layout { - display: flex; - flex-direction: column; - height: 100dvh; -} - -.Layout > * { - padding-inline: min(5dvw, 3.2rem); -} - -.Layout-header { - background-color: var(--color-bg); - padding-bottom: 0.5rem; - padding-top: max(env(safe-area-inset-top), 1rem); - text-align: center; -} - -.Layout-header > h1 { - margin: 0; -} - -.Layout-main { - margin: 0 auto; - padding-block: 0; - padding-block-end: 6.26rem; - width: min(72ch, 100%); -} .Nav { background-color: var(--color-bg); diff --git a/src/views/Layout.jsx b/src/views/Layout.jsx index ec5c2f0..c14ec2d 100644 --- a/src/views/Layout.jsx +++ b/src/views/Layout.jsx @@ -18,13 +18,17 @@ export function Layout() { const { user } = useAuth(); return ( <> -
    -
    -

    Smart shopping list

    +
    +
    +

    + GrocerEase +

    {!!user ? (
    - -

    Welcome, {user.displayName}

    + {/* */} +

    + Welcome, {user.displayName}! +

    ) : ( diff --git a/src/views/ManageList.jsx b/src/views/ManageList.jsx index 20cca9c..ca6fabe 100644 --- a/src/views/ManageList.jsx +++ b/src/views/ManageList.jsx @@ -1,11 +1,9 @@ import AddItemForm from '../components/ManageListForms/AddItemForm'; -import ShareListForm from '../components/ManageListForms/ShareListForm'; -export function ManageList({ listPath, user, data }) { +export function ManageList({ listPath, data }) { return (
    -
    ); } diff --git a/tailwind.config.js b/tailwind.config.js index b913671..ebbe018 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,13 +3,9 @@ export default { darkMode: ['class'], content: ['./index.html', './src/**/*.{js,ts,jsx,tsx}'], theme: { - extend: { - borderRadius: { - lg: 'var(--radius)', - md: 'calc(var(--radius) - 2px)', - sm: 'calc(var(--radius) - 4px)', - }, - colors: {}, + fontFamily: { + montserrat: ['montserrat', 'sans-serif'], + monda: ['monda', 'sans-serif'], }, }, plugins: [require('tailwindcss-animate')], From 260d83419526f8dd536d60bb19a2b693ff7ebcf3 Mon Sep 17 00:00:00 2001 From: wyna Date: Sun, 6 Oct 2024 11:26:47 +0200 Subject: [PATCH 2/7] style modifications --- src/components/CreateShoppingList.jsx | 4 ++-- src/components/ShareModal.jsx | 22 ++++++++++++---------- src/components/SingleList.jsx | 4 ++-- src/views/Home.jsx | 14 ++++++++++---- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/components/CreateShoppingList.jsx b/src/components/CreateShoppingList.jsx index f349280..3235c7b 100644 --- a/src/components/CreateShoppingList.jsx +++ b/src/components/CreateShoppingList.jsx @@ -29,7 +29,7 @@ export default function CreateShoppingList({ user, setListPath }) { Create a new list Create + diff --git a/src/components/ShareModal.jsx b/src/components/ShareModal.jsx index c5cd10a..6518a0d 100644 --- a/src/components/ShareModal.jsx +++ b/src/components/ShareModal.jsx @@ -20,21 +20,23 @@ export default function ShareModal({ }; return ( -
    +
    handleSubmit(event)} - className="absolute top-1/4 left-1/4 text-black bg-slate-50 z-10 rounded p-5 w-1/2 h-1/2 flex flex-col justify-between items-center" + className="relative text-black bg-slate-50 z-10 rounded p-10 w-full max-w-2xl flex flex-col justify-between items-center space-y-6" > -

    You're sharing {name}

    -
    - +

    You're sharing {name}

    +
    + setRecipientEmail(e.target.value)} />
    -
    +
    diff --git a/src/components/SingleList.jsx b/src/components/SingleList.jsx index 849c4de..959ed85 100644 --- a/src/components/SingleList.jsx +++ b/src/components/SingleList.jsx @@ -21,7 +21,7 @@ export function SingleList({ }; return ( -
  • +
  • -
    • diff --git a/src/views/Home.jsx b/src/views/Home.jsx index 427610a..df527a5 100644 --- a/src/views/Home.jsx +++ b/src/views/Home.jsx @@ -14,9 +14,15 @@ export function Home({ return (
    -

    - Your Lists -

    +
    +

    + + Your + + {' '} + Lists +

    +
    {isModalOpen && (
    -
      +
        {data?.map((item, index) => ( Date: Sun, 6 Oct 2024 11:49:38 +0200 Subject: [PATCH 3/7] removed ManageList from index.js --- src/views/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/index.js b/src/views/index.js index 9f10e56..735f00c 100644 --- a/src/views/index.js +++ b/src/views/index.js @@ -1,4 +1,3 @@ -export * from './ManageList'; export * from './Home'; export * from './Layout'; export * from './List'; From b281cb94e968ba34f775df0904cbe783e377f57f Mon Sep 17 00:00:00 2001 From: wyna Date: Sun, 6 Oct 2024 11:51:43 +0200 Subject: [PATCH 4/7] removed ManageList route --- src/App.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 670ab10..9fae95b 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,6 +1,6 @@ import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; -import { Home, Layout, List, ManageList } from './views'; +import { Home, Layout, List } from './views'; import { useAuth, useShoppingListData, useShoppingLists } from './api'; @@ -69,10 +69,6 @@ export function App() { path="/list" element={} /> - } - /> From c755f0d7a9e593d8a5e593cf50dd3b554fba3c71 Mon Sep 17 00:00:00 2001 From: marshjaja <114920895+marshjaja@users.noreply.github.com> Date: Sun, 6 Oct 2024 13:33:04 +0100 Subject: [PATCH 5/7] fix: Resolve merge conflict --- package-lock.json | 128 +--------------------------------------------- 1 file changed, 1 insertion(+), 127 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8603b35..4800588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3574,8 +3574,7 @@ "@radix-ui/react-use-layout-effect": "1.1.0", "@radix-ui/react-use-previous": "1.1.0", "@radix-ui/react-visually-hidden": "1.1.0", - "aria-hidden": "^1.1.1", - "react-remove-scroll": "2.6.0" + "aria-hidden": "^1.1.1" }, "peerDependencies": { "@types/react": "*", @@ -6783,14 +6782,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-nonce": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", - "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", - "engines": { - "node": ">=6" - } - }, "node_modules/get-nonce": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", @@ -7162,14 +7153,6 @@ "node": ">= 0.4" } }, - "node_modules/invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -9114,52 +9097,6 @@ } } }, - "node_modules/react-remove-scroll-bar": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz", - "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==", - "dependencies": { - "react-style-singleton": "^2.2.1", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/react-remove-scroll": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.7.tgz", - "integrity": "sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==", - "license": "MIT", - "dependencies": { - "react-remove-scroll-bar": "^2.3.4", - "react-style-singleton": "^2.2.1", - "tslib": "^2.1.0", - "use-callback-ref": "^1.3.0", - "use-sidecar": "^1.1.2" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/react-remove-scroll-bar": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz", @@ -9212,28 +9149,6 @@ "react-dom": ">=16.8" } }, - "node_modules/react-style-singleton": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz", - "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==", - "dependencies": { - "get-nonce": "^1.0.0", - "invariant": "^2.2.4", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/react-style-singleton": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz", @@ -10807,47 +10722,6 @@ "requires-port": "^1.0.0" } }, - "node_modules/use-callback-ref": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz", - "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/use-sidecar": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz", - "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==", - "dependencies": { - "detect-node-es": "^1.1.0", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/use-callback-ref": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz", From 46b86fc3db840fe148d2ffcd261f525ded9f0c05 Mon Sep 17 00:00:00 2001 From: marshjaja <114920895+marshjaja@users.noreply.github.com> Date: Sun, 6 Oct 2024 13:38:05 +0100 Subject: [PATCH 6/7] fix: tailwind conflicts --- tailwind.config.js | 83 +++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 45 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index ded8c6c..9b66647 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -12,53 +12,46 @@ export default { md: 'calc(var(--radius) - 2px)', sm: 'calc(var(--radius) - 4px)', }, - colors: { - 'main-green': '#2EBB4B', - 'light-green': '#79D8AC', - pink: '#F55A99', - black: '#1F1E26', - grey: '#757575', - 'light-grey': '#F3F3F3', + extend: { + borderRadius: { + lg: 'var(--radius)', + md: 'calc(var(--radius) - 2px)', + sm: 'calc(var(--radius) - 4px)', + }, + colors: { + 'primary-green': '#4ade80', + 'light-green': '#bbf7d0', + 'primary-pink': '#F55A99', + 'light-pink': '#D7A2C3', + 'ruby-pink': '#AC4270', + 'bg-black': '#181818', + 'dark-grey': '#7A7A7A', + 'light-grey': '#A3A3A3', + 'text-grey': '#B5B5B5', + 'main-green': '#2EBB4B', + 'light-green': '#79D8AC', + pink: '#F55A99', + black: '#1F1E26', + grey: '#757575', + orange: '#FBB300', + 'orange-hover': '#fbb400c9', + 'light-grey': '#F3F3F3', + soon: '#FFB74D', + 'kind-of-soon': '#FEE720', + 'not-soon': '#81C784', + inactive: '#B0BEC5', + overdue: '#FF5252', + }, + transitionDuration: { + 50: '50ms', + 25: '25ms', + }, + fontFamily: { + montserrat: ['montserrat', 'sans-serif'], + }, }, - extend: { - borderRadius: { - lg: 'var(--radius)', - md: 'calc(var(--radius) - 2px)', - sm: 'calc(var(--radius) - 4px)', - }, - colors: { - 'primary-green': '#4ade80', - 'light-green': '#bbf7d0', - 'primary-pink': '#F55A99', - 'light-pink': '#D7A2C3', - 'ruby-pink': '#AC4270', - 'bg-black': '#181818', - 'dark-grey': '#7A7A7A', - 'light-grey': '#A3A3A3', - 'text-grey': '#B5B5B5', - }, - transitionDuration: { - 50: '50ms', - 25: '25ms', - - 'main-green': '#2EBB4B', - 'light-green': '#79D8AC', - pink: '#F55A99', - black: '#1F1E26', - grey: '#757575', - orange: '#FBB300', - 'orange-hover': '#fbb400c9', - 'light-grey': '#F3F3F3', - soon: '#FFB74D', - 'kind-of-soon': '#FEE720', - 'not-soon': '#81C784', - inactive: '#B0BEC5', - overdue: '#FF5252', - }, - fontFamily: { - montserrat: ['montserrat', 'sans-serif'], + plugins: [require('tailwindcss-animate')], }, }, - plugins: [require('tailwindcss-animate')], }, }; From 759e80b3026c2673fe2c84d44554ced56b67f54e Mon Sep 17 00:00:00 2001 From: marshjaja <114920895+marshjaja@users.noreply.github.com> Date: Sun, 6 Oct 2024 13:40:28 +0100 Subject: [PATCH 7/7] fix: CSS conflict --- src/index.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/index.css b/src/index.css index 68c2fd0..304dcd9 100644 --- a/src/index.css +++ b/src/index.css @@ -2,9 +2,6 @@ @tailwind components; @tailwind utilities; -* { - @apply transition-colors duration-50; -} /* Styles for number input */ input[type='number']::-webkit-inner-spin-button, input[type='number']::-webkit-outer-spin-button {