From 2cad8b03cfe4c77ddaa383a4982a1bdd010385e4 Mon Sep 17 00:00:00 2001 From: Aayush Shukla Date: Tue, 28 May 2024 20:29:04 +0530 Subject: [PATCH 1/8] Very basic layout done --- src/pages/projects.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/projects.jsx b/src/pages/projects.jsx index 9abd0eb..49d8803 100644 --- a/src/pages/projects.jsx +++ b/src/pages/projects.jsx @@ -2,8 +2,10 @@ import React from 'react' const Projects = () => { return ( -
Projects
+
+

</Projects>

+
) } -export default Projects \ No newline at end of file +export default Projects From ba0459f922af671881803a92a90ff11a85008f28 Mon Sep 17 00:00:00 2001 From: Aayush Shukla Date: Mon, 3 Jun 2024 13:13:24 +0530 Subject: [PATCH 2/8] Gradient as background --- src/pages/events.css | 3 +++ src/pages/events.jsx | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/pages/events.css diff --git a/src/pages/events.css b/src/pages/events.css new file mode 100644 index 0000000..5c89a9a --- /dev/null +++ b/src/pages/events.css @@ -0,0 +1,3 @@ +.root { + background: linear-gradient(to bottom, #040414, #0E1C31); +} diff --git a/src/pages/events.jsx b/src/pages/events.jsx index bab493a..19fcc75 100644 --- a/src/pages/events.jsx +++ b/src/pages/events.jsx @@ -1,11 +1,12 @@ import React from 'react' import Header from '../components/header' +import './events.css' const events = () => { return ( <>
-
+

</Events>

From d0500f7fbb0b3b4e445757e5f6dde776c1a1fa13 Mon Sep 17 00:00:00 2001 From: Aayush Shukla Date: Wed, 5 Jun 2024 10:42:43 +0530 Subject: [PATCH 3/8] Made basic Events page & using universal CSS --- src/index.css | 1 + src/pages/events.css | 3 --- src/pages/events.jsx | 53 ++++++++++++++++++-------------------------- 3 files changed, 23 insertions(+), 34 deletions(-) delete mode 100644 src/pages/events.css diff --git a/src/index.css b/src/index.css index 2b6c526..4f1ded8 100644 --- a/src/index.css +++ b/src/index.css @@ -76,6 +76,7 @@ div { bottom: -2px; /* Adjust the distance from the text */ left: 0; } + .link-activee { color: white; } diff --git a/src/pages/events.css b/src/pages/events.css deleted file mode 100644 index 5c89a9a..0000000 --- a/src/pages/events.css +++ /dev/null @@ -1,3 +0,0 @@ -.root { - background: linear-gradient(to bottom, #040414, #0E1C31); -} diff --git a/src/pages/events.jsx b/src/pages/events.jsx index 19fcc75..bdf07ef 100644 --- a/src/pages/events.jsx +++ b/src/pages/events.jsx @@ -1,42 +1,33 @@ import React from 'react' import Header from '../components/header' -import './events.css' const events = () => { + + return ( <>
-
-

</Events>

-
-
-

Insert Photo

-
-
-

Event name

-
-

Date:XX/XX/XXXX

-

Venue:

-

Prize Pool:XXXX/-

-
-
-
-
-
-

Insert Photo

-
-
-

Event name

-
-

Date:XX/XX/XXXX

-

Venue:

-

Prize Pool:XXXX/-

-
-
-
-
+
+
+
+
+ +
+
+ + + + + + + + + +
-
+
+
+ ) } From e563a6cd296d15ab58b8dda93e0f241e7046660c Mon Sep 17 00:00:00 2001 From: Aayush Shukla Date: Wed, 5 Jun 2024 17:50:24 +0530 Subject: [PATCH 4/8] Working on events page, hard to replicate the design --- .idea/.gitignore | 5 + .idea/Website.iml | 12 ++ .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/material_theme_project_new.xml | 12 ++ .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + package-lock.json | 117 +++++++++++++++++++ package.json | 2 + src/components/header.jsx | 2 +- src/components/temp.jsx | 0 src/pages/events.jsx | 83 ++++++++----- 11 files changed, 224 insertions(+), 29 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/Website.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/material_theme_project_new.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml delete mode 100644 src/components/temp.jsx diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/Website.iml b/.idea/Website.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/Website.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml new file mode 100644 index 0000000..fce79cb --- /dev/null +++ b/.idea/material_theme_project_new.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..092dd28 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 09a7f9c..a99946a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,8 @@ "react-icons": "^5.2.1", "react-photo-album": "^2.4.0", "react-scripts": "5.0.1", + "styled-components": "^6.1.11", + "swiper": "^11.1.4", "tailwind-merge": "^2.3.0", "web-vitals": "^2.1.4" }, @@ -2302,6 +2304,27 @@ "postcss-selector-parser": "^6.0.10" } }, + "node_modules/@emotion/is-prop-valid": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", + "license": "MIT", + "dependencies": { + "@emotion/memoize": "^0.8.1" + } + }, + "node_modules/@emotion/memoize": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", + "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==", + "license": "MIT" + }, + "node_modules/@emotion/unitless": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", + "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==", + "license": "MIT" + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -4510,6 +4533,12 @@ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==" }, + "node_modules/@types/stylis": { + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz", + "integrity": "sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==", + "license": "MIT" + }, "node_modules/@types/testing-library__jest-dom": { "version": "5.14.9", "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz", @@ -5979,6 +6008,15 @@ "node": ">= 6" } }, + "node_modules/camelize": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", + "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", @@ -6414,6 +6452,15 @@ "postcss": "^8.4" } }, + "node_modules/css-color-keywords": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz", + "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==", + "license": "ISC", + "engines": { + "node": ">=4" + } + }, "node_modules/css-declaration-sorter": { "version": "6.4.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", @@ -6604,6 +6651,17 @@ "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" }, + "node_modules/css-to-react-native": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz", + "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==", + "license": "MIT", + "dependencies": { + "camelize": "^1.0.0", + "css-color-keywords": "^1.0.0", + "postcss-value-parser": "^4.0.2" + } + }, "node_modules/css-tree": { "version": "1.0.0-alpha.37", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", @@ -16178,6 +16236,12 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, + "node_modules/shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -16731,6 +16795,34 @@ "webpack": "^5.0.0" } }, + "node_modules/styled-components": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.11.tgz", + "integrity": "sha512-Ui0jXPzbp1phYij90h12ksljKGqF8ncGx+pjrNPsSPhbUUjWT2tD1FwGo2LF6USCnbrsIhNngDfodhxbegfEOA==", + "license": "MIT", + "dependencies": { + "@emotion/is-prop-valid": "1.2.2", + "@emotion/unitless": "0.8.1", + "@types/stylis": "4.2.5", + "css-to-react-native": "3.2.0", + "csstype": "3.1.3", + "postcss": "8.4.38", + "shallowequal": "1.1.0", + "stylis": "4.3.2", + "tslib": "2.6.2" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/styled-components" + }, + "peerDependencies": { + "react": ">= 16.8.0", + "react-dom": ">= 16.8.0" + } + }, "node_modules/stylehacks": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", @@ -16746,6 +16838,12 @@ "postcss": "^8.2.15" } }, + "node_modules/stylis": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz", + "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==", + "license": "MIT" + }, "node_modules/sucrase": { "version": "3.35.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", @@ -16956,6 +17054,25 @@ "boolbase": "~1.0.0" } }, + "node_modules/swiper": { + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.1.4.tgz", + "integrity": "sha512-1n7kbYJB2dFEpUHRFszq7gys/ofIBrMNibwTiMvPHwneKND/t9kImnHt6CfGPScMHgI+dWMbGTycCKGMoOO1KA==", + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/swiperjs" + }, + { + "type": "open_collective", + "url": "http://opencollective.com/swiper" + } + ], + "license": "MIT", + "engines": { + "node": ">= 4.7.0" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", diff --git a/package.json b/package.json index b298d5f..8916565 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "react-icons": "^5.2.1", "react-photo-album": "^2.4.0", "react-scripts": "5.0.1", + "styled-components": "^6.1.11", + "swiper": "^11.1.4", "tailwind-merge": "^2.3.0", "web-vitals": "^2.1.4" }, diff --git a/src/components/header.jsx b/src/components/header.jsx index e72bca2..e42f7da 100644 --- a/src/components/header.jsx +++ b/src/components/header.jsx @@ -4,7 +4,7 @@ import { NavLink } from 'react-router-dom'; const Header = ({ type }) => { return (
-
+
IEEE Logo
+
); }; diff --git a/src/pages/projects.jsx b/src/pages/projects.jsx index b69e70a..6fa484c 100644 --- a/src/pages/projects.jsx +++ b/src/pages/projects.jsx @@ -4,8 +4,9 @@ import Header from '../components/header' const Projects = () => { return ( <> -
-
Projects
+
+
Projects
+ ) } diff --git a/src/pages/team.jsx b/src/pages/team.jsx index e54099b..0e1b741 100644 --- a/src/pages/team.jsx +++ b/src/pages/team.jsx @@ -1,7 +1,10 @@ +import Footer from "../components/footer"; + const Team = () => { return ( <>
TEAM
+
) } From 54dded380e092306d7454ea8cf4fd23be601a107 Mon Sep 17 00:00:00 2001 From: Aayush Shukla Date: Wed, 5 Jun 2024 19:52:06 +0530 Subject: [PATCH 8/8] Click navigates to gallery page now --- src/pages/events.jsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pages/events.jsx b/src/pages/events.jsx index 93d7ddf..331bc68 100644 --- a/src/pages/events.jsx +++ b/src/pages/events.jsx @@ -10,8 +10,15 @@ import { EffectCoverflow, Pagination, Navigation } from 'swiper/modules'; import Header from "../components/header"; import image1 from '../data/images/12.jpg'; +import { useNavigate } from "react-router-dom"; const Events = () => { + const navigate = useNavigate(); + + const handleNavigateToGallery = () => { + navigate('/gallery'); + }; + return ( <>
@@ -56,9 +63,11 @@ const Events = () => {
+ className='border-2 border-solid border-teal-500 p-3 rounded-full bg-gradient-to-r from-b_col1 to-b_col2 float-end' + onClick={handleNavigateToGallery} + > +` View Gallery > +`
)