diff --git a/package-lock.json b/package-lock.json index ccb8b324c..ec21e938f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,16 +15,17 @@ "axios": "^1.3.4", "file-saver": "^2.0.5", "formik": "^2.2.9", - "framer-motion": "^10.15.0", + "framer-motion": "^10.18.0", "lottie-react": "^2.4.0", "moment": "^2.29.4", "razorpay": "^2.9.3", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.4", "react-google-charts": "^4.0.0", "react-helmet": "^6.1.0", "react-hot-toast": "^2.4.1", - "react-icons": "^4.10.1", + "react-icons": "^4.12.0", "react-qr-code": "^2.0.11", "react-router-dom": "^6.9.0", "react-select": "^5.7.7", @@ -6791,9 +6792,9 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/framer-motion": { - "version": "10.15.0", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.15.0.tgz", - "integrity": "sha512-HDjWrYWgbO5orKuhnXETLFzk7UUvwWur2HFs2elAZ8lVpI49ClHql31DNTVvVBcOrSHfAOS4eBDBedIvOx634w==", + "version": "10.18.0", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.18.0.tgz", + "integrity": "sha512-oGlDh1Q1XqYPksuTD/usb0I70hq95OUzmL9+6Zd+Hs4XV0oaISBa/UUMSjYiq6m8EUF32132mOJ8xVZS+I0S6w==", "dependencies": { "tslib": "^2.4.0" }, @@ -8540,6 +8541,15 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.1.tgz", "integrity": "sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg==" }, + "node_modules/react-fast-marquee": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/react-fast-marquee/-/react-fast-marquee-1.6.4.tgz", + "integrity": "sha512-LAgvhRmHdqaUQ8R5jCUwzEGFUIjnCCt3T3W8X7j7wF6DWe0SATlpP0JX1V0pp2qX3DYUezmn1Iz5AtRFdL2EWQ==", + "peerDependencies": { + "react": ">= 16.8.0 || 18.0.0", + "react-dom": ">= 16.8.0 || 18.0.0" + } + }, "node_modules/react-focus-lock": { "version": "2.9.4", "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.9.4.tgz", @@ -8601,9 +8611,9 @@ } }, "node_modules/react-icons": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz", - "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz", + "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==", "peerDependencies": { "react": "*" } @@ -15322,9 +15332,9 @@ } }, "framer-motion": { - "version": "10.15.0", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.15.0.tgz", - "integrity": "sha512-HDjWrYWgbO5orKuhnXETLFzk7UUvwWur2HFs2elAZ8lVpI49ClHql31DNTVvVBcOrSHfAOS4eBDBedIvOx634w==", + "version": "10.18.0", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.18.0.tgz", + "integrity": "sha512-oGlDh1Q1XqYPksuTD/usb0I70hq95OUzmL9+6Zd+Hs4XV0oaISBa/UUMSjYiq6m8EUF32132mOJ8xVZS+I0S6w==", "requires": { "@emotion/is-prop-valid": "^0.8.2", "tslib": "^2.4.0" @@ -16580,6 +16590,12 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.1.tgz", "integrity": "sha512-xTYf9zFim2pEif/Fw16dBiXpe0hoy5PxcD8+OwBnTtNLfIm3g6WxhKNurY+6OmdH1u6Ta/W/Vl6vjbYP1MFnDg==" }, + "react-fast-marquee": { + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/react-fast-marquee/-/react-fast-marquee-1.6.4.tgz", + "integrity": "sha512-LAgvhRmHdqaUQ8R5jCUwzEGFUIjnCCt3T3W8X7j7wF6DWe0SATlpP0JX1V0pp2qX3DYUezmn1Iz5AtRFdL2EWQ==", + "requires": {} + }, "react-focus-lock": { "version": "2.9.4", "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.9.4.tgz", @@ -16619,9 +16635,9 @@ } }, "react-icons": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz", - "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz", + "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==", "requires": {} }, "react-is": { diff --git a/package.json b/package.json index 172810e0b..04c7e86e4 100644 --- a/package.json +++ b/package.json @@ -18,16 +18,17 @@ "axios": "^1.3.4", "file-saver": "^2.0.5", "formik": "^2.2.9", - "framer-motion": "^10.15.0", + "framer-motion": "^10.18.0", "lottie-react": "^2.4.0", "moment": "^2.29.4", "razorpay": "^2.9.3", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-fast-marquee": "^1.6.4", "react-google-charts": "^4.0.0", "react-helmet": "^6.1.0", "react-hot-toast": "^2.4.1", - "react-icons": "^4.10.1", + "react-icons": "^4.12.0", "react-qr-code": "^2.0.11", "react-router-dom": "^6.9.0", "react-select": "^5.7.7", diff --git a/src/App.tsx b/src/App.tsx index 2b58bc896..02037e538 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -241,6 +241,8 @@ const ConnectedDevices = lazy( ); const Wadhwani = lazy(() => import("./modules/Dashboard/modules/Wadhwani")); +const Trivial = lazy(() => import("./modules/Public/TrivialIdeas/modules/trivial")); + function App() { const AuthChecker = SecureAuthRoutes(); const router = createBrowserRouter([ @@ -277,6 +279,10 @@ function App() { path: "donation/refund", element: }, + { + path:"trivial-ideas", + element: + }, { path: "/", element: , diff --git a/src/modules/Public/Donation/Donation.module.css b/src/modules/Public/Donation/Donation.module.css index 808db5897..58cc26b5a 100644 --- a/src/modules/Public/Donation/Donation.module.css +++ b/src/modules/Public/Donation/Donation.module.css @@ -1,93 +1,92 @@ .LClandingPage { - position: relative; - overflow-x: hidden; + display: flex; + justify-content: space-around; + margin: 10rem 0; + margin-bottom: 8rem; } -.joinCircle { - background: var(--blue); - border-radius: var(--borderRadius); - padding: 0.5rem 1rem; - font-size: 0.8rem; - margin-top: 1rem; - width: 6rem; - color: #fff; +.DonationHero { + width: 80vw; + min-height: 60vh; + display: flex; } - -.backgroundImage { - top: 0; - position: absolute; - - z-index: -2; +.HeroLeft { + width: 50%; + background-color: white; + display: flex; + flex-direction: column; + gap: 1rem; + padding: 5px; } - -.backgroundImage img { - width: 100vw; - height: 110vh; +.HeroLeft h1 { + font-size: 4.4rem; + font-weight: bold; + line-height: 5rem; } - -.LClandingPageHero { - /* background-image: url(https://i.ibb.co/cCvB4r6/Learning-BG.png); - background-repeat: no-repeat; - background-size: cover; - background-position: center; */ - position: relative; - height: 100vh; - width: 100%; +.HeroLeft h1:nth-child(2) { + background: linear-gradient(30deg, #6660f4, #af2ee6); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} +.HeroLeft p { + font-size: 1.4rem; + font-weight: 500; + margin-top: 0.5rem; +} +.OrgContainer { + display: flex; + gap: 2.5rem; + flex-wrap: wrap; +} +.OrgContainer img { + max-width: 120px; + max-height: 60px; +} +.HeroLeft .Stats { + display: flex; + gap: 2.8rem; +} +.HeroLeft .Stats div { display: flex; - align-items: center; - justify-content: center; flex-direction: column; - text-align: center; - gap: 1rem; - padding-top: 5rem; } - -@media screen and (min-width: 800px) { - .LClandingPageHero { - height: 75vh; - } +.HeroLeft .Stats div h3 { + font-size: 2.5rem; + font-weight: 600; } - -.LClandingPageHero span { +.HeroLeft .Stats div h4 { + font-weight: 500; + font-size: 1.4rem; + text-align: center; +} +.HeroImgContainer { + width: 50%; display: flex; - align-items: center; + align-items: start; justify-content: center; - gap: 1rem; - font-size: 3.5rem; - color: #000; + padding-top: 2rem; } - -.LClandingPageHero span img { - position: relative; - top: 0.75rem; - height: 3rem; +.HeroImgContainer img { + border-radius: 24px; + max-width: 600px; + height: 50vh; + object-fit: cover; + overflow: hidden; + box-shadow: 10px 10px 40px 5px #eff2f6, -10px -10px 40px 5px #eff2f6; } - -.LClandingPageHero .dash { - position: absolute; - top: -50%; - width: 120%; - height: 100%; - border: 5px solid #accaf6; - border-style: dashed; - border-radius: 45%; -} - -.LClandingPageHero .heroTitle b:nth-child(2) { - font-size: 4rem; - color: var(--blue); - position: relative; - top: -1rem; - background-image: linear-gradient(to right, #ddecff, #eaf3ff); - border-radius: 10%; - height: -1rem; - padding: 0rem 0.5rem; +.MarqueeContainer { + background-color: var(--blue); + height: 65px; + width: 100vw; + display: flex; + align-items: center; + font-size: 2rem; + font-weight: 600; + color: white; } -.LClandingPageHero p { - width: 75%; - font-weight: 600; - font-size: 1.1rem; +.MarqueeContainer span { + color: black; } .DonationSection { @@ -96,54 +95,148 @@ display: flex; justify-content: center; margin-bottom: 6rem; + margin-top: 3rem; } .DonationFormElement { background: #fff; - box-shadow: -1.6px 6.4px 32px 3.2px rgba(0, 0, 0, 0.15); + box-shadow: 10px 10px 40px 5px #eff2f6, -10px 10px 40px 5px #eff2f6; width: 80%; - top: -25%; - padding: 1.5rem 3rem; + padding: 1.5rem 4rem; display: flex; + border-radius: 20px; gap: 2rem; } .DetailsContainer { - width: 100%; + width: 50%; display: flex; flex-direction: column; padding: 1rem 0; - gap: 0.2rem; + gap: 1rem; +} + +.DetailsContainer label { + position: relative; + top: 10px; + color: black; + font-size: 0.9rem; + font-weight: 700; +} + +.CheckOrgContainer { + display: flex; + align-items: center; +} + +.Checkbox { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + width: 20px; + height: 20px; + border: 2px solid #ccc; + border-radius: 4px; + outline: none; + cursor: pointer; + position: relative; + vertical-align: middle; + margin-right: 2px; + transition: 0.2s; +} + +.Checkbox:checked { + background-color: rgba(69, 110, 246, 0.16); + border-color: var(--blue); + transition: 0.2s; +} + +.Checkbox:checked::after { + content: ""; + position: absolute; + left: 5px; + top: 1px; + width: 5px; + height: 10px; + border: solid var(--blue); + border-width: 0 2px 2px 0; + transform: rotate(45deg); + transition: 0.2s; +} + +.OrgChecklabel{ + font-size: 1rem; + color: black; + font-weight: 500; + top: 0; + margin-left: 5px; } -.DetailsContainer h1, .DonationInputStyles { margin-bottom: 0.7rem; + height: 48px; + border-radius: 0.4rem; + max-width: 500px; + border: 1px solid #d5d4dc; + padding: 0.4rem 1rem; + transition: .2s; + transition: outline .05s; } -.DetailsContainer label { - margin: 0.2rem 0.5rem; +.DonationInputStyles:hover{ + border-color: #93b8fe; + background-color: #f5f8ff; } -.DetailsContainer h1 { - font-weight: 600; - font-size: 1.7rem; +.DonationInputStyles:focus{ + outline: 3px solid var(--blue); +} + +.DonationRightSide{ + width: 50%; + display: flex; + align-items: center; +} + +.AmountContainer { + display: flex; + flex-direction: column; + max-width: 468px; +} + +.AmountContainer h1 { + font-size: 14px; + font-weight: 700; +} + +.AmountContainer h4 { + text-align: center; + font-weight: 700; + font-size: 14px; + padding: 0.5rem 0; } .DonateButtonContainer { display: flex; - justify-content: center; + justify-content:center; + align-items: center; gap: 1rem; + padding: 0.8rem 0; + flex-wrap: wrap; } .DonateButtonContainer button { background-color: #fff; - width: 100%; - color: var(--blue); - border: 2px solid var(--blue); + color: black; + font-weight: 600; + border: 3px solid var(--blue); border-radius: 0.5rem; - padding: 0.9rem 1.4rem; - margin-bottom: 1rem; + width: 6.5rem; + height: 50px; + display: flex; + align-items: center; + justify-content: center; + font-size: 1.2rem; } .DonateButtonContainer button:hover { @@ -155,61 +248,85 @@ background-color: var(--blue); color: #fff; } - -.DonationInputStyles { - border-radius: 0.4rem; - border: 1.12px solid rgba(45, 191, 252, 0.25); - box-shadow: 0px 1.6px 6.4px 0px rgba(0, 0, 0, 0.1); - padding: 0.4rem 1rem; - width: 100%; +.AmountField { + font-size: 1.5rem; + max-width:100%; + transition: .05s; } -.AmountField { - font-size: 1.8rem; - font-weight: 500; - padding: 0.5rem 1rem; +.AmountField:focus{ + outline: 3px solid var(--blue); } .CurrencyContainer { - position: relative; + padding: 0.5rem 0; + display: flex; + flex-direction: column; } .CurrencyContainer p { - position: absolute; - cursor: default; - font-weight: 200; - color: rgba(0, 0, 0, 0.5); - right: 1rem; - top: 20%; + font-weight: 700; + color: black; + font-size: 14px; + padding-bottom: .3rem; } -.TermsContainer { +.TermsContainer{ display: flex; - align-items: center; } -.TermsContainer input { - width: 1rem; +.TermsContainer .Checkbox{ + scale: .75; + top: -1px; + display: inline; + padding-right: 15px; + margin-right: 5px; } -.TermsContainer label { - cursor: default; - font-size: 0.7rem; - color: rgba(0, 0, 0, 0.8); +.TermsContainer label{ + font-size: 14px; + color:#8B849B; + font-weight: 400; + line-height: 18px; + text-align: start; +} + +.TermsContainer label a{ + text-decoration: underline; } .SubmitButton { margin-top: 1rem; font-size: 1.4rem; - width: 60%; - align-self: center; + width: 100%; + display: flex; + justify-content: center; } .SubmitButton button { - padding: 0.7rem 1rem; + padding: 8px 25px; + background-color: var(--blue); + color: white; + border-radius: 10px; + font-size: 1rem; } /* Refund Page */ +.RefundPage { + position: relative; + overflow-x: hidden; +} + +.backgroundImage { + top: 0; + position: absolute; + z-index: -2; +} + +.backgroundImage img { + width: 100vw; + height: 110vh; +} .refundSection { display: flex; @@ -266,11 +383,60 @@ gap: 1rem; } + .DonationFormElement { + padding: 1.5rem 2rem; + } + .SubmitButton { width: 100%; align-items: center; } } +@media only screen and (max-width: 820px) { + .LClandingPage { + margin-top: 6rem; + margin-bottom: 3rem; + } + + .HeroImgContainer { + display: none; + } + + .HeroLeft { + width: 100%; + } + + .HeroLeft h1 { + text-align: center; + } + + .HeroLeft p { + text-align: center; + } + + .OrgContainer { + flex-wrap: wrap; + justify-content: center; + } + + .HeroLeft .Stats { + justify-content: center; + } + + .DetailsContainer{ + width: 100%; + + } + + .DonationInputStyles{ + max-width: 600px; + } + + .DonationRightSide{ + width: 100%; + justify-content: center; + } +} @media (width<=550px) { .LClandingPageHero .dash { @@ -296,17 +462,11 @@ top: -10%; width: 96%; } - + .DonationRightSide{ + justify-content: center; + } .DonateButtonContainer { - /* flex-direction: column; */ align-items: center; - gap: 0.3rem; - } - .DonateButtonContainer button { - width: 100%; - padding: 0.4rem 0.8rem; - margin-bottom: 0.6rem; - font-size: 0.8rem; } .CurrencyContainer p, diff --git a/src/modules/Public/Donation/Donation.tsx b/src/modules/Public/Donation/Donation.tsx index 2f95855a8..06f5b0dd0 100644 --- a/src/modules/Public/Donation/Donation.tsx +++ b/src/modules/Public/Donation/Donation.tsx @@ -5,6 +5,12 @@ import Footer from "./components/Footer"; import Navbar from "./components/Navbar"; import { submitForm } from "./services/api"; import styles from "./Donation.module.css"; +import Marquee from "react-fast-marquee"; + +import icfoss from "./assets/icfoss.png"; +import kdu from "./assets/kdu.png"; +import kdisc from "./assets/kdisc.png"; +import heroImg from "./assets/heroImg.jpg"; const Donation = () => { const [amount, setAmount] = useState(); @@ -12,7 +18,7 @@ const Donation = () => { const [email, setEmail] = useState(""); const [mobile, setMobile] = useState(); const [pan, setPan] = useState(""); - const [selectedAmount, setSelectedAmount] = useState(10000); + const [selectedAmount, setSelectedAmount] = useState(0); const [isOrganisation, setIsOrganisation] = useState(false); const [company, setCompany] = useState(""); @@ -83,35 +89,56 @@ const Donation = () => { }; return ( -
- +
+
+ -
- {/*
- textured background -
*/} - {/*
*/} -
- - Donate to{" "} - - - {/* Let's grow together */} +
+
+

Help us sustain

+

Our Mission

+

+ Foster innovation culture, introduce new + technologies, and develop skilled entrepreneurs. +

+
+ + + +
+
+
+

30k+

+

Students

+
+
+

300+

+

Events

+
+
+
+
+ +
-

- An informal mechanism for bringing together learners who are - interested in the same topic from across different fields - and disciplines. A fantastic way to spend a small amount of - time learning about new things with a group of people with - same interests! -

+
+ +
+ + Make Learning Accessible           +             +       Transform Education Today     +            +             Build Brighter + Futures               +             +   Make Learning Accessible         +             +         +
-
{ @@ -120,37 +147,38 @@ const Donation = () => { }} >
-

Details

- +
+ + setIsOrganisation(!isOrganisation) + } + className={styles.Checkbox} + /> +

