Skip to content

Commit

Permalink
Merge branch 'main' of github.com:tsg-iitkgp/web-frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
Harshbansal8705 committed Nov 26, 2024
2 parents be70d41 + 34bb568 commit 17cac8c
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 12 deletions.
19 changes: 16 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions src/components/Footer/footer.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ footer {
width: 70%;
background-color: transparent;
border-bottom: 1px solid white;
margin: 0.5rem auto;
margin: 2rem auto;
}

.tsgContainer {
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -168,6 +168,8 @@ footer {
text-align: center;
color: white;
margin: 1rem auto;
padding-top: 20px;
padding-bottom: 15px;
}

.copyright a{
Expand Down Expand Up @@ -196,7 +198,7 @@ footer {
}

.footerContainer {
height: auto;
height: auto ;
flex-direction: column;
}
.tsgContainer {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Events/Events.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export default function Events() {
<h2 className={Styles.categoryHeading2}>Events</h2>
<div className={Styles.cardsWrapper}>
{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) {
Expand All @@ -167,7 +167,7 @@ export default function Events() {
description={event.description}
resultExists={event.resultExists}
imgSrc={imgSrc}
index={event.id}
index={index}
displayTrue={() => {
setShow(true);
setContent(event);
Expand Down
13 changes: 9 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12348,16 +12348,21 @@ [email protected]:
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"
Expand Down

0 comments on commit 17cac8c

Please sign in to comment.