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.

Sign up for GitHub

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

Error404 page #166

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
+108 −66
Open

Error404 page #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1249ca0
routing 404-page
hokageCodes Dec 5, 2022
979c79e
Changed button text on error page and routed footer logo to go to home
hokageCodes Dec 5, 2022
33def30
changed our misson text and link to route to resources page
hokageCodes Dec 5, 2022
7444c9a
update
hokageCodes Dec 5, 2022
e2c5ad7
izz going now o
hokageCodes Dec 5, 2022
ee5c5df
scroll to top on route component/function added
hokageCodes Dec 5, 2022
c2c1b51
fix?
hokageCodes Dec 5, 2022
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
155 changes: 92 additions & 63 deletions frontend/src/components/Footer/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import logoUpdate from '../../assets/logoUpdate.svg';

const aboutUsData = [
{
name: 'Our Mission',
path: '/aboutus',
name: 'Resources',
path: '/resources',
},
{
name: 'Our Vision',
Expand Down Expand Up @@ -52,71 +52,100 @@ const resourcesData = [
// removed according to new design ];

const Footer = () => (
<footer className='bg-[#D1E9FF] px-0 py-0'>
<div className="w-full flex flex-col max-w-[1440px] mx-auto max-md:flex-col-reverse max-md:justify-center max-md:items-center max-md:py-8 md:flex-row justify-between xl:py-[136px] max-xl:py-[81px] max-xl:px-[80px] xl:px-[160px]">

<div>
<figure className='flex flex-col max-md:h-[25px] max-md:mt-10'>
<img className='w-full h-full' src={logoUpdate} alt="Company logo" />
{/* <p className='font-semibold text-[40px] leading-[50px]'>reconcile.<span className='text-[#2E90FA]'>AI</span></p> */}
</figure>
{/* <div className="pt-[4px] mb-[18px] w-[230px]">
<p className="text-[#344054] font-normal text-[16px] xl:text-[20px]">
This is a website that can help you balance your sales account
</p>
</div> removed According to new design */ }
<div className="text-[#98A2B3] flex items-center gap-6 mt-6 max-md:justify-center">
<BsTwitter className='max-md:w-5' size={34} />
<BsFacebook className='max-md:w-5' size={34} />
<BsInstagram className='max-md:w-5' size={34} />
<footer className="bg-[#D1E9FF] py-[5em] md:py-[12em]">
<div className="flex flex-col-reverse justify-center items-center lg:items-start lg:flex-row lg:justify-between w-9/12 mx-auto gap-[4em] lg:gap-0 align-top">
<div className="flex flex-col justify-center lg:max-w-[20%] align-center lg:justify-start gap-[0.5rem] lg:gap-6">
<Link to="/">
<figure className="flex justify-start items-center flex-col lg:items-start">
<img
className="w-8/12 lg:w-10/12"
src={logoUpdate}
alt="Company logo"
/>
</figure>
</Link>

<div className="hidden text-[#98A2B3] lg:flex justify-center lg:justify-start items-center gap-6 mt-6">
<BsTwitter size={24} />
<BsFacebook size={24} />
<BsInstagram size={24} />
</div>

<div className="text-[#98A2B3] flex justify-center lg:justify-start items-center gap-6 mt-6 lg:hidden">
<BsTwitter size={20} />
<BsFacebook size={20} />
<BsInstagram size={20} />
</div>
</div>

{/* About us Tab */}
<div className="flex flex-col pt-[10px] xl:pt-0">
<h3 className="font-medium text-[#344054] text-[1.4em] md:text-[1.8em] text-center lg:text-left">
About Us
</h3>

<div className="flex flex-col gap-6 mt-6 text-center lg:text-left">
{aboutUsData.map((item) => (
<Link
key={uuid()}
to={item.path}
className="text-[#344054] text-[1.2em] md:text-[1.4em] text-center lg:text-left"
>
{item.name}
</Link>
))}
</div>
</div>

{/* Resources Tab */}
<div className="flex flex-col pt-[10px] xl:pt-0">
<h3 className="font-medium text-[#344054] text-[1.4em] text-center lg:text-left md:text-[1.8em]">
Resources
</h3>

<div className="flex flex-col gap-6 mt-6 text-center lg:text-left">
{resourcesData.map((item) => (
<Link
key={uuid()}
to={item.path}
className="text-[#344054] text-center lg:text-left md:text-[1.4em] text-[1.2em]"
>
{item.name}
</Link>
))}
</div>
</div>
</div>
<div className='flex justify-center max-md:text-center gap-[276px] max-md:flex-col px-10 max-lg:gap-8'>
<div className="flex flex-col">
<h3 className="font-medium text-[#101828] text-[18px] xl:text-[28px]">
About Us
</h3>
{aboutUsData.map((item) => (
<Link
to={item.path}
key={uuid()}
className="text-[#344054] font-normal text-[16px] xl:text-[20px] py-[4px]"
>
{item.name}
</Link>
))}
</div>
<div className="flex flex-col">
<h3 className="font-medium text-[#101828] text-[18px] xl:text-[28px]">
Resources
</h3>
{resourcesData.map((item) => (
<Link
key={uuid()}
to={item.path}
className="text-[#344054] font-normal text-[16px] xl:text-[20px] py-[4px]"
>
{item.name}
</Link>
))}
</div>
<div className="flex flex-col">
<h3 className="font-medium text-[#101828] text-[18px] xl:text-[28px]">
About Us
</h3>
{aboutUsData.map((item) => (
<Link
to={item.path}
key={uuid()}
className="text-[#344054] font-normal text-[16px] xl:text-[20px] py-[4px]"
>
{item.name}
</Link>
))}
</div>
<div className="flex flex-col">
<h3 className="font-medium text-[#101828] text-[18px] xl:text-[28px]">
Resources
</h3>
{resourcesData.map((item) => (
<Link
key={uuid()}
to={item.path}
className="text-[#344054] font-normal text-[16px] xl:text-[20px] py-[4px]"
>
{item.name}
</Link>
))}
</div>
</div>

{/* Removed according to new design <div className="flex flex-col pt-[10px] xl:pt-0">
<h3 className="font-medium text-[#344054] text-[18px] xl:text-[28px]">
Product
</h3>
{ProductData.map((item) => (
<Link
to={item.path}
key={uuid()}
className="text-[#344054] font-normal text-[16px] xl:text-[20px] py-[4px]"
>
{item.name}
</Link>
))}
</div> */}
</div>
</footer>
);

Expand Down
12 changes: 12 additions & 0 deletions frontend/src/components/ScrollToTop/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import {useEffect} from 'react'
import { useLocation } from 'react-router-dom';

export default function ScrollToTop() {
const { pathname } = useLocation();

useEffect(() => {
window.scrollTo(0, 0);

}, [pathname])
return null;
}
3 changes: 2 additions & 1 deletion frontend/src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import Privacy from './pages/Privacy';
// } from './pages/Dashboard/DashboardMain/UploadFile/Upload';

const router = createBrowserRouter([

{
path: '/',
element: <LandingPage />,
Expand Down Expand Up @@ -181,7 +182,7 @@ const router = createBrowserRouter([
element: <Privacy />,
},
{
path: '/*',
path: '*',
element: <Error404 />,
},
// {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Error404/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export default function Error404 () {
We could not find what you searched for. Try searching again
</p>
<a
className="py-[16px] px-[28px] w-[131px] h-[60px] bg-[#2E90FA] text-[#fff] rounded-[8px] shadow-[0_1px_2px_rgba(16, 24, 40, 0.05)] text-center"
className="py-[16px] px-[28px] w-[150px] h-[60px] bg-[#2E90FA] text-[#fff] rounded-[8px] shadow-[0_1px_2px_rgba(16, 24, 40, 0.05)] text-center"
href="https://reconcileai.hng.tech/"
>
Go Back
Go to Home
</a>
</div>
</div>
Expand Down