From 40a673a418ef42274c63632227335c8695333d13 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Fri, 7 Nov 2025 21:36:08 -0800 Subject: [PATCH] Compartmentalized Timeline and Carousel, applied www-data permissions to all files in built docker container, for deploys to work --- Dockerfile | 2 ++ src/components/{ => CustomCarousel}/CustomCarousel.astro | 2 +- .../CustomCarousel}/custom-carousel.ts | 0 src/components/{ => Timeline}/Timeline.astro | 2 +- .../components => components/Timeline}/timeline.ts | 0 src/env.d.ts | 9 +-------- src/layouts/BaseLayout.astro | 2 +- src/pages/education.astro | 4 ++-- .../spacex/avionics-test-engineering-internship.astro | 4 ++-- .../experience/spacex/hardware-test-engineer-i-ii.astro | 4 ++-- src/pages/hobby/body-mods.astro | 2 +- src/pages/hobby/homelab/home-server-rack.astro | 2 +- src/pages/hobby/homelab/kubernetes-cluster.astro | 2 +- src/pages/hobby/homelab/offsite-backup-rack.astro | 2 +- .../custom-accessories/chubby-buttons-2-mount.astro | 2 +- src/pages/index.astro | 2 +- src/scripts/main.js | 0 src/scripts/main.ts | 1 + tsconfig.json | 1 - 19 files changed, 19 insertions(+), 24 deletions(-) rename src/components/{ => CustomCarousel}/CustomCarousel.astro (98%) rename src/{scripts/components => components/CustomCarousel}/custom-carousel.ts (100%) rename src/components/{ => Timeline}/Timeline.astro (96%) rename src/{scripts/components => components/Timeline}/timeline.ts (100%) delete mode 100644 src/scripts/main.js create mode 100644 src/scripts/main.ts diff --git a/Dockerfile b/Dockerfile index 8a2a98d..97263f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,4 +31,6 @@ RUN rm index.html COPY --from=build /app/dist . +RUN chown -R www-data:www-data * + EXPOSE 80 \ No newline at end of file diff --git a/src/components/CustomCarousel.astro b/src/components/CustomCarousel/CustomCarousel.astro similarity index 98% rename from src/components/CustomCarousel.astro rename to src/components/CustomCarousel/CustomCarousel.astro index 2ccde3e..cd018e6 100644 --- a/src/components/CustomCarousel.astro +++ b/src/components/CustomCarousel/CustomCarousel.astro @@ -93,4 +93,4 @@ const limitByWidthClasses = "max-h-fit"; )} - + diff --git a/src/pages/education.astro b/src/pages/education.astro index 4647402..76de1c4 100644 --- a/src/pages/education.astro +++ b/src/pages/education.astro @@ -1,7 +1,7 @@ --- import BaseLayout from "@layouts/BaseLayout.astro"; -import Carousel from "@components/CustomCarousel.astro"; -import Timeline from "@components/Timeline.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; +import Timeline from "@components/Timeline/Timeline.astro"; import Table from "@components/Table.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/pages/experience/spacex/avionics-test-engineering-internship.astro b/src/pages/experience/spacex/avionics-test-engineering-internship.astro index 8193d26..4150dc1 100644 --- a/src/pages/experience/spacex/avionics-test-engineering-internship.astro +++ b/src/pages/experience/spacex/avionics-test-engineering-internship.astro @@ -1,7 +1,7 @@ --- import ExperienceLayout from '@layouts/ExperienceLayout.astro'; -import Timeline from '@components/Timeline.astro'; -import Carousel from "@components/CustomCarousel.astro"; +import Timeline from '@components/Timeline/Timeline.astro'; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import spring_2019_interns from "@assets/experience/spacex/avionics-test-engineering-internship/spring-2019-interns.jpg"; diff --git a/src/pages/experience/spacex/hardware-test-engineer-i-ii.astro b/src/pages/experience/spacex/hardware-test-engineer-i-ii.astro index 93aaad0..376cc24 100644 --- a/src/pages/experience/spacex/hardware-test-engineer-i-ii.astro +++ b/src/pages/experience/spacex/hardware-test-engineer-i-ii.astro @@ -1,7 +1,7 @@ --- import ExperienceLayout from '@layouts/ExperienceLayout.astro'; -import Timeline from '@components/Timeline.astro'; -import Carousel from "@components/CustomCarousel.astro"; +import Timeline from '@components/Timeline/Timeline.astro'; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import starlink_headquarters_selfie from "@assets/experience/spacex/hardware-test-engineer-i-ii/starlink-headquarters-selfie.jpg"; diff --git a/src/pages/hobby/body-mods.astro b/src/pages/hobby/body-mods.astro index 89ea386..abe57ae 100644 --- a/src/pages/hobby/body-mods.astro +++ b/src/pages/hobby/body-mods.astro @@ -1,6 +1,6 @@ --- import HobbyLayout from "@layouts/HobbyLayout.astro"; -import Carousel from "@components/CustomCarousel.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/pages/hobby/homelab/home-server-rack.astro b/src/pages/hobby/homelab/home-server-rack.astro index d320258..0b90dc9 100644 --- a/src/pages/hobby/homelab/home-server-rack.astro +++ b/src/pages/hobby/homelab/home-server-rack.astro @@ -1,6 +1,6 @@ --- import HobbyLayout from "@layouts/HobbyLayout.astro"; -import Carousel from "@components/CustomCarousel.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/pages/hobby/homelab/kubernetes-cluster.astro b/src/pages/hobby/homelab/kubernetes-cluster.astro index 4f63b89..e73ed9c 100644 --- a/src/pages/hobby/homelab/kubernetes-cluster.astro +++ b/src/pages/hobby/homelab/kubernetes-cluster.astro @@ -1,6 +1,6 @@ --- import HobbyLayout from "@layouts/HobbyLayout.astro"; -import Carousel from "@components/CustomCarousel.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/pages/hobby/homelab/offsite-backup-rack.astro b/src/pages/hobby/homelab/offsite-backup-rack.astro index 0c7b66e..f58799e 100644 --- a/src/pages/hobby/homelab/offsite-backup-rack.astro +++ b/src/pages/hobby/homelab/offsite-backup-rack.astro @@ -1,6 +1,6 @@ --- import HobbyLayout from "@layouts/HobbyLayout.astro"; -import Carousel from "@components/CustomCarousel.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro b/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro index c8e574a..c0f0c3c 100644 --- a/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro +++ b/src/pages/hobby/motorcycling/custom-accessories/chubby-buttons-2-mount.astro @@ -1,6 +1,6 @@ --- import HobbyLayout from "@layouts/HobbyLayout.astro"; -import Carousel from "@components/CustomCarousel.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/pages/index.astro b/src/pages/index.astro index df4a80a..12db0e0 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,6 +1,6 @@ --- import BaseLayout from '../layouts/BaseLayout.astro'; -import Carousel from "@components/CustomCarousel.astro"; +import Carousel from "@components/CustomCarousel/CustomCarousel.astro"; import type {carouselGroup} from "@interfaces/image-carousel.ts"; diff --git a/src/scripts/main.js b/src/scripts/main.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/scripts/main.ts b/src/scripts/main.ts new file mode 100644 index 0000000..899f06d --- /dev/null +++ b/src/scripts/main.ts @@ -0,0 +1 @@ +import "flowbite"; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 05765df..8441b7c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,6 @@ "@data/*": ["./src/data/*"], "@interfaces/*": ["./src/interfaces/*"], "@layouts/*": ["./src/layouts/*"], - "@scripts/*": ["./src/scripts/*"], "@styles/*": ["./src/styles/*"] }