Skip to content

Commit 5768d91

Browse files
sidd233sidd233
authored
Merge branch 'main' into Achievement-Section
2 parents 848af15 + fa12245 commit 5768d91

20 files changed

Lines changed: 747 additions & 70 deletions

‎.gitignore‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
pnpm-debug.log*
8-
lerna-debug.log*
9-
.eslintcache
10-
11-
node_modules
12-
dist
13-
dist-ssr
14-
*.local
15-
16-
# Editor directories and files
17-
.vscode/*
18-
!.vscode/extensions.json
19-
.idea
20-
.DS_Store
21-
*.suo
22-
*.ntvs*
23-
*.njsproj
24-
*.sln
25-
*.sw?
26-
27-
#Environment Variables
28-
.env
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
9+
.eslintcache
10+
11+
node_modules
12+
dist
13+
dist-ssr
14+
*.local
15+
16+
# Editor directories and files
17+
.vscode/*
18+
!.vscode/extensions.json
19+
.idea
20+
.DS_Store
21+
*.suo
22+
*.ntvs*
23+
*.njsproj
24+
*.sln
25+
*.sw?
26+
27+
#Environment Variables
28+
.env
29+
dist/

‎LICENSE‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
2-
3-
Copyright (c) 2025 OpenCodeNITR
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
MIT License
2+
3+
Copyright (c) 2025 OpenCodeNITR
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎index.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
66
<title>ASME</title>
7+
<link
8+
rel="stylesheet"
9+
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
10+
integrity="sha512-pap6a2xqMML/7KZ8mUg4e8lVrW9Rp4kdqWphUVi1z9trFtQlfZo5x3fXU8AX3r6UeHeB+uS3vhwKkD6tw+OzTg=="
11+
crossorigin="anonymous"
12+
referrerpolicy="no-referrer"
13+
/>
714
</head>
815
<body>
916
<div id="root"></div>

‎package-lock.json‎

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

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
"lucide-react": "^0.525.0",
1616
"react": "^19.1.0",
1717
"react-dom": "^19.1.0",
18+
"react-icons": "^5.5.0",
1819
"react-router": "^7.6.3",
20+
"react-router-dom": "^7.6.3",
1921
"tailwindcss": "^4.1.11"
2022
},
2123
"devDependencies": {
@@ -30,7 +32,7 @@
3032
"husky": "^9.1.7",
3133
"lint-staged": "^16.1.2",
3234
"prettier": "^3.6.2",
33-
"vite": "^7.0.3"
35+
"vite": "^7.0.4"
3436
},
3537
"lint-staged": {
3638
"**/*": "prettier --write --ignore-unknown",

‎public/_redirects‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* /index.html 200

‎src/Playground.jsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1+
import Navbar from "./components/playground/Navbar.jsx";
12
import { Outlet } from "react-router";
23

34
const Playground = () => {
4-
return <Outlet />;
5+
return (
6+
<>
7+
<Navbar />
8+
<Outlet />
9+
<Footer />
10+
</>
11+
);
512
};
613

714
export default Playground;

‎src/components/playground/AboutSection.jsx‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import Button from "../shared/Button";
2+
import { siteConfig } from "../../config/navbarHero";
3+
4+
export default function AboutSection() {
5+
return (
6+
<section className="bg-white px-4 sm:px-6 md:px-10 lg:px-16 py-12 sm:py-16">
7+
<div className="w-full max-w-[1600px] mx-auto flex flex-col md:flex-row items-center justify-between gap-y-10 gap-x-10 md:gap-x-20">
8+
<div className="w-full max-w-[500px] px-2 md:px-0 mt-10 md:mt-0">
9+
<img
10+
src={siteConfig.about.image}
11+
alt="ASME NIT Rourkela team members"
12+
className="rounded-md shadow-lg object-cover w-full h-auto"
13+
/>
14+
</div>
15+
16+
<div className="w-full text-center md:text-left space-y-4 max-w-[700px]">
17+
<h1
18+
className="text-3xl sm:text-4xl md:text-[47px] lg:text-[56px] font-bold uppercase text-black leading-[120%]"
19+
style={{ fontFamily: "Helvetica, Arial, sans-serif" }}
20+
>
21+
{siteConfig.about.title}
22+
</h1>
23+
24+
<p
25+
className="text-base sm:text-lg text-[rgba(106,106,106,1)] leading-[150%] mt-4 max-w-2xl mx-auto md:mx-0"
26+
style={{ fontFamily: "Helvetica, Arial, sans-serif" }}
27+
>
28+
{siteConfig.about.description}
29+
</p>
30+
31+
<div className="flex flex-col sm:flex-row sm:justify-center md:justify-start items-center mt-6 gap-4">
32+
<Button
33+
className="bg-white text-blue-600 px-10 shadow-lg py-2 rounded-md border border-black hover:bg-blue-100"
34+
style={{ fontFamily: "Helvetica, Arial, sans-serif" }}
35+
>
36+
{siteConfig.about.button}
37+
</Button>
38+
</div>
39+
</div>
40+
</div>
41+
</section>
42+
);
43+
}

‎src/components/playground/EventCard.jsx‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import React from "react";
2+
3+
const EventCard = () => {
4+
return (
5+
<div className="bg-gray-50 rounded-xl shadow-md overflow-hidden flex flex-col md:flex-row border-2 border-[#0B2044]">
6+
<img
7+
src="https://res.cloudinary.com/dswk9scro/image/upload/v1752313324/image_urekzp.png"
8+
alt="Event"
9+
className="w-full md:w-2/5 object-cover"
10+
/>
11+
<div className="p-4 flex flex-col justify-center">
12+
<h3 className="text-xl font-semibold text-[#0B2044]">Sample Event</h3>
13+
<p className="text-sm text-gray-600 mt-1">
14+
Placeholder description for the event.
15+
</p>
16+
<p className="text-sm text-gray-400 mt-2">Date: 25 Aug 2025</p>
17+
</div>
18+
</div>
19+
);
20+
};
21+
export default EventCard;

0 commit comments

Comments
 (0)