diff --git a/.dev/Dockerfile b/.dev/Dockerfile index 6bfa88a83..5d215ed9b 100644 --- a/.dev/Dockerfile +++ b/.dev/Dockerfile @@ -1,5 +1,3 @@ -# syntax=docker/dockerfile:1 - ARG RUBY_VERSION=3.4 # use the official Bun image @@ -10,9 +8,9 @@ WORKDIR /usr/src/app # install dependencies into temp directory # this will cache them and speed up future builds FROM base AS install -RUN mkdir -p /temp/dev -COPY package.json bun.lockb /temp/dev/ -RUN cd /temp/dev && bun install +WORKDIR /temp/dev +COPY package.json bun.lockb ./ +RUN bun install # Install Ruby dependencies in a separate stage FROM ruby:$RUBY_VERSION-alpine AS ruby-gems diff --git a/.dev/compose.yml b/.dev/compose.yml index a41a73d0d..3bca39b31 100644 --- a/.dev/compose.yml +++ b/.dev/compose.yml @@ -15,8 +15,8 @@ x-backend: &backend IRB_HISTFILE: /usr/local/hist/.irb_history services: - hugo: - image: hugomods/hugo:exts-non-root-0.145.0 + hugo: &hugo + image: hugomods/hugo:exts-non-root-0.147.0 stdin_open: true tty: true volumes: @@ -28,7 +28,11 @@ services: sh: <<: *backend - command: sh + command: bash + + t-setup: + <<: *hugo + command: hugo --minify --environment production --forceSyncStatic --cleanDestinationDir --logLevel warn t: <<: *backend @@ -41,6 +45,10 @@ services: reservations: cpus: '1.5' memory: '512M' + + depends_on: + t-setup: + condition: service_completed_successfully volumes: bundle: history: diff --git a/.github/workflows/_hugo.yml b/.github/workflows/_hugo.yml index c202d92d4..e63bd43a2 100644 --- a/.github/workflows/_hugo.yml +++ b/.github/workflows/_hugo.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: 0.145.0 + hugo-version: 0.147.9 extended: true - name: Checkout diff --git a/bin/build b/bin/build index 132949072..8a2a42dc3 100755 --- a/bin/build +++ b/bin/build @@ -1,6 +1,4 @@ #!/usr/bin/env sh -set -euo pipefail - #hugo --minify --environment production --forceSyncStatic --cleanDestinationDir --logLevel warn "$@" bin/docked hugo --minify --environment production --forceSyncStatic --cleanDestinationDir --logLevel warn "$@" diff --git a/bin/compose b/bin/dc similarity index 67% rename from bin/compose rename to bin/dc index aaf34d60c..ae7c8a318 100755 --- a/bin/compose +++ b/bin/dc @@ -1,7 +1,5 @@ #!/usr/bin/env sh -set -e - # Set Docker platform for ARM-based Macs (M1/M2 chips) if [ "$(uname -s)" = "Darwin" ]; then case "$(uname -m)" in @@ -11,7 +9,10 @@ if [ "$(uname -s)" = "Darwin" ]; then esac fi -docker compose \ - -f .dev/compose.yml \ +echo "Running docker compose with project name: ${DOCKED_PROJECT_NAME:-jtcom}" +pwd + +docker "compose" \ + -f ".dev/compose.yml" \ -p "${DOCKED_PROJECT_NAME:-jtcom}" \ "$@" diff --git a/bin/docked b/bin/docked index ce88058b1..66a22c0e1 100755 --- a/bin/docked +++ b/bin/docked @@ -1,5 +1,3 @@ #!/usr/bin/env sh -set -e - -bin/compose run --rm --quiet-pull --remove-orphans "$@" +bin/dc run --rm --quiet-pull --remove-orphans "$@" diff --git a/bin/test b/bin/test index 668096e46..9900a1a84 100755 --- a/bin/test +++ b/bin/test @@ -1,8 +1,4 @@ -#!/bin/sh - -set -e - -bin/build --destination public-test --baseURL http://localhost:1314 +#!/usr/bin/env sh if [ -z "$1" ]; then find test -type f -name '*_test.rb' -exec bundle exec ruby -Itest {} + diff --git a/content/blog/_index.md b/content/blog/_index.md index be032d3ca..0c53ade1c 100644 --- a/content/blog/_index.md +++ b/content/blog/_index.md @@ -2,12 +2,10 @@ title: Receive Valuable Information from Our Blog Page description: Our blog page consists of articles that offer updated information and the most updated tips to help you achieve your goals. author: Paul Keen -type: page slug: blog -layout: blog metatags: image: og-blog.jpg date: 2022-10-10T06:30:10+00:00 ---- \ No newline at end of file +--- diff --git a/hugo.toml b/hugo.toml index b9014cd71..69e5cafd3 100644 --- a/hugo.toml +++ b/hugo.toml @@ -242,10 +242,6 @@ disableKinds = [] weight = 20 -[outputFormats] - [outputFormats.html] - isPlainText = true - [params.forms.career] action = "https://docs.google.com/forms/d/e/1FAIpQLSfHFrlRzMK2EdIKNNLJuo9Kl4O_eRHLwvOLKNP2d0y06d2YCQ/formResponse" first_name = "entry.1569799146" @@ -269,4 +265,3 @@ tell = "entry.1791620687" [params.forms.newsletter] action = "https://docs.google.com/forms/u/0/d/e/1FAIpQLSdD4751jeepeQe4wefgLqBO6XAU0qqvKWvmJ8P6xRmrMRvakg/formResponse" email = "entry.939459641" - diff --git a/test/fixtures/screenshots/linux/mobile/404.png b/test/fixtures/screenshots/linux/mobile/404.png index ed595e0de..b6a56b64a 100644 Binary files a/test/fixtures/screenshots/linux/mobile/404.png and b/test/fixtures/screenshots/linux/mobile/404.png differ diff --git a/test/fixtures/screenshots/linux/mobile/blog/index.png b/test/fixtures/screenshots/linux/mobile/blog/index.png index 1c43c2a4b..f8871a25b 100644 Binary files a/test/fixtures/screenshots/linux/mobile/blog/index.png and b/test/fixtures/screenshots/linux/mobile/blog/index.png differ diff --git a/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png b/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png new file mode 100644 index 000000000..3df476683 Binary files /dev/null and b/test/fixtures/screenshots/linux/mobile/blog/index/_pagination.png differ diff --git a/test/fixtures/screenshots/linux/mobile/free_consultation.png b/test/fixtures/screenshots/linux/mobile/free_consultation.png index 761b67235..eb62fd6dc 100644 Binary files a/test/fixtures/screenshots/linux/mobile/free_consultation.png and b/test/fixtures/screenshots/linux/mobile/free_consultation.png differ diff --git a/test/fixtures/screenshots/linux/mobile/homepage.png b/test/fixtures/screenshots/linux/mobile/homepage.png new file mode 100644 index 000000000..23d5efa67 Binary files /dev/null and b/test/fixtures/screenshots/linux/mobile/homepage.png differ diff --git a/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png b/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png index b17149e7d..5b8ec83f0 100644 Binary files a/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png and b/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu.png differ diff --git a/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu/services.png b/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu/services.png index 4f9308326..42aae443c 100644 Binary files a/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu/services.png and b/test/fixtures/screenshots/linux/mobile/nav/hamburger_menu/services.png differ diff --git a/test/fixtures/screenshots/macos/desktop/404.png b/test/fixtures/screenshots/macos/desktop/404.png index 98193d4ec..aa0b5c190 100644 Binary files a/test/fixtures/screenshots/macos/desktop/404.png and b/test/fixtures/screenshots/macos/desktop/404.png differ diff --git a/test/fixtures/screenshots/macos/desktop/blog/index/_pagination.png b/test/fixtures/screenshots/macos/desktop/blog/index/_pagination.png index 71dc48bb3..d469b150e 100644 Binary files a/test/fixtures/screenshots/macos/desktop/blog/index/_pagination.png and b/test/fixtures/screenshots/macos/desktop/blog/index/_pagination.png differ diff --git a/test/fixtures/screenshots/macos/desktop/free_consultation.png b/test/fixtures/screenshots/macos/desktop/free_consultation.png index 204df14f1..6a015a61a 100644 Binary files a/test/fixtures/screenshots/macos/desktop/free_consultation.png and b/test/fixtures/screenshots/macos/desktop/free_consultation.png differ diff --git a/test/fixtures/screenshots/macos/desktop/homepage.png b/test/fixtures/screenshots/macos/desktop/homepage.png index e5ccc2d64..37fda6665 100644 Binary files a/test/fixtures/screenshots/macos/desktop/homepage.png and b/test/fixtures/screenshots/macos/desktop/homepage.png differ diff --git a/test/fixtures/screenshots/macos/desktop/nav/services.png b/test/fixtures/screenshots/macos/desktop/nav/services.png index 1fe7b5d86..11a131218 100644 Binary files a/test/fixtures/screenshots/macos/desktop/nav/services.png and b/test/fixtures/screenshots/macos/desktop/nav/services.png differ diff --git a/test/fixtures/screenshots/macos/desktop/nav/use_cases.png b/test/fixtures/screenshots/macos/desktop/nav/use_cases.png index 881e08e2f..d93e9b9ff 100644 Binary files a/test/fixtures/screenshots/macos/desktop/nav/use_cases.png and b/test/fixtures/screenshots/macos/desktop/nav/use_cases.png differ diff --git a/test/fixtures/screenshots/macos/mobile/404.png b/test/fixtures/screenshots/macos/mobile/404.png index ed595e0de..fcd1f6795 100644 Binary files a/test/fixtures/screenshots/macos/mobile/404.png and b/test/fixtures/screenshots/macos/mobile/404.png differ diff --git a/test/fixtures/screenshots/macos/mobile/blog/index.png b/test/fixtures/screenshots/macos/mobile/blog/index.png index 5935aa7b0..674434795 100644 Binary files a/test/fixtures/screenshots/macos/mobile/blog/index.png and b/test/fixtures/screenshots/macos/mobile/blog/index.png differ diff --git a/test/fixtures/screenshots/macos/mobile/free_consultation.png b/test/fixtures/screenshots/macos/mobile/free_consultation.png index 2342180e9..80ac67833 100644 Binary files a/test/fixtures/screenshots/macos/mobile/free_consultation.png and b/test/fixtures/screenshots/macos/mobile/free_consultation.png differ diff --git a/test/fixtures/screenshots/macos/mobile/homepage.png b/test/fixtures/screenshots/macos/mobile/homepage.png index 92f847226..f3e95f5c6 100644 Binary files a/test/fixtures/screenshots/macos/mobile/homepage.png and b/test/fixtures/screenshots/macos/mobile/homepage.png differ diff --git a/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu.png b/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu.png index 81077ed12..ba8ba3b94 100644 Binary files a/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu.png and b/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu.png differ diff --git a/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu/services.png b/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu/services.png index ac0131b9d..f34c7c797 100644 Binary files a/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu/services.png and b/test/fixtures/screenshots/macos/mobile/nav/hamburger_menu/services.png differ diff --git a/test/system/mobile_site_test.rb b/test/system/mobile_site_test.rb index a424892a8..c1c74ccf7 100644 --- a/test/system/mobile_site_test.rb +++ b/test/system/mobile_site_test.rb @@ -71,7 +71,7 @@ def test_top_bar_hamburger_menu open_mobile_menu - assert_matches_screenshot "nav/hamburger_menu", wait: 3, stability_time_limit: 0.025 + assert_matches_screenshot "nav/hamburger_menu", wait: 3, stability_time_limit: 0.025, tolerance: 0.01 end def test_top_bar_hamburger_menu_services diff --git a/themes/beaver/layouts/_default/_markup/render-heading.html b/themes/beaver/layouts/_markup/render-heading.html similarity index 100% rename from themes/beaver/layouts/_default/_markup/render-heading.html rename to themes/beaver/layouts/_markup/render-heading.html diff --git a/themes/beaver/layouts/_default/_markup/render-image.html b/themes/beaver/layouts/_markup/render-image.html similarity index 100% rename from themes/beaver/layouts/_default/_markup/render-image.html rename to themes/beaver/layouts/_markup/render-image.html diff --git a/themes/beaver/layouts/_default/_markup/render-link.html b/themes/beaver/layouts/_markup/render-link.html similarity index 100% rename from themes/beaver/layouts/_default/_markup/render-link.html rename to themes/beaver/layouts/_markup/render-link.html diff --git a/themes/beaver/layouts/partials/blog/img-cropped.html b/themes/beaver/layouts/_partials/blog/img-cropped.html similarity index 100% rename from themes/beaver/layouts/partials/blog/img-cropped.html rename to themes/beaver/layouts/_partials/blog/img-cropped.html diff --git a/themes/beaver/layouts/partials/blog/json-ld.html b/themes/beaver/layouts/_partials/blog/json-ld.html similarity index 100% rename from themes/beaver/layouts/partials/blog/json-ld.html rename to themes/beaver/layouts/_partials/blog/json-ld.html diff --git a/themes/beaver/layouts/partials/blog/related-posts.html b/themes/beaver/layouts/_partials/blog/related-posts.html similarity index 100% rename from themes/beaver/layouts/partials/blog/related-posts.html rename to themes/beaver/layouts/_partials/blog/related-posts.html diff --git a/themes/beaver/layouts/partials/blog/share.html b/themes/beaver/layouts/_partials/blog/share.html similarity index 100% rename from themes/beaver/layouts/partials/blog/share.html rename to themes/beaver/layouts/_partials/blog/share.html diff --git a/themes/beaver/layouts/partials/clients/grid-single.html b/themes/beaver/layouts/_partials/clients/grid-single.html similarity index 98% rename from themes/beaver/layouts/partials/clients/grid-single.html rename to themes/beaver/layouts/_partials/clients/grid-single.html index a36cffd26..2ac6bd4a7 100644 --- a/themes/beaver/layouts/partials/clients/grid-single.html +++ b/themes/beaver/layouts/_partials/clients/grid-single.html @@ -1,45 +1,45 @@ -{{ $image := .Resources.Get .Params.client.cover_image }} - -{{ $logo := .Resources.Get .Params.client.logo }} -{{ if eq (.Scratch.Get "logoVariant") "white" }} -{{ $logo = .Resources.Get .Params.client.logo_white_version }} -{{ end }} -{{ .Scratch.Delete "logoVariant" }} -
- - - -
- -
- -
- - - -
-
- - -
-
- - {{ partial "img/client-logo.html" (dict "image" $logo "title" .Params.client.name) }} - -
-
-
-

