From 5c0f9aba75c62c805a8127db99fb8b2335e94b05 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 5 Dec 2024 17:38:28 -0500 Subject: [PATCH 1/3] Add deploy workflow --- .github/workflows/deploy.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..7f493b0 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,29 @@ +name: Deploy to github.io + +on: + push: + branches: ['main'] + workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: 'pages' + cancel-in-progress: true + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install dependencies + run: npm ci + + - name: Deploy + run: | + npm run deploy From 1c0f3a9033715ffd6e514132d17a3b2e38ed21c0 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 5 Dec 2024 17:42:51 -0500 Subject: [PATCH 2/3] Add fade-in --- src/Projects/ProjectPageContainer.tsx | 8 ++++++-- src/Projects/Projects.css | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/Projects/ProjectPageContainer.tsx b/src/Projects/ProjectPageContainer.tsx index 6e95496..dc227b7 100644 --- a/src/Projects/ProjectPageContainer.tsx +++ b/src/Projects/ProjectPageContainer.tsx @@ -31,9 +31,9 @@ export default function ArticleContainer() { const { id } = useParams(); const projects = React.useContext(ProjectContext) - const project = React.useMemo(() => projects.find(a => a.id === id), [ projects, id ]) + const project = React.useMemo(() => projects.find(a => a.id === id), [projects, id]) const pageId = project?.id || "placeholder" - const [projectContent, setProjectContent] = React.useState(DEFAULT_CONTENT) + const [projectContent, setProjectContent] = React.useState() React.useEffect(() => { import(`../content/projects/${pageId}.json`) .then((result) => { @@ -43,6 +43,10 @@ export default function ArticleContainer() { }) }, [pageId]) + if (!projectContent) { + return null + } + return ( ) diff --git a/src/Projects/Projects.css b/src/Projects/Projects.css index 123c97a..5e87c18 100644 --- a/src/Projects/Projects.css +++ b/src/Projects/Projects.css @@ -100,6 +100,19 @@ line-height: 1.5; width: 100%; color: rgba(0, 2, 111, 1); + animation: fade-in 1s; +} + + + +@keyframes fade-in { + from { + opacity: 0; + } + + to { + opacity: 100; + } } @media (min-width: 800px) { From 193068fa1ea762515ed521c0a94e5b5c57669c91 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 5 Dec 2024 17:48:33 -0500 Subject: [PATCH 3/3] Update timing --- src/Projects/Projects.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Projects/Projects.css b/src/Projects/Projects.css index 5e87c18..89db027 100644 --- a/src/Projects/Projects.css +++ b/src/Projects/Projects.css @@ -16,7 +16,8 @@ padding-top: 5em; flex-grow: 1; background-color: transparent; - gap: 4em + gap: 4em; + animation: fade-in 0.4s; } .projects-list-cell { @@ -100,7 +101,7 @@ line-height: 1.5; width: 100%; color: rgba(0, 2, 111, 1); - animation: fade-in 1s; + animation: fade-in 0.4s; }