diff --git a/.forgejo/workflows/deploy-test.yaml b/.forgejo/workflows/deploy-test.yaml deleted file mode 100644 index 7830220..0000000 --- a/.forgejo/workflows/deploy-test.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: Hugo - -on: - push: - branches: - - main - -jobs: - build: - runs-on: hugo-latest - steps: - - name: Temp fix to update hugo - run: wget "https://github.com/gohugoio/hugo/releases/download/v0.126.3/hugo_extended_0.126.3_Linux-64bit.tar.gz" && tar xf "hugo_extended_0.126.3_Linux-64bit.tar.gz" && mv ./hugo /usr/bin/hugo && rm -f hugo_extended_0.126.3_Linux-64bit.tar.gz LICENSE README.md - - name: Grab packages - run: apt install -y rsync openssh-client - - uses: actions/checkout@v4 - with: - submodules: 'true' - - name: Run build task - run: hugo --minify - - name: Test static page - run: bash ${{ gitea.workspace }}/bin/test_static_page.sh - - name: Deploy to Server - uses: https://git.myco.systems/mirrors/ssh-deploy@main - env: - SSH_PRIVATE_KEY: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }} - ARGS: "-rlgoDzvc -i --delete" - SOURCE: "public/" - REMOTE_HOST: ${{ secrets.REMOTE_HOST }} - REMOTE_USER: ${{ secrets.REMOTE_USER }} - TARGET: ${{ secrets.REMOTE_TARGET }} - # - name: Running Page Speed Insights - # uses: https://github.com/JakePartusch/psi-action@v1.3 - # id: drafting - # with: - # url: "https://gallowelding.com" - # threshold: 70 - # strategy: desktop \ No newline at end of file diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..1a575bd --- /dev/null +++ b/.forgejo/workflows/deploy.yaml @@ -0,0 +1,25 @@ +name: Hugo + +on: + push: + branches: + - main + +jobs: + build: + runs-on: hugo-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: 'true' + - name: Run build task + run: hugo --minify + - name: Deploy to Server + uses: https://git.myco.systems/mirrors/ssh-deploy@main + env: + SSH_PRIVATE_KEY: ${{ secrets.RUNNER_SSH_PRIVATE_KEY }} + ARGS: "-rlgoDzvc -i --delete" + SOURCE: "public/" + REMOTE_HOST: ${{ secrets.REMOTE_HOST }} + REMOTE_USER: ${{ secrets.REMOTE_USER }} + TARGET: ${{ secrets.REMOTE_TARGET }} \ No newline at end of file diff --git a/bin/test_static_page.sh b/bin/test_static_page.sh deleted file mode 100755 index efbd6ad..0000000 --- a/bin/test_static_page.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -PORT=8080 -python3 -m http.server $PORT --directory public/ & - -SERVER_PID=$! - -# Give it a moment to start -sleep 1 - -# Check if the server is running -if ! ps -p $SERVER_PID > /dev/null; then - echo "HTTP server failed to start." - exit 1 -fi - -# Check HTTP status -status_code=$(curl -o /dev/null -s -w "%{http_code}" http://localhost:$PORT) - -# Kill the http server -kill $SERVER_PID - -# Check if status code is 200 -if [ "$status_code" -ne 200 ]; then - echo "Website returned a non-200 status code: $status_code" - exit 1 -fi \ No newline at end of file diff --git a/config.yaml b/config.yaml index de1483b..4df801e 100644 --- a/config.yaml +++ b/config.yaml @@ -12,6 +12,10 @@ params: industries. With over a decade of experience, Ian Gallo specializes in hand-welded, durable structures at affordable prices while prioritizing professionalism and inclusivity. + catalogButtons: + home: + - categoryName: 'aslkjjdlk' + img: https://placehold.co/300x200/ social: main: - url: 'mailto:iangalloart@gmail.com' diff --git a/content/catalog/index.md b/content/catalog/index.md index d0a3316..1dc6037 100644 --- a/content/catalog/index.md +++ b/content/catalog/index.md @@ -72,7 +72,7 @@ { "item": "5ft Half Circle Arch ", "quant": "1", - "dimensions": "60\" wide, custom height", + "dimensions": "60\" wide, (custom height)", "baseCost": "$350", "deliveryPickup": "", "installBreakdown": "", diff --git a/themes/gallo/layouts/index.html b/themes/gallo/layouts/index.html index f991f95..28a9c7f 100644 --- a/themes/gallo/layouts/index.html +++ b/themes/gallo/layouts/index.html @@ -1,3 +1,4 @@ {{ define "main" }} {{ partial "header.html" . }} +{{ partial "categories.html" . }} {{ end }} diff --git a/themes/gallo/layouts/partials/categories.html b/themes/gallo/layouts/partials/categories.html new file mode 100644 index 0000000..abeea22 --- /dev/null +++ b/themes/gallo/layouts/partials/categories.html @@ -0,0 +1,5 @@ +{{ range .Site.Params.catalogButtons.home }} + + + +{{ end }} \ No newline at end of file diff --git a/themes/gallo/layouts/partials/rental-catalog.html b/themes/gallo/layouts/partials/rental-catalog.html index b122a66..4a45ad6 100644 --- a/themes/gallo/layouts/partials/rental-catalog.html +++ b/themes/gallo/layouts/partials/rental-catalog.html @@ -1,147 +1,190 @@ -
- {{ range .Params.catalog }} - {{ if ne .item "" }} -
- Placeholder Image -
-
{{ .item }}
-
- {{ if ne .quant "" }} -
- Quantity: - {{ .quant }} -
- {{ end }} - {{ if ne .dimensions "" }} -
- Dimensions: - {{ .dimensions }} -
- {{ end }} - {{ if ne .baseCost "" }} -
- Base Cost: - {{ .baseCost }} -
- {{ end }} - {{ if ne .deliveryPickup "" }} -
- + Delivery/Pickup: - {{ .deliveryPickup }} -
- {{ end }} - {{ if ne .installBreakdown "" }} -
- + Install/Breakdown: - {{ .installBreakdown }} -
- {{ end }} - {{ if ne .purchaseCost "" }} -
- Purchase Cost: - {{ .purchaseCost }} -
- {{ end }} -
-
-
- - - -
-