Skip to content

Commit 32924a6

Browse files
Mitiksha-28Mitiksha-28
committed
feat: merged dev
2 parents 18c9143 + 13f55a6 commit 32924a6

File tree

29 files changed

+1033
-104
lines changed

29 files changed

+1033
-104
lines changed

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
build/
2+
dist/

‎.eslintrc.cjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ module.exports = {
3131
{ vars: "all", args: "after-used", ignoreRestSiblings: false },
3232
],
3333
"react/jsx-pascal-case": ["error", { allowAllCaps: true }],
34+
"jsx-a11y/mouse-events-have-key-events": "off",
3435
"no-console": "error",
3536
"import/no-unresolved": "off",
3637
"import/extensions": "off",

‎.github/workflows/ci.yaml‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,50 @@
11
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- dev
84
pull_request:
95
branches:
10-
- main
116
- dev
7+
types:
8+
- closed
129

1310
jobs:
1411
build:
1512
name: Build
1613
runs-on: ubuntu-latest
1714

1815
steps:
19-
- name: Checkout code
20-
uses: actions/checkout@v2
16+
- name: Checkout Code
17+
uses: actions/checkout@v3
2118

22-
- name: Setup Node.js
23-
uses: actions/setup-node@v2
19+
- name: Install Node
20+
uses: actions/setup-node@v3
2421
with:
25-
node-version: '20.11.0'
22+
node-version: 18.x
2623

27-
- name: Install dependencies
24+
- name: Install Dependencies
2825
run: npm install
2926

30-
- name: Build project
31-
run: npm run build
27+
- name: Build Project
28+
run: npm run build
29+
30+
- name: Upload artifact to enable deployment
31+
uses: actions/upload-artifact@v3
32+
with:
33+
name: production-files
34+
path: ./dist
35+
36+
deploy:
37+
needs: build
38+
runs-on: ubuntu-latest
39+
steps:
40+
- name: Download artifact
41+
uses: actions/download-artifact@v3
42+
with:
43+
name: production-files
44+
path: ./dist
45+
46+
- name: Deploy to GitHub Pages
47+
uses: peaceiris/actions-gh-pages@v3
48+
with:
49+
github_token: ${{ secrets.CI_CD_TOKEN }}
50+
publish_dir: ./dist

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
65
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite + React</title>
6+
<title>CodeX</title>
87
</head>
8+
99
<body>
1010
<div id="root"></div>
1111
<script type="module" src="/src/main.jsx"></script>

‎package.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
{
2-
"name": "vite-project",
2+
"name": "codex-website",
33
"private": true,
44
"version": "0.0.0",
55
"type": "module",
6+
"homepage": "https://codexsit.github.io/CodeX-Website/",
67
"scripts": {
78
"dev": "vite",
89
"build": "vite build",
910
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
1011
"preview": "vite preview",
1112
"lint:fix": "eslint --fix .",
1213
"style": "prettier --write {src,test}/**/* ./*.{json,*.json} !package-lock.json -u --no-error-on-unmatched-pattern",
13-
"prepare": "husky install"
14+
"prepare": "husky install",
15+
"deploy": "vite build && gh-pages -d dist"
1416
},
1517
"dependencies": {
1618
"@fontsource/league-gothic": "^5.0.18",
1719
"@fontsource/poppins": "^5.0.8",
1820
"@vitejs/plugin-react": "^4.2.1",
21+
"framer-motion": "^11.5.4",
22+
"lodash": "^4.17.21",
1923
"prop-types": "^15.8.1",
2024
"react": "^18.2.0",
2125
"react-dom": "^18.2.0",
@@ -38,6 +42,7 @@
3842
"eslint-plugin-react": "^7.33.2",
3943
"eslint-plugin-react-hooks": "^4.6.0",
4044
"eslint-plugin-react-refresh": "^0.4.5",
45+
"gh-pages": "^6.1.1",
4146
"husky": "^8.0.0",
4247
"lint-staged": "^15.2.2",
4348
"postcss-cli": "^11.0.0",

‎public/images/teams/Aditya-Desai.jpeg‎

89.3 KB
Loading

‎public/images/teams/Saksham-Gupta.jpeg‎

146 KB
Loading

‎src/App.jsx‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
1+
import { AnimatePresence } from "framer-motion";
12
import { HashRouter as Router, Routes, Route } from "react-router-dom";
23
import { ToastContainer } from "react-toastify";
34
import routes from "@/routes/index";
45
import Navbar from "@/components/Navbar/index";
5-
6-
6+
import Cursor from "./components/Cursor";
7+
import CursorVariantProvider from "@/context/CursorVariantProvider";
78

89
const navLinks = [
9-
{name: "About Us", path: "/about-us"},
10-
{name: "Our Team", path: "/teams"},
11-
{name: "Gallery", path: "/gallery"},
12-
{name: "Contact", path: "/contact"},
13-
{name: "Projects", path: "/projects"}
14-
10+
{ name: "About Us", path: "/about-us" },
11+
{ name: "Our Team", path: "/teams" },
12+
{ name: "Events", path: "/events" },
13+
{ name: "Gallery", path: "/gallery" },
14+
{ name: "Contact", path: "/contact" },
15+
{ name: "Community", path: "/community" },
1516
];
1617

1718
function App() {
1819
return (
19-
<Router>
20-
<Navbar links={navLinks}/>
20+
<CursorVariantProvider>
21+
<AnimatePresence>
22+
<Router>
23+
<Navbar links={navLinks} />
24+
<Cursor />
2125

22-
<ToastContainer />
23-
<Routes>
24-
{routes.map((route) => (
25-
<Route path={route.path} element={route.render} key={route.lable} />
26-
))}
27-
</Routes>
28-
</Router>
26+
<ToastContainer />
27+
<Routes>
28+
{routes.map((route) => (
29+
<Route
30+
path={route.path}
31+
element={route.render}
32+
key={route.label}
33+
/>
34+
))}
35+
</Routes>
36+
</Router>
37+
</AnimatePresence>
38+
</CursorVariantProvider>
2939
);
3040
}
3141

‎src/assets/images/About/oval.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎src/assets/images/About/stockimage1.svg‎

Lines changed: 9 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)