Skip to content

Commit

Permalink
Merge pull request #128 from EnigmaVSSUT/eventFunction
Browse files Browse the repository at this point in the history
update date format
  • Loading branch information
Princerey authored Feb 24, 2024
2 parents 428c0b3 + c024754 commit 39c0876
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 30 deletions.
3 changes: 2 additions & 1 deletion src/app/events/Events.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ export default function Events() {

</Stack>
</AnimatePage>
)
);

}
2 changes: 1 addition & 1 deletion src/app/events/components/Calender.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Calendar() {
<DateCalendar
value={value}
onChange={(newValue) => {
setPickedDate(newValue.format("dddd, MMMM DD"));
setPickedDate(newValue.format("DD MMMM, YYYY"));
setValue(newValue);
}}
/>
Expand Down
7 changes: 4 additions & 3 deletions src/app/events/components/EventList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ import { HighlightOff } from "@mui/icons-material";

const datalist1 = [
{
date: "Wednesday, November 29",
date: "20 February, 2024",
title: "Orientation Day",
info: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia quae ipsum numquam error, sequi hic, facere perferendis nostrum nulla, quis modi culpa corrupti officiis fuga quaerat ex odit sed dignissimos.",
},
];

const datalist2 = [
{
date: "Sunday, November 21",
date: "17 November, 2024",
title: "Enigma Induction",
info: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia quae ipsum numquam error, sequi hic, facere perferendis nostrum nulla, quis modi culpa corrupti officiis fuga quaerat ex odit sed dignissimos.",
},
{
date: "Sunday, November 21",
date: "18 March, 2024",
title: "Info Session",
info: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officia quae ipsum numquam error, sequi hic, facere perferendis nostrum nulla, quis modi culpa corrupti officiis fuga quaerat ex odit sed dignissimos.",
},
Expand All @@ -39,6 +39,7 @@ export default function EventList() {
const pickedDate = useDatePicker((state) => state.pickedDate);

useEffect(() => {
console.log(pickedDate)
if (pickedDate !== "") {
const filteredByDate = totalData.filter(
(data) => data.date === pickedDate
Expand Down
51 changes: 26 additions & 25 deletions src/app/events/events.module.css
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
@keyframes fillAnimation {
0% {
width: 0;
}
100% {
width: 100%;
}
0% {
width: 0;
}
.divider, .dividerGreen {
position: relative;
100% {
width: 100%;
transition: width 0.5s;
animation: fillAnimation 2s;
animation-fill-mode: forwards;
}
}
.divider, .dividerGreen {
position: relative;
width: 100%;
transition: width 0.5s;
animation: fillAnimation 2s;
animation-fill-mode: forwards;
}

.eventcard:hover {
cursor: pointer;
box-shadow: 0 0 2px 1px rgba(68, 237, 63, 0.2);
}
.eventcard:hover {
cursor: pointer;
box-shadow: 0 0 2px 1px rgba(68, 237, 63, 0.2);
}



.eventcard:hover .dividerGreen{
display: block;
border-color: #6ffa53;
}

.dividerGreen{
display: none;
}
.eventcard:hover .dividerGreen{
display: block;
border-color: #6ffa53;
}

.calender{
.dividerGreen{
display: none;
}

.calender{
border: 1px solid rgba(43, 201, 37, 0.2);
box-shadow: 0 0px 6px 2px rgba(43, 201, 37, 0.2);
border-radius: 10px;
height: fit-content;
display: flex;
justify-content: center;
align-items: center;
}
}

0 comments on commit 39c0876

Please sign in to comment.