Skip to content

Commit

Permalink
feat: about page, fix: mobile forced view and default export of pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Suman373 committed Jul 17, 2024
1 parent 7ffd4dc commit 5186215
Show file tree
Hide file tree
Showing 13 changed files with 118 additions and 30 deletions.
2 changes: 1 addition & 1 deletion client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<link rel="icon" href="" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="viewport" content="width=1024" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Blossom is the platform to help you with donation, charity fundraises and events" />
<link rel="manifest" href="" />
Expand Down
4 changes: 2 additions & 2 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "client",
"version": "1.4.3",
"version": "1.5.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.5",
Expand Down
15 changes: 5 additions & 10 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
import React, { useState, useEffect } from 'react';
import './App.scss';
import { BrowserRouter as BRouter, Routes, Route, Navigate } from 'react-router-dom';
import UserHome from './pages/user/UserHome/UserHome';
import AddFundRaise from './pages/user/AddFundRaise/AddFundRaise';
import AddEvent from './pages/user/AddEvent/AddEvent';
import {UserHome, AddFundRaise, AddEvent, UserDetails,
FundDetails, EventDetails, DetailsForm, Success
} from './pages/user/index';
import {Landing, Signup, About} from './pages/nonuser/index';
import Footer from './components/Footer/Footer';
import UserDetails from './pages/user/UserDetails/UserDetails';
import Landing from './pages/nonuser/Landing/Landing';
import Signup from './pages/nonuser/Signup/Signup';
import useAuth from './hooks/useAuth';
import FundDetails from './pages/user/FundDetails/FundDetails';
import EventDetails from './pages/user/EventDetails/EventDetails';
import DetailsForm from './pages/user/DetailsForm/DetailsForm';
import Success from './pages/user/Success/Success';

const App = () => {
const [user, setUser] = useState(null);
Expand Down Expand Up @@ -49,6 +43,7 @@ const App = () => {
<Routes>
<Route path="/" element={<Landing />}></Route>
<Route path="/signup" element={<Signup setUser={setUser} />}></Route>
<Route path="/about" element={<About/>}></Route>
</Routes>
}
<Footer />
Expand Down
11 changes: 6 additions & 5 deletions client/src/components/Footer/Footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,17 @@
font-size: 2.9rem;
}
.copyright{
font-size: 1.1rem;
height: 4rem;
height: 7rem;
border-top:2px solid #fff;
background:#272525;
color:#ffffffff;
padding: 0.6rem;
}
.copyright p{
font-size: 1.1rem;
text-align: center;
display: grid;
place-content: center;
margin:0.5rem;
}

