diff --git a/.gitignore b/.gitignore index d679d63f..2bcdab39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -# Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. - /.phpunit.cache /.phpunit.result.cache /output_*/ @@ -11,3 +9,4 @@ source/build /.direnv/ +/source/atdc/* diff --git a/.gitmodules b/.gitmodules index 6d2e1ab4..d72f6645 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ -[submodule "source/_pages/atdc"] - path = source/_pages/atdc - url = git@github.com:opdavies/atdc-pages.git - branch = main +[submodule "source/atdc"] + path = source/atdc + url = forgejo@ssh.oliverdavies.uk:opdavies/atdc-pages.git diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 0aecf530..49f6e123 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -2,8 +2,6 @@ sculpin_content_types: daily_emails: permalink: /daily/:year/:month/:day/:basename/ - pages: - permalink: /:basename/ podcast_episodes: permalink: /podcast/:basename/ posts: diff --git a/source/_pages/404.md b/source/404.md similarity index 96% rename from source/_pages/404.md rename to source/404.md index 1074a585..84c8f7b0 100644 --- a/source/_pages/404.md +++ b/source/404.md @@ -1,4 +1,5 @@ --- +layout: page title: Page not found --- @@ -17,6 +18,4 @@ If you were looking for something else, you can [search for it](/search). {% include 'daily-email-form.html.twig' with { intro: 'Sign up and get daily emails about Drupal, PHP and software development.' } %} - - {{ parent() }} {% endblock %} diff --git a/source/_pages/atdc b/source/_pages/atdc deleted file mode 160000 index f31e5c43..00000000 --- a/source/_pages/atdc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f31e5c4364890b2a31b3acd961f78565ad822de9 diff --git a/source/_pages/archive.html b/source/archive.html similarity index 99% rename from source/_pages/archive.html rename to source/archive.html index d20b22a0..eaf2a324 100644 --- a/source/_pages/archive.html +++ b/source/archive.html @@ -1,4 +1,5 @@ --- +layout: page title: The Daily Drupaler meta: title: The Daily Drupaler - Daily Software Development Thoughts and Tips | %site.name% diff --git a/source/atdc b/source/atdc new file mode 160000 index 00000000..856a7323 --- /dev/null +++ b/source/atdc @@ -0,0 +1 @@ +Subproject commit 856a7323f64b5a9476dc74fa09be04f6e818e280 diff --git a/source/_pages/atdc-welcome.md b/source/atdc-welcome.md similarity index 98% rename from source/_pages/atdc-welcome.md rename to source/atdc-welcome.md index 2775c316..67a19af8 100644 --- a/source/_pages/atdc-welcome.md +++ b/source/atdc-welcome.md @@ -1,4 +1,5 @@ --- +layout: page title: Welcome to the Test-Driven Drupal email course meta: title: Welcome to the Test-Driven Drupal email course | %site.name% diff --git a/source/_pages/atdc.md b/source/atdc.md similarity index 97% rename from source/_pages/atdc.md rename to source/atdc.md index 1d03c50a..c9fbefc8 100644 --- a/source/_pages/atdc.md +++ b/source/atdc.md @@ -1,4 +1,5 @@ --- +layout: page title: Introduction to Automated Testing in Drupal email course --- @@ -21,7 +22,5 @@ Learn to test things like: {% block content_bottom %}
{% include 'testimonials' with { tag: 'atdc' } %} - - {{ parent() }}
{% endblock %} diff --git a/source/_pages/bcm.md b/source/bcm.md similarity index 98% rename from source/_pages/bcm.md rename to source/bcm.md index 56f8b3e0..2e09fd13 100644 --- a/source/_pages/bcm.md +++ b/source/bcm.md @@ -1,4 +1,5 @@ --- +layout: page title: Hi, PHP UserGroup Munich! --- diff --git a/source/_pages/bco.md b/source/bco.md similarity index 98% rename from source/_pages/bco.md rename to source/bco.md index 732f5e8f..a47b33c7 100644 --- a/source/_pages/bco.md +++ b/source/bco.md @@ -1,4 +1,5 @@ --- +layout: page title: Hi, PHP Oxford! --- diff --git a/source/_pages/brumphp.md b/source/brumphp.md similarity index 99% rename from source/_pages/brumphp.md rename to source/brumphp.md index ac96fc5a..1736a45d 100644 --- a/source/_pages/brumphp.md +++ b/source/brumphp.md @@ -1,4 +1,5 @@ --- +layout: page title: BrumPHP --- diff --git a/source/_pages/build-configs.md b/source/build-configs.md similarity index 99% rename from source/_pages/build-configs.md rename to source/build-configs.md index dec3cb46..c0069118 100644 --- a/source/_pages/build-configs.md +++ b/source/build-configs.md @@ -1,4 +1,5 @@ --- +layout: page title: "Build Configs - configuration files as a service" products: - diff --git a/source/_pages/call.html.twig b/source/call.html.twig similarity index 99% rename from source/_pages/call.html.twig rename to source/call.html.twig index 9e0452a8..5b719a4f 100644 --- a/source/_pages/call.html.twig +++ b/source/call.html.twig @@ -1,4 +1,5 @@ --- +layout: page title: Book a 1-on-1 consulting call link: https://savvycal.com/opdavies/consulting-call price: 350 diff --git a/source/_pages/contact.md b/source/contact.md similarity index 94% rename from source/_pages/contact.md rename to source/contact.md index f4c4da32..adcb1f45 100644 --- a/source/_pages/contact.md +++ b/source/contact.md @@ -1,4 +1,5 @@ --- +layout: page title: Contact Oliver --- diff --git a/source/_pages/daily.md b/source/daily.md similarity index 98% rename from source/_pages/daily.md rename to source/daily.md index 526ee406..7f387a74 100644 --- a/source/_pages/daily.md +++ b/source/daily.md @@ -1,4 +1,5 @@ --- +layout: page title: Sign up for the Daily Drupaler Email List meta: title: The Daily Drupaler - Daily Software Development Thoughts and Tips | %site.name% @@ -30,6 +31,4 @@ use: [daily_emails] tag: 'daily', title: 'What subscribers have said', } %} - - {{ parent() }} {% endblock %} diff --git a/source/_pages/dcg.md b/source/dcg.md similarity index 99% rename from source/_pages/dcg.md rename to source/dcg.md index d2a0bb38..74d3f875 100644 --- a/source/_pages/dcg.md +++ b/source/dcg.md @@ -1,4 +1,5 @@ --- +layout: page title: DrupalCamp Ghent 2024 --- diff --git a/source/_pages/drupal-london.md b/source/drupal-london.md similarity index 99% rename from source/_pages/drupal-london.md rename to source/drupal-london.md index cfb5a039..2870d5d8 100644 --- a/source/_pages/drupal-london.md +++ b/source/drupal-london.md @@ -1,4 +1,5 @@ --- +layout: page title: Drupal London --- diff --git a/source/_pages/drupal-upgrade.md b/source/drupal-upgrade.md similarity index 99% rename from source/_pages/drupal-upgrade.md rename to source/drupal-upgrade.md index 39dc2552..989bfad5 100644 --- a/source/_pages/drupal-upgrade.md +++ b/source/drupal-upgrade.md @@ -1,4 +1,5 @@ --- +layout: page title: Are you stuck on Drupal 7, 8 or 9? button: text: Book your roadmap now diff --git a/source/_pages/drupalcamp-ghent.md b/source/drupalcamp-ghent.md similarity index 98% rename from source/_pages/drupalcamp-ghent.md rename to source/drupalcamp-ghent.md index d041adef..907b0518 100644 --- a/source/_pages/drupalcamp-ghent.md +++ b/source/drupalcamp-ghent.md @@ -1,4 +1,5 @@ --- +layout: page title: DrupalCamp Ghent 2024 --- diff --git a/source/_pages/drupalgive.md b/source/drupalgive.md similarity index 99% rename from source/_pages/drupalgive.md rename to source/drupalgive.md index 986a69b7..e4a7efe0 100644 --- a/source/_pages/drupalgive.md +++ b/source/drupalgive.md @@ -1,4 +1,5 @@ --- +layout: page title: My Drupal Contributions modules: - diff --git a/source/_pages/dto.md b/source/dto.md similarity index 99% rename from source/_pages/dto.md rename to source/dto.md index d56efe05..9eb03fef 100644 --- a/source/_pages/dto.md +++ b/source/dto.md @@ -1,4 +1,5 @@ --- +layout: page title: Introduction to Automated Testing and Test-Driven Development with Drupal drupal_version: 10 prices: diff --git a/source/_pages/glossary.html.twig b/source/glossary.html.twig similarity index 98% rename from source/_pages/glossary.html.twig rename to source/glossary.html.twig index 23164c81..4481d037 100644 --- a/source/_pages/glossary.html.twig +++ b/source/glossary.html.twig @@ -1,4 +1,5 @@ --- +layout: page title: Glossary terms: - diff --git a/source/_pages/index.html.twig b/source/index.html.twig similarity index 99% rename from source/_pages/index.html.twig rename to source/index.html.twig index c7ff8bfd..3d5567a2 100644 --- a/source/_pages/index.html.twig +++ b/source/index.html.twig @@ -1,6 +1,7 @@ --- -title: Unlimited Drupal Consulting for a Fixed Monthly Price +layout: page permalink: / +title: Unlimited Drupal Consulting for a Fixed Monthly Price meta: title: Unlimited Drupal Consulting by Oliver Davies supported_version: 10 diff --git a/source/_pages/mob.md b/source/mob.md similarity index 97% rename from source/_pages/mob.md rename to source/mob.md index 9342e812..b21f3436 100644 --- a/source/_pages/mob.md +++ b/source/mob.md @@ -1,4 +1,5 @@ --- +layout: page title: An Introduction to Mob Programming --- diff --git a/source/_pages/new.md b/source/new.md similarity index 99% rename from source/_pages/new.md rename to source/new.md index dd716614..d819b593 100644 --- a/source/_pages/new.md +++ b/source/new.md @@ -1,4 +1,5 @@ --- +layout: page title: Get Unlimited Drupal Consulting for a Fixed Monthly Price meta: title: Unlimited Drupal Consulting by Oliver Davies diff --git a/source/_pages/pair.html.twig b/source/pair.html.twig similarity index 99% rename from source/_pages/pair.html.twig rename to source/pair.html.twig index 9cdb3f9d..f40e1975 100644 --- a/source/_pages/pair.html.twig +++ b/source/pair.html.twig @@ -1,4 +1,5 @@ --- +layout: page title: Pair program with me price: 499 link: https://savvycal.com/opdavies/pair diff --git a/source/_pages/phpberks.md b/source/phpberks.md similarity index 99% rename from source/_pages/phpberks.md rename to source/phpberks.md index 27d10bdb..3c7ae78b 100644 --- a/source/_pages/phpberks.md +++ b/source/phpberks.md @@ -1,4 +1,5 @@ --- +layout: page title: PHP Berkshire --- diff --git a/source/_pages/podcast.md b/source/podcast.md similarity index 98% rename from source/_pages/podcast.md rename to source/podcast.md index ad008a60..0ec0a4b1 100644 --- a/source/_pages/podcast.md +++ b/source/podcast.md @@ -1,4 +1,5 @@ --- +layout: page title: The Beyond Blocks podcast meta: description: A podcast about Drupal, PHP open-source and software development. diff --git a/source/_pages/presentations.html.twig b/source/presentations.html.twig similarity index 100% rename from source/_pages/presentations.html.twig rename to source/presentations.html.twig diff --git a/source/_pages/press.md b/source/press.md similarity index 99% rename from source/_pages/press.md rename to source/press.md index 15a8df88..d821414c 100644 --- a/source/_pages/press.md +++ b/source/press.md @@ -1,4 +1,5 @@ --- +layout: page title: Press Info --- diff --git a/source/_pages/pricing.md b/source/pricing.md similarity index 99% rename from source/_pages/pricing.md rename to source/pricing.md index d19f7ff5..6496cbe0 100644 --- a/source/_pages/pricing.md +++ b/source/pricing.md @@ -1,4 +1,5 @@ --- +layout: page title: Products and Services products: - diff --git a/source/_pages/search.html.twig b/source/search.html.twig similarity index 98% rename from source/_pages/search.html.twig rename to source/search.html.twig index 464698bd..f0b5a51c 100644 --- a/source/_pages/search.html.twig +++ b/source/search.html.twig @@ -1,4 +1,5 @@ --- +layout: page title: Search common_searches: - Drupal diff --git a/source/_pages/sfs.md b/source/sfs.md similarity index 97% rename from source/_pages/sfs.md rename to source/sfs.md index cb744b7d..b01d8745 100644 --- a/source/_pages/sfs.md +++ b/source/sfs.md @@ -1,4 +1,5 @@ --- +layout: page title: Sculpin from Scratch --- diff --git a/source/_pages/speaker.md b/source/speaker.md similarity index 98% rename from source/_pages/speaker.md rename to source/speaker.md index 6fa17418..54810157 100644 --- a/source/_pages/speaker.md +++ b/source/speaker.md @@ -1,4 +1,5 @@ --- +layout: page title: Speaker Information --- diff --git a/source/_pages/sponsor.md b/source/sponsor.md similarity index 99% rename from source/_pages/sponsor.md rename to source/sponsor.md index 414ab992..58f5d2b8 100644 --- a/source/_pages/sponsor.md +++ b/source/sponsor.md @@ -1,4 +1,5 @@ --- +layout: page title: Sponsor me to work on Open Source Software --- diff --git a/source/_pages/testimonials.md b/source/testimonials.md similarity index 89% rename from source/_pages/testimonials.md rename to source/testimonials.md index 7ab472f3..32a72c8b 100644 --- a/source/_pages/testimonials.md +++ b/source/testimonials.md @@ -1,4 +1,5 @@ --- +layout: page title: Testimonials --- diff --git a/source/_pages/things-about-php.md b/source/things-about-php.md similarity index 99% rename from source/_pages/things-about-php.md rename to source/things-about-php.md index f68c5760..6f3cb0a9 100644 --- a/source/_pages/things-about-php.md +++ b/source/things-about-php.md @@ -1,4 +1,5 @@ --- +layout: page title: Things you should know about PHP --- diff --git a/source/_pages/welcome.md b/source/welcome.md similarity index 98% rename from source/_pages/welcome.md rename to source/welcome.md index 2bf4978e..6a4ece75 100644 --- a/source/_pages/welcome.md +++ b/source/welcome.md @@ -1,4 +1,5 @@ --- +layout: page title: Welcome! meta: title: Welcome to my Daily Email list | %site.name%