From e176f4f27fd06be14535d779013ef964bbaae84e Mon Sep 17 00:00:00 2001
From: Rui Oliveira <70754369+ruioliveira02@users.noreply.github.com>
Date: Thu, 30 Nov 2023 00:28:29 +0000
Subject: [PATCH 09/15] fix: security vulnerabilities (#584)
---
package-lock.json | 362 +++++++++++++++++++++++++++-------------------
package.json | 4 +-
2 files changed, 216 insertions(+), 150 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 7db802ec..1175f29a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
"@headlessui/react": "^1.4.2",
"@heroicons/react": "^1.0.5",
"@netlify/plugin-nextjs": "^4.40.1",
- "axios": "^0.25.0",
+ "axios": "^1.6.2",
"framer-motion": "^7.5.3",
"jsqr": "^1.4.0",
"lottie-web": "^5.8.1",
@@ -26,7 +26,7 @@
"react-dom": "^18.2.0",
"react-map-gl": "^6.1.17",
"react-p5": "^1.3.21",
- "sharp": "^0.30.0",
+ "sharp": "^0.32.6",
"typewriter-effect": "^2.21.0"
},
"devDependencies": {
@@ -1880,6 +1880,11 @@
"has-symbols": "^1.0.3"
}
},
+ "node_modules/asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+ },
"node_modules/autoprefixer": {
"version": "10.4.13",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
@@ -1935,11 +1940,13 @@
}
},
"node_modules/axios": {
- "version": "0.25.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
- "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+ "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"dependencies": {
- "follow-redirects": "^1.14.7"
+ "follow-redirects": "^1.15.0",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
}
},
"node_modules/axobject-query": {
@@ -2439,6 +2446,17 @@
"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
"dev": true
},
+ "node_modules/combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "dependencies": {
+ "delayed-stream": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/commander": {
"version": "9.5.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
@@ -2684,6 +2702,14 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
"node_modules/denque": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -3269,9 +3295,9 @@
}
},
"node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
@@ -3768,6 +3794,19 @@
"node": ">=0.10.0"
}
},
+ "node_modules/form-data": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/fraction.js": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -4636,58 +4675,11 @@
"resolved": "https://registry.npmjs.org/destr/-/destr-2.0.2.tgz",
"integrity": "sha512-65AlobnZMiCET00KaFFjUefxDX0khFA/E4myqZ7a6Sq1yZtR8+FVIvilVX66vF2uobSumxooYZChiRPCKNqhmg=="
},
- "node_modules/ipx/node_modules/node-addon-api": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
- "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
- },
"node_modules/ipx/node_modules/pathe": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
"integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q=="
},
- "node_modules/ipx/node_modules/sharp": {
- "version": "0.32.6",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
- "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
- "hasInstallScript": true,
- "dependencies": {
- "color": "^4.2.3",
- "detect-libc": "^2.0.2",
- "node-addon-api": "^6.1.0",
- "prebuild-install": "^7.1.1",
- "semver": "^7.5.4",
- "simple-get": "^4.0.1",
- "tar-fs": "^3.0.4",
- "tunnel-agent": "^0.6.0"
- },
- "engines": {
- "node": ">=14.15.0"
- },
- "funding": {
- "url": "https://opencollective.com/libvips"
- }
- },
- "node_modules/ipx/node_modules/tar-fs": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
- "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
- "dependencies": {
- "mkdirp-classic": "^0.5.2",
- "pump": "^3.0.0",
- "tar-stream": "^3.1.5"
- }
- },
- "node_modules/ipx/node_modules/tar-stream": {
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
- "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
- "dependencies": {
- "b4a": "^1.6.4",
- "fast-fifo": "^1.2.0",
- "streamx": "^2.15.0"
- }
- },
"node_modules/iron-webcrypto": {
"version": "0.10.1",
"resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-0.10.1.tgz",
@@ -5856,6 +5848,25 @@
"node": ">=10.0.0"
}
},
+ "node_modules/mime-db": {
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mime-types": {
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "dependencies": {
+ "mime-db": "1.52.0"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -6086,9 +6097,9 @@
}
},
"node_modules/node-addon-api": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
- "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+ "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
},
"node_modules/node-fetch": {
"version": "2.7.0",
@@ -6208,9 +6219,9 @@
}
},
"node_modules/normalize-package-data/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true,
"bin": {
"semver": "bin/semver"
@@ -6355,9 +6366,9 @@
}
},
"node_modules/npm-run-all/node_modules/semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true,
"bin": {
"semver": "bin/semver"
@@ -7303,6 +7314,11 @@
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
},
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+ },
"node_modules/pump": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -7939,27 +7955,47 @@
}
},
"node_modules/sharp": {
- "version": "0.30.7",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.7.tgz",
- "integrity": "sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==",
+ "version": "0.32.6",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
+ "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
"hasInstallScript": true,
"dependencies": {
"color": "^4.2.3",
- "detect-libc": "^2.0.1",
- "node-addon-api": "^5.0.0",
+ "detect-libc": "^2.0.2",
+ "node-addon-api": "^6.1.0",
"prebuild-install": "^7.1.1",
- "semver": "^7.3.7",
+ "semver": "^7.5.4",
"simple-get": "^4.0.1",
- "tar-fs": "^2.1.1",
+ "tar-fs": "^3.0.4",
"tunnel-agent": "^0.6.0"
},
"engines": {
- "node": ">=12.13.0"
+ "node": ">=14.15.0"
},
"funding": {
"url": "https://opencollective.com/libvips"
}
},
+ "node_modules/sharp/node_modules/tar-fs": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+ "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+ "dependencies": {
+ "mkdirp-classic": "^0.5.2",
+ "pump": "^3.0.0",
+ "tar-stream": "^3.1.5"
+ }
+ },
+ "node_modules/sharp/node_modules/tar-stream": {
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+ "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+ "dependencies": {
+ "b4a": "^1.6.4",
+ "fast-fifo": "^1.2.0",
+ "streamx": "^2.15.0"
+ }
+ },
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -8189,9 +8225,9 @@
}
},
"node_modules/streamx": {
- "version": "2.15.2",
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz",
- "integrity": "sha512-b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg==",
+ "version": "2.15.5",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.5.tgz",
+ "integrity": "sha512-9thPGMkKC2GctCzyCUjME3yR03x2xNo0GPKGkRw2UMYN+gqWa9uqpyNWhmsNCutU5zHmkUum0LsCRQTXUgUCAg==",
"dependencies": {
"fast-fifo": "^1.1.0",
"queue-tick": "^1.0.1"
@@ -9183,9 +9219,9 @@
}
},
"node_modules/word-wrap": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
- "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+ "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -10548,6 +10584,11 @@
"has-symbols": "^1.0.3"
}
},
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+ },
"autoprefixer": {
"version": "10.4.13",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
@@ -10575,11 +10616,13 @@
"dev": true
},
"axios": {
- "version": "0.25.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
- "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+ "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"requires": {
- "follow-redirects": "^1.14.7"
+ "follow-redirects": "^1.15.0",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
}
},
"axobject-query": {
@@ -10940,6 +10983,14 @@
"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
"dev": true
},
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ },
"commander": {
"version": "9.5.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
@@ -11126,6 +11177,11 @@
"slash": "^3.0.0"
}
},
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+ },
"denque": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz",
@@ -11601,9 +11657,9 @@
},
"dependencies": {
"semver": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
"dev": true
}
}
@@ -11971,6 +12027,16 @@
"for-in": "^1.0.1"
}
},
+ "form-data": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+ "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ }
+ },
"fraction.js": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -12599,50 +12665,10 @@
"resolved": "https://registry.npmjs.org/destr/-/destr-2.0.2.tgz",
"integrity": "sha512-65AlobnZMiCET00KaFFjUefxDX0khFA/E4myqZ7a6Sq1yZtR8+FVIvilVX66vF2uobSumxooYZChiRPCKNqhmg=="
},
- "node-addon-api": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
- "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
- },
"pathe": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
"integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q=="
- },
- "sharp": {
- "version": "0.32.6",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
- "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
- "requires": {
- "color": "^4.2.3",
- "detect-libc": "^2.0.2",
- "node-addon-api": "^6.1.0",
- "prebuild-install": "^7.1.1",
- "semver": "^7.5.4",
- "simple-get": "^4.0.1",
- "tar-fs": "^3.0.4",
- "tunnel-agent": "^0.6.0"
- }
- },
- "tar-fs": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
- "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
- "requires": {
- "mkdirp-classic": "^0.5.2",
- "pump": "^3.0.0",
- "tar-stream": "^3.1.5"
- }
- },
- "tar-stream": {
- "version": "3.1.6",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
- "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
- "requires": {
- "b4a": "^1.6.4",
- "fast-fifo": "^1.2.0",
- "streamx": "^2.15.0"
- }
}
}
},
@@ -13497,6 +13523,19 @@
"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="
},
+ "mime-db": {
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+ },
+ "mime-types": {
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "requires": {
+ "mime-db": "1.52.0"
+ }
+ },
"mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -13664,9 +13703,9 @@
}
},
"node-addon-api": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
- "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA=="
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+ "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="
},
"node-fetch": {
"version": "2.7.0",
@@ -13752,9 +13791,9 @@
},
"dependencies": {
"semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true
}
}
@@ -13860,9 +13899,9 @@
"dev": true
},
"semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"dev": true
},
"shebang-command": {
@@ -14520,6 +14559,11 @@
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
},
+ "proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+ },
"pump": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -14975,18 +15019,40 @@
}
},
"sharp": {
- "version": "0.30.7",
- "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.30.7.tgz",
- "integrity": "sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==",
+ "version": "0.32.6",
+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.32.6.tgz",
+ "integrity": "sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==",
"requires": {
"color": "^4.2.3",
- "detect-libc": "^2.0.1",
- "node-addon-api": "^5.0.0",
+ "detect-libc": "^2.0.2",
+ "node-addon-api": "^6.1.0",
"prebuild-install": "^7.1.1",
- "semver": "^7.3.7",
+ "semver": "^7.5.4",
"simple-get": "^4.0.1",
- "tar-fs": "^2.1.1",
+ "tar-fs": "^3.0.4",
"tunnel-agent": "^0.6.0"
+ },
+ "dependencies": {
+ "tar-fs": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz",
+ "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
+ "requires": {
+ "mkdirp-classic": "^0.5.2",
+ "pump": "^3.0.0",
+ "tar-stream": "^3.1.5"
+ }
+ },
+ "tar-stream": {
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz",
+ "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==",
+ "requires": {
+ "b4a": "^1.6.4",
+ "fast-fifo": "^1.2.0",
+ "streamx": "^2.15.0"
+ }
+ }
}
},
"shebang-command": {
@@ -15155,9 +15221,9 @@
"integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="
},
"streamx": {
- "version": "2.15.2",
- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz",
- "integrity": "sha512-b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg==",
+ "version": "2.15.5",
+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.5.tgz",
+ "integrity": "sha512-9thPGMkKC2GctCzyCUjME3yR03x2xNo0GPKGkRw2UMYN+gqWa9uqpyNWhmsNCutU5zHmkUum0LsCRQTXUgUCAg==",
"requires": {
"fast-fifo": "^1.1.0",
"queue-tick": "^1.0.1"
@@ -15882,9 +15948,9 @@
}
},
"word-wrap": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
- "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+ "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
"dev": true
},
"wordwrap": {
diff --git a/package.json b/package.json
index 4bb17e14..45bf1fd3 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
"@headlessui/react": "^1.4.2",
"@heroicons/react": "^1.0.5",
"@netlify/plugin-nextjs": "^4.40.1",
- "axios": "^0.25.0",
+ "axios": "^1.6.2",
"framer-motion": "^7.5.3",
"jsqr": "^1.4.0",
"lottie-web": "^5.8.1",
@@ -43,7 +43,7 @@
"react-dom": "^18.2.0",
"react-map-gl": "^6.1.17",
"react-p5": "^1.3.21",
- "sharp": "^0.30.0",
+ "sharp": "^0.32.6",
"typewriter-effect": "^2.21.0"
},
"devDependencies": {
From 9e24fa9393feeafe484b74d3bcd7e4e005822b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rio=20Rodrigues?=
<93675410+MarioRodrigues10@users.noreply.github.com>
Date: Fri, 1 Dec 2023 16:21:20 +0000
Subject: [PATCH 10/15] fix: "Register here" redirect (#587)
---
components/Input/index.tsx | 2 +-
components/Select/index.tsx | 4 +++-
layout/ForgotPassword/components/ForgotPasswordForm/index.tsx | 2 +-
layout/Login/Login.tsx | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/components/Input/index.tsx b/components/Input/index.tsx
index 63eb6798..3f5015a5 100644
--- a/components/Input/index.tsx
+++ b/components/Input/index.tsx
@@ -34,7 +34,7 @@ export function InputBase({
{children}
diff --git a/components/Select/index.tsx b/components/Select/index.tsx
index 80489e6c..2f1f5f7d 100644
--- a/components/Select/index.tsx
+++ b/components/Select/index.tsx
@@ -50,7 +50,9 @@ export default function Select({
{...rest}
>
{options.map((option) => (
-
+
))}
)}
>
diff --git a/layout/Login/Login.tsx b/layout/Login/Login.tsx
index 964da312..ed36b7ef 100644
--- a/layout/Login/Login.tsx
+++ b/layout/Login/Login.tsx
@@ -27,7 +27,7 @@ function Login() {
Date: Mon, 4 Dec 2023 15:02:25 +0000
Subject: [PATCH 11/15] feat: animate challenges page components (#591)
---
.../components/Challenges/Challenge/index.tsx | 123 +++++++++---------
.../components/Challenges/index.jsx | 41 +++---
2 files changed, 88 insertions(+), 76 deletions(-)
diff --git a/layout/Challenges/components/Challenges/Challenge/index.tsx b/layout/Challenges/components/Challenges/Challenge/index.tsx
index 065cdeea..b492ffc8 100644
--- a/layout/Challenges/components/Challenges/Challenge/index.tsx
+++ b/layout/Challenges/components/Challenges/Challenge/index.tsx
@@ -1,5 +1,5 @@
import Button from "@components/Button";
-import Link from "next/link";
+import { motion as Motion } from "framer-motion";
function Action({ text, url }) {
return (
@@ -33,65 +33,72 @@ interface IProps {
export default function Challenge(props: IProps) {
return (
-
-
-
- {props.title}
-
-
{props.description}
-
+
+
- {props.prizes && (
-
- Awards 🏆
-
- )}
- {props.prizes &&
- props.prizes.map((prize, index) => {
- let ordinal = "";
- switch (index + 1) {
- case 1:
- ordinal = "st";
- break;
- case 2:
- ordinal = "nd";
- break;
- case 3:
- ordinal = "rd";
- break;
- default:
- ordinal = "th";
- }
- return (
-
-
- {index + 1}
- {ordinal} place - {props.prizes[index].name}
-
-
- );
- })}
- {props.button != null && (
-
- )}
+
+ {props.title}
+
+
{props.description}
+
+
+ {props.prizes && (
+
+ Awards 🏆
+
+ )}
+ {props.prizes &&
+ props.prizes.map((prize, index) => {
+ let ordinal = "";
+ switch (index + 1) {
+ case 1:
+ ordinal = "st";
+ break;
+ case 2:
+ ordinal = "nd";
+ break;
+ case 3:
+ ordinal = "rd";
+ break;
+ default:
+ ordinal = "th";
+ }
+ return (
+
+
+ {index + 1}
+ {ordinal} place - {props.prizes[index].name}
+
+
+ );
+ })}
+ {props.button != null && (
+
+ )}
+
-
+
);
}
diff --git a/layout/Challenges/components/Challenges/index.jsx b/layout/Challenges/components/Challenges/index.jsx
index 588e7dcf..1a91c3b5 100644
--- a/layout/Challenges/components/Challenges/index.jsx
+++ b/layout/Challenges/components/Challenges/index.jsx
@@ -4,43 +4,48 @@ import challenges from "/data/challenges.json";
import { useState } from "react";
export default function Challenges() {
- const [k, setKey] = useState(0);
+ const [key, setKey] = useState(0);
return (
-
+
{Object.keys(challenges).map((i) => (
-
-
+
))}
-
- {Object.keys(challenges).map((k) => {
+
+ {Object.keys(challenges).map((key) => {
return (
-
+
);
From fe4618a4e99eae78055d16fe437790c463df7a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Lobo?=
<30907944+joaodiaslobo@users.noreply.github.com>
Date: Tue, 5 Dec 2023 00:31:56 +0000
Subject: [PATCH 12/15] feat: improve map design (#592)
---
layout/FAQs/FAQs.tsx | 45 +++---
.../components/FindUs/index.tsx} | 15 +-
layout/FAQs/components/index.ts | 3 +-
layout/Team/Team.tsx | 3 +-
layout/Team/components/FindUs/Map/index.jsx | 46 ------
layout/Team/components/index.ts | 3 +-
public/images/map/location.svg | 140 ++++++++++++++++++
7 files changed, 175 insertions(+), 80 deletions(-)
rename layout/{Team/components/FindUs/index.jsx => FAQs/components/FindUs/index.tsx} (73%)
delete mode 100644 layout/Team/components/FindUs/Map/index.jsx
create mode 100644 public/images/map/location.svg
diff --git a/layout/FAQs/FAQs.tsx b/layout/FAQs/FAQs.tsx
index c1ca82b1..892e10f2 100644
--- a/layout/FAQs/FAQs.tsx
+++ b/layout/FAQs/FAQs.tsx
@@ -3,35 +3,38 @@ import { withoutAuth } from "@context/Auth";
import Navbar from "@components/Navbar";
import Footer from "@components/Footer";
-import { Question } from "./components";
+import { Question, FindUs } from "./components";
import questions from "@data/faqs.json";
function Faq() {
return (
-
-
-
-
- Frequently Asked Questions
-
-
- This list of frequently asked questions serves to complement the
- general rules that you can find below. Get in touch with the
- organizing team whenever a question arises and we will add answers
- to the most frequently asked questions here.
-
-
-
-
- {questions.map((question, i) => (
-
- ))}
+ <>
+
+
+
+
+ Frequently Asked Questions
+
+
+ This list of frequently asked questions serves to complement the
+ general rules that you can find below. Get in touch with the
+ organizing team whenever a question arises and we will add answers
+ to the most frequently asked questions here.
+
+
+
+
+ {questions.map((question, i) => (
+
+ ))}
+
-
+
+
-
+ >
);
}
diff --git a/layout/Team/components/FindUs/index.jsx b/layout/FAQs/components/FindUs/index.tsx
similarity index 73%
rename from layout/Team/components/FindUs/index.jsx
rename to layout/FAQs/components/FindUs/index.tsx
index e8c0648e..b5015166 100644
--- a/layout/Team/components/FindUs/index.jsx
+++ b/layout/FAQs/components/FindUs/index.tsx
@@ -1,8 +1,4 @@
-import dynamic from "next/dynamic";
-
-const Map = dynamic(() => import("./Map"), {
- ssr: false,
-});
+import { motion as Motion } from "framer-motion";
const email = "cesium@di.uminho.pt";
@@ -15,10 +11,13 @@ export default function FindUs() {
- The SEI is free for participants and is organized by volunteers from
+ SEI is free for participants and is organized by volunteers from
CeSIUM and from the university community.
-
+
+ This years event will take place at Pedagogic Complex 2, Gualtar
+ Campus.
+
Centro de Estudantes de Engenharia Informática
@@ -30,7 +29,7 @@ export default function FindUs() {
-
+
);
diff --git a/layout/FAQs/components/index.ts b/layout/FAQs/components/index.ts
index 623c0a31..572c4b32 100644
--- a/layout/FAQs/components/index.ts
+++ b/layout/FAQs/components/index.ts
@@ -1,3 +1,4 @@
import Question from "./Question";
+import FindUs from "./FindUs";
-export { Question };
+export { FindUs, Question };
diff --git a/layout/Team/Team.tsx b/layout/Team/Team.tsx
index a845572e..f70d455b 100644
--- a/layout/Team/Team.tsx
+++ b/layout/Team/Team.tsx
@@ -1,6 +1,6 @@
import { withoutAuth } from "@context/Auth";
-import { Hero, FindUs, Organization } from "./components";
+import { Hero, Organization } from "./components";
import Navbar from "@components/Navbar";
import Footer from "@components/Footer";
@@ -10,7 +10,6 @@ function Index() {
-
);
diff --git a/layout/Team/components/FindUs/Map/index.jsx b/layout/Team/components/FindUs/Map/index.jsx
deleted file mode 100644
index 8c1c62d7..00000000
--- a/layout/Team/components/FindUs/Map/index.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Component } from "react";
-import ReactMapGL, { Marker } from "react-map-gl";
-
-class Map extends Component {
- state = {
- viewport: {
- latitude: 41.56223051893658,
- longitude: -8.39774542273983,
- zoom: 15,
- },
- };
-
- onViewportChange = (viewport) => {
- const { width, height, ...etc } = viewport;
- this.setState({ viewport: etc });
- };
-
- render() {
- return (
-
{
- this.setState({ viewport });
- }}
- {...this.state.viewport}
- >
-
-
- );
- }
-}
-
-export default Map;
diff --git a/layout/Team/components/index.ts b/layout/Team/components/index.ts
index 4bb20541..e5eff99c 100644
--- a/layout/Team/components/index.ts
+++ b/layout/Team/components/index.ts
@@ -1,5 +1,4 @@
import Hero from "./Hero";
-import FindUs from "./FindUs";
import Organization from "./Organization";
-export { Hero, FindUs, Organization };
+export { Hero, Organization };
diff --git a/public/images/map/location.svg b/public/images/map/location.svg
new file mode 100644
index 00000000..e79ea704
--- /dev/null
+++ b/public/images/map/location.svg
@@ -0,0 +1,140 @@
+
+
From 4b897ad9e7504da8b73a7971c7542bf43a269789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1rio=20Guimar=C3=A3es?=
<49988070+Darguima@users.noreply.github.com>
Date: Wed, 6 Dec 2023 23:30:57 +0000
Subject: [PATCH 13/15] fix: standardize button component implementation (#585)
---
components/Button/index.tsx | 17 ++++-------------
components/Layout/Layout.tsx | 2 +-
layout/Attendee/Profile/Profile.tsx | 4 ++--
layout/Attendee/Wheel/Wheel.tsx | 4 ++--
.../components/Challenges/Challenge/index.tsx | 2 +-
layout/Home/components/Hero/Pitch/index.jsx | 4 ++--
layout/Home/components/Speakers/index.jsx | 2 +-
layout/Login/components/LoginForm/index.tsx | 2 +-
layout/Product/Product.tsx | 2 +-
.../components/ResetPasswordForm/index.tsx | 2 +-
layout/SignUp/components/SignUpForm/index.tsx | 4 ++--
.../components/StaffRedeemButton/index.jsx | 5 +----
.../dashboard/SponsorBadgeButton/index.jsx | 5 +----
.../dashboard/SponsorPrizeButton/index.jsx | 2 +-
.../sponsor/spotlight/SpotlightButton/index.jsx | 5 +----
layout/shared/Leaderboard/Leaderboard.tsx | 4 ++--
pages/register/[uuid].js | 6 +++---
17 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/components/Button/index.tsx b/components/Button/index.tsx
index d2ff5b36..dc0deab6 100644
--- a/components/Button/index.tsx
+++ b/components/Button/index.tsx
@@ -3,9 +3,7 @@ import { ButtonHTMLAttributes, ReactNode } from "react";
interface Props extends Omit
, "title"> {
title: ReactNode;
description?: string;
- customStyle?: string;
bold?: boolean;
- disabled?: boolean;
}
interface ButtonTitleProps {
@@ -16,22 +14,15 @@ interface ButtonTitleProps {
export default function Button({
title,
description,
- type,
- disabled,
- onClick,
- customStyle,
- bold,
+ bold = false,
...rest
}: Props) {
return (
diff --git a/layout/Attendee/Profile/Profile.tsx b/layout/Attendee/Profile/Profile.tsx
index ff26cc7e..4f3c9494 100644
--- a/layout/Attendee/Profile/Profile.tsx
+++ b/layout/Attendee/Profile/Profile.tsx
@@ -102,10 +102,10 @@ function Profile({ courses }) {
diff --git a/layout/Attendee/Wheel/Wheel.tsx b/layout/Attendee/Wheel/Wheel.tsx
index aeacf190..6cbf0c1a 100644
--- a/layout/Attendee/Wheel/Wheel.tsx
+++ b/layout/Attendee/Wheel/Wheel.tsx
@@ -203,11 +203,11 @@ function WheelPage() {
(window.location.href = url)}
title={text}
- customStyle="text-white bg-primary border-tertiary hover:bg-tertiary"
+ className="text-white bg-primary border-tertiary hover:bg-tertiary"
/>
);
diff --git a/layout/Home/components/Hero/Pitch/index.jsx b/layout/Home/components/Hero/Pitch/index.jsx
index d4d8d0c9..4811e564 100644
--- a/layout/Home/components/Hero/Pitch/index.jsx
+++ b/layout/Home/components/Hero/Pitch/index.jsx
@@ -11,8 +11,8 @@ export default function Pitch() {
diff --git a/layout/Home/components/Speakers/index.jsx b/layout/Home/components/Speakers/index.jsx
index 12c38d12..f2a880df 100644
--- a/layout/Home/components/Speakers/index.jsx
+++ b/layout/Home/components/Speakers/index.jsx
@@ -16,7 +16,7 @@ export default function Speakers() {
diff --git a/layout/Login/components/LoginForm/index.tsx b/layout/Login/components/LoginForm/index.tsx
index 7bd2a561..44b65d88 100644
--- a/layout/Login/components/LoginForm/index.tsx
+++ b/layout/Login/components/LoginForm/index.tsx
@@ -54,7 +54,7 @@ export default function LoginForm() {
title={isLoading ? "Authenticating..." : "LET'S GO"}
disabled={isLoading}
type="submit"
- customStyle="text-secondary bg-quinary border-quinary w-full h-16"
+ className="h-16 w-full border-quinary bg-quinary text-secondary"
/>
{errors &&
{errors}
}
diff --git a/layout/Product/Product.tsx b/layout/Product/Product.tsx
index 85131df0..7a3c893c 100644
--- a/layout/Product/Product.tsx
+++ b/layout/Product/Product.tsx
@@ -89,7 +89,7 @@ function ProductSlug() {
refetchUser();
})
}
- customStyle="m-auto block h-20 w-full rounded-full bg-quinary hover:opacity-75 disabled:bg-gray-400 disabled:opacity-75"
+ className="m-auto block h-20 w-full rounded-full bg-quinary hover:opacity-75 disabled:bg-gray-400 disabled:opacity-75"
disabled={user.token_balance < product.price}
title="REDEEM"
description={`${product.price} tokens 💰`}
diff --git a/layout/ResetPassword/components/ResetPasswordForm/index.tsx b/layout/ResetPassword/components/ResetPasswordForm/index.tsx
index 2a942c19..7e64bb43 100644
--- a/layout/ResetPassword/components/ResetPasswordForm/index.tsx
+++ b/layout/ResetPassword/components/ResetPasswordForm/index.tsx
@@ -97,7 +97,7 @@ export default function ResetPasswordForm() {
diff --git a/layout/SignUp/components/SignUpForm/index.tsx b/layout/SignUp/components/SignUpForm/index.tsx
index 39a042d2..c2a70b95 100644
--- a/layout/SignUp/components/SignUpForm/index.tsx
+++ b/layout/SignUp/components/SignUpForm/index.tsx
@@ -131,7 +131,7 @@ export default function SignUpForm({ courses }) {
/>
{
e.preventDefault();
updateScanning(!scanning);
@@ -158,7 +158,7 @@ export default function SignUpForm({ courses }) {
{(local_error || (!isLoading && errors)) && (
diff --git a/layout/Staff/components/StaffRedeemButton/index.jsx b/layout/Staff/components/StaffRedeemButton/index.jsx
index 094e6d5e..5713a190 100644
--- a/layout/Staff/components/StaffRedeemButton/index.jsx
+++ b/layout/Staff/components/StaffRedeemButton/index.jsx
@@ -2,10 +2,7 @@ import Button from "@components/Button";
export default function StaffRedeemButton() {
return (
-
+
);
}
diff --git a/layout/moonstone/sponsor/dashboard/SponsorBadgeButton/index.jsx b/layout/moonstone/sponsor/dashboard/SponsorBadgeButton/index.jsx
index 5eb272bd..4d2fc207 100644
--- a/layout/moonstone/sponsor/dashboard/SponsorBadgeButton/index.jsx
+++ b/layout/moonstone/sponsor/dashboard/SponsorBadgeButton/index.jsx
@@ -10,10 +10,7 @@ export default function SponsorBadgeButton({ sponsor, all }) {
);
return (
-
+
);
}
diff --git a/layout/moonstone/sponsor/dashboard/SponsorPrizeButton/index.jsx b/layout/moonstone/sponsor/dashboard/SponsorPrizeButton/index.jsx
index 6fad0b9e..e2e11caf 100644
--- a/layout/moonstone/sponsor/dashboard/SponsorPrizeButton/index.jsx
+++ b/layout/moonstone/sponsor/dashboard/SponsorPrizeButton/index.jsx
@@ -4,7 +4,7 @@ export default function SponsorPrizeButton({ prize }) {
return (
diff --git a/layout/moonstone/sponsor/spotlight/SpotlightButton/index.jsx b/layout/moonstone/sponsor/spotlight/SpotlightButton/index.jsx
index 9c518ce8..8523927b 100644
--- a/layout/moonstone/sponsor/spotlight/SpotlightButton/index.jsx
+++ b/layout/moonstone/sponsor/spotlight/SpotlightButton/index.jsx
@@ -3,10 +3,7 @@ import Button from "@components/Button";
export default function SpotlightButton() {
return (
-
+
);
}
diff --git a/layout/shared/Leaderboard/Leaderboard.tsx b/layout/shared/Leaderboard/Leaderboard.tsx
index 29a45442..0c92b071 100644
--- a/layout/shared/Leaderboard/Leaderboard.tsx
+++ b/layout/shared/Leaderboard/Leaderboard.tsx
@@ -132,7 +132,7 @@ function Leaderboard() {
{
@@ -142,7 +142,7 @@ function Leaderboard() {
/>
{
diff --git a/pages/register/[uuid].js b/pages/register/[uuid].js
index c4021b34..4ee39ca6 100644
--- a/pages/register/[uuid].js
+++ b/pages/register/[uuid].js
@@ -116,9 +116,9 @@ function Register({ courses }) {
onChange={(e) => updatePasswordConfirmation(e.currentTarget.value)}
/>
{errors && (
From 48d93ef331af19082637cea81d2f9bc441eabd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Lobo?=
<30907944+joaodiaslobo@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:14:28 +0000
Subject: [PATCH 14/15] feat: fetch event dates from schedule data (#594)
---
components/Schedule/index.jsx | 9 +++++++--
layout/Home/components/Hero/Title/index.tsx | 13 ++++++++++++-
package-lock.json | 11 +++++++++++
package.json | 1 +
4 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/components/Schedule/index.jsx b/components/Schedule/index.jsx
index 448e6a2a..c37d794f 100644
--- a/components/Schedule/index.jsx
+++ b/components/Schedule/index.jsx
@@ -4,6 +4,8 @@ import Day from "./Day";
import { useState, useEffect } from "react";
import { useRouter } from "next/router";
+import scheduleData from "/data/schedule.json";
+
function leapYear(year) {
return (year % 4 == 0 && year % 100 != 0) || year % 400 == 0;
}
@@ -87,8 +89,11 @@ function addDate(date, days) {
}
export default function Schedule(props) {
- const min_date = "2023/2/14";
- const max_date = "2023/2/17";
+ /* Fetch first and last day of the event from schedule data */
+ const eventDates = scheduleData.map((day) => day.date).sort();
+ const min_date = eventDates[0];
+ const max_date = eventDates[eventDates.length - 1];
+
const defaultFilter = props.filters === undefined ? "" : props.filters;
//calculate default date
diff --git a/layout/Home/components/Hero/Title/index.tsx b/layout/Home/components/Hero/Title/index.tsx
index 747a68c2..cef62ab5 100644
--- a/layout/Home/components/Hero/Title/index.tsx
+++ b/layout/Home/components/Hero/Title/index.tsx
@@ -1,10 +1,21 @@
import TypeWriter from "typewriter-effect";
+import schedule from "@data/schedule.json";
+import dayjs from "dayjs";
export default function Title() {
+ /* Parse event dates info from schedule data */
+ const dates = schedule.map((day) => day.date).sort();
+
+ const firstDayDate = dayjs(dates[0], "YYYY/M/D");
+ const lastDayDate = dayjs(dates[dates.length - 1], "YYYY/M/D");
+
+ const month = firstDayDate.format("MMMM");
+ const year = firstDayDate.format("YYYY");
+
return (
- 14-17 February 2023
+ {firstDayDate.format("D")}-{lastDayDate.format("D")} {month} {year}
{/* 2xl:leading-[6.5rem] is intended to only work with the following font - Terminal */}
Date: Thu, 7 Dec 2023 16:35:17 +0000
Subject: [PATCH 15/15] feat: apply `select-none` to all titles and buttons
(#593)
---
components/Badge/index.tsx | 2 +-
components/BadgeFilter/index.tsx | 2 +-
components/Balance/index.jsx | 4 +++-
components/Button/index.tsx | 2 +-
components/Footer/index.tsx | 6 +++---
components/Heading/index.tsx | 2 +-
components/Input/index.tsx | 2 +-
components/JoinUs/index.jsx | 2 +-
components/Layout/Layout.tsx | 6 +++---
components/Navbar/index.jsx | 6 +++---
components/Schedule/Day/index.tsx | 2 +-
components/Schedule/index.jsx | 2 +-
components/Select/index.tsx | 2 +-
layout/Attendee/Badgedex/Badgedex.tsx | 6 +++---
layout/Attendee/Identifier/Identifier.tsx | 2 +-
layout/Attendee/Inventory/Inventory.tsx | 2 +-
layout/Attendee/Profile/Profile.tsx | 6 +++---
layout/Attendee/Profile/components/CVInput/index.tsx | 4 ++--
.../Attendee/Profile/components/CheckpointTracker/index.tsx | 2 +-
layout/Attendee/Store/components/Product/index.tsx | 2 +-
layout/Attendee/Wheel/Wheel.tsx | 2 +-
layout/Attendee/Wheel/components/ListItem3Cols/index.tsx | 6 ++++--
layout/Attendee/Wheel/components/ListItem4Cols/index.tsx | 2 +-
layout/Attendee/Wheel/components/WheelMessage/index.tsx | 2 +-
layout/Attendees/Attendees.tsx | 6 ++++--
layout/Challenges/components/Challenges/Challenge/index.tsx | 2 +-
layout/Challenges/components/Challenges/index.jsx | 2 +-
layout/Challenges/components/Hero/index.jsx | 2 +-
layout/FAQs/FAQs.tsx | 2 +-
layout/FAQs/components/FindUs/index.tsx | 4 ++--
layout/FAQs/components/Question/index.tsx | 6 +++---
layout/Home/components/Hero/ExpectList/index.jsx | 2 +-
layout/Home/components/Hero/Organization/index.jsx | 1 +
layout/Home/components/Hero/Pitch/index.jsx | 2 +-
layout/Home/components/Hero/index.tsx | 4 ++--
layout/Home/components/Partners/index.jsx | 4 ++--
layout/Home/components/Speakers/index.jsx | 4 ++--
layout/Home/components/Sponsors/index.jsx | 2 +-
layout/Login/Login.tsx | 2 +-
layout/Product/Product.tsx | 4 ++--
layout/Schedule/components/Hero/index.jsx | 2 +-
layout/SignUp/SignUp.tsx | 2 +-
layout/Speakers/components/Hero/index.jsx | 2 +-
layout/Speakers/components/Schedule/Table/Block/index.jsx | 4 ++--
layout/Speakers/components/Schedule/index.jsx | 2 +-
layout/Sponsor/Scanner/Scanner.tsx | 2 +-
layout/Sponsor/Visitors/Visitors.tsx | 4 ++--
layout/Staff/Badges/Badges.tsx | 4 +++-
layout/Staff/Identifier/Identifier.tsx | 2 +-
layout/Staff/Prizes/Prizes.tsx | 2 +-
layout/Team/components/Hero/index.jsx | 2 +-
layout/Team/components/Organization/Member/index.jsx | 1 +
layout/Team/components/Organization/index.jsx | 4 ++--
layout/shared/Leaderboard/Leaderboard.tsx | 3 +--
layout/shared/Leaderboard/components/Table/index.tsx | 2 +-
55 files changed, 86 insertions(+), 77 deletions(-)
diff --git a/components/Badge/index.tsx b/components/Badge/index.tsx
index aea56971..f8ad5730 100644
--- a/components/Badge/index.tsx
+++ b/components/Badge/index.tsx
@@ -6,7 +6,7 @@ export default function Badge({ name, id, avatar, tokens, owned }) {
href={`/badge/${id}`}
className={`h-full w-full ${owned ? "opacity-100" : "opacity-30"}`}
>
-
+
diff --git a/components/BadgeFilter/index.tsx b/components/BadgeFilter/index.tsx
index 5a1bfed4..4d40fcb1 100644
--- a/components/BadgeFilter/index.tsx
+++ b/components/BadgeFilter/index.tsx
@@ -6,7 +6,7 @@ export default function BadgeFilter({ onChange }) {