Skip to content

Commit

Permalink
Merge pull request #97 from LUISEDOCCOR/404-page
Browse files Browse the repository at this point in the history 
Page 404 resolving conflicts
  • Loading branch information
@afordigital
afordigital authored Apr 8, 2024
2 parents 04e54f5 + 34e0221 commit 4b9e9bc
Show file tree
Hide file tree
Showing 4 changed files with 258 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect } from 'react';
import { ROUTE } from '@common';
import { Home } from '@pages/Home';
import { NotFound } from '@pages/NotFound/NotFound';
import { Projects } from '@pages/Projects/Projects';
import { Registration } from '@pages/Registration/Registration';
import { supabase } from '@utils';
Expand Down Expand Up @@ -48,6 +49,7 @@ function App() {
<Route path={ROUTE.home} element={<Home />} />
<Route path={ROUTE.projects} element={<Projects />} />
<Route path={ROUTE.registration} element={<Registration />} />
<Route path={ROUTE.notFound} element={<NotFound />} />
</Routes>
</>
);
Expand Down
3 changes: 2 additions & 1 deletion src/common/constants/routes.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export const ROUTE = {
home: '/',
projects: '/projects',
registration: '/registration'
registration: '/registration',
notFound: '*'
};
203 changes: 203 additions & 0 deletions src/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@
);

/* Carousel config end */

/* Hamster config start */

--bg: hsl(90,90%,20%);
--fg: hsl(223,10%,10%);

/* Hamster config end */
}

* {
Expand Down Expand Up @@ -367,3 +374,199 @@ body {
stroke-width: 1;
}
}

