Skip to content

Commit

Permalink
Merge branch 'Dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JimmyTron authored Apr 30, 2024
2 parents e3e8df2 + 299c7b7 commit b3568ea
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 37 deletions.
19 changes: 19 additions & 0 deletions src/APP/components/ViewMoreBtn.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from "react";
import { Link } from "react-router-dom";

import { arrowRight } from "@/assets/images/icons";

function ViewMoreBtn({ link }) {
return (
<Link to={link} className="border rounded-full bg-white p-1 w-fit">
<div className="flex-center bg-green-light rounded-full px-3 py-1.5 gap-2">
<span className="capitalize text-green-header text-sm font-semibold">
Learn more
</span>
<img src={arrowRight} alt="arrow-right" className="size-5" />
</div>
</Link>
);
}

export default ViewMoreBtn;
2 changes: 1 addition & 1 deletion src/APP/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ export { default as GoBackBtn } from "./GoBackBtn";
export { default as Header } from "./Header";
export { default as Loader } from "./Loader";
export { default as PodcastCard } from "./PodcastCard";
export { default as LandingWrapper } from "./LandingWrapper";
export { default as LandingWrapper } from "./LandingWrapper";
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ function SingleEvent() {
);
}

export default SingleEvent;
export default SingleEvent;
22 changes: 0 additions & 22 deletions src/APP/pages/community/sections/gallerySection/GallerySection.jsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,8 @@
/* eslint-disable react/prop-types */
import { LazyLoadImage } from "react-lazy-load-image-component";
import { Link } from "react-router-dom";
// import {
// galleryimage1,
// galleryimage2,
// galleryimage3,
// galleryimage4,
// galleryimage5,
// galleryimage6,
// galleryimage7,
// galleryimage8,
// galleryimage9,
// } from "../../../../../assets/images/community";
import { arrowRight } from "../../../../../assets/images/icons";
import photosData from "../../../gallery/data";

// const photos = [
// { image: galleryimage1 },
// // { image: galleryimage2 },
// // { image: galleryimage3 },
// { image: galleryimage4 },
// { image: galleryimage5 },
// { image: galleryimage6 },
// { image: galleryimage7 },
// { image: galleryimage8 },
// ];
function GallerySection() {
return (
<div className="pb-10 sm:pb-24 text-center">
Expand Down
6 changes: 4 additions & 2 deletions src/APP/pages/events/sections/eventsSection/Events.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ import {
// globe,
// } from "../../../../../assets/images/icons";


function Events({ events }) {
// const formattedDate = format(parseISO(start_date), "do, MMMM");
// import formatEventDates from "../../../../../utilities/formatEventDate";
// import { LazyLoadImage } from "react-lazy-load-image-component";


return (
<div
Expand Down Expand Up @@ -82,7 +86,6 @@ function Events({ events }) {
// </p>
// </div>
// </div>

// <div className="p-5 w-full bg-white rounded-b-lg space-y-4">
// <div className="flex flex-between">
// <div className="space-y-4">
Expand All @@ -94,7 +97,6 @@ function Events({ events }) {
// />
// {format(parseISO(start_date), "do, MMMM")}
// </p>

// <p className="flex gap-2 items-center">
// <LazyLoadImage
// src={globe}
Expand Down
3 changes: 0 additions & 3 deletions src/APP/pages/events/sections/eventsSection/EventsSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import useTopEvents from "../../../../../hooks/Queries/eventsSection/useTopEvent
import { Loader } from "../../../../components";
import Error500 from "../../../errorPages/Error500";
import Events from "./Events";
import { LazyLoadImage } from "react-lazy-load-image-component";
import { Link } from "react-router-dom";
import { arrowRight } from "../../../../../assets/images/icons";
function EventsSection({ showTabs, showAllEventsLink }) {
const [filters, setFilters] = useState({});

Expand Down
1 change: 0 additions & 1 deletion src/APP/pages/gallery/sections/ImageCardss.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function ImageCard({ photo }) {
className="aspect-video object-cover"
loading="lazy"
/>

<div className="absolute top-0 right-0 w-full h-full flex opacity-0 transition-all duration-500 ease-linear hover:opacity-100">
<div className="bg-transparent w-1/2 h-full" />
<div className="bg-[#00664E] text-white w-1/2 h-full flex items-center justify-center flex-col gap-2">
Expand Down
3 changes: 1 addition & 2 deletions src/APP/pages/landingPage/sections/CTASection.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/* eslint-disable import/extensions */
/* eslint-disable import/no-unresolved */
import React, { useState } from "react";

import JoinSYTModal from "../../community/sections/JoinSYTModal";
import { bannerImg } from "@/assets/images/hero-section";

import { bannerImg } from "@/assets/images/hero-section";
function CTASection() {
const [isOpen, setIsOpen] = useState(false);

Expand Down
1 change: 1 addition & 0 deletions src/APP/pages/landingPage/sections/HeroSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ function HeroSection() {

{/* Image Section */}
<JoinSYTModal isOpen={isOpen} closeModal={closeModal} />

</section>
);
}
Expand Down
1 change: 0 additions & 1 deletion src/APP/pages/landingPage/sections/OurEvents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import Error500 from "../../errorPages/Error500";
import useTopEvents from "@/hooks/Queries/eventsSection/useTopEvents";
import { LazyLoadImage } from "react-lazy-load-image-component";
import { error500svg } from "../../../../assets/images/errorPages";

function OurEvents() {
const {
data: topEvents,
Expand Down
3 changes: 1 addition & 2 deletions src/APP/pages/landingPage/sections/WhatWeDo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
/* eslint-disable import/no-unresolved */
/* eslint-disable react/prop-types */
import React from "react";

import { LazyLoadImage } from "react-lazy-load-image-component";
import { Button } from "../../../components";
import { whatWeDoData } from "../data";

function WhatWeDo() {
return (
<section className="max-w-1440 w-full mx-auto flex flex-col items-center gap-8 pt-2">
Expand Down Expand Up @@ -51,6 +49,7 @@ function WhatWeDoCard({ card, index }) {
{description}
</p>


<Button link={link} title="View More" />
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/assets/images/aboutPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ export {
LittleMore,
PartnerWithUs,
featuredEvent,
};
};
2 changes: 1 addition & 1 deletion src/assets/images/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import teams from "./teams.svg";
import greyTwitter from "./twitter-grey.svg";
import upleft from "./up-left.svg";
import upleftGreen from "./upleft-green.svg";

export {
arrowRight,
bellIcon,
Expand All @@ -48,4 +47,5 @@ export {
clock,
sytLogoWhite,
sytLogoGreen,

};
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default {
content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
theme: {
extend: {

fontFamily: {
spaceGrotesk: ["Space Grotesk", "sans-serif"],
poppins: ["Poppins", "sans-serif"],
Expand Down

0 comments on commit b3568ea

Please sign in to comment.