Skip to content

Commit 0da0882

Browse files
User-DKUser-DK
authored
Merge pull request #7 from User-DK/main
final poster and rulebook updated
2 parents 0ce0d8f + 9ce766b commit 0da0882

File tree

21 files changed

+299
-1662
lines changed

21 files changed

+299
-1662
lines changed

‎Frontend/package-lock.json‎

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

‎Frontend/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6+
"@fortawesome/free-brands-svg-icons": "^6.7.2",
67
"@fortawesome/free-solid-svg-icons": "^6.7.2",
78
"@fortawesome/react-fontawesome": "^0.2.2",
89
"@mui/icons-material": "^5.14.6",

‎Frontend/public/index.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
34
<head>
45
<meta charset="UTF-8">
56
<meta name="viewport" content="width=device-width, initial-scale=1.0">
67
<title>WCE Art Circle</title>
78
<link rel="icon" href="./favi.png" type="image/png">
89

9-
10+
1011
</head>
12+
1113
<body>
12-
<div id="root"></div>
14+
<div id="root"></div>
1315
</body>
14-
<script src="https://checkout.razorpay.com/v1/checkout.js"></script>
1516
</html>

‎Frontend/src/API/registerAPI.js‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Frontend/src/App.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
BrowserRouter,
66
} from "react-router-dom";
77
import Main from "./Main";
8-
import Admin from "./components/admin/Admin";
8+
// import Admin from "./components/admin/Admin";
99
import TermsandConditions from "./components/policies/TermsandConditions";
1010
import ServicePricing from "./components/policies/ServicePricing";
1111
import PrivacyPolicy from "./components/policies/Privacypolicy";
@@ -23,7 +23,7 @@ const App = () => {
2323
<BrowserRouter>
2424
<Routes>
2525
<Route exact path="/" element={<Main />} />
26-
<Route exact path="/adminverification" element={<Admin />} />
26+
{/* <Route exact path="/adminverification" element={<Admin />} /> */}
2727
<Route
2828
exact
2929
path="/terms-and-conditions"

‎Frontend/src/components/about/about.css‎

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,7 @@
1717
padding-left: 50px;
1818
padding-top: 80px;
1919
border: 2px solid #21E6C1;
20-
/* &:hover {
21-
filter: contrast(1.1);
22-
}
23-
24-
&:active {
25-
filter: contrast(0.9);
26-
}
27-
&::before,
28-
&::after {
29-
content: "";
30-
position: absolute;
31-
top: -10px;
32-
left: -10px;
33-
right: -10px;
34-
bottom: -10px;
35-
border: 2px solid #21E6C1;
36-
transition: all 1s;
37-
animation: clippath 10s infinite linear;
38-
border-radius: 280px 20px 280px 20px;
39-
}
40-
41-
&::after {
42-
animation: clippath 10s infinite -5s linear;
43-
} */
44-
4520
}
46-
/* @keyframes clippath {
47-
0%,
48-
100% {
49-
clip-path: inset(0 0 95% 0);
50-
}
51-
52-
25% {
53-
clip-path: inset(0 95% 0 0);
54-
}
55-
50% {
56-
clip-path: inset(95% 0 0 0);
57-
}
58-
75% {
59-
clip-path: inset(0 0 0 95%);
60-
}
61-
} */
6221
.about h1{
6322
font-size: 2.5rem;
6423
}
@@ -160,64 +119,8 @@
160119
text-align: justify;
161120
margin-bottom: 1rem;
162121
}
163-
/* .heading{
164-
display: flex;
165-
gap: 30px;
166-
padding:50px;
167-
} */
168122

169123
}
170-
/* @keyframes clippath {
171-
0%,
172-
100% {
173-
clip-path: inset(0 0 95% 0);
174-
}
175-
176-
25% {
177-
clip-path: inset(0 95% 0 0);
178-
}
179-
50% {
180-
clip-path: inset(95% 0 0 0);
181-
}
182-
75% {
183-
clip-path: inset(0 0 0 95%);
184-
}
185-
}
186-
.about h1{
187-
font-size: 2.5rem;
188-
}
189-
.about-img{
190-
display: flex;
191-
display: none;
192-
justify-content: center;
193-
align-items: center;
194-
padding-bottom: 3rem;
195-
}
196-
.about-img img{
197-
padding: 0;
198-
margin: 0;
199-
height: 20rem;
200-
width: 28rem;
201-
object-fit: cover;
202-
}
203-
.about h6{
204-
font-size: 1rem;
205-
font-weight: 100;
206-
padding-bottom: 3rem;
207-
}
208-
.about-text{
209-
display: flex;
210-
justify-content: center;
211-
align-items: center;
212-
/* height: 30rem; */
213-
/* width: 15rem;
214-
text-align: justify;
215-
}
216-
.heading{
217-
display: flex;
218-
gap: 30px;
219-
padding:50px;
220-
} */
221124

222125
@media (min-width:350px) and (max-width:500px) {
223126
.main{

0 commit comments

Comments
 (0)