Reapply "add fade to pages and canvas duration"
This reverts commit 92a78a1178.
This commit is contained in:
@@ -1,11 +1,14 @@
|
|||||||
import "./about.sass";
|
import "./about.sass";
|
||||||
import {lazy} from "react";
|
import {lazy} from "react";
|
||||||
import {ExternalLink} from "../router/Link";
|
import {ExternalLink} from "../router/Link";
|
||||||
|
import {motion} from "motion/react";
|
||||||
|
import {AnimateFade} from "../animations";
|
||||||
|
|
||||||
const About = lazy(() => import("./About.mdx"));
|
const About = lazy(() => import("./About.mdx"));
|
||||||
|
|
||||||
|
const main = AnimateFade();
|
||||||
export default function AboutPage() {
|
export default function AboutPage() {
|
||||||
return <main className="about-page">
|
return <motion.main initial={main.initial} animate={main.animate} className="about-page">
|
||||||
<div className="edge"/>
|
<div className="edge"/>
|
||||||
<section className="about-container">
|
<section className="about-container">
|
||||||
<About components={{
|
<About components={{
|
||||||
@@ -13,5 +16,5 @@ export default function AboutPage() {
|
|||||||
}}/>
|
}}/>
|
||||||
</section>
|
</section>
|
||||||
<div className="edge"/>
|
<div className="edge"/>
|
||||||
</main>
|
</motion.main>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,8 @@ $reader-bg: #27213C
|
|||||||
display: flex
|
display: flex
|
||||||
flex-direction: row
|
flex-direction: row
|
||||||
justify-content: center
|
justify-content: center
|
||||||
|
> img
|
||||||
|
min-width: 200px
|
||||||
|
|
||||||
|
|
||||||
.clothing>img
|
.clothing>img
|
||||||
|
|||||||
@@ -2,10 +2,12 @@ import {useArticle} from "./ArticleContext";
|
|||||||
import "./list.sass";
|
import "./list.sass";
|
||||||
import {ReactComponent as BoxSvg} from "../img/blog-box.svg";
|
import {ReactComponent as BoxSvg} from "../img/blog-box.svg";
|
||||||
import {Article, ARTICLES} from "./articles";
|
import {Article, ARTICLES} from "./articles";
|
||||||
|
import {motion} from "motion/react";
|
||||||
|
import {AnimateFade} from "../animations";
|
||||||
|
|
||||||
|
const main = AnimateFade();
|
||||||
export function ArticlesList() {
|
export default function ArticlesList() {
|
||||||
return <main className="art-ctr">
|
return <motion.main animate={main.animate} initial={main.initial} className="art-ctr">
|
||||||
<section className="spacer"/>
|
<section className="spacer"/>
|
||||||
<section className="articles">
|
<section className="articles">
|
||||||
{
|
{
|
||||||
@@ -15,7 +17,7 @@ export function ArticlesList() {
|
|||||||
}
|
}
|
||||||
</section>
|
</section>
|
||||||
<section className="spacer"/>
|
<section className="spacer"/>
|
||||||
</main>
|
</motion.main>
|
||||||
}
|
}
|
||||||
|
|
||||||
function BlogBox(props: { article: Article }) {
|
function BlogBox(props: { article: Article }) {
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 959 KiB |
@@ -2,7 +2,7 @@ import "./canvas.sass";
|
|||||||
import {motion} from "framer-motion";
|
import {motion} from "framer-motion";
|
||||||
import {Canvas as ThreeCanvas} from "@react-three/fiber";
|
import {Canvas as ThreeCanvas} from "@react-three/fiber";
|
||||||
import {Moon} from "./Moon";
|
import {Moon} from "./Moon";
|
||||||
import {AnimateSpin} from "../animations";
|
import {AnimateFade, AnimateSpin} from "../animations";
|
||||||
import {Environment, OrbitControls, useTexture} from "@react-three/drei";
|
import {Environment, OrbitControls, useTexture} from "@react-three/drei";
|
||||||
import Jupiter from "../img/2k_jupiter.jpg";
|
import Jupiter from "../img/2k_jupiter.jpg";
|
||||||
import Makemake from "../img/2k_makemake_fictional.jpg";
|
import Makemake from "../img/2k_makemake_fictional.jpg";
|
||||||
@@ -10,10 +10,12 @@ import Ceres from "../img/2k_ceres_fictional.jpg";
|
|||||||
import Haumea from "../img/2k_haumea_fictional.jpg";
|
import Haumea from "../img/2k_haumea_fictional.jpg";
|
||||||
import MilkyWay from "../img/2k_stars_milky_way.jpg";
|
import MilkyWay from "../img/2k_stars_milky_way.jpg";
|
||||||
|
|
||||||
|
const main = AnimateFade();
|
||||||
export default function Canvas() {
|
export default function Canvas() {
|
||||||
|
|
||||||
|
// fade animation sync with loading
|
||||||
return (
|
return (
|
||||||
<main className="canvas">
|
<motion.main initial={main.initial} animate={main.animate} transition={{duration: 3}} className="canvas">
|
||||||
<section className="canvas-ctr">
|
<section className="canvas-ctr">
|
||||||
<ThreeCanvas shadows>
|
<ThreeCanvas shadows>
|
||||||
<OrbitControls enableZoom={false} />
|
<OrbitControls enableZoom={false} />
|
||||||
@@ -29,7 +31,7 @@ export default function Canvas() {
|
|||||||
<h3 className="tooltip">
|
<h3 className="tooltip">
|
||||||
Drag to orbit
|
Drag to orbit
|
||||||
</h3>
|
</h3>
|
||||||
</main>
|
</motion.main>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import React, {PropsWithChildren} from "react";
|
import React, {PropsWithChildren} from "react";
|
||||||
import {useRouter} from "./RouterContext";
|
import {useRouter} from "./RouterContext";
|
||||||
import {Path} from "./router";
|
import {Path} from "./router";
|
||||||
import {ArticlesList} from "../articles/ArticlesList";
|
|
||||||
|
|
||||||
type Route = [Path, string];
|
type Route = [Path, string];
|
||||||
type Routes = [Route, Route, Route];
|
type Routes = [Route, Route, Route];
|
||||||
@@ -21,7 +20,7 @@ function Route(props: PropsWithChildren & {route: Route}) {
|
|||||||
|
|
||||||
const Canvas = React.lazy(() => import("../index/Canvas"));
|
const Canvas = React.lazy(() => import("../index/Canvas"));
|
||||||
const About = React.lazy(() => import("../about/AboutPage"));
|
const About = React.lazy(() => import("../about/AboutPage"));
|
||||||
|
const ArticlesList = React.lazy(() => import("../articles/ArticlesList"));
|
||||||
|
|
||||||
export function Routes() {
|
export function Routes() {
|
||||||
const [index, about, articles] = ROUTES;
|
const [index, about, articles] = ROUTES;
|
||||||
|
|||||||
Reference in New Issue
Block a user