+ I’m paying for an organization. +

+
+ setName(e.target.value)} required /> -
- - setIsOrganisation(!isOrganisation) - } - > - -
+ {isOrganisation && ( <> - + setCompany(e.target.value)} @@ -158,33 +186,33 @@ const Donation = () => { /> )} - + setEmail(e.target.value)} required /> - + setMobile(Number(e.target.value))} required /> - + { required />
- -
-

Donate

-
-
-
+
+
); }; diff --git a/src/modules/Public/Donation/assets/footer/facebook.webp b/src/modules/Public/Donation/assets/footer/facebook.webp new file mode 100644 index 000000000..40dd03239 Binary files /dev/null and b/src/modules/Public/Donation/assets/footer/facebook.webp differ diff --git a/src/modules/Public/Donation/assets/footer/instagram.webp b/src/modules/Public/Donation/assets/footer/instagram.webp new file mode 100644 index 000000000..71a91f188 Binary files /dev/null and b/src/modules/Public/Donation/assets/footer/instagram.webp differ diff --git a/src/modules/Public/Donation/assets/footer/linkedin.webp b/src/modules/Public/Donation/assets/footer/linkedin.webp new file mode 100644 index 000000000..6a10b8ab0 Binary files /dev/null and b/src/modules/Public/Donation/assets/footer/linkedin.webp differ diff --git a/src/modules/Public/Donation/assets/footer/twitter.webp b/src/modules/Public/Donation/assets/footer/twitter.webp new file mode 100644 index 000000000..7e278fbf5 Binary files /dev/null and b/src/modules/Public/Donation/assets/footer/twitter.webp differ diff --git a/src/modules/Public/Donation/assets/footer/whatsapp.svg b/src/modules/Public/Donation/assets/footer/whatsapp.svg new file mode 100644 index 000000000..b009a8b56 --- /dev/null +++ b/src/modules/Public/Donation/assets/footer/whatsapp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/modules/Public/Donation/assets/footer/youtube.webp b/src/modules/Public/Donation/assets/footer/youtube.webp new file mode 100644 index 000000000..1157be47d Binary files /dev/null and b/src/modules/Public/Donation/assets/footer/youtube.webp differ diff --git "a/src/modules/Public/Donation/assets/footer/\302\265Learn-white.webp" "b/src/modules/Public/Donation/assets/footer/\302\265Learn-white.webp" new file mode 100644 index 000000000..b9b321571 Binary files /dev/null and "b/src/modules/Public/Donation/assets/footer/\302\265Learn-white.webp" differ diff --git a/src/modules/Public/Donation/assets/heroImg.jpg b/src/modules/Public/Donation/assets/heroImg.jpg new file mode 100644 index 000000000..c6023d925 Binary files /dev/null and b/src/modules/Public/Donation/assets/heroImg.jpg differ diff --git a/src/modules/Public/Donation/assets/icfoss.png b/src/modules/Public/Donation/assets/icfoss.png new file mode 100644 index 000000000..db5a20913 Binary files /dev/null and b/src/modules/Public/Donation/assets/icfoss.png differ diff --git a/src/modules/Public/Donation/assets/kdisc.png b/src/modules/Public/Donation/assets/kdisc.png new file mode 100644 index 000000000..90d9e0080 Binary files /dev/null and b/src/modules/Public/Donation/assets/kdisc.png differ diff --git a/src/modules/Public/Donation/assets/kdu.png b/src/modules/Public/Donation/assets/kdu.png new file mode 100644 index 000000000..eca916ae3 Binary files /dev/null and b/src/modules/Public/Donation/assets/kdu.png differ diff --git "a/src/modules/Public/Donation/assets/\302\265.png" "b/src/modules/Public/Donation/assets/\302\265.png" new file mode 100644 index 000000000..4f185d605 Binary files /dev/null and "b/src/modules/Public/Donation/assets/\302\265.png" differ diff --git "a/src/modules/Public/Donation/assets/\302\265.webp" "b/src/modules/Public/Donation/assets/\302\265.webp" deleted file mode 100644 index e1f19d2d7..000000000 Binary files "a/src/modules/Public/Donation/assets/\302\265.webp" and /dev/null differ diff --git a/src/modules/Public/Donation/components/Footer.module.css b/src/modules/Public/Donation/components/Footer.module.css index cdc22543f..88ed88294 100644 --- a/src/modules/Public/Donation/components/Footer.module.css +++ b/src/modules/Public/Donation/components/Footer.module.css @@ -1,125 +1,235 @@ -.footer { - padding: 5rem; - background: #e0eeff; - color: #000; -} -.footer > hr { - border: 1px solid #000; - opacity: 0.2; - margin: 5rem 0; -} -.container { - display: flex; - gap: 7rem; -} - -.centerContainer { - justify-content: center; -} - -.footerSection { - display: flex; - flex-direction: column; - gap: 1rem; -} - -.footerLogo { +.mainfooter_container { + margin-top: 2rem; + background-color: #E0EEFF; + color: black; + position: relative; + /* z-index: -1; */ + } + + .footer_container { + padding: 2rem; + } + + @media only screen and (min-width: 1000px) { + .footer_container { + max-width: 1300px; + margin: auto; + } + } + + .mulearn { + width: 6rem; + filter: invert(); + } + + .links { + margin-top: 1rem; display: flex; - flex-direction: column; - width: 25%; - padding: 0 2rem; - gap: 2rem; + flex-direction: row; + } + @media (max-width: 767px) { + .links_mobile { + display: flex; + } + } + + .link { + margin-top: 0; + margin-right: 1rem; + font-weight: 400; + font-size: 0.9rem; + } + + .link:hover { + color:var(--blue); + } + + .line { + margin-top: 2rem; + background-color: rgb(97, 97, 97); + width: 100%; + height: 2px; + } + + a { + font-weight: 500; + } + + .address, + .mail { + margin-top: 1rem; font-size: 0.8rem; -} - -.footerLogo img { - width: 60%; -} - -.footerLogo p { - text-align: left; -} - -.title { + font-weight: 400; + width: 75%; + } + + .mail { + color:var(--blue); + margin-bottom: 0.5rem; + } + + .social { + height: 2rem; + width: 2rem; + margin-top: 2rem; + margin-right: 1rem; + transition: 0.5s ease; + filter: invert(); + } + + .social:hover { + transform: scale(1.3); + } + + @media only screen and (min-width: 1000px) { + .first_section { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-end; + } + + .address_container { + font-size: 0.9rem; + width: 35%; + } + + .address, + .mail { + margin-top: 2rem; + font-size: 0.9rem; + font-weight: 400; + width: 75%; + } + } + + .mail { font-weight: 600; -} -.links { + } + + .mailus { + display: block; + padding-top: 1rem; + color: rgb(176, 176, 245); + } + + .title { + font-size: 2rem; + font-weight: 700; + color: #5e72e4; + } + + .fheadingtext { + font-size: 1.1rem; + color: white; + margin-top: 4vh; + } + + .fparagraph { + font-size: 0.8rem; + font-weight: 300; + color: white; + } + + .newsletterinvite { display: flex; - flex-direction: column; - gap: 1rem; + flex-direction: row; + } + + .invite_container { + position: relative; + background-color: white; + padding: 0.5rem 1rem; + margin-top: 2vh; + border-radius: 5px; + } + + .invite_container input { font-size: 0.8rem; -} -.links > a:hover { - color: #2e85fe; -} -.socialMedia { + border: none; + padding: 0.5rem; + width: 12.5rem; + } + + .invite_container button { + border: none; + font-size: 0.8rem; + color: white; + background-color: #f6832a; + padding: 0.5rem 1.75rem; + border-radius: 3px; + } + + .invite_container button:hover { + background-color: #fd7915; + } + + input:focus, + select:focus, + textarea:focus, + button:focus { + outline: none; + } + + .newsletter { + width: 20rem; + } + + .newslettertext { + color: white; display: flex; - gap: 2rem; - font-size: x-large; -} -.legal { + flex-direction: row; + } + + .fs_rightside { display: flex; - gap: 1.5rem; - font-size: 0.8rem; -} -.copyRight { - font-size: 0.9rem; -} -@media screen and (max-width: 1000px) { - .container { - flex-direction: column; - align-items: center; - gap: 4rem; - } - - .footerLogo { - width: 100%; - max-width: 30rem; - align-items: center; - margin: 3rem; - } - - .footerLogo p { - text-align: center; - } - - .footerSection { - display: none; - } - .footer > hr { - display: none; - } - .socialMedia { - justify-content: center; - } - .legal { - justify-content: center; - flex-direction: column; - align-items: center; + } + + @media only screen and (min-width: 1000px) { + .right_side { + width: 30%; } - .copyRight { - text-align: center; + .left_links { + display: flex; } -} -@media screen and (max-width: 800px) { - .container { - gap: 2rem; + + .larger_screen { + display: flex; + flex-direction: row; + align-items: center; + margin-top: 0.5rem; } - - .footerLogo { - width: 19rem; + .newsletter { + width: 20rem; + text-align: right; } - - .footerLogo p { - display: none; + + .bottom_section { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; } -} -@media screen and (max-width: 380px) { - .socialMedia { - font-size: large; + } + + .bottomcopyright { + position: absolute; + bottom: 0; + color: black; + background-color: #E0EEFF; + width: 100%; + text-align: center; + padding: 5px 0px 5px 0px; + font-size: 0.6rem; + } + @media (max-width: 767px) { + .mobile_line_break { + display: block; } - - .footerLogo { - width: 15rem; + } + + @media (min-width: 768px) { + .mobile-line-break { + display: inline; } -} + } \ No newline at end of file diff --git a/src/modules/Public/Donation/components/Footer.tsx b/src/modules/Public/Donation/components/Footer.tsx index 3a7fd981a..ab5cc7426 100644 --- a/src/modules/Public/Donation/components/Footer.tsx +++ b/src/modules/Public/Donation/components/Footer.tsx @@ -1,124 +1,173 @@ +import React from "react"; import styles from "./Footer.module.css"; -import { footerData } from "../services/footerData"; import { Link } from "react-router-dom"; -import { - RiWhatsappFill, - RiTwitterFill, - RiInstagramFill, - RiLinkedinBoxFill, - RiYoutubeFill, - RiFacebookBoxFill -} from "react-icons/ri"; -export default function Footer() { - return ( -
-
-
- - mulearn - -
- {footerData.map((data, index) => { - return ( -
-

{data.name}

-
- {data.links.map(link => { - return ( - - {link.name} - - ); - })} -
-
- ); - })} +import waIcon from "../assets/footer/whatsapp.svg" +import twitterIcon from "../assets/footer/twitter.webp" +import instaIcon from "../assets/footer/instagram.webp" +import linkedInIcon from "../assets/footer/linkedin.webp" +import ytIcon from "../assets/footer/youtube.webp" +import fbIcon from "../assets/footer/facebook.webp" +import MulearnWhite from "../assets/footer/µLearn-white.webp" + + +function scrollTop() { + window.scrollTo({ + top: 0, + behavior: "smooth", + }); +} + +const Footer = () => { + return ( +
+
+
+
+ + + +
+ +

Terms and Condition

+ + +

Privacy Policy

+
-
-
+ + + +
+ +
+
+
+

+ Technopark Trivandrum, Kazhakkoottam, Trivandrum - 695581, + Kerala, India +

+ +

+ info@mulearn.org +

+
+
+ + {/*
+
+
+

Join Our Mailing List

+

+ Join Our Mailing List Be the first to know about upcoming + coding workshops, new coding tools, and other Mulearn related + news. +

+ +
+ +
+
-
- ); -} +
*/} + + +
+
+

µLearn Foundation | Copyright © 2023 All rights reserved.

+
+ + ); +}; + +export default Footer; \ No newline at end of file diff --git a/src/modules/Public/Donation/components/Navbar.module.css b/src/modules/Public/Donation/components/Navbar.module.css index 9f546d4a9..aee17792b 100644 --- a/src/modules/Public/Donation/components/Navbar.module.css +++ b/src/modules/Public/Donation/components/Navbar.module.css @@ -1,18 +1,24 @@ .LClandingPageNav { - position: absolute; + position: fixed; top: 0; width: 100%; - z-index: 1; + z-index: 2; display: flex; - justify-content: space-between; - padding: 3rem 5rem; + justify-content: space-around; + padding: 1rem 0rem; + gap: 10vw; + backdrop-filter:blur(30px); +} +.LClandingPageNav img{ + width: 32px; + height: 40px; } - .LClandingPageNav .navLinks, .LClandingPageNav .navLinks div { display: flex; align-items: center; - gap: 2rem; + gap: 3rem; + font-size: 1.1rem; } .LClandingPageNav .navLinks div { @@ -23,17 +29,19 @@ .LClandingPageNav .navLinks button { background: var(--blue); border-radius: var(--borderRadius); - padding: 0.5rem 1rem; - font-size: 0.8rem; + padding: .5rem 2rem; + font-size: 1.1rem; color: #fff; } -@media (width <=820px) { +@media (width <=800px) { .LClandingPageNav { - padding: 3rem 2rem; + justify-content: space-between; + padding: 2rem 2rem; } - .LClandingPageNav .navLinks { + .LClandingPageNav .navLinks div{ display: none; } + } diff --git a/src/modules/Public/Donation/components/Navbar.tsx b/src/modules/Public/Donation/components/Navbar.tsx index cdcbd4ad6..3ebdeb226 100644 --- a/src/modules/Public/Donation/components/Navbar.tsx +++ b/src/modules/Public/Donation/components/Navbar.tsx @@ -1,13 +1,13 @@ import styles from "./Navbar.module.css"; import { Link, useNavigate} from "react-router-dom"; - +import logo from "../assets/µ.png" export default function Navbar(){ const navigate = useNavigate(); return(