{{ .Params.excerpt }}

-
-
-
    - {{ range .Params.categories }} -
  • {{ . }}
    • - {{ end }} -
-
-
-
+{{ $image := .Resources.Get .Params.client.cover_image }} + +{{ $logo := .Resources.Get .Params.client.logo }} +{{ if eq (.Scratch.Get "logoVariant") "white" }} +{{ $logo = .Resources.Get .Params.client.logo_white_version }} +{{ end }} +{{ .Scratch.Delete "logoVariant" }} +
+ + + +
+ +
+ +
+ + + +
+
+ + +
+
+ + {{ partial "img/client-logo.html" (dict "image" $logo "title" .Params.client.name) }} + +
+
+
+

{{ .Params.excerpt }}

+
+
+
    + {{ range .Params.categories }} +
  • {{ . }}
    • + {{ end }} +
+
+
+
diff --git a/themes/beaver/layouts/partials/companies.html b/themes/beaver/layouts/_partials/companies.html similarity index 100% rename from themes/beaver/layouts/partials/companies.html rename to themes/beaver/layouts/_partials/companies.html diff --git a/themes/beaver/layouts/partials/header/critical/about-us.html b/themes/beaver/layouts/_partials/header/critical/about-us.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/about-us.html rename to themes/beaver/layouts/_partials/header/critical/about-us.html diff --git a/themes/beaver/layouts/partials/header/critical/careers.html b/themes/beaver/layouts/_partials/header/critical/careers.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/careers.html rename to themes/beaver/layouts/_partials/header/critical/careers.html diff --git a/themes/beaver/layouts/partials/header/critical/clients.html b/themes/beaver/layouts/_partials/header/critical/clients.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/clients.html rename to themes/beaver/layouts/_partials/header/critical/clients.html diff --git a/themes/beaver/layouts/partials/header/critical/contact-us.html b/themes/beaver/layouts/_partials/header/critical/contact-us.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/contact-us.html rename to themes/beaver/layouts/_partials/header/critical/contact-us.html diff --git a/themes/beaver/layouts/partials/header/critical/free-consultation.html b/themes/beaver/layouts/_partials/header/critical/free-consultation.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/free-consultation.html rename to themes/beaver/layouts/_partials/header/critical/free-consultation.html diff --git a/themes/beaver/layouts/partials/header/critical/homepage.html b/themes/beaver/layouts/_partials/header/critical/homepage.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/homepage.html rename to themes/beaver/layouts/_partials/header/critical/homepage.html diff --git a/themes/beaver/layouts/partials/header/critical/privacy-policy.html b/themes/beaver/layouts/_partials/header/critical/privacy-policy.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/privacy-policy.html rename to themes/beaver/layouts/_partials/header/critical/privacy-policy.html diff --git a/themes/beaver/layouts/partials/header/critical/services.html b/themes/beaver/layouts/_partials/header/critical/services.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/services.html rename to themes/beaver/layouts/_partials/header/critical/services.html diff --git a/themes/beaver/layouts/partials/header/critical/single/careers.html b/themes/beaver/layouts/_partials/header/critical/single/careers.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/single/careers.html rename to themes/beaver/layouts/_partials/header/critical/single/careers.html diff --git a/themes/beaver/layouts/partials/header/critical/single/clients.html b/themes/beaver/layouts/_partials/header/critical/single/clients.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/single/clients.html rename to themes/beaver/layouts/_partials/header/critical/single/clients.html diff --git a/themes/beaver/layouts/partials/header/critical/single/services.html b/themes/beaver/layouts/_partials/header/critical/single/services.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/single/services.html rename to themes/beaver/layouts/_partials/header/critical/single/services.html diff --git a/themes/beaver/layouts/partials/header/critical/single/use-cases.html b/themes/beaver/layouts/_partials/header/critical/single/use-cases.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/single/use-cases.html rename to themes/beaver/layouts/_partials/header/critical/single/use-cases.html diff --git a/themes/beaver/layouts/partials/header/critical/use-cases.html b/themes/beaver/layouts/_partials/header/critical/use-cases.html similarity index 100% rename from themes/beaver/layouts/partials/header/critical/use-cases.html rename to themes/beaver/layouts/_partials/header/critical/use-cases.html diff --git a/themes/beaver/layouts/partials/header/json-ld-company.html b/themes/beaver/layouts/_partials/header/json-ld-company.html similarity index 100% rename from themes/beaver/layouts/partials/header/json-ld-company.html rename to themes/beaver/layouts/_partials/header/json-ld-company.html diff --git a/themes/beaver/layouts/partials/img/404.html b/themes/beaver/layouts/_partials/img/404.html similarity index 100% rename from themes/beaver/layouts/partials/img/404.html rename to themes/beaver/layouts/_partials/img/404.html diff --git a/themes/beaver/layouts/partials/img/careers.html b/themes/beaver/layouts/_partials/img/careers.html similarity index 100% rename from themes/beaver/layouts/partials/img/careers.html rename to themes/beaver/layouts/_partials/img/careers.html diff --git a/themes/beaver/layouts/partials/img/client-logo.html b/themes/beaver/layouts/_partials/img/client-logo.html similarity index 100% rename from themes/beaver/layouts/partials/img/client-logo.html rename to themes/beaver/layouts/_partials/img/client-logo.html diff --git a/themes/beaver/layouts/partials/img/generic.html b/themes/beaver/layouts/_partials/img/generic.html similarity index 100% rename from themes/beaver/layouts/partials/img/generic.html rename to themes/beaver/layouts/_partials/img/generic.html diff --git a/themes/beaver/layouts/partials/img/hero-big.html b/themes/beaver/layouts/_partials/img/hero-big.html similarity index 100% rename from themes/beaver/layouts/partials/img/hero-big.html rename to themes/beaver/layouts/_partials/img/hero-big.html diff --git a/themes/beaver/layouts/partials/img/hero.html b/themes/beaver/layouts/_partials/img/hero.html similarity index 100% rename from themes/beaver/layouts/partials/img/hero.html rename to themes/beaver/layouts/_partials/img/hero.html diff --git a/themes/beaver/layouts/partials/img/homepage.html b/themes/beaver/layouts/_partials/img/homepage.html similarity index 100% rename from themes/beaver/layouts/partials/img/homepage.html rename to themes/beaver/layouts/_partials/img/homepage.html diff --git a/themes/beaver/layouts/partials/img/resize.html b/themes/beaver/layouts/_partials/img/resize.html similarity index 100% rename from themes/beaver/layouts/partials/img/resize.html rename to themes/beaver/layouts/_partials/img/resize.html diff --git a/themes/beaver/layouts/partials/img/testimonial.html b/themes/beaver/layouts/_partials/img/testimonial.html similarity index 100% rename from themes/beaver/layouts/partials/img/testimonial.html rename to themes/beaver/layouts/_partials/img/testimonial.html diff --git a/themes/beaver/layouts/partials/page/contact-form.html b/themes/beaver/layouts/_partials/page/contact-form.html similarity index 99% rename from themes/beaver/layouts/partials/page/contact-form.html rename to themes/beaver/layouts/_partials/page/contact-form.html index b4f84a047..762abb808 100644 --- a/themes/beaver/layouts/partials/page/contact-form.html +++ b/themes/beaver/layouts/_partials/page/contact-form.html @@ -1,35 +1,35 @@ -
-
-
-
- -
-
-
-
- -
-
-
-
- -
- -
-
-
- -
-
-
-
- -
-
-
-
-
-
- -
-
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+ +
+
diff --git a/themes/beaver/layouts/partials/page/cover_image.html b/themes/beaver/layouts/_partials/page/cover_image.html similarity index 100% rename from themes/beaver/layouts/partials/page/cover_image.html rename to themes/beaver/layouts/_partials/page/cover_image.html diff --git a/themes/beaver/layouts/partials/page/footer.html b/themes/beaver/layouts/_partials/page/footer.html similarity index 100% rename from themes/beaver/layouts/partials/page/footer.html rename to themes/beaver/layouts/_partials/page/footer.html diff --git a/themes/beaver/layouts/partials/page/header.html b/themes/beaver/layouts/_partials/page/header.html similarity index 100% rename from themes/beaver/layouts/partials/page/header.html rename to themes/beaver/layouts/_partials/page/header.html diff --git a/themes/beaver/layouts/partials/page/navigation.html b/themes/beaver/layouts/_partials/page/navigation.html similarity index 100% rename from themes/beaver/layouts/partials/page/navigation.html rename to themes/beaver/layouts/_partials/page/navigation.html diff --git a/themes/beaver/layouts/partials/page/site-scripts.html b/themes/beaver/layouts/_partials/page/site-scripts.html similarity index 100% rename from themes/beaver/layouts/partials/page/site-scripts.html rename to themes/beaver/layouts/_partials/page/site-scripts.html diff --git a/themes/beaver/layouts/partials/page/testimonials.html b/themes/beaver/layouts/_partials/page/testimonials.html similarity index 97% rename from themes/beaver/layouts/partials/page/testimonials.html rename to themes/beaver/layouts/_partials/page/testimonials.html index 9453cf0b3..b3b454fe1 100644 --- a/themes/beaver/layouts/partials/page/testimonials.html +++ b/themes/beaver/layouts/_partials/page/testimonials.html @@ -1,154 +1,154 @@ -{{ $nonCriticalCSS := resources.Get "css/swiper.min.css" | postCSS | minify | fingerprint | resources.PostProcess }} - - - -
-
-
-
-
-
-

