Skip to content

Commit

Permalink
Merge pull request #107 from dvm-bitspilani/main
Browse files Browse the repository at this point in the history
Merge main to prod
  • Loading branch information
samyak-jain-12 authored Sep 28, 2024
2 parents 2960483 + 686aa9d commit b0f6c5c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
Binary file added assets/Events/Carousel/eventcard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion components/Events/Category/Category.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import EventCard from "../EventCard/EventCard";
import Carousel from "../Carousel/Carousel";
import axios from "axios";
import largeImage from "@/assets/Events/Carousel/eventLarge.png";
import eventcard from "../../../assets/Events/Carousel/eventcard.png";

interface CategoryProps {
onClose: () => void;
Expand Down Expand Up @@ -46,7 +47,7 @@ export default function Category({ onClose }: CategoryProps) {
key={index}
name={name}
// about={about}
img={largeImage}
img={eventcard}
onClick={() => {
eventClickHandler(index);
}}
Expand Down
3 changes: 2 additions & 1 deletion components/Events/EventCard/EventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { StaticImageData } from "next/image";
import Image from "next/image";
import image from '@/assets/Events/Carousel/event.png';
import largeImage from '@/assets/Events/Carousel/eventLarge.png';
import eventcard from "../../../assets/Events/Carousel/eventcard.png";

interface EventCardProps {
name: string;
Expand All @@ -16,7 +17,7 @@ interface EventCardProps {
export default function EventCard({
name,
about,
img=largeImage,
img=eventcard,
onClick,
}: EventCardProps) {
return (
Expand Down
11 changes: 8 additions & 3 deletions components/Events/EventCard/eventcard.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
overflow: hidden;
cursor: pointer;
box-shadow: 0 0 10px 5px rgba(209, 180, 226, 0.8);
position: relative;

.eventName {
margin: 0.7rem 0 0 0;
Expand All @@ -25,10 +26,14 @@
padding: 1rem;

.eventImg {
float: left;
margin-right: 0.7rem;
position: absolute;
top: 60%;
left: 50%;
transform: translate(-50%,-50%);
// float: left;
// margin-right: 0.7rem;
height: auto;
opacity: 0.5;
// opacity: 0.5;
}

p {
Expand Down

0 comments on commit b0f6c5c

Please sign in to comment.