Skip to content

Commit 0ce0d8f

Browse files
authored
Merge pull request #6 from User-DK/main
An attempt to optimise the page performance in production
2 parents cb0b028 + e211280 commit 0ce0d8f

File tree

8 files changed

+1096
-1632
lines changed

8 files changed

+1096
-1632
lines changed

Frontend/dependency-dump.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"@testing-library/jest-dom": "^5.17.0",
99
"@testing-library/react": "^13.4.0",
1010
"@testing-library/user-event": "^13.5.0",
11-
11+

Frontend/package-lock.json

Lines changed: 1058 additions & 1594 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Frontend/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@fortawesome/react-fontawesome": "^0.2.2",
88
"@mui/icons-material": "^5.14.6",
99
"@mui/material": "^5.14.6",
10-
"framer-motion": "^10.15.0",
10+
"axios": "^1.4.0",
1111
"react": "^18.2.0",
1212
"react-dom": "^18.2.0",
1313
"react-icons": "^4.10.1",
@@ -17,8 +17,7 @@
1717
"sweetalert": "^2.1.2",
1818
"sweetalert2": "^11.7.27",
1919
"swiper": "^10.1.0",
20-
"web-vitals": "^2.1.4",
21-
"axios": "^1.4.0"
20+
"web-vitals": "^2.1.4"
2221
},
2322
"scripts": {
2423
"start": "react-scripts start",
-8.88 MB
Binary file not shown.

Frontend/src/components/events/allEvents.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ const events = [
33
index: 1,
44
Name: 'Yuvarang 2025',
55
description:
6-
'Yuvarang is the signature event of Art Circle. It is the only cultural mega event of WCE Sangli. The event is open to all colleges and for all trades. Art Circle tries to cover and enhance all the artforms in all the domains (eg- drama, dance, music or content writing like poetry sketching colouring and many more. Art Circle also gives an opportunity to school going children to showcase their talent.We members of Art Circle always try to preserve the culture,promote and encourage the artforms of India and always try to do our best in this initiative',
7-
icon: "https://github.com/wce-artcircle/Assets/blob/main/events/yuvarang-final-2025.png?raw=true",
6+
'Yuvarang is the signature event of Art Circle. It is the only cultural mega event of WCE Sangli. The event is open to all colleges and for all trades. Art Circle tries to cover and enhance all the artforms in all the domains - drama, dance, music or content writing like poetry sketching colouring and many more. Art Circle also gives an opportunity to school going children to showcase their talent. We members of Art Circle always try to preserve the culture,promote and encourage the artforms of India and always try to do our best in this initiative',
7+
icon: " https://cdn.statically.io/gh/wce-artcircle/Assets/main/assets/yuvarang-2025.png",
88
register: "https://konfhub.com/yuvarang-2025"
99
},
1010
{
1111
index: 2,
1212
Name: 'GIM 2024',
1313
description:
1414
'Kalarambh is the most awaited and most celebrated event of ArtCircle. It is basically General interest meet(GIM) arranged for newly admitted first year members to get the overall idea about the ArtCircle and events arranged by ArtCircle. Kalarambh is the golden opportunity for all the teams of ArtCircle to showcase their talent and encourage the new artists to be a part of ArtCircle to enhance and polish their artistic skills by joining ArtCircle.As the name suggests its the beautiful beginning of the art for the first year members in their 4 year journey with WCE.',
15-
icon: "https://raw.githubusercontent.com/wce-artcircle/Assets/main/events/Kalarambh.jpg",
15+
icon: "https://cdn.statically.io/gh/wce-artcircle/Assets/main/events/Kalarambh.jpg",
1616
// register: "https://konfhub.com/gim-2024"
1717
},
1818
{
1919
index: 3,
2020
Name: 'Ganjyot 2024',
2121
description:
2222
'It is a Photography Competition which aims at celebrating Ganpati Festival and capturing it with a different perspective. The competition is open to all WCE students. The participants are required to click a photograph of Ganpati Bappa in the campus and submit it to the club. The best photographs are selected by the judges and the winners are awarded Free ticket to GIM 2024. The competition is a great opportunity for the students to showcase their photography skills and creativity.',
23-
icon: "https://raw.githubusercontent.com/wce-artcircle/Assets/main/events/Ganjyot.jpg",
23+
icon: "https://cdn.statically.io/gh/wce-artcircle/Assets/main/events/Ganjyot.jpg",
2424
more: ""
2525
},
2626
{
@@ -29,28 +29,28 @@ const events = [
2929
Name: 'Dandiya Nights 2023',
3030
description:
3131
'Dandiya Nights is the most awaited program of WCE ART Circle, which typically falls in October. It is celebrated at Open Air Theatre of WCE with great energy and enthusiasm. The members of Art Circle perform dandiya dance which is set beforehand. On the event day, individuals attire themselves in the traditional Gujarati fashion. Dandiyas(sticks) are also provided by the club. An energetic and colourful aura is formed with the beats of song and dance.',
32-
icon: "https://raw.githubusercontent.com/wce-artcircle/Assets/main/events/2023-navratri.png",
32+
icon: "https://cdn.statically.io/gh/wce-artcircle/Assets/main/events/2023-navratri.png",
3333
},
3434
{
3535
index: 5,
3636
Name: 'YUVARANG 2023',
3737
description:
3838
'Yuvarang is the signature event of ArtCircle. It is the only cultural mega event of WCE Sangli. The event is open to all colleges and for all trades. ArtCircle tries to cover and enhance all the artforms in all the domains (eg- drama ,dance,music, litrature or Content writing like poetry sketching colouring and many more. ArtCircle also gives an opportunity to school going children to showcase their talent.We members of ArtCircle always try to preserve the culture,promote and encourage the artforms of India and alwyas try to do our best in this initiative',
39-
icon: "https://raw.githubusercontent.com/wce-artcircle/Assets/main/events/yuvarang-23.jpeg",
39+
icon: "https://cdn.statically.io/gh/wce-artcircle/Assets/main/events/yuvarang-23.jpeg",
4040
},
4141
{
4242
index: 6,
4343
Name: 'VARSHAV 2023',
4444
description:
4545
'Varshav is the newly added online photography competition introduced by Wce ArtCircle. It is an online photography competition exclusively for WCE students.Varshav promotes nature photography during Rainy season which also gives the message of environment conservation. WCE has always been rich and blessed with natural greeney which is more beautified by the Rains. Almost everyone in the campus is amazed by the scenic beauty and captures it in a photograph. This fondness of nature by fellow students of WCE needs an appreciation and ArtCircle tries its best to do so via Varshav.',
46-
icon: "https://raw.githubusercontent.com/wce-artcircle/Assets/main/events/photography-contest.png",
46+
icon: "https://cdn.statically.io/gh/wce-artcircle/Assets/main/events/photography-contest.png",
4747
},
4848
{
4949
index: 7,
5050
Name: 'FAREWELL 2023',
5151
description:
5252
'Runanubandh is every emotional and close to heart event for all the ArtCircle members. It is a farewell cum declaration program, where the current assistant and joint board members arrange the farewell for the Chief board and then the newly elected president, chief board and joint board members are declared. It is followed by the games that refresh the memories of all the ArtCircle members that the experienced during their tenure and motivates the newly elected board to do the same.The program is concluded with the oath by the newly elected president and board members and then followed by taking hand impressions of the Ex- Chief board members to preserve the memories.Overall the program is filled with all kinds of emotions and is exclusively for only ArtCircle members.',
53-
icon: "https://raw.githubusercontent.com/wce-artcircle/Assets/main/events/farewell.png",
53+
icon: "https://cdn.statically.io/gh/wce-artcircle/Assets/main/events/farewell.png",
5454
},
5555
// {
5656
// index: 5,

Frontend/src/components/events/events.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@
141141
}
142142
.modal {
143143
background-color: rgba(0, 0, 0, 0.7);
144-
justify-content: center;
145-
align-items: center;
146144
border-radius: 10px;
147145
border-width: 5rem;
148146

@@ -155,6 +153,10 @@
155153
color: rgb(255, 255, 255);
156154
font-weight: 400;
157155
overflow-y: auto;
156+
border-radius: 10px;
157+
justify-content: center;
158+
align-items: center;
159+
158160
}
159161
.modal-content img {
160162
width: 40rem;

Frontend/src/components/teams/Teams.jsx

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// import React, { useState } from 'react'
2-
import { motion } from "framer-motion";
2+
// import { motion } from "framer-motion";
33
// import {
44
// CarouselComponent,
55
// CarouselItemsDirective,
@@ -42,14 +42,14 @@ const Teams = () => {
4242
navigate(card.link[index]);
4343
};
4444

45-
const cardVariables = {
46-
expand: {
47-
width: "400px",
48-
},
49-
collapsed: {
50-
width: "200px",
51-
},
52-
};
45+
// const cardVariables = {
46+
// expand: {
47+
// width: "400px",
48+
// },
49+
// collapsed: {
50+
// width: "200px",
51+
// },
52+
// };
5353
const card = {
5454
name: [
5555
"Dance Team",
@@ -81,24 +81,18 @@ const Teams = () => {
8181
</div>
8282
<div className="cards">
8383
{[0, 1, 2, 3, 4, 5].map((index) => (
84-
<motion.div
85-
className={`${
86-
index === expandIndex ? "expand" : " "
87-
}, cards-style`}
84+
<div
85+
className={`cards-style ${
86+
index === expandIndex ? "expand" : ""
87+
}`}
8888
key={index}
89-
variants={cardVariables}
90-
initial="collapsed"
91-
animate={index === expandIndex ? "expand" : "collapsed"}
92-
transition={{ duration: 0.5 }}
93-
onHoverStart={() => {
94-
handleHover(index);
95-
}}
96-
onHoverEnd={() => {
97-
handleHover(index);
98-
}}
89+
onMouseEnter={() => handleHover(index)}
90+
onMouseLeave={() => handleHover(index)}
9991
onClick={() => handleCardClick(index)}
10092
style={{
10193
backgroundImage: `url(${card.images[index]})`,
94+
transition: "width 0.5s",
95+
width: index === expandIndex ? "400px" : "200px",
10296
}}
10397
>
10498
<div className="card-content">
@@ -107,7 +101,7 @@ const Teams = () => {
107101
{index === expandIndex && <p>{card.name[index]}</p>}
108102
</div>
109103
</div>
110-
</motion.div>
104+
</div>
111105
))}
112106
</div>
113107
</div>

Frontend/src/components/teams/teams.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
background-size: cover;
2525
background-position: center;
2626
border: 2px solid var(--color-primary);
27+
transition: width 0.5s;
2728
}
2829
.card-content {
2930
display: flex;
@@ -104,4 +105,8 @@
104105
margin-top: 40px;
105106
}
106107
}
108+
109+
.expand {
110+
width: 400px;
111+
}
107112

0 commit comments

Comments
 (0)