From a38cd2689496d1f642faf02f0a6ca15e9ec5943d Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 6 Dec 2025 11:07:06 -0800 Subject: [PATCH 1/4] Fix trailing slashes breaking pathname in prod, keep flex for main page div so footer sits properly, misspelling fix --- astro.config.mjs | 1 + src/data/site-layout.ts | 2 +- src/layouts/BaseLayout.astro | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/astro.config.mjs b/astro.config.mjs index e5c0ec1..f1661f4 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -13,6 +13,7 @@ const disabledPaths = getPaths(siteLayout, [], true); export default defineConfig({ site: "https://caperren.com", + trailingSlash: "never", prefetch: { prefetchAll: true, }, diff --git a/src/data/site-layout.ts b/src/data/site-layout.ts index fd3442f..540e71a 100644 --- a/src/data/site-layout.ts +++ b/src/data/site-layout.ts @@ -29,7 +29,7 @@ export const siteLayout: navLink[] = [ path: "osu-ceoas-ocean-mixing-group", children: [ { - navText: "Robotics Oceanographic Surface Sampler", + navText: "Robotic Oceanographic Surface Sampler", path: "robotic-oceanographic-surface-sampler", }, { diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index 24f3ce2..24e2e8f 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -40,15 +40,13 @@ const pageEnabled = pathToMetadata(Astro.url.pathname).enabled ?? true; {pageEnabled ? pageTitle : "Corwin Perren"} - +
-
+
{ showTitle && pageEnabled && ( From c5fdcf6b10d315f822251e78b628a1f8cf10636c Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 6 Dec 2025 11:20:47 -0800 Subject: [PATCH 2/4] Change docker registry to local ip for faster access --- .gitea/workflows/build-production.yaml | 6 +++--- .gitea/workflows/build-staging.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build-production.yaml b/.gitea/workflows/build-production.yaml index 9b54e85..2c782f8 100644 --- a/.gitea/workflows/build-production.yaml +++ b/.gitea/workflows/build-production.yaml @@ -57,7 +57,7 @@ jobs: - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: gitea.perren.cloud + registry: 192.168.1.36:30008 username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.ACTIONS_TOKEN }} @@ -70,8 +70,8 @@ jobs: context: caperren-com push: true tags: | - gitea.perren.cloud/caperren/${{ needs.test.outputs.repo_name }}:${{ needs.test.outputs.repo_version_hash }} - gitea.perren.cloud/caperren/caperren-com:latest + 192.168.1.36:30008/caperren/${{ needs.test.outputs.repo_name }}:${{ needs.test.outputs.repo_version_hash }} + 192.168.1.36:30008/caperren/caperren-com:latest build-args: | REPO_VERSION_HASH=${{ needs.test.outputs.repo_version_hash }} BUILD_ENVIRONMENT=production diff --git a/.gitea/workflows/build-staging.yaml b/.gitea/workflows/build-staging.yaml index c583857..c5ae520 100644 --- a/.gitea/workflows/build-staging.yaml +++ b/.gitea/workflows/build-staging.yaml @@ -57,7 +57,7 @@ jobs: - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: gitea.perren.cloud + registry: 192.168.1.36:30008 username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.ACTIONS_TOKEN }} @@ -70,7 +70,7 @@ jobs: context: caperren-com push: true tags: | - gitea.perren.cloud/caperren/caperren-com:latest-staging + 192.168.1.36:30008/caperren/caperren-com:latest-staging build-args: | REPO_VERSION_HASH=${{ needs.test.outputs.repo_version_hash }} BUILD_ENVIRONMENT=staging From 4f571b3ae1db094ce88c07ab140be1630b53f252 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 6 Dec 2025 11:37:40 -0800 Subject: [PATCH 3/4] Explicitly make docker registry http --- .gitea/workflows/build-production.yaml | 2 +- .gitea/workflows/build-staging.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-production.yaml b/.gitea/workflows/build-production.yaml index 2c782f8..11635a3 100644 --- a/.gitea/workflows/build-production.yaml +++ b/.gitea/workflows/build-production.yaml @@ -57,7 +57,7 @@ jobs: - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: 192.168.1.36:30008 + registry: http://192.168.1.36:30008 username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.ACTIONS_TOKEN }} diff --git a/.gitea/workflows/build-staging.yaml b/.gitea/workflows/build-staging.yaml index c5ae520..fe05a4e 100644 --- a/.gitea/workflows/build-staging.yaml +++ b/.gitea/workflows/build-staging.yaml @@ -57,7 +57,7 @@ jobs: - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: 192.168.1.36:30008 + registry: http://192.168.1.36:30008 username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.ACTIONS_TOKEN }} From 95c9f186bbb34619ea6f47370bc63fedcb227253 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 6 Dec 2025 11:53:18 -0800 Subject: [PATCH 4/4] Revert local pointing build changes --- .gitea/workflows/build-production.yaml | 6 +++--- .gitea/workflows/build-staging.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build-production.yaml b/.gitea/workflows/build-production.yaml index 11635a3..9b54e85 100644 --- a/.gitea/workflows/build-production.yaml +++ b/.gitea/workflows/build-production.yaml @@ -57,7 +57,7 @@ jobs: - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: http://192.168.1.36:30008 + registry: gitea.perren.cloud username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.ACTIONS_TOKEN }} @@ -70,8 +70,8 @@ jobs: context: caperren-com push: true tags: | - 192.168.1.36:30008/caperren/${{ needs.test.outputs.repo_name }}:${{ needs.test.outputs.repo_version_hash }} - 192.168.1.36:30008/caperren/caperren-com:latest + gitea.perren.cloud/caperren/${{ needs.test.outputs.repo_name }}:${{ needs.test.outputs.repo_version_hash }} + gitea.perren.cloud/caperren/caperren-com:latest build-args: | REPO_VERSION_HASH=${{ needs.test.outputs.repo_version_hash }} BUILD_ENVIRONMENT=production diff --git a/.gitea/workflows/build-staging.yaml b/.gitea/workflows/build-staging.yaml index fe05a4e..c583857 100644 --- a/.gitea/workflows/build-staging.yaml +++ b/.gitea/workflows/build-staging.yaml @@ -57,7 +57,7 @@ jobs: - name: Login to Docker Registry uses: docker/login-action@v3 with: - registry: http://192.168.1.36:30008 + registry: gitea.perren.cloud username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.ACTIONS_TOKEN }} @@ -70,7 +70,7 @@ jobs: context: caperren-com push: true tags: | - 192.168.1.36:30008/caperren/caperren-com:latest-staging + gitea.perren.cloud/caperren/caperren-com:latest-staging build-args: | REPO_VERSION_HASH=${{ needs.test.outputs.repo_version_hash }} BUILD_ENVIRONMENT=staging