From c51c2e29ef6da0985034ff47485b2469bec3b840 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 11 Apr 2023 11:06:28 +0530 Subject: [PATCH 01/13] ProjectCard Implemented --- client/package-lock.json | 478 +++++++++++------- client/package.json | 6 +- client/src/app.css | 4 + client/src/asset/icons/icons.jsx | 66 +++ client/src/pages/projects/ProjectCard.jsx | 61 +++ client/src/pages/projects/Projects.jsx | 22 +- .../src/pages/projects/fakeProjectsData.jsx | 16 +- client/tailwind.config.js | 7 + 8 files changed, 472 insertions(+), 188 deletions(-) create mode 100644 client/src/pages/projects/ProjectCard.jsx diff --git a/client/package-lock.json b/client/package-lock.json index 12f460d4..3c70ac92 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@vitejs/plugin-react": "^2.1.0", - "autoprefixer": "^10.4.12", + "autoprefixer": "^10.4.14", "eslint": "^7.32.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.5.0", @@ -41,11 +41,11 @@ "eslint-plugin-react-hooks": "^4.6.0", "gh-pages": "^4.0.0", "jest": "^29.2.2", - "postcss": "^8.4.17", + "postcss": "^8.4.21", "prettier": "2.7.1", "prettier-eslint-cli": "^6.0.1", "rollup-plugin-visualizer": "^5.8.3", - "tailwindcss": "^3.1.8", + "tailwindcss": "^3.3.1", "terser": "^5.15.1", "vite": "^3.1.8" } @@ -6229,27 +6229,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/acorn-node": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", - "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", - "dependencies": { - "acorn": "^7.0.0", - "acorn-walk": "^7.0.0", - "xtend": "^4.0.2" - } - }, - "node_modules/acorn-node/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/acorn-walk": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", @@ -6400,6 +6379,11 @@ "node": ">=4" } }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, "node_modules/anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -6577,9 +6561,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.12", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz", - "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "funding": [ { "type": "opencollective", @@ -6591,8 +6575,8 @@ } ], "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001407", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -7050,9 +7034,9 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "funding": [ { "type": "opencollective", @@ -7064,10 +7048,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" }, "bin": { "browserslist": "cli.js" @@ -7182,9 +7166,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001414", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz", - "integrity": "sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==", + "version": "1.0.30001477", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz", + "integrity": "sha512-lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ==", "funding": [ { "type": "opencollective", @@ -7193,6 +7177,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -8101,11 +8089,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==" - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -8173,22 +8156,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/detective": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", - "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", - "dependencies": { - "acorn-node": "^1.8.2", - "defined": "^1.0.0", - "minimist": "^1.2.6" - }, - "bin": { - "detective": "bin/detective.js" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -8384,9 +8351,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.270", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.270.tgz", - "integrity": "sha512-KNhIzgLiJmDDC444dj9vEOpZEgsV96ult9Iff98Vanumn+ShJHd5se8aX6KeVxdc0YQeqdrezBZv89rleDbvSg==" + "version": "1.4.357", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.357.tgz", + "integrity": "sha512-UTkCbNTAcGXABmEnQrGcW4m3cG6fcyBfD4KDF0iyEAlbrGZiY9dmslyDAGOD1Kr5biN2F743Y30aRCOtau35Vw==" }, "node_modules/email-addresses": { "version": "3.1.0", @@ -10143,9 +10110,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -16015,6 +15982,14 @@ "node": ">=8" } }, + "node_modules/jiti": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz", + "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==", + "bin": { + "jiti": "bin/jiti.js" + } + }, "node_modules/js-sdsl": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", @@ -16739,6 +16714,16 @@ "multicast-dns": "cli.js" } }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "node_modules/nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -16791,9 +16776,9 @@ "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" }, "node_modules/normalize-path": { "version": "3.0.0", @@ -17394,9 +17379,9 @@ } }, "node_modules/postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", + "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "funding": [ { "type": "opencollective", @@ -18078,11 +18063,11 @@ } }, "node_modules/postcss-nested": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", - "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz", + "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==", "dependencies": { - "postcss-selector-parser": "^6.0.6" + "postcss-selector-parser": "^6.0.10" }, "engines": { "node": ">=12.0" @@ -18473,9 +18458,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", + "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -22455,6 +22440,67 @@ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" }, + "node_modules/sucrase": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz", + "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.2", + "commander": "^4.0.0", + "glob": "7.1.6", + "lines-and-columns": "^1.1.6", + "mz": "^2.7.0", + "pirates": "^4.0.1", + "ts-interface-checker": "^0.1.9" + }, + "bin": { + "sucrase": "bin/sucrase", + "sucrase-node": "bin/sucrase-node" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/sucrase/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/sucrase/node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/sucrase/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -22634,32 +22680,34 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "node_modules/tailwindcss": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz", - "integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.1.tgz", + "integrity": "sha512-Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g==", "dependencies": { "arg": "^5.0.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", + "jiti": "^1.17.2", "lilconfig": "^2.0.6", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.14", + "postcss": "^8.0.9", "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", - "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.10", + "postcss-nested": "6.0.0", + "postcss-selector-parser": "^6.0.11", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.22.1" + "resolve": "^1.22.1", + "sucrase": "^3.29.0" }, "bin": { "tailwind": "lib/cli.js", @@ -22820,6 +22868,25 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/throat": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", @@ -22921,6 +22988,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "node_modules/ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + }, "node_modules/tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -23130,9 +23202,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", - "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "funding": [ { "type": "opencollective", @@ -24190,14 +24262,6 @@ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", @@ -28607,23 +28671,6 @@ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "requires": {} }, - "acorn-node": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", - "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", - "requires": { - "acorn": "^7.0.0", - "acorn-walk": "^7.0.0", - "xtend": "^4.0.2" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" - } - } - }, "acorn-walk": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", @@ -28725,6 +28772,11 @@ "color-convert": "^1.9.0" } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, "anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -28854,12 +28906,12 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { - "version": "10.4.12", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz", - "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==", + "version": "10.4.14", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz", + "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==", "requires": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001407", + "browserslist": "^4.21.5", + "caniuse-lite": "^1.0.30001464", "fraction.js": "^4.2.0", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", @@ -29218,14 +29270,14 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" }, "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" } }, "bser": { @@ -29307,9 +29359,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001414", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz", - "integrity": "sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==" + "version": "1.0.30001477", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz", + "integrity": "sha512-lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ==" }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -29954,11 +30006,6 @@ "object-keys": "^1.1.1" } }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==" - }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -30008,16 +30055,6 @@ } } }, - "detective": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", - "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", - "requires": { - "acorn-node": "^1.8.2", - "defined": "^1.0.0", - "minimist": "^1.2.6" - } - }, "didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -30170,9 +30207,9 @@ } }, "electron-to-chromium": { - "version": "1.4.270", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.270.tgz", - "integrity": "sha512-KNhIzgLiJmDDC444dj9vEOpZEgsV96ult9Iff98Vanumn+ShJHd5se8aX6KeVxdc0YQeqdrezBZv89rleDbvSg==" + "version": "1.4.357", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.357.tgz", + "integrity": "sha512-UTkCbNTAcGXABmEnQrGcW4m3cG6fcyBfD4KDF0iyEAlbrGZiY9dmslyDAGOD1Kr5biN2F743Y30aRCOtau35Vw==" }, "email-addresses": { "version": "3.1.0", @@ -31360,9 +31397,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -35749,6 +35786,11 @@ } } }, + "jiti": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz", + "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==" + }, "js-sdsl": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", @@ -36300,6 +36342,16 @@ "thunky": "^1.0.2" } }, + "mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "requires": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -36340,9 +36392,9 @@ "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" }, "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" }, "normalize-path": { "version": "3.0.0", @@ -36769,9 +36821,9 @@ } }, "postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", + "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "requires": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -37131,11 +37183,11 @@ } }, "postcss-nested": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", - "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz", + "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==", "requires": { - "postcss-selector-parser": "^6.0.6" + "postcss-selector-parser": "^6.0.10" } }, "postcss-nesting": { @@ -37361,9 +37413,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", + "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -40319,6 +40371,50 @@ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" }, + "sucrase": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz", + "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==", + "requires": { + "@jridgewell/gen-mapping": "^0.3.2", + "commander": "^4.0.0", + "glob": "7.1.6", + "lines-and-columns": "^1.1.6", + "mz": "^2.7.0", + "pirates": "^4.0.1", + "ts-interface-checker": "^0.1.9" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -40468,32 +40564,34 @@ } }, "tailwindcss": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz", - "integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.1.tgz", + "integrity": "sha512-Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g==", "requires": { "arg": "^5.0.2", "chokidar": "^3.5.3", "color-name": "^1.1.4", - "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", + "jiti": "^1.17.2", "lilconfig": "^2.0.6", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.14", + "postcss": "^8.0.9", "postcss-import": "^14.1.0", "postcss-js": "^4.0.0", "postcss-load-config": "^3.1.4", - "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.10", + "postcss-nested": "6.0.0", + "postcss-selector-parser": "^6.0.11", "postcss-value-parser": "^4.2.0", "quick-lru": "^5.1.1", - "resolve": "^1.22.1" + "resolve": "^1.22.1", + "sucrase": "^3.29.0" }, "dependencies": { "color-name": { @@ -40590,6 +40688,22 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, + "thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "requires": { + "any-promise": "^1.0.0" + } + }, + "thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "requires": { + "thenify": ">= 3.1.0 < 4" + } + }, "throat": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", @@ -40671,6 +40785,11 @@ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" }, + "ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + }, "tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -40822,9 +40941,9 @@ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, "update-browserslist-db": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", - "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -41622,11 +41741,6 @@ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" - }, "y18n": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", diff --git a/client/package.json b/client/package.json index 838ed487..e30c53b3 100644 --- a/client/package.json +++ b/client/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@vitejs/plugin-react": "^2.1.0", - "autoprefixer": "^10.4.12", + "autoprefixer": "^10.4.14", "eslint": "^7.32.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.5.0", @@ -66,11 +66,11 @@ "eslint-plugin-react-hooks": "^4.6.0", "gh-pages": "^4.0.0", "jest": "^29.2.2", - "postcss": "^8.4.17", + "postcss": "^8.4.21", "prettier": "2.7.1", "prettier-eslint-cli": "^6.0.1", "rollup-plugin-visualizer": "^5.8.3", - "tailwindcss": "^3.1.8", + "tailwindcss": "^3.3.1", "terser": "^5.15.1", "vite": "^3.1.8" } diff --git a/client/src/app.css b/client/src/app.css index acbf631b..7736829b 100644 --- a/client/src/app.css +++ b/client/src/app.css @@ -44,3 +44,7 @@ a { #active { background-color: #b26910; } + +.projectCardLinks { + @apply border border-white border-solid w-10 h-10 rounded-2xl flex justify-center items-center hover:border-projectCardLinkHover hover:text-projectCardLinkHover after:content-[attr(data-tooltip)] after:absolute after:-translate-y-full after:bottom-3 after:bg-projectCardLinkHover after:text-projectCardBg after:p-1 after:rounded after:hidden hover:after:block before:border-8 before:border-transparent before:border-solid before:border-t-projectCardLinkHover before:absolute before:-translate-y-full before:bottom-4 before:hidden hover:before:block before:transition-all after:transition-all; +} diff --git a/client/src/asset/icons/icons.jsx b/client/src/asset/icons/icons.jsx index bea94438..dd3930df 100644 --- a/client/src/asset/icons/icons.jsx +++ b/client/src/asset/icons/icons.jsx @@ -1,3 +1,5 @@ +import { func } from "prop-types"; + export function Discord(props) { return ( @@ -137,3 +139,67 @@ export function Menu(props) { ); } + +export function GithubIcon(props) { + return ( + + + + ); +} + +export function DiscordIcon(props) { + return ( + + + + ); +} + +export function ProjectIcon(props) { + return ( + + + + ); +} + +export function ProjectCardImg(props) { + return ( + + + + ); +} diff --git a/client/src/pages/projects/ProjectCard.jsx b/client/src/pages/projects/ProjectCard.jsx new file mode 100644 index 00000000..80219704 --- /dev/null +++ b/client/src/pages/projects/ProjectCard.jsx @@ -0,0 +1,61 @@ +import React from "react"; +import { + DiscordIcon, + GithubIcon, + ProjectCardImg, + ProjectIcon, +} from "../../asset/icons/icons"; + +function ProjectCard({ + title, + description, + status, + gitUrl, + discordUrl, + projectUrl, + image, +}) { + const statusColor = statusText => { + if (statusText === "Ongoing") return "text-onGoing"; + if (statusText === "Inactive") return "text-inActive"; + if (statusText === "Completed") return "text-completed"; + return "text-canceled"; + }; + + return ( +
+
+ +
+
+

{title}

+

+ {description} +

+ +
+

+ Status: {status} +

+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ ); +} + +export default ProjectCard; diff --git a/client/src/pages/projects/Projects.jsx b/client/src/pages/projects/Projects.jsx index 057bdcdb..f67237aa 100644 --- a/client/src/pages/projects/Projects.jsx +++ b/client/src/pages/projects/Projects.jsx @@ -1,5 +1,25 @@ +import React from "react"; +import ProjectCard from "./ProjectCard"; +import { projectsMap } from "./fakeProjectsData"; + function Projects() { - return
Projects
; + return ( +
+ {projectsMap && + projectsMap.map((ele, key) => ( + + + + ))} +
+ ); } export default Projects; diff --git a/client/src/pages/projects/fakeProjectsData.jsx b/client/src/pages/projects/fakeProjectsData.jsx index 6ac7abb9..681ec423 100644 --- a/client/src/pages/projects/fakeProjectsData.jsx +++ b/client/src/pages/projects/fakeProjectsData.jsx @@ -1,3 +1,5 @@ +import { ProjectCardImg } from "../../asset/icons/icons"; + export const projectsMap = [ { id: 1, @@ -10,18 +12,20 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 2, title: "Project #2", description: "Porro praesentium nobis sunt sed molestiae. A eaque omnis assumenda dolore iusto maiores id veniam.", - status: "Completed", + status: "Inactive", startDate: "3/23/2022", endDate: "11/28/2022", discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 3, @@ -34,6 +38,7 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 4, @@ -46,18 +51,20 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 5, title: "Project #5", description: "Ducimus facilis laboriosam vitae nobis. Dolorum laboriosam consequuntur soluta reiciendis dolorum nihil.", - status: "Ongoing", + status: "Canceled", startDate: "7/30/2022", endDate: "11/28/2022", discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 6, @@ -70,6 +77,7 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 7, @@ -82,6 +90,7 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 8, @@ -94,6 +103,7 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 9, @@ -106,6 +116,7 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, { id: 10, @@ -118,5 +129,6 @@ export const projectsMap = [ discordUrl: "https://discord.com/", gitUrl: "https://github.com/", projectUrl: "https://angular.io/", + image: "icon", }, ]; diff --git a/client/tailwind.config.js b/client/tailwind.config.js index 9cebaa35..1940af17 100644 --- a/client/tailwind.config.js +++ b/client/tailwind.config.js @@ -5,6 +5,13 @@ module.exports = { extend: { colors: { occ_color: "#b26910", + projectCardBg:"#2a2c2e", + projectCardDescription:"#f5f5f5", + onGoing:"#4CDC4C", + completed:"#3498db", + inActive:"#f1c40f", + canceled:"#ff2d55", + projectCardLinkHover:"#ff9617" }, animation: { bounce200: "bounce 1s infinite 200ms", From ef2e90ee0fb753d8acb2b27ce1e0a8fbb1e7731f Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 11 Apr 2023 11:19:13 +0530 Subject: [PATCH 02/13] Lint errors fixed --- client/tailwind.config.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/tailwind.config.js b/client/tailwind.config.js index 1940af17..2eb01b2a 100644 --- a/client/tailwind.config.js +++ b/client/tailwind.config.js @@ -5,13 +5,13 @@ module.exports = { extend: { colors: { occ_color: "#b26910", - projectCardBg:"#2a2c2e", - projectCardDescription:"#f5f5f5", - onGoing:"#4CDC4C", - completed:"#3498db", - inActive:"#f1c40f", - canceled:"#ff2d55", - projectCardLinkHover:"#ff9617" + projectCardBg: "#2a2c2e", + projectCardDescription: "#f5f5f5", + onGoing: "#4CDC4C", + completed: "#3498db", + inActive: "#f1c40f", + canceled: "#ff2d55", + projectCardLinkHover: "#ff9617", }, animation: { bounce200: "bounce 1s infinite 200ms", From 59a5ed261ba337c856d731fe404b29b7ea1e6bc8 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 20 Apr 2023 17:20:01 +0530 Subject: [PATCH 03/13] Component in Place --- .../projects/project-card/Project-Card.jsx | 66 +++++++++++++++++++ client/src/pages/projects/Projects.jsx | 4 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 client/src/components/projects/project-card/Project-Card.jsx diff --git a/client/src/components/projects/project-card/Project-Card.jsx b/client/src/components/projects/project-card/Project-Card.jsx new file mode 100644 index 00000000..dd618710 --- /dev/null +++ b/client/src/components/projects/project-card/Project-Card.jsx @@ -0,0 +1,66 @@ +import React from "react"; +import { + DiscordIcon, + GithubIcon, + ProjectCardImg, + ProjectIcon, +} from "../../../asset/icons/icons"; + +function ProjectCard({ + title, + description, + status, + gitUrl, + discordUrl, + projectUrl, + image, +}) { + const statusColor = statusText => { + if (statusText === "Ongoing") return "text-onGoing"; + if (statusText === "Inactive") return "text-inActive"; + if (statusText === "Completed") return "text-completed"; + return "text-canceled"; + }; + + return ( +
+
+ +
+
+

{title}

+

+ {description} +

+ +
+

+ Status: {status} +

+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ ); +} + +export default ProjectCard; + + + +//file moved to correct folder +//drop shadow fixed \ No newline at end of file diff --git a/client/src/pages/projects/Projects.jsx b/client/src/pages/projects/Projects.jsx index 057bdcdb..0de6e6d1 100644 --- a/client/src/pages/projects/Projects.jsx +++ b/client/src/pages/projects/Projects.jsx @@ -1,5 +1,7 @@ +import ProjectCard from "../../components/projects/project-card/Project-Card"; + function Projects() { - return
Projects
; + return
; } export default Projects; From 5f6d64dec2f7e47e690eac09d2bdf45d52ba14dc Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 20 Apr 2023 17:21:50 +0530 Subject: [PATCH 04/13] Icons added --- client/src/asset/icons/icons.jsx | 63 ++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/client/src/asset/icons/icons.jsx b/client/src/asset/icons/icons.jsx index bea94438..92ab5605 100644 --- a/client/src/asset/icons/icons.jsx +++ b/client/src/asset/icons/icons.jsx @@ -137,3 +137,66 @@ export function Menu(props) { ); } +export function GithubIcon(props) { + return ( + + + + ); +} + +export function DiscordIcon(props) { + return ( + + + + ); +} + +export function ProjectIcon(props) { + return ( + + + + ); +} + +export function ProjectCardImg(props) { + return ( + + + + ); +} From a3730883c79d48a5d10da6c8c6d5a414e089eb5e Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 20 Apr 2023 17:26:34 +0530 Subject: [PATCH 05/13] Done --- client/src/pages/projects/Projects.jsx | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/client/src/pages/projects/Projects.jsx b/client/src/pages/projects/Projects.jsx index 0de6e6d1..1c87d319 100644 --- a/client/src/pages/projects/Projects.jsx +++ b/client/src/pages/projects/Projects.jsx @@ -1,7 +1,25 @@ +import React from "react"; import ProjectCard from "../../components/projects/project-card/Project-Card"; +import { projectsMap } from "./fakeProjectsData"; function Projects() { - return
; + return( +
+ {projectsMap && + projectsMap.map((ele, key) => ( + + + + ))} +
+ ) } export default Projects; From b3871b7f264a66ca2c4227d1e33f3f598c347b21 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Thu, 20 Apr 2023 17:47:45 +0530 Subject: [PATCH 06/13] All issues resolved --- .../projects/project-card/Project-Card.jsx | 33 ++++++++----------- .../projects/project-card/project-card.css | 33 +++++++++++++++++++ 2 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 client/src/components/projects/project-card/project-card.css diff --git a/client/src/components/projects/project-card/Project-Card.jsx b/client/src/components/projects/project-card/Project-Card.jsx index dd618710..ad25e9ea 100644 --- a/client/src/components/projects/project-card/Project-Card.jsx +++ b/client/src/components/projects/project-card/Project-Card.jsx @@ -5,6 +5,7 @@ import { ProjectCardImg, ProjectIcon, } from "../../../asset/icons/icons"; +import "./project-card.css" function ProjectCard({ title, @@ -23,44 +24,38 @@ function ProjectCard({ }; return ( -
-
+
+

{title}

-

+

{description}

-
+

Status: {status}

-
- + -
- + -
-
- + -
+
); } -export default ProjectCard; - - - -//file moved to correct folder -//drop shadow fixed \ No newline at end of file +export default ProjectCard; \ No newline at end of file diff --git a/client/src/components/projects/project-card/project-card.css b/client/src/components/projects/project-card/project-card.css new file mode 100644 index 00000000..193394ff --- /dev/null +++ b/client/src/components/projects/project-card/project-card.css @@ -0,0 +1,33 @@ +.project-card-link { + @apply border + border-white + border-solid + w-10 h-10 + rounded-2xl + flex + justify-center + items-center + hover:border-orange + hover:text-orange + after:content-[attr(data-tooltip)] + after:absolute + after:-translate-y-full + after:bottom-3 + after:bg-orange + after:text-gray-med + after:p-1 + after:rounded + after:hidden + hover:after:block + before:border-8 + before:border-transparent + before:border-solid + before:border-t-orange + before:absolute + before:-translate-y-full + before:bottom-4 + before:hidden + hover:before:block + before:transition-all + after:transition-all; +} \ No newline at end of file From 76a93c8241f409e48a46768809bdd55b46c75220 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Fri, 21 Apr 2023 10:04:12 +0530 Subject: [PATCH 07/13] Prop types Added --- .../projects/project-card/Project-Card.jsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/client/src/components/projects/project-card/Project-Card.jsx b/client/src/components/projects/project-card/Project-Card.jsx index ad25e9ea..97e47722 100644 --- a/client/src/components/projects/project-card/Project-Card.jsx +++ b/client/src/components/projects/project-card/Project-Card.jsx @@ -6,6 +6,7 @@ import { ProjectIcon, } from "../../../asset/icons/icons"; import "./project-card.css" +import PropTypes from "prop-types"; function ProjectCard({ title, @@ -14,7 +15,6 @@ function ProjectCard({ gitUrl, discordUrl, projectUrl, - image, }) { const statusColor = statusText => { if (statusText === "Ongoing") return "text-onGoing"; @@ -26,7 +26,7 @@ function ProjectCard({ return (
- +

{title}

@@ -58,4 +58,14 @@ function ProjectCard({ ); } -export default ProjectCard; \ No newline at end of file +ProjectCard.propTypes={ + title:PropTypes.string.isRequired, + description:PropTypes.string.isRequired, + status:PropTypes.string.isRequired, + gitUrl:PropTypes.string.isRequired, + discordUrl:PropTypes.string.isRequired, + projectUrl:PropTypes.string.isRequired, +} + +export default ProjectCard; + From 8f200aa93c284075767c316dd1eac5c28f367c4b Mon Sep 17 00:00:00 2001 From: Siddhant Date: Fri, 21 Apr 2023 10:05:02 +0530 Subject: [PATCH 08/13] Errors fixed --- .../projects/project-card/Project-Card.jsx | 48 +++++++++++-------- .../projects/project-card/project-card.css | 2 +- client/src/pages/projects/Projects.jsx | 32 ++++++------- 3 files changed, 44 insertions(+), 38 deletions(-) diff --git a/client/src/components/projects/project-card/Project-Card.jsx b/client/src/components/projects/project-card/Project-Card.jsx index 97e47722..9c603fb9 100644 --- a/client/src/components/projects/project-card/Project-Card.jsx +++ b/client/src/components/projects/project-card/Project-Card.jsx @@ -5,7 +5,7 @@ import { ProjectCardImg, ProjectIcon, } from "../../../asset/icons/icons"; -import "./project-card.css" +import "./project-card.css"; import PropTypes from "prop-types"; function ProjectCard({ @@ -26,46 +26,52 @@ function ProjectCard({ return (
- +

{title}

-

- {description} -

+

{description}

); } -ProjectCard.propTypes={ - title:PropTypes.string.isRequired, - description:PropTypes.string.isRequired, - status:PropTypes.string.isRequired, - gitUrl:PropTypes.string.isRequired, - discordUrl:PropTypes.string.isRequired, - projectUrl:PropTypes.string.isRequired, -} +ProjectCard.propTypes = { + title: PropTypes.string.isRequired, + description: PropTypes.string.isRequired, + status: PropTypes.string.isRequired, + gitUrl: PropTypes.string.isRequired, + discordUrl: PropTypes.string.isRequired, + projectUrl: PropTypes.string.isRequired, +}; export default ProjectCard; - diff --git a/client/src/components/projects/project-card/project-card.css b/client/src/components/projects/project-card/project-card.css index 193394ff..b7b79684 100644 --- a/client/src/components/projects/project-card/project-card.css +++ b/client/src/components/projects/project-card/project-card.css @@ -30,4 +30,4 @@ hover:before:block before:transition-all after:transition-all; -} \ No newline at end of file +} diff --git a/client/src/pages/projects/Projects.jsx b/client/src/pages/projects/Projects.jsx index 1c87d319..9e0e12c2 100644 --- a/client/src/pages/projects/Projects.jsx +++ b/client/src/pages/projects/Projects.jsx @@ -3,23 +3,23 @@ import ProjectCard from "../../components/projects/project-card/Project-Card"; import { projectsMap } from "./fakeProjectsData"; function Projects() { - return( + return (
- {projectsMap && - projectsMap.map((ele, key) => ( - - - - ))} -
- ) + {projectsMap && + projectsMap.map((ele, key) => ( + + + + ))} +
+ ); } export default Projects; From 978e46a4e74b3d591323c900a05ca08ae3cb2097 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 25 Apr 2023 09:47:54 +0530 Subject: [PATCH 09/13] Done --- client/src/asset/icons/icons.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/src/asset/icons/icons.jsx b/client/src/asset/icons/icons.jsx index 8495fb56..cdea4d3d 100644 --- a/client/src/asset/icons/icons.jsx +++ b/client/src/asset/icons/icons.jsx @@ -139,10 +139,6 @@ export function Menu(props) { ); } -<<<<<<< HEAD - -======= ->>>>>>> siddhantJain-Project-Card export function GithubIcon(props) { return ( ); -} +} \ No newline at end of file From 3bae4b9487eb828d8695971e46ec870d522a9dab Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 25 Apr 2023 09:48:49 +0530 Subject: [PATCH 10/13] CSS Fixed --- client/src/app.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/src/app.css b/client/src/app.css index 7736829b..571cb28b 100644 --- a/client/src/app.css +++ b/client/src/app.css @@ -45,6 +45,3 @@ a { background-color: #b26910; } -.projectCardLinks { - @apply border border-white border-solid w-10 h-10 rounded-2xl flex justify-center items-center hover:border-projectCardLinkHover hover:text-projectCardLinkHover after:content-[attr(data-tooltip)] after:absolute after:-translate-y-full after:bottom-3 after:bg-projectCardLinkHover after:text-projectCardBg after:p-1 after:rounded after:hidden hover:after:block before:border-8 before:border-transparent before:border-solid before:border-t-projectCardLinkHover before:absolute before:-translate-y-full before:bottom-4 before:hidden hover:before:block before:transition-all after:transition-all; -} From dc5b8155c7e562b154e31cbf2c6476e3f0fb891a Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 25 Apr 2023 09:51:14 +0530 Subject: [PATCH 11/13] Code Removed --- client/src/pages/projects/ProjectCard.jsx | 61 ----------------------- 1 file changed, 61 deletions(-) delete mode 100644 client/src/pages/projects/ProjectCard.jsx diff --git a/client/src/pages/projects/ProjectCard.jsx b/client/src/pages/projects/ProjectCard.jsx deleted file mode 100644 index 80219704..00000000 --- a/client/src/pages/projects/ProjectCard.jsx +++ /dev/null @@ -1,61 +0,0 @@ -import React from "react"; -import { - DiscordIcon, - GithubIcon, - ProjectCardImg, - ProjectIcon, -} from "../../asset/icons/icons"; - -function ProjectCard({ - title, - description, - status, - gitUrl, - discordUrl, - projectUrl, - image, -}) { - const statusColor = statusText => { - if (statusText === "Ongoing") return "text-onGoing"; - if (statusText === "Inactive") return "text-inActive"; - if (statusText === "Completed") return "text-completed"; - return "text-canceled"; - }; - - return ( -
-
- -
-
-

{title}

-

- {description} -

- -
-

- Status: {status} -

-
- - - -
-
- - - -
-
- - - -
-
-
-
- ); -} - -export default ProjectCard; From 3de246a536c3d1c1221288dc4c448ab05ecd8ba8 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 25 Apr 2023 09:53:15 +0530 Subject: [PATCH 12/13] Before scripts --- client/src/components/projects/project-card/Project-Card.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/projects/project-card/Project-Card.jsx b/client/src/components/projects/project-card/Project-Card.jsx index 9c603fb9..95196e75 100644 --- a/client/src/components/projects/project-card/Project-Card.jsx +++ b/client/src/components/projects/project-card/Project-Card.jsx @@ -22,7 +22,7 @@ function ProjectCard({ if (statusText === "Completed") return "text-completed"; return "text-canceled"; }; - + return (
From b4df23967d785d9ec912fe33abd31233e3e6b329 Mon Sep 17 00:00:00 2001 From: Siddhant Date: Tue, 25 Apr 2023 09:54:01 +0530 Subject: [PATCH 13/13] Final Commit --- client/src/app.css | 1 - client/src/asset/icons/icons.jsx | 2 +- client/src/components/projects/project-card/Project-Card.jsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/src/app.css b/client/src/app.css index 571cb28b..acbf631b 100644 --- a/client/src/app.css +++ b/client/src/app.css @@ -44,4 +44,3 @@ a { #active { background-color: #b26910; } - diff --git a/client/src/asset/icons/icons.jsx b/client/src/asset/icons/icons.jsx index cdea4d3d..f36a7eeb 100644 --- a/client/src/asset/icons/icons.jsx +++ b/client/src/asset/icons/icons.jsx @@ -201,4 +201,4 @@ export function ProjectCardImg(props) { /> ); -} \ No newline at end of file +} diff --git a/client/src/components/projects/project-card/Project-Card.jsx b/client/src/components/projects/project-card/Project-Card.jsx index 95196e75..9c603fb9 100644 --- a/client/src/components/projects/project-card/Project-Card.jsx +++ b/client/src/components/projects/project-card/Project-Card.jsx @@ -22,7 +22,7 @@ function ProjectCard({ if (statusText === "Completed") return "text-completed"; return "text-canceled"; }; - + return (