Skip to content

Commit

Permalink
Update 31-01-2024 (#125)
Browse files Browse the repository at this point in the history 
* page init

* remove borders

* add paginator

* add paginator

* Add Paginatoor

* tablet design update

* add text color to Join community btn

* delete EventAbout.css file

* comment out resources navlinks

* resolve conflicts

* set max-width to 1440px

* init blog formatting

* format blogs page

* add line-clamp to podCard title&desc

* return categories

* add blog search functionality

* prevent blogWrapper.css styles affecting other components

* add text-primary & bg in global.css

* style code on blog body

* wrap no result in a p tag

* init pageNotFound

* import 404 image

* complete page not found page

* import formatDistanceToNow (#100)

* refactor service section

* change param to title_slug

* filter blogs by categories

* make blog categories scrollable

* span components on the landing page

* add download attribute internship document

* fix route

* fetch related blogs on blog page

* refetch on page change

* add error img

* add condition filtering to cat

* add loader to blog page

* build error500 mobile page

* build error500 web page

* remove img border

* error 400 page build

* error 400 page build

* error 403 page build

* reinsert 404 page

* remove 403 route

* removed unbuilt routes

* Filter out recurring current blog on related blogs fetched.

* Add error500 svg img

* Dev resolve conflict (#106)

* Update Dev (#96)

* -

* remove and refactor code

* import useQuery

* make navlinks active

* delete NavLink component

* set max-width on pages

---------

Co-authored-by: felixNyalenda <felixasejunior@gmail.com>
Co-authored-by: Jimmy Oty <oduorjames@hotmail.com>

* Update 05-01-24 (#99)

* init blog formatting

* format blogs page

* add line-clamp to podCard title&desc

* return categories

* add blog search functionality

* prevent blogWrapper.css styles affecting other components

* add text-primary & bg in global.css

* style code on blog body

* wrap no result in a p tag

---------

Co-authored-by: felixNyalenda <felixasejunior@gmail.com>

* Update 05-01-24  Beta (#101)

* init blog formatting

* format blogs page

* add line-clamp to podCard title&desc

* return categories

* add blog search functionality

* prevent blogWrapper.css styles affecting other components

* add text-primary & bg in global.css

* style code on blog body

* wrap no result in a p tag

* import formatDistanceToNow (#100)

---------

Co-authored-by: felixNyalenda <felixasejunior@gmail.com>

---------

Co-authored-by: SpaceYaTech <139357796+spaceyatech-org@users.noreply.github.com>
Co-authored-by: Jimmy Oty <oduorjames@hotmail.com>

* remove duplicate

* create error routes

* re-route to error-pages

* Add related blogs header

* conditionally render related blogs

* conditionally render related blogs

* resize subscription form on small screens

* style: fixed styles on landing page

* refactor: added temp API statements

* refactor: added single order endpoint

* rename related blogs header to related articles

* gallery init

* add dummy photos

* reformat event dates

* format date on the events page

* remove console logs

* add Loader

* remove parse

* Add blog liking functionality

* add hover effect

* Hotfix 0.1 broken events page (#113)

* Update date attribute name

* Uncomment blocked single events page

* use grid to render images

* add overflow to events container

* add wrap on Events cities filter for mobile

* add more photos

* change id number

* data syt photos

* refactor: add gallery footer link

* add error boundary

* add fetch-blog

* set p tags font sizes

* error500 import

* Update 'date' variable to 'start_date'

* Remove console log statement

* Update src/APP/pages/aboutUs/sections/PartnerCTA.jsx

* Update src/APP/pages/aboutUs/sections/PartnerCTA.jsx

Co-authored-by: Sonia Lomo <49971500+sonylomo@users.noreply.github.com>

* remove the justify-between on events display

* replace Link tags with a tags on error pages

* add pattern attr to phone input

* add colabs cover

* refactor: added resources route

* commented out resources page

---------

Co-authored-by: felixNyalenda <felixasejunior@gmail.com>
Co-authored-by: Jimmy Oty <76045766+JimmyOty@users.noreply.github.com>
Co-authored-by: Collins Kasyoki <collinskasyoki@gmail.com>
Co-authored-by: SpaceYaTech <139357796+spaceyatech-org@users.noreply.github.com>
Co-authored-by: sonylomo <sonylomo1@gmail.com>
Co-authored-by: Sonia Lomo <49971500+sonylomo@users.noreply.github.com>
  • Loading branch information
@JimmyTron @Ase020
@JimmyOty @collinskasyoki @spaceyatech-org @sonylomo
7 people authored Feb 6, 2024
1 parent 6770184 commit 4e640d3
Show file tree
Hide file tree
Showing 30 changed files with 1,116 additions and 863 deletions.
1,145 changes: 572 additions & 573 deletions src/ADMIN/pages/events/AddEventPage.jsx
View file

Large diffs are not rendered by default.

234 changes: 117 additions & 117 deletions src/APP/components/Header2.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,117 +1,117 @@
import { useState } from "react";
import { Link, useLocation } from "react-router-dom";

import logo from "../../assets/images/sytLogo.png";
import menu from "../../assets/images/hamburger-menu.svg";

const navLinks = [
{
id: 1,
link: "Home",
route: "/",
},
{
id: 2,
link: "About Us",
route: "/about-us",
},
{
id: 3,
link: "Community",
route: "/community",
},
{
id: 4,
link: "Products",
route: "/products",
},
{
id: 5,
link: "Blogs",
route: "/blogs",
},
// {
// id: 6,
// link: "Resources",
// route: "/resources",
// },
// {
// id: 7,
// link: "Shop",
// route: "/shop",
// },
// {
// id: 8,
// link: "Donate",
// route: "/donate",
// },
];

const Header2 = () => {
const [showNavlinks, setShowNavlinks] = useState(false);

const { pathname } = useLocation();

return (
<header className="py-5 md:px-10 px-5 flex items-center justify-between md:shadow-none shadow-md relative max-w-[1440px] md:mx-auto">
{/* logo */}
<Link to="/">
<img src={logo} alt="logo" className="md:w-16 w-12" />
</Link>

{/* mobile menu */}
<img
src={menu}
alt="logo"
className="md:hidden"
onClick={() => setShowNavlinks((prev) => !prev)}
/>

{/* mobile navlinks */}
<nav
className="flex flex-col items-start justify-start gap-6 text-base absolute top-[90px] left-0 bg-white border-b w-full h-fit z-[1] p-5 pl-12"
style={
showNavlinks
? { display: "flex", height: "calc(100vh - 90px)" }
: { display: "none" }
}
>
{navLinks.map(({ link, id, route }) => {
const isActive = pathname === route;
return (
<Link
key={id}
className={`${
isActive ? "text-primary underline" : "text-gray-900"
} hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
to={`${route}`}
onClick={() => setShowNavlinks(false)}
>
{link}
</Link>
);
})}
</nav>

{/* navlinks */}
<nav className="md:flex hidden items-center gap-5 text-base">
{navLinks.map(({ id, link, route }) => {
const isActive = pathname === route;
return (
<Link
key={id}
className={`${
isActive ? "text-primary underline" : "text-gray-900"
} hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
to={`${route}`}
>
{link}
</Link>
);
})}
</nav>
</header>
);
};

export default Header2;
import { useState } from "react";
import { Link, useLocation } from "react-router-dom";

import logo from "../../assets/images/sytLogo.png";
import menu from "../../assets/images/hamburger-menu.svg";

const navLinks = [
{
id: 1,
link: "Home",
route: "/",
},
{
id: 2,
link: "About Us",
route: "/about-us",
},
{
id: 3,
link: "Community",
route: "/community",
},
{
id: 4,
link: "Products",
route: "/products",
},
{
id: 5,
link: "Blogs",
route: "/blogs",
},
// {
// id: 6,
// link: "Resources",
// route: "/resources",
// },
// {
// id: 7,
// link: "Shop",
// route: "/shop",
// },
// {
// id: 8,
// link: "Donate",
// route: "/donate",
// },
];

const Header2 = () => {
const [showNavlinks, setShowNavlinks] = useState(false);

const { pathname } = useLocation();

return (
<header className="py-5 md:px-10 px-5 flex items-center justify-between md:shadow-none shadow-md relative max-w-[1440px] md:mx-auto">
{/* logo */}
<Link to="/">
<img src={logo} alt="logo" className="md:w-16 w-12" />
</Link>

{/* mobile menu */}
<img
src={menu}
alt="logo"
className="md:hidden"
onClick={() => setShowNavlinks((prev) => !prev)}
/>

{/* mobile navlinks */}
<nav
className="flex flex-col items-start justify-start gap-6 text-base absolute top-[90px] left-0 bg-white border-b w-full h-fit z-[1] p-5 pl-12"
style={
showNavlinks
? { display: "flex", height: "calc(100vh - 90px)" }
: { display: "none" }
}
>
{navLinks.map(({ link, id, route }) => {
const isActive = pathname === route;
return (
<Link
key={id}
className={`${
isActive ? "text-primary underline" : "text-gray-900"
} hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
to={`${route}`}
onClick={() => setShowNavlinks(false)}
>
{link}
</Link>
);
})}
</nav>

{/* navlinks */}
<nav className="md:flex hidden items-center gap-5 text-base">
{navLinks.map(({ id, link, route }) => {
const isActive = pathname === route;
return (
<Link
key={id}
className={`${
isActive ? "text-primary underline" : "text-gray-900"
} hover:text-primary hover:underline transition-all duration-300 cursor-pointer`}
to={`${route}`}
>
{link}
</Link>
);
})}
</nav>
</header>
);
};

export default Header2;
5 changes: 2 additions & 3 deletions src/APP/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Homepage from "./pages/shop/Homepage";
import SingleItemPage from "./pages/shop/pages/SingleItemPage";
import Layout from "./pages/Layout";
import Products from "./pages/products2/Products";
import Resources from "./pages/resources/Resources";
import Resources from "./pages/resources2/Resources";

import Checkout from "./pages/shop/pages/OrderSummary";

Expand All @@ -26,10 +26,10 @@ import Error404 from "./pages/errorPages/Error404";
import Error500 from "./pages/errorPages/Error500";

import ErrorBoundary from "./pages/errorPages/ErrorBoundary";

import ProductDisplay from "./pages/shop/pages/ProductDisplay";
import GalleryPage from "./pages/gallery/GalleryPage";


export {
LandingPage,
Homepage,
Expand All @@ -56,5 +56,4 @@ export {
ErrorBoundary,
ProductDisplay,
GalleryPage,

};
3 changes: 2 additions & 1 deletion src/APP/pages/aboutUs/sections/LeadershipSection.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,9 @@ function LeadershipSection() {
/>

<input
type="telephone"
type="tel"
placeholder="Phone number"
pattern="[0-9\s]{10,13}"
required
className="w-full outline-none text-base font-normal placeholder:text-gray-600 border border-[#79747E] rounded-[4px] pl-4 py-2"
value={phoneNumber}
Expand Down
1 change: 0 additions & 1 deletion src/APP/pages/aboutUs/sections/PartnerCTA.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ function PartnerCTA() {
<p>
<a
href="/src/assets/reports/spaceyatech-internship-program.pdf"
download="SpaceYaTech_Internship_Program_2023.pdf"
target="_blank"
rel="noopener noreferrer"
className="text-primary text-sm sm:text-base"
Expand Down
7 changes: 2 additions & 5 deletions src/APP/pages/blog/Blog.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@

import React from "react";
import React, { useEffect } from "react";
import { useParams, useNavigate } from "react-router-dom";


import BlogWrapper from "./sections/BlogWrapper";
import RelatedBlogs from "./sections/RelatedBlogs";
import { Loader } from "../../components";
Expand All @@ -14,7 +11,7 @@ function Blog() {
const navigate = useNavigate();
const {
data: blogData,

refetch: refetchBlogData,
isLoading,
isError,
isSuccess,
Expand Down
Loading

0 comments on commit 4e640d3

Please sign in to comment.