TESTIMONIALS

-
-
-
-
-
-

- Most clients stay over 3 years. Some stayed beyond 6. -

-
-
-
-
-
-

Don’t just take our word for it. See what our clients say about our services.

-
-
-
-
-
-
- - - -
- -
- - -
- - {{ $image := resources.Get "img/badges/top-software-development-companies.svg" }} - Top Software Development Company on GoodFirms - -
- -
- {{ $image := resources.Get "img/badges/clutch.png" }} - {{ $title := "Clutch banner" }} - {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} -
- - -
- {{ $image := resources.Get "img/badges/glassdoor.png" }} - {{ $title := "Glassdoor logo" }} - {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} -
-
- {{ $image := resources.Get "img/badges/top-rated.png" }} - {{ $title := "Top Rated" }} - {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} -
- -
- {{ $image := resources.Get "img/badges/tewa.png" }} - {{ $title := "Top Web Development Companies" }} - {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} -
-
- -
-
-
-
-

- 4.8/5.0 - - {{ $image := resources.Get "img/stars.png" }} - {{ $title := "" }} - {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 212 "class" "alignnone size-full") }} -

-
-
-
-
-
-
-

Based on 32 client reviews

-
-
-
-
- -
- - - -
-
-
-
-
-
-
- -
- {{ range .Site.Params.testimonials }} -
-
-
-
-

