Skip to content

Commit

Permalink
Merge pull request #92 from SpaceyaTech/update-team
Browse files Browse the repository at this point in the history
Update team
  • Loading branch information
JimmyTron authored Dec 28, 2023
2 parents 46377bb + 09ddfee commit 86ced69
Show file tree
Hide file tree
Showing 20 changed files with 785 additions and 509 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-fast-marquee": "^1.6.2",
"react-hook-form": "^7.48.2",
"react-query": "^3.39.3",
"react-router-dom": "^6.11.2",
Expand Down
772 changes: 469 additions & 303 deletions src/ADMIN/pages/events/AddEventPage.jsx

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions src/APP/components/Footer2.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Link } from "react-router-dom";
import logo from "../../assets/images/sytLogo.png";
import backup from "../../assets/images/backup.svg";
// import backup from "../../assets/images/backup.svg";
import { linkedin, twitter, spotify } from "../../assets/images/socials";
import youtube from "../../assets/images/socials/youtube.svg";

Expand Down Expand Up @@ -68,10 +68,10 @@ function Footer2() {
<Link to="/about-us">About Us</Link>
</li>
<li>
<a href="/#faq">FAQs</a>
<Link to="/community">Community</Link>
</li>
<li>
<Link to="/community">Community</Link>
<a href="/products">Products</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -137,9 +137,7 @@ function Footer2() {

<div className="sm:mt-14 mt-10">
<h1 className="text-center text-[#00FFC3] my-4 md:my-8">
&copy;{" "}
{year}{" "}
SpaceYaTech | All Rights Reserved
&copy; {year} SpaceYaTech | All Rights Reserved
</h1>
</div>

Expand Down
3 changes: 1 addition & 2 deletions src/APP/components/PodcastCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ export default PodcastCard;

PodcastCard.propTypes = {
img: PropTypes.string.isRequired,
category: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
description: PropTypes.string.isRequired,
link: PropTypes.number.isRequired,
link: PropTypes.string.isRequired,
};
4 changes: 2 additions & 2 deletions src/APP/pages/aboutUs/sections/HeroSection.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";

import { aboutImg2, heroImg } from "../../../../assets/images/aboutPage";
import { about2, heroImg } from "../../../../assets/images/aboutPage";

function HeroSection() {
return (
Expand Down Expand Up @@ -30,7 +30,7 @@ function HeroSection() {
</div>
<div className="flex flex-col md:flex-row justify-between items-center md:my-20 min-h-96 px-4 md:px-0">
<div className="my-10">
<img src={aboutImg2} alt="space ya tech" />
<img src={about2} alt="space ya tech" />
</div>
<div className="leading-6 md:w-1/2 text-base space-y-4 md:pl-10">
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import React, { useEffect, useState } from "react";
// } from "../../../../../../assets/images/community";
import { Link, useParams } from "react-router-dom";
import { parse as parseDate, format } from "date-fns";
import parse from "html-react-parser"
import parse from "html-react-parser";
import Events from "../../../../events/sections/eventsSection/Events";
import { useOneEvent } from "../../../../../../hooks/Queries/singleEvent/useSingleEvent";
import { fetchEvents } from "../../../../../../hooks/Queries/eventsSection/useEventCategories";
Expand Down
271 changes: 141 additions & 130 deletions src/APP/pages/landingPage/sections/HeroSection3.jsx
Original file line number Diff line number Diff line change
@@ -1,130 +1,141 @@
import { Link } from "react-router-dom";
import {
ctfroom,
DevOps,
Kushite,
Propel,
bannerImg,
chimoney,
moringa,
osca,
reactke,
spheron,
cytonn,
} from "../../../../assets/images/hero-section";

const partners = [
{
id: 1,
img: ctfroom,
name: "ctfroom",
link: "https://ctfroom.com/",
},
{
id: 2,
img: DevOps,
name: "DevOps",
link: "https://twitter.com/nairobidevops",
},
{
id: 3,
img: Propel,
name: "Propel",
link: "https://propel.community/",
},
{
id: 4,
img: moringa,
name: "moringa",
link: "https://moringaschool.com/",
},
{
id: 5,
img: chimoney,
name: "chimoney",
link: "https://chimoney.io/",
},
{
id: 6,
img: Kushite,
name: "Kushite",
link: "https://icpkushite.com/",
},
{
id: 7,
img: osca,
name: "osca",
link: "https://oscafrica.org/",
},
{
id: 8,
img: cytonn,
name: "cytonn",
link: "#",
},
{
id: 9,
img: reactke,
name: "reactke",
link: "https://www.reactdevske.org/",
},
];

const HeroSection3 = () => {
return (
<section className="p-3 md:px-10 flex flex-col mx-auto gap-2 xl:max-w-[1440px]">
{/* Hero Header */}
<div className="flex flex-col-reverse md:flex-row items-center gap-8 md:gap-4">
{/* hero desc */}
<div className="flex-1 flex flex-col gap-6">
<h1 className="md:text-[40px] text-2xl leading-8 md:leading-normal font-medium text-gray-900 text-center md:text-left">
Accelerate your <span className="text-[#009975]">growth</span> and
unlock your potential in the tech ecosphere
</h1>
<p className="text-sm md:text-xl font-normal leading-relaxed text-center md:text-left">
The fastest growing Africa, open-source community looking to change
the way young Africans get started in technology.
</p>

<Link
to="/community"
preventScrollReset={true}
className="text-white bg-[#009975] border-0 py-3 px-8 focus:outline-none rounded-lg text-lg w-full md:w-fit text-center"
>
Join the community
</Link>
</div>

{/* hero img */}
<div className="flex-1">
<img
src={bannerImg}
alt="banner"
className="w-full h-full object-cover"
/>
</div>
</div>

{/* Partners */}
<div className="my-6 flex flex-col items-center gap-6">
<h2 className="text-3xl font-semibold">Our Partners</h2>

<p className="max-w-[832px] text-center text-base font-normal">
At SpaceYaTech, we thrive on innovation, knowledge and the support of
our dedicated partners. Join us in celebrating the companies and
individuals who make SpaceYaTech possible.
</p>

<div className="overflow-auto flex flex-row gap-14 md:px-3 w-full items-center">
{partners.map(({ id, img, name }) => (
// <a href={link} target="_blank" rel="noopener noreferrer">
<img src={img} className="object-cover" alt={name} key={id} />
// </a>
))}
</div>
</div>
</section>
);
};

export default HeroSection3;
import { Link } from "react-router-dom";
import Marquee from "react-fast-marquee";
import {
ctfroom,
DevOps,
Kushite,
Propel,
bannerImg,
chimoney,
moringa,
osca,
reactke,
spheron,
cytonn,
} from "../../../../assets/images/hero-section";

const partners = [
{
id: 1,
img: ctfroom,
name: "ctfroom",
link: "https://ctfroom.com/",
},
{
id: 2,
img: DevOps,
name: "DevOps",
link: "https://twitter.com/nairobidevops",
},
{
id: 3,
img: Propel,
name: "Propel",
link: "https://propel.community/",
},
{
id: 4,
img: moringa,
name: "moringa",
link: "https://moringaschool.com/",
},
{
id: 5,
img: chimoney,
name: "chimoney",
link: "https://chimoney.io/",
},
{
id: 6,
img: Kushite,
name: "Kushite",
link: "https://icpkushite.com/",
},
{
id: 7,
img: osca,
name: "osca",
link: "https://oscafrica.org/",
},
{
id: 8,
img: cytonn,
name: "cytonn",
link: "#",
},
{
id: 9,
img: reactke,
name: "reactke",
link: "https://www.reactdevske.org/",
},
];

const HeroSection3 = () => {
return (
<section className="p-3 md:px-10 flex flex-col mx-auto gap-2 xl:max-w-[1440px]">
{/* Hero Header */}
<div className="flex flex-col-reverse md:flex-row items-center gap-8 md:gap-4">
{/* hero desc */}
<div className="flex-1 flex flex-col gap-6">
<h1 className="md:text-[40px] text-2xl leading-8 md:leading-normal font-medium text-gray-900 text-center md:text-left">
Accelerate your <span className="text-[#009975]">growth</span> and
unlock your potential in the tech ecosphere
</h1>
<p className="text-sm md:text-xl font-normal leading-relaxed text-center md:text-left">
The fastest growing Africa, open-source community looking to change
the way young Africans get started in technology.
</p>

<Link
to="/community"
preventScrollReset={true}
className="text-white bg-[#009975] border-0 py-3 px-8 focus:outline-none rounded-lg text-lg w-full md:w-fit text-center"
>
Join the community
</Link>
</div>

{/* hero img */}
<div className="flex-1">
<img
src={bannerImg}
alt="banner"
className="w-full h-full object-cover"
/>
</div>
</div>

{/* Partners */}
<div className="my-6 flex flex-col items-center gap-6">
<h2 className="text-3xl font-semibold">Our Partners</h2>

<p className="max-w-[832px] text-center text-base font-normal">
At SpaceYaTech, we thrive on innovation, knowledge and the support of
our dedicated partners. Join us in celebrating the companies and
individuals who make SpaceYaTech possible.
</p>

<Marquee
className="overflow-auto flex flex-row gap-14 w-full items-center"
pauseOnHover
gradient
gradientColor="white"
gradientWidth={100}
>
{partners.map(({ id, img, name, link }) => (
<a href={link} target="_blank" rel="noopener noreferrer" key={id}>
<img
src={img}
className="object-cover max-w-none px-7"
alt={name}
/>
</a>
))}
</Marquee>
</div>
</section>
);
};

export default HeroSection3;
Loading

0 comments on commit 86ced69

Please sign in to comment.