/************************************************/
/* HAMSTER CLASSES */
/************************************************/
.wheel-and-hamster {
--dur: 1s;
position: relative;
width: 12em;
height: 12em;
}
.wheel,
.hamster,
.hamster div,
.spoke {
position: absolute;
}
.wheel,
.spoke {
border-radius: 50%;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.wheel {
background: radial-gradient(100% 100% at center,hsla(0,0%,60%,0) 47.8%,hsl(0,0%,60%) 48%);
z-index: 2;
}
.hamster {
animation: hamster var(--dur) ease-in-out infinite;
top: 50%;
left: calc(50% - 3.5em);
width: 7em;
height: 3.75em;
transform: rotate(4deg) translate(-0.8em,1.85em);
transform-origin: 50% 0;
z-index: 1;
}
.hamster__head {
animation: hamsterHead var(--dur) ease-in-out infinite;
background: hsl(30,90%,55%);
border-radius: 70% 30% 0 100% / 40% 25% 25% 60%;
box-shadow:
0 -0.25em 0 hsl(30,90%,80%) inset,
0.75em -1.55em 0 hsl(30,90%,90%) inset;
top: 0;
left: -2em;
width: 2.75em;
height: 2.5em;
transform-origin: 100% 50%;
}
.hamster__ear {
animation: hamsterEar var(--dur) ease-in-out infinite;
background: hsl(0,90%,85%);
border-radius: 50%;
box-shadow: -0.25em 0 hsl(30,90%,55%) inset;
top: -0.25em;
right: -0.25em;
width: 0.75em;
height: 0.75em;
transform-origin: 50% 75%;
}
.hamster__eye {
animation: hamsterEye var(--dur) linear infinite;
background-color: hsl(0,0%,0%);
border-radius: 50%;
top: 0.375em;
left: 1.25em;
width: 0.5em;
height: 0.5em;
}
.hamster__nose {
background: hsl(0,90%,75%);
border-radius: 35% 65% 85% 15% / 70% 50% 50% 30%;
top: 0.75em;
left: 0;
width: 0.2em;
height: 0.25em;
}
.hamster__body {
animation: hamsterBody var(--dur) ease-in-out infinite;
background: hsl(30,90%,90%);
border-radius: 50% 30% 50% 30% / 15% 60% 40% 40%;
box-shadow:
0.1em 0.75em 0 hsl(30,90%,55%) inset,
0.15em -0.5em 0 hsl(30,90%,80%) inset;
top: 0.25em;
left: 2em;
width: 4.5em;
height: 3em;
transform-origin: 17% 50%;
transform-style: preserve-3d;
}
.hamster__limb--fr,
.hamster__limb--fl {
clip-path: polygon(0 0,100% 0,70% 80%,60% 100%,0% 100%,40% 80%);
top: 2em;
left: 0.5em;
width: 1em;
height: 1.5em;
transform-origin: 50% 0;
}
.hamster__limb--fr {
animation: hamsterFRLimb var(--dur) linear infinite;
background: linear-gradient(hsl(30,90%,80%) 80%,hsl(0,90%,75%) 80%);
transform: rotate(15deg) translateZ(-1px);
}
.hamster__limb--fl {
animation: hamsterFLLimb var(--dur) linear infinite;
background: linear-gradient(hsl(30,90%,90%) 80%,hsl(0,90%,85%) 80%);
transform: rotate(15deg);
}
.hamster__limb--br,
.hamster__limb--bl {
border-radius: 0.75em 0.75em 0 0;
clip-path: polygon(0 0,100% 0,100% 30%,70% 90%,70% 100%,30% 100%,40% 90%,0% 30%);
top: 1em;
left: 2.8em;
width: 1.5em;
height: 2.5em;
transform-origin: 50% 30%;
}
.hamster__limb--br {
animation: hamsterBRLimb var(--dur) linear infinite;
background: linear-gradient(hsl(30,90%,80%) 90%,hsl(0,90%,75%) 90%);
transform: rotate(-25deg) translateZ(-1px);
}
.hamster__limb--bl {
animation: hamsterBLLimb var(--dur) linear infinite;
background: linear-gradient(hsl(30,90%,90%) 90%,hsl(0,90%,85%) 90%);
transform: rotate(-25deg);
}
.hamster__tail {
animation: hamsterTail var(--dur) linear infinite;
background: hsl(0,90%,85%);
border-radius: 0.25em 50% 50% 0.25em;
box-shadow: 0 -0.2em 0 hsl(0,90%,75%) inset;
top: 1.5em;
right: -0.5em;
width: 1em;
height: 0.5em;
transform: rotate(30deg) translateZ(-1px);
transform-origin: 0.25em 0.25em;
}
.spoke {
animation: spoke var(--dur) linear infinite;
background:
radial-gradient(100% 100% at center,hsl(0,0%,60%) 4.8%,hsla(0,0%,60%,0) 5%),
linear-gradient(hsla(0,0%,55%,0) 46.9%,hsl(0,0%,65%) 47% 52.9%,hsla(0,0%,65%,0) 53%) 50% 50% / 99% 99% no-repeat;
}

/* Animations */
@keyframes hamster {
from, to { transform: rotate(4deg) translate(-0.8em,1.85em); }
50% { transform: rotate(0) translate(-0.8em,1.85em); }
}
@keyframes hamsterHead {
from, 25%, 50%, 75%, to { transform: rotate(0); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(8deg); }
}
@keyframes hamsterEye {
from, 90%, to { transform: scaleY(1); }
95% { transform: scaleY(0); }
}
@keyframes hamsterEar {
from, 25%, 50%, 75%, to { transform: rotate(0); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(12deg); }
}
@keyframes hamsterBody {
from, 25%, 50%, 75%, to { transform: rotate(0); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(-2deg); }
}
@keyframes hamsterFRLimb {
from, 25%, 50%, 75%, to { transform: rotate(50deg) translateZ(-1px); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(-30deg) translateZ(-1px); }
}
@keyframes hamsterFLLimb {
from, 25%, 50%, 75%, to { transform: rotate(-30deg); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(50deg); }
}
@keyframes hamsterBRLimb {
from, 25%, 50%, 75%, to { transform: rotate(-60deg) translateZ(-1px); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(20deg) translateZ(-1px); }
}
@keyframes hamsterBLLimb {
from, 25%, 50%, 75%, to { transform: rotate(20deg); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(-60deg); }
}
@keyframes hamsterTail {
from, 25%, 50%, 75%, to { transform: rotate(30deg) translateZ(-1px); }
12.5%, 37.5%, 62.5%, 87.5% { transform: rotate(10deg) translateZ(-1px); }
}
@keyframes spoke {
from { transform: rotate(0); }
to { transform: rotate(-1turn); }
}
51 changes: 51 additions & 0 deletions src/pages/NotFound/NotFound.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { ButtonSize, ROUTE, Variant } from '@common';
import { Background, Button } from '@components';
import { RootLayout } from '@layouts';
import { Link } from 'react-router-dom';

export const NotFound = () => {
return (
<RootLayout>
<Background />
<main className="relative w-full z-10 text-cWhite font-dmsans">
<section className="container mx-auto px-5 max-w-7xl mx-auto grid md:grid-cols-[1fr_.4fr] place-items-center place-content-center h-[100svh]">
<article className="grid gap-4 text-shadow-md px-5">
<h1 className="text-7xl font-semibold">Error 404</h1>
<h2 className="text-4xl font-semibold">PÁGINA NO ENCONTRADA</h2>
<p className="text-3xl">
¡Hola! Lo sentimos, pero no pudimos encontrar lo que buscabas. Verifica que la dirección URL sea correcta
</p>
<Link to={ROUTE.home}>
<Button size={ButtonSize.xl} variant={Variant.ghost} onClick={() => {}} className="flex gap-2 items-center">
<span>IR A INICIO</span>
<div className="i-lucide:arrow-up-right w-8 h-8 bg-gradient-to-rb from-primary-600 to-secondary-500" />
</Button>
</Link>
</article>

<article className="hidden md:block">
{/* https://codepen.io/jkantner/pen/wvqeXrQ */}
<div className="wheel-and-hamster" role="img" aria-label="Orange and tan hamster running in a metal wheel">
<div className="wheel"></div>
<div className="hamster">
<div className="hamster__body">
<div className="hamster__head">
<div className="hamster__ear"></div>
<div className="hamster__eye"></div>
<div className="hamster__nose"></div>
</div>
<div className="hamster__limb hamster__limb--fr"></div>
<div className="hamster__limb hamster__limb--fl"></div>
<div className="hamster__limb hamster__limb--br"></div>
<div className="hamster__limb hamster__limb--bl"></div>
<div className="hamster__tail"></div>
</div>
</div>
<div className="spoke"></div>
</div>
</article>
</section>
</main>
</RootLayout>
);
};

0 comments on commit 4b9e9bc

Please sign in to comment.