Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/homepageediting #49

Open
wants to merge 48 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b45d871
feat/test commit
QJWork Jul 17, 2024
41eeae5
Feat: added images
QJWork Jul 17, 2024
5901287
feat: improvement on the image
QJWork Jul 17, 2024
154a022
Feat: minor changes to fit the figma
QJWork Jul 17, 2024
d0cb212
feat: reversing changes that had been made previously to the main branch
QJWork Jul 17, 2024
9447171
Feat: minor updates on "About"
QJWork Jul 17, 2024
88f8489
feat: small change
QJWork Jul 17, 2024
04ea105
feat: added the "we are here for you" part
QJWork Jul 17, 2024
8926b4d
Revert "feat: reversing changes that had been made previously to the …
QJWork Jul 17, 2024
5eedc6d
feat: fixing mistake
QJWork Jul 18, 2024
7467ef3
Feat: Added futureVisionSections.css for color and organization on th…
QJWork Jul 18, 2024
75a72d0
Feat: reverted all of the changes
QJWork Jul 18, 2024
024dfe3
Feat: color background+minor fix on the bug
QJWork Jul 18, 2024
6eb1155
feat: changes on the displacement of the FutureVision Section and con…
QJWork Jul 18, 2024
b11ede2
Feat: changes to fonts and and color of the FutureVision section
QJWork Jul 18, 2024
5840468
Feat: change in name
QJWork Jul 18, 2024
f40cedf
feat: background colors for the members
QJWork Jul 18, 2024
0a78ac1
feat: step 1 of using tailwind
QJWork Jul 18, 2024
5d89244
Feat: finished transformng CSS to TailwindCss
QJWork Jul 18, 2024
8675bcf
feat: background color changes
QJWork Jul 18, 2024
ad854b9
feat: futureVision
QJWork Jul 18, 2024
3d622b2
feat: design changes in about
QJWork Jul 18, 2024
ba04700
font and color changes on future vision section
QJWork Jul 22, 2024
62b2b2c
feat: background color changes
QJWork Jul 22, 2024
670e786
feat: minor fix on format
QJWork Jul 22, 2024
ee84182
feat minor changes on font
QJWork Jul 22, 2024
6b9e41c
feat: background
QJWork Jul 22, 2024
86bcff1
feat: merge
QJWork Jul 23, 2024
0416d1f
feat: reverse changes
QJWork Jul 23, 2024
76e4f2f
feat: fix minor problem (deleting unused parts created earlier)
QJWork Jul 23, 2024
cd55025
feat: background modification of match the background of the original…
QJWork Jul 23, 2024
8225b48
Feat: added Temp function for an alternative of the CenterDiscription…
QJWork Jul 23, 2024
d78f286
Merge branch 'main' of https://github.com/hicsail/cycm-ionic into fea…
QJWork Jul 23, 2024
474aee6
feat fix
QJWork Jul 23, 2024
4b913aa
feat: fix merge error
QJWork Jul 24, 2024
dcde0d6
feat: continue changing on the tempFunction
QJWork Jul 24, 2024
7a56379
fix styling
kchenturtles Jul 25, 2024
752d37d
format
kchenturtles Jul 25, 2024
011e6d4
style slideshow
kchenturtles Jul 25, 2024
941a6fb
style
kchenturtles Jul 25, 2024
6c84b71
Feat: Merge branch 'main' of https://github.com/hicsail/cycm-ionic in…
QJWork Jul 29, 2024
33fb5fb
feat: fix image length <0 problem
QJWork Jul 29, 2024
bb75763
feat: added comments
QJWork Jul 29, 2024
f9d4edf
feat: footer change
QJWork Jul 29, 2024
c3b9c41
reshape the frame
QJWork Jul 29, 2024
cb5d83c
feat: minor changes on the picture's location
QJWork Jul 29, 2024
84df3f0
feat: image shape change
QJWork Jul 31, 2024
bcc3cf0
feat: run prettier fix
QJWork Jul 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"react-markdown": "^9.0.1",
"react-router": "^5.3.4",
"react-router-dom": "^5.3.4",
"react-share": "^5.1.0"
"react-share": "^5.1.0",
"swiper": "^11.1.5"
},
"devDependencies": {
"@capacitor/cli": "5.5.1",
Expand Down
Binary file added public/Debussy - Clair de Lune.mp3
Binary file not shown.
Binary file added public/students.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/union-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 31 additions & 37 deletions src/components/AboutFutureVisionSections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,52 +8,46 @@ import React from "react";

export default function AboutFutureVisionSections() {
return (
<div className="future-vision-container">
<div className="future-vision-header">
<div className="flex flex-col items-center justify-center p-5 bg-[#FFE2E2] min-h-screen box-border text-center text-base text-[#101066]">
<div className="text-5xl font-bold mb-8">
<h1>FUTURE VISION</h1>
</div>
<div className="future-vision-cards">
<IonCard className="future-vision-card">
<IonCardHeader>
<IonCardTitle>COLLABORATIVE CREATION</IonCardTitle>
<div className="container sm:px-2 md:px-12 px-36 mx-auto flex flex-col gap-5 w-19/20 box-border md:flex-row">
<IonCard className="flex-1 bg-white text-[#100f66] rounded-lg shadow-md pb-5 pl-0 pr-10 mb-0 ml-0">
<IonCardHeader className="text-left">
<IonCardTitle className="text-[#100f66] font-bold text-3xl mb-4">
COLLABORATIVE CREATION
</IonCardTitle>
</IonCardHeader>
<IonCardContent>
<ul>
<li>
Opportunities for trainees in all disciplines to collaborate
</li>
<li>Create content for website and social media</li>
</ul>
<IonCardContent className="text-left text-xl mb-24">
Create opportunities for trainees in all disciplines to collaborate
and develop content for the website and social media.
</IonCardContent>
</IonCard>
<IonCard className="future-vision-card">
<IonCardHeader>
<IonCardTitle>COMMUNITY ENGAGEMENT</IonCardTitle>
<IonCard className="flex-1 bg-white text-[#100f66] rounded-lg shadow-md pb-5 pl-0 pr-10 mb-0 ml-0">
<IonCardHeader className="text-left">
<IonCardTitle className="text-[#100f66] font-bold text-3xl mb-4">
COMMUNITY ENGAGEMENT
</IonCardTitle>
</IonCardHeader>
<IonCardContent>
<ul>
<li>
Design training toolkits to be used at schools and
community-based organizations
</li>
<li>
Engage with youth outside of the clinical setting and in the
community
</li>
</ul>
<IonCardContent className="text-left text-xl mb-24">
Design training toolkits to be used at schools and community-based
organizations to engage with youth outside of the clinical setting
and in the community.
</IonCardContent>
</IonCard>
<IonCard className="future-vision-card">
<IonCardHeader>
<IonCardTitle>NATIONAL LEADERSHIP</IonCardTitle>
<IonCard className="flex-1 bg-white text-[#100f66] rounded-lg shadow-md pb-5 pl-0 pr-10 mb-0 ml-0 ">
<IonCardHeader className="text-left">
<IonCardTitle className="text-[#100f66] font-bold text-3xl mb-4">
NATIONAL LEADERSHIP
</IonCardTitle>
</IonCardHeader>
<IonCardContent>
<ul>
<li>
BMC Department of Psychiatry: National "go-to" resource for
mental health in diverse teens
</li>
</ul>
<IonCardContent className="text-left text-xl mb-24">
BMC Department of Psychiatry: <br />
National "go-to" resource for
<br />
mental health in diverse teens.
<br />
</IonCardContent>
</IonCard>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/AboutMissionSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ export default function AboutMissionSection() {
return (
<div>
<div className="flex flex-col justify-center items-center bg-[#FFE2E2] min-h-screen px-12 md:px-0">
{/* <img className="w-full h-auto z-[10]" alt="union-1" src="red-union.svg" /> */}
<div className="p-4 max-w-4xl w-full my-24">
<h1 className="text-[#101066] font-bold text-4xl sm:text-5xl md:text-6xl lg:text-7xl tracking-tight leading-none mb-4">
Mission Statement
<h1 className="text-[#101066] font-bold text-4xl sm:text-5xl md:text-6xl lg:text-7xl tracking-tight text-center leading-none mb-4">
Our mission
</h1>
<br />
<p className="text-[#101066] font-semibold text-base sm:text-lg md:text-xl lg:text-xl tracking-tight leading-tight mb-8">
Expand Down Expand Up @@ -56,6 +55,7 @@ export default function AboutMissionSection() {
</div>
</div>
</div>
<img className="w-full h-auto z-[10]" alt="union-1" src="union-2.png" />
</div>
</div>
);
Expand Down
6 changes: 3 additions & 3 deletions src/components/AboutTeamProfiles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ export default function AboutTeamProfiles() {

return (
<div>
<div className="flex flex-col justify-center items-center min-h-screen px-12 md:px-0">
<div className="flex flex-col justify-center items-center min-h-screen bg-[#ffffff] px-12 md:px-0">
{/* <img className="w-full h-auto z-[10]" alt="union-1" src="red-union.svg" /> */}
<div className="p-4 max-w-6xl w-full pt-36">
<div className="flex flex-col items-start justify-center">
<h1 className="text-[#101066] font-bold text-4xl sm:text-5xl md:text-6xl lg:text-7xl tracking-tight leading-none mb-4">
Meet our team
<h1 className="text-[#101066] text-center font-bold text-4xl sm:text-5xl md:text-6xl lg:text-7xl tracking-tight leading-none mb-4">
Meet Our Team
</h1>
</div>
<p className="text-[#101066] font-semibold text-base sm:text-lg md:text-xl lg:text-xl tracking-tight leading-tight mb-8">
Expand Down
8 changes: 4 additions & 4 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@ const Footer = () => {
</h5>
<div className="flex gap-3">
<a
className="flex font-medium items-center text-white hoverIcon"
className="flex font-medium items-center text-blue-800 hoverIcon"
href="https://www.facebook.com/"
>
<IonIcon icon={logoFacebook} size="large" />
</a>
<a
className="flex font-medium items-center text-white hoverIcon"
className="flex font-medium items-center text-red-400 hoverIcon"
href="https://www.instagram.com/"
>
<IonIcon icon={logoInstagram} size="large" />
</a>
<a
className="flex font-medium items-center text-white hoverIcon"
className="flex font-medium items-center text-blue-400 hoverIcon"
href="https://www.twitter.com/"
>
<IonIcon icon={logoTwitter} size="large" />
</a>
<a
className="flex font-medium items-center text-white hoverIcon"
className="flex font-medium items-center text-blue-700 hoverIcon"
href="https://www.linkedin.com/"
>
<IonIcon icon={logoLinkedin} size="large" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/HelpInfographics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import RedGraphic from "./RedGraphic";
export default function HelpInfographics() {
return (
<div className="flex flex-col md:flex-row w-full max-w-7xl px-8 my-28 mx-auto gap-16">
<RedGraphic />
<BlueGraphic />
<PinkGraphic />
<RedGraphic />
</div>
);
}
104 changes: 104 additions & 0 deletions src/components/ImageSlideshow.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
import React, { useEffect } from "react";
import {
IonButton,
IonCard,
IonCardContent,
IonCardSubtitle,
IonIcon,
} from "@ionic/react";
import { arrowForwardOutline } from "ionicons/icons";

// Type definition for the slide component
type SlideComponent = {
background: string;
description: string;
};

// Get the token from environment variables
const token = import.meta.env.VITE_STRAPY_TOKEN;

export default function ImageSlideshow() {
const [slide, setSlide] = React.useState(0); // State to keep track of the current slide
const [slides, setSlides] = React.useState<SlideComponent[]>([]); // State to store the slides

useEffect(() => {
// Fetch the slides data from the Strapi API
fetch(`${import.meta.env.VITE_STRAPI_URL}/api/slides?populate=*`, {
method: "GET",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
})
.then((res) => res.json())
.then((resp) => {
const data = resp.data;
console.log(data);
// Map the fetched data to the SlideComponent format
let slides: SlideComponent[] = data.map((slide: any) => {
console.log(slide);
console.log(slide.attributes.background.data[0].attributes.name);
return {
background: slide.attributes.background.data[0].attributes.name,
description: slide.attributes.description,
};
});
setSlides(slides); // Update the slides state
});
}, []);

// Function to move to the next slide
const nextSlide = () => {
setSlide(slide > slides.length - 2 ? 0 : slide + 1);
};

return (
<div className="mt-8 mx-auto w-3/4 px-8 justify-center">
<div>
<IonCard className={`testimonial-background slider-2 `}>
{slides.length > 0 && (
<>
<img
src={slides[slide].background}
alt="slide"
className="object-cover shrink-0 min-w-full blur-[2px] brightness-50 min-h-[115%] "
/>
<IonCardSubtitle
className="md:text-lg lg:text-2xl xl:text-3xl text-l w-full md:w-3/4"
style={{
color: "white",
fontWeight: "bold",
textAlign: "center",
position: "absolute",
top: "50%",
left: "50%",
transform: "translate(-50%, -50%)",
}}
>
{slides[slide].description}
</IonCardSubtitle>
<IonButton
className="absolute bottom-[0.5rem] right-[0.5rem] justify-end w-[4rem] h-[3rem] "
onClick={nextSlide}
color="light"
size="small"
shape="round"
style={{
"--box-shadow": "none",
"--ripple-color": "transparent",
transition: "width 2s, height 4s",
}}
>
<IonIcon
size="large"
icon={arrowForwardOutline}
style={{ color: "red" }}
/>
</IonButton>
</>
)}
</IonCard>
</div>
</div>
);
}
9 changes: 7 additions & 2 deletions src/components/NewHero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,21 @@ export default function NewHero() {
className="absolute lg:block hidden w-[30%] h-auto z-0 left-[60rem] top-[-26rem]"
alt="Rectangle"
/>
<img
src="pic4.png"
className="absolute lg:block hidden w-[30%] h-auto z-0 left-[60rem] top-[-26rem]"
alt="Rectangle"
/>

<div className="flex relative translate-x-[-50%] lg:left-2/3 left-[55%] lg:top-[-10rem] top-[-8rem]">
<div className="flex relative translate-x-[-50%] lg:left-2/3 left-[55%] lg:top-[-10rem] top-[-8rem] mb-40">
<img
src="pic1.png"
className="absolute lg:w-auto w-[45%] h-auto z-0 lg:top-[5rem] top-[7rem]"
alt="Rectangle"
/>
<img
src="pic2.png"
className="absolute lg:w-auto w-[60%] h-auto z-10 lg:left-[19rem] left-[35%] lg:top-[14rem] top-[9rem]"
className="absolute lg:w-auto w-[60%] h-auto z-10 lg:left-[19rem] left-[35%] lg:top-[14rem] top-[8rem]"
alt="Rectangle"
/>
<img
Expand Down
2 changes: 1 addition & 1 deletion src/components/PaddedHeaderText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default function PaddedHeaderText() {
<div>
<div className="flex flex-col justify-center items-center min-h-screen px-12 md:px-0">
<div className="p-4 max-w-4xl w-full">
<h1 className="text-[#101066] font-bold text-4xl sm:text-5xl md:text-6xl lg:text-7xl tracking-tight leading-none mb-4">
<h1 className="text-[#101066] font-bold text-4xl sm:text-5xl md:text-6xl lg:text-7xl tracking-tight leading-none mb-4 ">
Supporting Teen Mental Health
</h1>
<br />
Expand Down
Loading