From 3689980943806741113fe3b92f6899e86acbc0c5 Mon Sep 17 00:00:00 2001 From: Akash Manna <112533557+AkashManna2003@users.noreply.github.com> Date: Tue, 5 Nov 2024 22:20:51 +0530 Subject: [PATCH 1/2] Left-Right Alignment of Events --- package-lock.json | 19 ++++++++++++++++--- src/pages/Events/Events.js | 4 ++-- yarn.lock | 13 +++++++++---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8529f4f..5f58b95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4987,6 +4987,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", @@ -21414,9 +21425,11 @@ } }, "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "optional": true, + "peer": true, "engines": { "node": ">=10" }, diff --git a/src/pages/Events/Events.js b/src/pages/Events/Events.js index 27ef85d..4f35cdd 100755 --- a/src/pages/Events/Events.js +++ b/src/pages/Events/Events.js @@ -145,7 +145,7 @@ export default function Events() {

Events

{events && - events.map((event) => { + events.map((event, index) => { // Earlier code had a problem with the URL so we hard coded it in line number 157 // let imgSrc = null; // if (event.image) { @@ -163,7 +163,7 @@ export default function Events() { description={event.description} resultExists={event.resultExists} imgSrc={imgSrc} - index={event.id} + index={index} displayTrue={() => { setShow(true); setContent(event); diff --git a/yarn.lock b/yarn.lock index 8343903..ad8cd57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12348,16 +12348,21 @@ type-detect@4.0.8: resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.13.1, type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== type-fest@^0.20.2: version "0.20.2" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.3.1: version "0.3.1" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz" From eecada752291f229930d29770b4081c9c7a3bbc2 Mon Sep 17 00:00:00 2001 From: uditangshu <145389897+uditangshu@users.noreply.github.com> Date: Tue, 5 Nov 2024 22:57:59 +0530 Subject: [PATCH 2/2] fixed footer --- src/components/Footer/footer.module.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/Footer/footer.module.css b/src/components/Footer/footer.module.css index 6c8caf8..a0929ce 100755 --- a/src/components/Footer/footer.module.css +++ b/src/components/Footer/footer.module.css @@ -24,7 +24,7 @@ footer { width: 70%; background-color: transparent; border-bottom: 1px solid white; - margin: 0.5rem auto; + margin: 2rem auto; } .tsgContainer { @@ -84,7 +84,7 @@ footer { text-align: center; border-bottom: 1.5px dotted grey; padding: 0.5rem 0rem; - margin-bottom: 0.25rem; + margin-bottom: 0rem; position: relative; } @@ -168,6 +168,8 @@ footer { text-align: center; color: white; margin: 1rem auto; + padding-top: 20px; + padding-bottom: 15px; } .copyright a{ @@ -196,7 +198,7 @@ footer { } .footerContainer { - height: auto; + height: auto ; flex-direction: column; } .tsgContainer {