{{ .description }}

-
-
-
- {{ .name }} -
- {{ $image := resources.Get "img/stars.png" }} - {{ $title := "five stars" }} - {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 106 "class" "alignnone size-full") }} -
- {{ .title }} - -
-
-
-
- {{ end }} -
-
-
-
-
-
-
-
+{{ $nonCriticalCSS := resources.Get "css/swiper.min.css" | postCSS | minify | fingerprint | resources.PostProcess }} + + + +
+
+
+
+
+
+

TESTIMONIALS

+
+
+
+
+
+

+ Most clients stay over 3 years. Some stayed beyond 6. +

+
+
+
+
+
+

Don’t just take our word for it. See what our clients say about our services.

+
+
+
+
+
+
+ + + +
+ +
+ + +
+ + {{ $image := resources.Get "img/badges/top-software-development-companies.svg" }} + Top Software Development Company on GoodFirms + +
+ +
+ {{ $image := resources.Get "img/badges/clutch.png" }} + {{ $title := "Clutch banner" }} + {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} +
+ + +
+ {{ $image := resources.Get "img/badges/glassdoor.png" }} + {{ $title := "Glassdoor logo" }} + {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} +
+
+ {{ $image := resources.Get "img/badges/top-rated.png" }} + {{ $title := "Top Rated" }} + {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} +
+ +
+ {{ $image := resources.Get "img/badges/tewa.png" }} + {{ $title := "Top Web Development Companies" }} + {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 50 "class" "logo-image") }} +
+
+ +
+
+
+
+

