From bef7bfad876fb37f6e337a699174c499c43abf33 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 18 Sep 2025 01:41:42 -0400 Subject: Revamped project page; Switch to React; Updated pkgs --- src/components/3DModels.jsx | 25 ++++++++++++++++++ src/components/BlogCommentsForm.jsx | 1 - src/components/FetchMessages.jsx | 2 +- src/components/FormHandling.jsx | 2 +- src/components/GuestbookForm.jsx | 1 - src/components/Navbar.svelte | 2 +- src/data/models.json | 8 ++++++ src/data/webarchive.json | 10 +++++++ src/images/snug_cup.png | Bin 0 -> 2177091 bytes src/layouts/Default.astro | 7 ++--- src/pages/archive/index.astro | 21 +++++++++++++++ src/pages/index.astro | 9 +------ src/pages/privacy.md | 50 +++++++++++++++++++++++++++++++++++ src/pages/projects.astro | 42 ----------------------------- src/pages/projects/3d.astro | 46 ++++++++++++++++++++++++++++++++ src/pages/projects/index.astro | 30 +++++++++++++++++++++ src/pages/projects/programming.astro | 42 +++++++++++++++++++++++++++++ src/styles/Page.css | 2 +- src/styles/cards.css | 2 ++ src/styles/index.css | 1 + 20 files changed, 244 insertions(+), 59 deletions(-) create mode 100644 src/components/3DModels.jsx create mode 100644 src/data/models.json create mode 100644 src/data/webarchive.json create mode 100755 src/images/snug_cup.png create mode 100644 src/pages/archive/index.astro delete mode 100644 src/pages/projects.astro create mode 100644 src/pages/projects/3d.astro create mode 100644 src/pages/projects/index.astro create mode 100644 src/pages/projects/programming.astro (limited to 'src') diff --git a/src/components/3DModels.jsx b/src/components/3DModels.jsx new file mode 100644 index 0000000..4d8507e --- /dev/null +++ b/src/components/3DModels.jsx @@ -0,0 +1,25 @@ +import { Canvas, useLoader } from "@react-three/fiber"; +import { OrbitControls } from "@react-three/drei"; +import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader"; + +const Model = ({ model, scale }) => { + const gltf = useLoader(GLTFLoader, model); + return ( + <> + + + ); +}; + +export default function ThreeJSModels({ modelName, scale = 2 }) { + return ( +

+ ) +} diff --git a/src/components/BlogCommentsForm.jsx b/src/components/BlogCommentsForm.jsx index d0c585c..20e4748 100644 --- a/src/components/BlogCommentsForm.jsx +++ b/src/components/BlogCommentsForm.jsx @@ -1,4 +1,3 @@ -import { h } from 'preact'; import withFormHandling from './FormHandling'; import '../styles/Form.css'; diff --git a/src/components/FetchMessages.jsx b/src/components/FetchMessages.jsx index aa6f261..0a7eea3 100644 --- a/src/components/FetchMessages.jsx +++ b/src/components/FetchMessages.jsx @@ -1,4 +1,4 @@ -import { Component } from 'preact'; +import { Component } from 'react'; const withMessages = (WrappedComponent, apiEndpoint, FormComponent) => { return class extends Component { diff --git a/src/components/FormHandling.jsx b/src/components/FormHandling.jsx index 8f7f688..5210bdf 100644 --- a/src/components/FormHandling.jsx +++ b/src/components/FormHandling.jsx @@ -1,4 +1,4 @@ -import { Component } from 'preact'; +import { Component } from 'react'; import { marked } from 'marked'; import DOMPurify from 'dompurify'; diff --git a/src/components/GuestbookForm.jsx b/src/components/GuestbookForm.jsx index 4e06a27..7e47b5e 100644 --- a/src/components/GuestbookForm.jsx +++ b/src/components/GuestbookForm.jsx @@ -1,4 +1,3 @@ -import { h } from 'preact'; import withFormHandling from './FormHandling'; import '../styles/Form.css'; diff --git a/src/components/Navbar.svelte b/src/components/Navbar.svelte index 3211799..b90a90e 100644 --- a/src/components/Navbar.svelte +++ b/src/components/Navbar.svelte @@ -107,10 +107,10 @@

diff --git a/src/data/models.json b/src/data/models.json new file mode 100644 index 0000000..8d71642 --- /dev/null +++ b/src/data/models.json @@ -0,0 +1,8 @@ +[ + { + "name": "Snug Cup", + "description": "A cup for a project at school.", + "model": "/models/snug_cup_model.glb", + "fallback": "/images/snug_cup.png" + } +] diff --git a/src/data/webarchive.json b/src/data/webarchive.json new file mode 100644 index 0000000..9a6b1bb --- /dev/null +++ b/src/data/webarchive.json @@ -0,0 +1,10 @@ +[ + { + "name": "First Website", + "description": "Created by my dad using iFrames.", + "type": "personal" + }, + { + "name": "alee14.ga" + } +] diff --git a/src/images/snug_cup.png b/src/images/snug_cup.png new file mode 100755 index 0000000..cd6f7ae Binary files /dev/null and b/src/images/snug_cup.png differ diff --git a/src/layouts/Default.astro b/src/layouts/Default.astro index 95ceeaf..368f089 100644 --- a/src/layouts/Default.astro +++ b/src/layouts/Default.astro @@ -5,6 +5,7 @@ interface Props { } const { title = "Andrew Lee", description = "Andrew Lee Website" } = Astro.props; +import { ClientRouter } from "astro:transitions"; import Navbar from '../components/Navbar.svelte'; const date = new Date(); --- @@ -40,15 +41,15 @@ const date = new Date(); - + {title} -

diff --git a/src/pages/archive/index.astro b/src/pages/archive/index.astro new file mode 100644 index 0000000..7a23d95 --- /dev/null +++ b/src/pages/archive/index.astro @@ -0,0 +1,21 @@ +--- +import Page from "../../layouts/Page.astro"; +import "../../styles/cards.css"; +--- + +

Personal

First website

Created by my dad using iFrames

+ 2013 +

alee14.ga

My first website that I made using Bootstrap 3 with a template

+ 2017 +

+ diff --git a/src/pages/index.astro b/src/pages/index.astro index e7cc46d..d109080 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -37,7 +37,7 @@ const featuredProjects = projects.filter(project => project.featured);