From 20e5bd6553ced1efdfdf03ed58a34bc989e82d45 Mon Sep 17 00:00:00 2001 From: Aditya Pachauri <103623274+AdityyaX@users.noreply.github.com> Date: Sun, 24 Mar 2024 23:50:40 +0530 Subject: [PATCH 1/5] final changes done --- package-lock.json | 129 ++++++++++--------------------- src/components/About/index.jsx | 6 +- src/components/Landing/index.jsx | 40 +++++----- src/containers/Home/HomePage.jsx | 21 ++++- 4 files changed, 78 insertions(+), 118 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ec0b03..29ba615 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12808,12 +12808,6 @@ "jiti": "bin/jiti.js" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "peer": true - }, "node_modules/js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", @@ -22151,8 +22145,7 @@ "@babel/plugin-proposal-private-property-in-object": { "version": "7.21.0-placeholder-for-preset-env.2", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", - "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", - "requires": {} + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==" }, "semver": { "version": "6.3.1" @@ -22327,12 +22320,10 @@ } }, "@csstools/postcss-unset-value": { - "version": "1.0.2", - "requires": {} + "version": "1.0.2" }, "@csstools/selector-specificity": { - "version": "2.2.0", - "requires": {} + "version": "2.2.0" }, "@emotion/is-prop-valid": { "version": "1.2.1", @@ -23036,8 +23027,7 @@ "@restart/context": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz", - "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==", - "requires": {} + "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==" }, "@restart/hooks": { "version": "0.4.15", @@ -23961,12 +23951,10 @@ } }, "acorn-import-assertions": { - "version": "1.9.0", - "requires": {} + "version": "1.9.0" }, "acorn-jsx": { - "version": "5.3.2", - "requires": {} + "version": "5.3.2" }, "acorn-walk": { "version": "7.2.0" @@ -24034,8 +24022,7 @@ } }, "ajv-keywords": { - "version": "3.5.2", - "requires": {} + "version": "3.5.2" }, "ansi-escapes": { "version": "4.3.2", @@ -24386,8 +24373,7 @@ } }, "babel-plugin-named-asset-import": { - "version": "0.3.8", - "requires": {} + "version": "0.3.8" }, "babel-plugin-polyfill-corejs2": { "version": "0.4.7", @@ -24557,8 +24543,7 @@ "bootstrap": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", - "requires": {} + "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==" }, "brace-expansion": { "version": "1.1.11", @@ -25009,8 +24994,7 @@ "version": "1.0.0" }, "css-declaration-sorter": { - "version": "6.4.1", - "requires": {} + "version": "6.4.1" }, "css-has-pseudo": { "version": "3.0.4", @@ -25075,8 +25059,7 @@ } }, "css-prefers-color-scheme": { - "version": "6.0.3", - "requires": {} + "version": "6.0.3" }, "css-select": { "version": "4.3.0", @@ -25166,8 +25149,7 @@ } }, "cssnano-utils": { - "version": "3.1.0", - "requires": {} + "version": "3.1.0" }, "csso": { "version": "4.2.0", @@ -25913,8 +25895,7 @@ } }, "eslint-plugin-react-hooks": { - "version": "4.6.0", - "requires": {} + "version": "4.6.0" }, "eslint-plugin-testing-library": { "version": "5.11.1", @@ -27213,8 +27194,7 @@ "google-maps-react": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/google-maps-react/-/google-maps-react-2.0.6.tgz", - "integrity": "sha512-M8Eo9WndfQEfxcmm6yRq03qdJgw1x6rQmJ9DN+a+xPQ3K7yNDGkVDbinrf4/8vcox7nELbeopbm4bpefKewWfQ==", - "requires": {} + "integrity": "sha512-M8Eo9WndfQEfxcmm6yRq03qdJgw1x6rQmJ9DN+a+xPQ3K7yNDGkVDbinrf4/8vcox7nELbeopbm4bpefKewWfQ==" }, "gopd": { "version": "1.0.1", @@ -27574,8 +27554,7 @@ } }, "icss-utils": { - "version": "5.1.0", - "requires": {} + "version": "5.1.0" }, "idb": { "version": "7.1.1" @@ -28563,8 +28542,7 @@ } }, "jest-pnp-resolver": { - "version": "1.2.3", - "requires": {} + "version": "1.2.3" }, "jest-regex-util": { "version": "27.5.1" @@ -29160,12 +29138,6 @@ "jiti": { "version": "1.21.0" }, - "jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "peer": true - }, "js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", @@ -30927,8 +30899,7 @@ } }, "postcss-browser-comments": { - "version": "4.0.0", - "requires": {} + "version": "4.0.0" }, "postcss-calc": { "version": "8.2.4", @@ -31002,20 +30973,16 @@ } }, "postcss-discard-comments": { - "version": "5.1.2", - "requires": {} + "version": "5.1.2" }, "postcss-discard-duplicates": { - "version": "5.1.0", - "requires": {} + "version": "5.1.0" }, "postcss-discard-empty": { - "version": "5.1.1", - "requires": {} + "version": "5.1.1" }, "postcss-discard-overridden": { - "version": "5.1.0", - "requires": {} + "version": "5.1.0" }, "postcss-double-position-gradients": { "version": "3.1.2", @@ -31031,8 +30998,7 @@ } }, "postcss-flexbugs-fixes": { - "version": "5.0.2", - "requires": {} + "version": "5.0.2" }, "postcss-focus-visible": { "version": "6.0.4", @@ -31047,12 +31013,10 @@ } }, "postcss-font-variant": { - "version": "5.0.0", - "requires": {} + "version": "5.0.0" }, "postcss-gap-properties": { - "version": "3.0.5", - "requires": {} + "version": "3.0.5" }, "postcss-image-set-function": { "version": "4.0.7", @@ -31069,8 +31033,7 @@ } }, "postcss-initial": { - "version": "4.0.1", - "requires": {} + "version": "4.0.1" }, "postcss-js": { "version": "4.0.1", @@ -31109,12 +31072,10 @@ } }, "postcss-logical": { - "version": "5.0.4", - "requires": {} + "version": "5.0.4" }, "postcss-media-minmax": { - "version": "5.0.0", - "requires": {} + "version": "5.0.0" }, "postcss-merge-longhand": { "version": "5.1.7", @@ -31161,8 +31122,7 @@ } }, "postcss-modules-extract-imports": { - "version": "3.0.0", - "requires": {} + "version": "3.0.0" }, "postcss-modules-local-by-default": { "version": "4.0.3", @@ -31206,8 +31166,7 @@ } }, "postcss-normalize-charset": { - "version": "5.1.0", - "requires": {} + "version": "5.1.0" }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -31260,8 +31219,7 @@ } }, "postcss-opacity-percentage": { - "version": "1.1.3", - "requires": {} + "version": "1.1.3" }, "postcss-ordered-values": { "version": "5.1.3", @@ -31277,8 +31235,7 @@ } }, "postcss-page-break": { - "version": "3.0.4", - "requires": {} + "version": "3.0.4" }, "postcss-place": { "version": "7.0.5", @@ -31360,8 +31317,7 @@ } }, "postcss-replace-overflow-wrap": { - "version": "4.0.0", - "requires": {} + "version": "4.0.0" }, "postcss-selector-not": { "version": "6.0.1", @@ -31659,8 +31615,7 @@ "react-animated-cursor": { "version": "2.11.2", "resolved": "https://registry.npmjs.org/react-animated-cursor/-/react-animated-cursor-2.11.2.tgz", - "integrity": "sha512-LV0PtST61tdeW/chCqFt1JLp6i0d5fD9v2uradBcPAkKKCi2Iw7sAcD11ADS1TjXPPj9MOoD9YubEt++/IbZ+g==", - "requires": {} + "integrity": "sha512-LV0PtST61tdeW/chCqFt1JLp6i0d5fD9v2uradBcPAkKKCi2Iw7sAcD11ADS1TjXPPj9MOoD9YubEt++/IbZ+g==" }, "react-app-polyfill": { "version": "3.0.0", @@ -31786,14 +31741,12 @@ "react-icons": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz", - "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==", - "requires": {} + "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==" }, "react-intersection-observer": { "version": "8.34.0", "resolved": "https://registry.npmjs.org/react-intersection-observer/-/react-intersection-observer-8.34.0.tgz", - "integrity": "sha512-TYKh52Zc0Uptp5/b4N91XydfSGKubEhgZRtcg1rhTKABXijc4Sdr1uTp5lJ8TN27jwUsdXxjHXtHa0kPj704sw==", - "requires": {} + "integrity": "sha512-TYKh52Zc0Uptp5/b4N91XydfSGKubEhgZRtcg1rhTKABXijc4Sdr1uTp5lJ8TN27jwUsdXxjHXtHa0kPj704sw==" }, "react-is": { "version": "17.0.2" @@ -32717,8 +32670,7 @@ "slick-carousel": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz", - "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==", - "requires": {} + "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==" }, "smart-buffer": { "version": "4.2.0", @@ -33091,8 +33043,7 @@ } }, "style-loader": { - "version": "3.3.3", - "requires": {} + "version": "3.3.3" }, "style-to-object": { "version": "0.4.4", @@ -34056,8 +34007,7 @@ } }, "ws": { - "version": "8.15.0", - "requires": {} + "version": "8.15.0" } } }, @@ -34439,8 +34389,7 @@ } }, "ws": { - "version": "7.5.9", - "requires": {} + "version": "7.5.9" }, "xml-name-validator": { "version": "3.0.0" diff --git a/src/components/About/index.jsx b/src/components/About/index.jsx index 6140476..b0a4616 100644 --- a/src/components/About/index.jsx +++ b/src/components/About/index.jsx @@ -13,9 +13,9 @@ import {MIDDLE_SECTION} from '../../Module/General'; function LogoSectionAbout() { return ( -
- - +
+ {/* + */}

{MIDDLE_SECTION.TITLE}

{MIDDLE_SECTION.LONG_DESCRIPTION}

diff --git a/src/components/Landing/index.jsx b/src/components/Landing/index.jsx index 6704c3d..2cb5951 100644 --- a/src/components/Landing/index.jsx +++ b/src/components/Landing/index.jsx @@ -40,28 +40,26 @@ const Myinfo = () => {

{TOP_SECTION.SHORT_DESCRIPTION}

-
-
- - - -
+
+
+ + + +
+ + + +
+
+ + +
- - {" "} - - -
); }; diff --git a/src/containers/Home/HomePage.jsx b/src/containers/Home/HomePage.jsx index e84e873..8906135 100644 --- a/src/containers/Home/HomePage.jsx +++ b/src/containers/Home/HomePage.jsx @@ -106,7 +106,7 @@ export default function HomePage() {
- + @@ -115,14 +115,14 @@ export default function HomePage() { - +

Past Statistics

@@ -238,7 +238,17 @@ export default function HomePage() {
+

+ Tracks and Prizes +

+
+ Schedule - + {/* */} + {/* Schedule section ends here */} @@ -322,6 +334,7 @@ export default function HomePage() {
+

Title sponsor

{titleSponsor.map((item, i) => ( Date: Mon, 25 Mar 2024 13:51:40 +0530 Subject: [PATCH 2/5] mobile responsive schedule added --- src/containers/Home/HomePage.jsx | 7 ++++++- src/containers/Home/about.css | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/containers/Home/HomePage.jsx b/src/containers/Home/HomePage.jsx index 3b79db2..5e4c65f 100644 --- a/src/containers/Home/HomePage.jsx +++ b/src/containers/Home/HomePage.jsx @@ -324,7 +324,12 @@ export default function HomePage() { Schedule {/* */} - +
+ + + +
+ {/* Schedule section ends here */} diff --git a/src/containers/Home/about.css b/src/containers/Home/about.css index 222a6b4..ec6a016 100644 --- a/src/containers/Home/about.css +++ b/src/containers/Home/about.css @@ -470,3 +470,31 @@ margin-top: 15vh; scale: 0.6; } + + +/* Default styles for both mobile and laptop views */ +.image-container { + display: flex; /* Use flexbox for positioning images */ + justify-content: center; /* Center images horizontally */ +} + +.mobile-image, +.laptop-image { + display: none; /* Hide all images by default */ + max-width: 100%; /* Make images responsive */ + height: auto; /* Maintain aspect ratio */ +} + +/* Styles for mobile view (max-width: 767px) */ +@media only screen and (max-width: 767px) { + .mobile-image { + display: block; /* Display the mobile image */ + } +} + +/* Styles for laptop view (min-width: 768px) */ +@media only screen and (min-width: 768px) { + .laptop-image { + display: block; /* Display the laptop image */ + } +} From fb096341ac4b90f6917aca57e7e9066b9b00822e Mon Sep 17 00:00:00 2001 From: Aditya Pachauri <103623274+AdityyaX@users.noreply.github.com> Date: Mon, 25 Mar 2024 22:07:12 +0530 Subject: [PATCH 3/5] test changes --- src/components/heartbutton/heartbutton.jsx | 45 ++++++++++++++++++++++ src/components/heartbutton/style.css | 37 ++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 src/components/heartbutton/heartbutton.jsx create mode 100644 src/components/heartbutton/style.css diff --git a/src/components/heartbutton/heartbutton.jsx b/src/components/heartbutton/heartbutton.jsx new file mode 100644 index 0000000..be82613 --- /dev/null +++ b/src/components/heartbutton/heartbutton.jsx @@ -0,0 +1,45 @@ +import React, { useState } from 'react'; +import './style.css'; // Import the CSS file + +const HeartButton = () => { +// const [count, setCount] = useState(1); + +// const handleButtonClick = () => { +// setCount(count + 1); +// }; + +// return ( +//
+//
+// {/* {count} */} +// {count} +//
+//
+ +const increaseCount = () => { + fetch('http://localhost:3001/api/increment') + .then(response => response.json()) + .then(data => setCount(data.count)) + .catch(error => console.error('Error:', error)); + }; + + +const [count, setCount] = useState(''); + +// const increaseCount = () => { +// setCount(count + 1); +// }; + +return ( +
+ +
+ +
+
+ ); +}; + +export default HeartButton; diff --git a/src/components/heartbutton/style.css b/src/components/heartbutton/style.css new file mode 100644 index 0000000..78cfc0e --- /dev/null +++ b/src/components/heartbutton/style.css @@ -0,0 +1,37 @@ +/* style.css */ + +* { + margin: 0; + padding: 0; + } + + .heart { + background-color: #f9f9f9; + height: 60px; + width: 60px; + display: flex; + justify-content: center; + align-items: center; + font-size: 19px; + cursor: pointer; + position: relative; + } + + .heart:hover { + color: #1e050f; + background-color: #fb076d40; + } + + .heart .counter { + position: absolute; + display: flex; + justify-content: center; + align-items: center; + color: #000000; + border-radius: 10px; + font-size: 16px; + height: 40px; + width: 40px; + background-color: #d2a2b6; + } + \ No newline at end of file From 81cbb5e35aeb63588f3faa4ef4f9f2cf1a2d84d2 Mon Sep 17 00:00:00 2001 From: Aditya Pachauri <103623274+AdityyaX@users.noreply.github.com> Date: Tue, 26 Mar 2024 01:41:25 +0530 Subject: [PATCH 4/5] mobile view fixed --- src/components/About/index.jsx | 13 ++- src/components/Schedule/schedule.css | 32 +++++++ src/components/Schedule/schedule.jsx | 123 ++++----------------------- src/containers/Home/HomePage.jsx | 22 ++--- src/containers/Home/about.css | 11 +++ 5 files changed, 78 insertions(+), 123 deletions(-) diff --git a/src/components/About/index.jsx b/src/components/About/index.jsx index b0a4616..45ec4d1 100644 --- a/src/components/About/index.jsx +++ b/src/components/About/index.jsx @@ -17,8 +17,17 @@ function LogoSectionAbout() { {/* */}

{MIDDLE_SECTION.TITLE}

-

{MIDDLE_SECTION.LONG_DESCRIPTION}

- +
+

+ + The largest code fest of Delhi-NCR is back! ⚡
+ Join this 24-Hour Hackathon to hustle and shine through 5 amazing tracks, Embark on an Odyssey to learn new technologies, seek guidance from experienced mentors and engrave your name on the boards of our esteemed Judges.
+ Witness prodigious Speakers of the Nation live! ✨
+ Not just that, win huge prizes and hampers by brainstorming and creating the best hack!
+ Be ready to sail through an amazing night of fun, code and much more on 28th & 29th April! 💫 + +

+
); } diff --git a/src/components/Schedule/schedule.css b/src/components/Schedule/schedule.css index 74d54b6..d464d1b 100644 --- a/src/components/Schedule/schedule.css +++ b/src/components/Schedule/schedule.css @@ -381,3 +381,35 @@ right: 9%; } } + .image-container { + display: flex; /* Use flexbox for positioning images */ + justify-content: center; /* Center images horizontally */ + } + + .mobile-image, + .laptop-image { + display: none; /* Hide all images by default */ + max-width: 100%; /* Make images responsive */ + height: auto; /* Maintain aspect ratio */ + } + + /* Styles for mobile view (max-width: 767px) */ + @media only screen and (max-width: 767px) { + .mobile-image { + display: block; /* Display the mobile image */ + } + } + + /* Styles for laptop view (min-width: 768px) */ + @media only screen and (min-width: 768px) { + .laptop-image { + display: block; /* Display the laptop image */ + } + } + @media (max-width: 767px) { + .Schedule-heading { + display: block; + font-size: 24px; /* Adjust the font size as needed */ + /* Add any other styles you need to make it visible and look good on smaller screens */ + } + } \ No newline at end of file diff --git a/src/components/Schedule/schedule.jsx b/src/components/Schedule/schedule.jsx index 3771e40..6178130 100644 --- a/src/components/Schedule/schedule.jsx +++ b/src/components/Schedule/schedule.jsx @@ -3,112 +3,25 @@ import './schedule.css' const Schedule = () => { return( -
-
-
-
- - - - - - - -
-
+ <> + +
+

+ Schedule +

-
+ +
+ + + + +
+ ) }; diff --git a/src/containers/Home/HomePage.jsx b/src/containers/Home/HomePage.jsx index 5e4c65f..165f621 100644 --- a/src/containers/Home/HomePage.jsx +++ b/src/containers/Home/HomePage.jsx @@ -245,7 +245,7 @@ export default function HomePage() { className="prize_heading" style={{ fontFamily: "repo-bold" }} > - Tracks and Prizes + Track Prizes
@@ -296,7 +296,7 @@ export default function HomePage() { "https://s3.ap-south-1.amazonaws.com/innohacks3.0/prizes/girl.gif" } > -

Best All Girl Team

+

Best All Girls Team

@@ -315,20 +315,10 @@ export default function HomePage() { {/* Theme end */} {/* Schedule here */} - -

- Schedule -

- {/* */} -
- - - -
+ + + + {/* Schedule section ends here */} diff --git a/src/containers/Home/about.css b/src/containers/Home/about.css index ec6a016..e29d82d 100644 --- a/src/containers/Home/about.css +++ b/src/containers/Home/about.css @@ -498,3 +498,14 @@ margin-top: 15vh; display: block; /* Display the laptop image */ } } +@media (max-width: 767px) { + .Schedule-heading { + display: block; + font-size: 24px; /* Adjust the font size as needed */ + /* Add any other styles you need to make it visible and look good on smaller screens */ + } +} + + +/* Default styles for both divs */ + From 9de66ada4aa2589af60f024c0835acc1bb89a702 Mon Sep 17 00:00:00 2001 From: Aditya Pachauri <103623274+AdityyaX@users.noreply.github.com> Date: Tue, 26 Mar 2024 01:50:44 +0530 Subject: [PATCH 5/5] heading fixed --- src/components/Schedule/schedule.jsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/Schedule/schedule.jsx b/src/components/Schedule/schedule.jsx index 6178130..6b48a47 100644 --- a/src/components/Schedule/schedule.jsx +++ b/src/components/Schedule/schedule.jsx @@ -7,10 +7,12 @@ return(

+ data-aos="zoom-in" + data-aos-duration="800" + id="prizes" + className="prize_heading" + style={{ fontFamily: "repo-bold", marginBottom: "10rem" }} + > Schedule