@media screen and (max-width:850px){
.footer_row{
padding-top: 2rem;
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/Footer/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ const Footer = () => {
</div>
</div>
<div className="copyright">
&copy; Blossom 2024 | All Rights Reserved
<p> Made in 🇮🇳 with ❤️</p>
<p> &copy; Blossom 2024 | All Rights Reserved</p>
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/PublicNav/PublicNav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function PublicNav() {
whileHover={{
scale: 1.1,
transition: { duration: 0.2 },
}}><Link to="#">About us</Link>
}}><Link to="/about">About us</Link>
</motion.li>
<motion.li
whileHover={{
Expand Down
49 changes: 49 additions & 0 deletions client/src/pages/nonuser/About/About.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from 'react';
import './About.scss';
import { motion } from 'framer-motion';

const About = () => {
return (
<div className='about-wrapper'>
<motion.h1
animate={{ y: 20 }}
transition={{ ease: "easeIn", duration: 1.5 }}
>What are we ?
</motion.h1>
<p>Blossom is a dedicated nonprofit organization committed to uplifting underprivileged communities through a variety of impactful initiatives. With a steadfast focus on fundraising, charity, events, and volunteer services, Blossom strives to make a meaningful difference in the lives of those in need. By mobilizing resources and fostering a spirit of compassion and support, Blossom endeavors to create opportunities for disadvantaged individuals and families to thrive. Through their unwavering dedication and community-driven approach, Blossom serves as a beacon of hope and empowerment, aiming to build a brighter future for all.</p>

<h3>Founding Principles</h3>
<ul>
<li>
Blooming Impact : Blossom strives to facilitate impactful fundraises, ensuring that every dollar raised has a direct and positive effect on the cause it supports. We believe in the potential of small acts coming together to create significant change.
</li>
<li>
Seed of Empathy : The project is rooted in the belief that empathy is the seed from which compassion blossoms. By fostering understanding and awareness, Blossom aims to inspire a collective sense of responsibility for the well-being of our global community.
</li>
<li>
Volunteer Harmony : Blossom recognizes the invaluable contribution of volunteers and seeks to connect passionate individuals with opportunities that align with their skills and interests. Through volunteer services, we aim to create a network of change-makers who actively contribute to building a better world.
</li>
</ul>

<h3>Key Initiatives</h3>

<ul>
<li>Blossom Fundraisers: Engage in a variety of fundraisers, ranging from online campaigns to community events, to support a diverse array of causes, including education, healthcare, environmental conservation, and more.</li>
<li>
Charity Bloom: Direct and transparent charity donation mechanisms that ensure funds reach their intended recipients efficiently. We believe in fostering trust and accountability in the donation process.
</li>
<li>Volunteer Hub: Connect individuals with volunteer opportunities based on their skills, interests, and geographical location. By creating a harmonious volunteer ecosystem, Blossom seeks to maximize the positive impact of dedicated individuals.</li>
</ul>

<h3>Why Blossom?</h3>
<ul>
<li>Inclusive: Blossom is committed to inclusivity, embracing a wide range of causes to address the multifaceted challenges faced by communities globally.</li>
<li>Transparency: We prioritize transparency in all our operations, ensuring that donors and volunteers have a clear understanding of how their contributions are making a difference.</li>
<li>Community-Centric: Blossom is built on the idea that positive change is most effective when driven by a united community. Together, we can create a world where compassion and generosity flourish.</li>
</ul>
<p>Join us in the journey to make the world bloom with kindness and positive change. Together, let's sow the seeds of a brighter future through Project Blossom.</p>
</div>
)
}

export default About;
25 changes: 25 additions & 0 deletions client/src/pages/nonuser/About/About.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@use '../../../utils/variables';
@import '../../../utils/mixins';

.about-wrapper{
min-height: 100vh;
width: 100vw;
padding: 1rem 10%;

h1{
font-size: 3rem;
text-align: center;
color:variables.$blue-light;
margin-bottom: 2rem;
}
p,li{
font-size: 1rem;
line-height: 2;
}

h3{
font-size: 2rem;
color:variables.$blue-light;
margin:1rem 0;
}
}
20 changes: 12 additions & 8 deletions client/src/pages/nonuser/Landing/Landing.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import './Landing.scss';
import Typed from 'typed.js';
import { Link } from 'react-router-dom';
import { useInView } from 'react-intersection-observer';
import { FaHandHoldingHeart, FaHandHolding, FaHeart, FaHandsHelping } from "react-icons/fa";
import { FaHandHoldingHeart, FaHeart, FaHandsHelping } from "react-icons/fa";
import { IoPeople } from "react-icons/io5";
import { GiEternalLove } from "react-icons/gi";
import charity from '../../../assets/charity.png';
import PublicNav from '../../../components/PublicNav/PublicNav';
import handsBanner from '../../../assets/hands-banner.jpg';
import Announcement from '../../../components/Announcement/Announcement';
import { motion } from 'framer-motion';

function Landing() {

Expand Down Expand Up @@ -47,9 +48,12 @@ function Landing() {
<PublicNav />
<div className="banner">
<Announcement />
<h1>
<motion.h1
initial={{ y: -80 }}
animate={{ y: 0 }}
transition={{ duration: 2 }} >
Cultivating Change through Compassion .
</h1>
</motion.h1>
<div style={{ margin: '1rem 0' }}>
<span id='typewriter-text' ref={elementRef}>
</span>
Expand Down Expand Up @@ -77,7 +81,7 @@ function Landing() {
<GiEternalLove />
<h4>Fundraises</h4>
<p>Small contributions from lots of people make a difference.</p>
<Link to="#a">
<Link to="/about">
Know more
</Link>
</div>
Expand All @@ -87,7 +91,7 @@ function Landing() {
<FaHandHoldingHeart />
<h4>Donations</h4>
<p>Secure online donations with complete transparency. Your help is handled with care.</p>
<Link to="#a">
<Link to="/about">
Know more
</Link>
</div>
Expand All @@ -97,7 +101,7 @@ function Landing() {
<IoPeople />
<h4>Volunteer</h4>
<p>Get started with volunteering services we provide</p>
<Link to="#a">
<Link to="/about">
Know more
</Link>
</div>
Expand All @@ -112,12 +116,12 @@ function Landing() {
<p>
Welcome to Blossom, a transformative initiative dedicated to nurturing positive change in the world through fundraises, charity donations, and volunteer services. Born out of a deep-rooted commitment to creating a better tomorrow, Blossom is more than just a project; it's a movement that harnesses the power of collective goodwill to address pressing social issues.
</p>
<h2 style={{color:'#0964da'}}>Mission</h2>
<h2 style={{ color: '#0964da' }}>Mission</h2>
<p>
At the heart of Blossom lies a mission to cultivate a culture of compassion, generosity, and community involvement. Our aim is to provide a platform that empowers individuals and organizations to make a meaningful impact on the lives of those in need.
</p>

<Link className='welcome-link' to="#a">
<Link className='welcome-link' to="/about">
Know more
</Link>
</div>
Expand Down
3 changes: 3 additions & 0 deletions client/src/pages/nonuser/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export {default as Landing} from './Landing/Landing';
export {default as Signup} from './Signup/Signup';
export {default as About} from './About/About';
2 changes: 1 addition & 1 deletion client/src/pages/user/FundDetails/FundDetails.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
flex-direction: column;
align-items: center;
justify-content: flex-start;
width: 16rem;
width: 14rem;
height: 25rem;
background: variables.$blue-light;
border: 2px solid #ececec;
Expand Down
10 changes: 10 additions & 0 deletions client/src/pages/user/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export {default as UserHome} from './UserHome/UserHome';
export {default as AddFundRaise} from './AddFundRaise/AddFundRaise';
export {default as AddEvent} from './AddEvent/AddEvent';
export {default as AddFeed} from './AddFeed/AddFeed';
export {default as UserDetails} from './UserDetails/UserDetails';
export {default as FundDetails} from './FundDetails/FundDetails';
export {default as EventDetails} from './EventDetails/EventDetails';
export {default as DetailsForm} from './DetailsForm/DetailsForm';
export {default as Success} from './Success/Success';
export {default as Settings} from './Settings-page/Settings';

0 comments on commit 5186215

Please sign in to comment.