+ 4.8/5.0 + + {{ $image := resources.Get "img/stars.png" }} + {{ $title := "" }} + {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 212 "class" "alignnone size-full") }} +

+
+
+
+
+
+
+

Based on 32 client reviews

+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+ +
+ {{ range .Site.Params.testimonials }} +
+
+
+
+

{{ .description }}

+
+
+
+ {{ .name }} +
+ {{ $image := resources.Get "img/stars.png" }} + {{ $title := "five stars" }} + {{ partial "img/resize.html" (dict "image" $image "title" $title "width" 106 "class" "alignnone size-full") }} +
+ {{ .title }} + +
+
+
+
+ {{ end }} +
+
+
+
+
+
+
+
diff --git a/themes/beaver/layouts/partials/page/use-cases.html b/themes/beaver/layouts/_partials/page/use-cases.html similarity index 100% rename from themes/beaver/layouts/partials/page/use-cases.html rename to themes/beaver/layouts/_partials/page/use-cases.html diff --git a/themes/beaver/layouts/partials/pagination.html b/themes/beaver/layouts/_partials/pagination.html similarity index 100% rename from themes/beaver/layouts/partials/pagination.html rename to themes/beaver/layouts/_partials/pagination.html diff --git a/themes/beaver/layouts/partials/svg.html b/themes/beaver/layouts/_partials/svg.html similarity index 100% rename from themes/beaver/layouts/partials/svg.html rename to themes/beaver/layouts/_partials/svg.html diff --git a/themes/beaver/layouts/partials/svgi.html b/themes/beaver/layouts/_partials/svgi.html similarity index 100% rename from themes/beaver/layouts/partials/svgi.html rename to themes/beaver/layouts/_partials/svgi.html diff --git a/themes/beaver/layouts/partials/svgiw.html b/themes/beaver/layouts/_partials/svgiw.html similarity index 100% rename from themes/beaver/layouts/partials/svgiw.html rename to themes/beaver/layouts/_partials/svgiw.html diff --git a/themes/beaver/layouts/partials/technologies.html b/themes/beaver/layouts/_partials/technologies.html similarity index 100% rename from themes/beaver/layouts/partials/technologies.html rename to themes/beaver/layouts/_partials/technologies.html diff --git a/themes/beaver/layouts/shortcodes/img.html b/themes/beaver/layouts/_shortcodes/img.html similarity index 100% rename from themes/beaver/layouts/shortcodes/img.html rename to themes/beaver/layouts/_shortcodes/img.html diff --git a/themes/beaver/layouts/_shortcodes/youtube.html b/themes/beaver/layouts/_shortcodes/youtube.html new file mode 100644 index 000000000..9827c492c --- /dev/null +++ b/themes/beaver/layouts/_shortcodes/youtube.html @@ -0,0 +1,127 @@ +{{- /* +Renders an embedded YouTube video. + +@param {bool} [allowFullScreen=true] Whether the iframe element can activate full screen mode. +@param {bool} [autoplay=false] Whether to automatically play the video. Forces mute to be true. +@param {string} [class] The class attribute of the wrapping div element. When specified, removes the style attributes from the iframe element and its wrapping div element. +@param {bool} [controls=true] Whether to display the video controls. +@param {int} [end] The time, measured in seconds from the start of the video, when the player should stop playing the video. +@param {string} [id] The video id. Optional if the id is the first and only positional argument. +@param {string} [loading=eager] The loading attribute of the iframe element. +@param {bool} [loop=false] Whether to indefinitely repeat the video. Ignores the start and end arguments after the first play. +@param {bool} [mute=false] Whether to mute the video. Always true when autoplay is true. +@param {int} [start] The time, measured in seconds from the start of the video, when the player should start playing the video. +@param {string} [title] The title attribute of the iframe element. Defaults to "YouTube video". + +@returns {template.HTML} + +@reference https://developers.google.com/youtube/player_parameters + +@example {{< youtube 0RKpf3rK57I >}} +@example {{< youtube id=0RKpf3rK57I loading=lazy start=30 >}} +*/}} + +{{- $pc := .Page.Site.Config.Privacy.YouTube }} +{{- $remoteErrID := "err-youtube-remote" }} +{{- if not $pc.Disable }} +{{- with $id := or (.Get "id") (.Get 0) }} + +{{- /* Set defaults. */}} +{{- $allowFullScreen := true }} +{{- $autoplay := 0 }} +{{- $class := "" }} +{{- $controls := 1 }} +{{- $end := 0 }} +{{- $loading := "eager" }} +{{- $loop := 0 }} +{{- $mute := 0 }} +{{- $start := 0 }} +{{- $title := "YouTube video" }} +{{- $iframeAllowList := "accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" }} + +{{- /* Get arguments. */}} +{{- if in (slice "true" true 1) ($.Get "allowFullScreen") }} +{{- $allowFullScreen = true }} +{{- else if in (slice "false" false 0) ($.Get "allowFullScreen") }} +{{- $allowFullScreen = false }} +{{- end }} +{{- if in (slice "true" true 1) ($.Get "autoplay") }} +{{- $autoplay = 1 }} +{{- else if in (slice "false" false 0) ($.Get "autoplay") }} +{{- $autoplay = 0 }} +{{- end }} +{{- if in (slice "true" true 1) ($.Get "controls") }} +{{- $controls = 1 }} +{{- else if in (slice "false" false 0) ($.Get "controls") }} +{{- $controls = 0 }} +{{- end }} +{{- if in (slice "true" true 1) ($.Get "loop") }} +{{- $loop = 1 }} +{{- else if in (slice "false" false 0) ($.Get "loop") }} +{{- $loop = 0 }} +{{- end }} +{{- if or (in (slice "true" true 1) ($.Get "mute")) $autoplay }} +{{- $mute = 1 }} +{{- else if in (slice "false" false 0) ($.Get "mute") }} +{{- $mute = 0 }} +{{- end }} +{{- $class := or ($.Get "class") $class }} +{{- $end := or ($.Get "end") $end }} +{{- $loading := or ($.Get "loading") $loading }} +{{- $start := or ($.Get "start") $start }} +{{- $title := or ($.Get "title") $title }} + +{{- /* Adjust iframeAllowList. */}} +{{- if $allowFullScreen }} +{{- $iframeAllowList = printf "%s; fullscreen" $iframeAllowList }} +{{- end }} + +{{- /* Define src attribute. */}} +{{- $host := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" }} +{{- $src := printf "https://%s/embed/%s" $host $id }} +{{- $params := dict +"autoplay" $autoplay +"controls" $controls +"end" $end +"mute" $mute +"start" $start +"loop" $loop +}} +{{- if $loop }} +{{- $params = merge $params (dict "playlist" $id) }} +{{- end }} +{{- with querify $params }} +{{- $src = printf "%s?%s" $src . }} +{{- end }} + +{{- /* Set div attributes. */}} +{{- $divStyle := "position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden;" }} +{{- if $class }} +{{- $divStyle = "" }} +{{- end }} + +{{- /* Set iframe attributes. */}} +{{- $iframeStyle := "position: absolute; top: 0; left: 0; width: 100%; height: 100%; border:0;" }} +{{- if $class }} +{{- $iframeStyle = "" }} +{{- end }} +{{- $referrerpolicy := "strict-origin-when-cross-origin" }} + +{{- /* Render. */ -}} +
+ +
+{{- else }} +{{- errorf "The %q shortcode requires an id argument. See %s" .Name .Position }} +{{- end }} +{{- end }} diff --git a/themes/beaver/layouts/_default/baseof.html b/themes/beaver/layouts/baseof.html similarity index 100% rename from themes/beaver/layouts/_default/baseof.html rename to themes/beaver/layouts/baseof.html diff --git a/themes/beaver/layouts/page/index.html b/themes/beaver/layouts/home.html similarity index 100% rename from themes/beaver/layouts/page/index.html rename to themes/beaver/layouts/home.html diff --git a/themes/beaver/layouts/_default/list.html b/themes/beaver/layouts/list.html similarity index 100% rename from themes/beaver/layouts/_default/list.html rename to themes/beaver/layouts/list.html diff --git a/themes/beaver/layouts/_default/section.html b/themes/beaver/layouts/section.html similarity index 100% rename from themes/beaver/layouts/_default/section.html rename to themes/beaver/layouts/section.html diff --git a/themes/beaver/layouts/_default/single.html b/themes/beaver/layouts/single.html similarity index 100% rename from themes/beaver/layouts/_default/single.html rename to themes/beaver/layouts/single.html