diff --git a/.gitignore b/.gitignore index 242cc09c..7f917eb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /mix-manifest.json /node_modules/ /output_*/ -/source/build/ +/source/dist/ /vendor/ diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index a2b90484..e4b7c76f 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -13,12 +13,12 @@ availability: full: no avatar: - url: /build/images/me-precedent.jpg + url: /dist/images/me-precedent.jpg email: oliver+url@oliverdavies.uk favicon: - url: /build/images/me-phpnw.png + url: /dist/images/me-phpnw.png irc: name: opdavies diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index 8002c134..c2b1c0c9 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -19,7 +19,7 @@ {% include 'og' with { og: page.meta.og } %} - + {% block stylesheets %}{% endblock %} {% for size in site.apple_touch_icon_sizes %} @@ -48,7 +48,7 @@ {% endif %} - + {% block scripts %}{% endblock %} diff --git a/source/_partials/badges.html.twig b/source/_partials/badges.html.twig index 254102d7..724283fd 100644 --- a/source/_partials/badges.html.twig +++ b/source/_partials/badges.html.twig @@ -1,26 +1,26 @@
- Drupal Association Individual Member + Drupal Association Individual Member
- Acquia Certified Grand Master - Drupal 8 Exam Badge + Acquia Certified Grand Master - Drupal 8 Exam Badge
diff --git a/source/_partials/meetup.html.twig b/source/_partials/meetup.html.twig index b5aad165..ee8e7b33 100644 --- a/source/_partials/meetup.html.twig +++ b/source/_partials/meetup.html.twig @@ -2,7 +2,7 @@ {{ name }} logo diff --git a/source/_posts/announcing-the-drupal-vm-generator.md b/source/_posts/announcing-the-drupal-vm-generator.md index e281294b..1ad842fc 100644 --- a/source/_posts/announcing-the-drupal-vm-generator.md +++ b/source/_posts/announcing-the-drupal-vm-generator.md @@ -14,7 +14,7 @@ For the past few weeks I’ve been working on a personal side project, based on {% endblock %} {% block content %} -![](/build/images/blog/drupalvm-generate-repo.png) +![](/dist/images/blog/drupalvm-generate-repo.png) ## What is Drupal VM? @@ -38,7 +38,7 @@ Based on the options passed to it and/or answers that you provide, it generates Here’s an example of it in action: -!['An animated gif showing the interaction process and the resulting config.yml file'](/build/images/blog/drupalvm-generate-example-2.gif) +!['An animated gif showing the interaction process and the resulting config.yml file'](/dist/images/blog/drupalvm-generate-example-2.gif) You can also define options when calling the command and skip any or all questions. Running the following would bypass all of the questions and create a new file with no interaction or additional steps. diff --git a/source/_posts/automating-sculpin-with-jenkins.md b/source/_posts/automating-sculpin-with-jenkins.md index 325fec06..6b88752c 100644 --- a/source/_posts/automating-sculpin-with-jenkins.md +++ b/source/_posts/automating-sculpin-with-jenkins.md @@ -32,7 +32,7 @@ As we don’t need any write access back to the repo, using the HTTP URL rather Also, as I knew that I’d be working a lot with feature branches, I entered `*/master` as the only branch to build. This meant that pushing changes or making edits on any other branches would not trigger a build. -![Defining the Git repository in Jenkins](/build/images/blog/oliverdavies-uk-jenkins-git-repo.png) +![Defining the Git repository in Jenkins](/dist/images/blog/oliverdavies-uk-jenkins-git-repo.png) I also checked the **Poll SCM** option so that Jenkins would be routinely checking for updated code. This essentially uses the same syntax as cron, specifying minutes, hours etc. I entered `* * * * *` so that Jenkins would poll each minute, knowing that I could make this less frequent if needed. @@ -92,7 +92,7 @@ After originally thinking that I'd have to split the build steps into a separate I set this to `@daily` (the same `H H * * *` - `H` is a Jenkins thing), so that the build would be triggered automatically each day without a commit, and deploy any updates to the site. -![Setting Jenkins to periodically build a new version of the site.](/build/images/blog/oliverdavies-uk-jenkins-git-timer.png) +![Setting Jenkins to periodically build a new version of the site.](/dist/images/blog/oliverdavies-uk-jenkins-git-timer.png) ## Next Steps diff --git a/source/_posts/creating-custom-docksal-commands.md b/source/_posts/creating-custom-docksal-commands.md index 4a7f530d..2d2e3e01 100644 --- a/source/_posts/creating-custom-docksal-commands.md +++ b/source/_posts/creating-custom-docksal-commands.md @@ -59,7 +59,7 @@ touch .docksal/commands/phpunit This will create a new, empty `.docksal/commands/phpunit` file, and now the `phpunit` command is now listed under "Custom commands" when we run `fin`. -![](/build/images/blog/docksal-phpunit-command/1.gif) +![](/dist/images/blog/docksal-phpunit-command/1.gif) You can write commands with any interpreter. I’m going to use bash, so I’ll add the shebang to the top of the file. @@ -84,7 +84,7 @@ fin interprets lines starting with `##` as documentation - the first of which it Now when I run it, I see the new description. -![](/build/images/blog/docksal-phpunit-command/2.gif) +![](/dist/images/blog/docksal-phpunit-command/2.gif) Any additional lines are used as help text with running `fin help phpunit`. Here I’ll add an example command to demonstrate how to run it as well as some more in-depth text about what the command will do. @@ -101,7 +101,7 @@ Any additional lines are used as help text with running `fin help phpunit`. Here Now when I run `fin help phpunit`, I see the new help text. -![](/build/images/blog/docksal-phpunit-command/3.gif) +![](/dist/images/blog/docksal-phpunit-command/3.gif) ## Adding some content diff --git a/source/_posts/drupalcamp-bristol-2018.md b/source/_posts/drupalcamp-bristol-2018.md index 0f7c5f45..782da37c 100644 --- a/source/_posts/drupalcamp-bristol-2018.md +++ b/source/_posts/drupalcamp-bristol-2018.md @@ -13,7 +13,7 @@ meta: description: 'It’s with heavy hearts that we are announcing there won’t be a DrupalCamp Bristol 2018.' type: website image: - url: /build/images/blog/drupalcamp-bristol-17-logo.jpg + url: /dist/images/blog/drupalcamp-bristol-17-logo.jpg width: 228 height: 448 type: image/img diff --git a/source/_posts/drupalcamp-bristol-tickets-sessions-sponsors.md b/source/_posts/drupalcamp-bristol-tickets-sessions-sponsors.md index 9f597aa9..54362bda 100644 --- a/source/_posts/drupalcamp-bristol-tickets-sessions-sponsors.md +++ b/source/_posts/drupalcamp-bristol-tickets-sessions-sponsors.md @@ -17,7 +17,7 @@ meta: slug: drupalcamp-bristol-early-bird-tickets-sessions-sponsors --- {% block excerpt %} -

![DrupalCamp Bristol 2017 logo](/build/images/blog/drupalcamp-bristol-17-logo.jpg)

+

![DrupalCamp Bristol 2017 logo](/dist/images/blog/drupalcamp-bristol-17-logo.jpg)

In less than two months time, [DrupalCamp Bristol][0] will be back for our third year! (July seems to come around quicker each year). This is this year’s schedule and venues: {% endblock %} diff --git a/source/_posts/git-format-patch.md b/source/_posts/git-format-patch.md index dd2c7287..3158b427 100644 --- a/source/_posts/git-format-patch.md +++ b/source/_posts/git-format-patch.md @@ -32,7 +32,7 @@ This differs slightly different for each Drupal user, and the code can be found If this is added to the end of the commit message, the resulting commit will show that it was committed by the maintainer but authored by a different user. This will then display on Drupal.org that you’ve made a commit to that project. -![A screenshot of a commit that was authored by rli but committed by opdavies](/build/images/blog/git-format-patch.png) +![A screenshot of a commit that was authored by rli but committed by opdavies](/dist/images/blog/git-format-patch.png) The problem is that some project maintainers either don’t know about this option or occasionally forget to add it. [Dreditor](http://dreditor.org) can suggest a commit message and assign an author, but it is optional and, of course, not all maintainers use Dreditor (although they probably should). diff --git a/source/_posts/improve-jpg-quality.md b/source/_posts/improve-jpg-quality.md index 6f8b2669..a19e791f 100644 --- a/source/_posts/improve-jpg-quality.md +++ b/source/_posts/improve-jpg-quality.md @@ -18,5 +18,5 @@ To increase the quality of your images, change the setting in the two following * admin/settings/imageapi/config * admin/settings/image-toolkit -The first one is for ImageAPI. Primarily, this means Imagecache presets. The second one is for core's image.inc. This is used for resizing profile pictures in core, and some contrib modules. Once changed, I did have to flush each of the Imagecache presets (admin/build/imagecache) for the changes to take effect. +The first one is for ImageAPI. Primarily, this means Imagecache presets. The second one is for core's image.inc. This is used for resizing profile pictures in core, and some contrib modules. Once changed, I did have to flush each of the Imagecache presets (admin/dist/imagecache) for the changes to take effect. {% endblock %} diff --git a/source/_posts/introducing-the-drupal-meetups-twitterbot.md b/source/_posts/introducing-the-drupal-meetups-twitterbot.md index e6abc98b..ed0a9be9 100644 --- a/source/_posts/introducing-the-drupal-meetups-twitterbot.md +++ b/source/_posts/introducing-the-drupal-meetups-twitterbot.md @@ -6,7 +6,7 @@ tags: - php --- {% block excerpt %} -

![](/build/images/blog/drupal-meetups-twitterbot.png)

+

![](/dist/images/blog/drupal-meetups-twitterbot.png)

The [Drupal Meetups Twitterbot][0] is a small project that I worked on a few months ago, but hadn't got around to promoting yet. It’s intention is to provide [one Twitter account][1] where people can get the up to date news from various Drupal meetups. {% endblock %} diff --git a/source/_posts/minimum-core-version.md b/source/_posts/minimum-core-version.md index de5d3c16..86070889 100644 --- a/source/_posts/minimum-core-version.md +++ b/source/_posts/minimum-core-version.md @@ -68,7 +68,7 @@ dependencies[] = system (>=7.36) Because we need to check for Drupal's core version, we're using the system module as the dependency and specifying that it needs to be either equal to or greater than 7.36. If this dependency is not met, e.g. Drupal 7.35 is being used, then the module cannot be enabled rather than showing a function not found error for `user_has_role()` when it is called. -![A screenshot of the modules page showing System as a dependency for a custom module.](/build/images/blog/minimum-drupal-version-d7.png) +![A screenshot of the modules page showing System as a dependency for a custom module.](/dist/images/blog/minimum-drupal-version-d7.png) ## External Links diff --git a/source/_posts/nginx-redirects-with-query-string-arguments.md b/source/_posts/nginx-redirects-with-query-string-arguments.md index 4c735cd8..506a07af 100644 --- a/source/_posts/nginx-redirects-with-query-string-arguments.md +++ b/source/_posts/nginx-redirects-with-query-string-arguments.md @@ -41,7 +41,7 @@ return 301 https://www.example.com$uri$is_args$args; Here is an demo of it working on this website: -![](/build/images/blog/nginx-redirect-with-args.gif) +![](/dist/images/blog/nginx-redirect-with-args.gif) ## Resources diff --git a/source/_posts/publishing-sculpin-sites-with-github-pages.md b/source/_posts/publishing-sculpin-sites-with-github-pages.md index c4229bc6..34b63fe7 100644 --- a/source/_posts/publishing-sculpin-sites-with-github-pages.md +++ b/source/_posts/publishing-sculpin-sites-with-github-pages.md @@ -6,13 +6,13 @@ meta: description: 'How I moved my Sculpin site to GitHub Pages.' og: image: - url: '/build/images/blog/jackson-octocat.png' + url: '/dist/images/blog/jackson-octocat.png' type: 'image/png' height: 200 width: 451 --- {% block excerpt %} -

![](/build/images/blog/jackson-octocat.png)

+

![](/dist/images/blog/jackson-octocat.png)

Earlier this week I moved this site from my personal Linode server to [GitHub Pages][0]. @@ -25,7 +25,7 @@ I’ve seen different implementations of this, mostly where the Sculpin code is This has been made simpler and tidier now that we can use a `docs` directory within the repository to serve content. queue($recipients, $message, $owner); These three pieces of data are then saved as part of the queued item. You can see these by checking the "queue" table in the database or by running `drush queue-list`. -![](/build/images/blog/private-message-queue.png) +![](/dist/images/blog/private-message-queue.png) ``` $ drush queue-list diff --git a/source/_posts/splitting-a-new-contrib-module-from-a-project-repo.md b/source/_posts/splitting-a-new-contrib-module-from-a-project-repo.md index 028df0ea..763434a8 100644 --- a/source/_posts/splitting-a-new-contrib-module-from-a-project-repo.md +++ b/source/_posts/splitting-a-new-contrib-module-from-a-project-repo.md @@ -113,7 +113,7 @@ In this case, the new branch will be `8.x-1.x`. Here is a screenshot of example module that I’ve split and pushed to GitLab. Notice that there are multiple commits in the history, and each still attributed to it’s original author. -![Screenshot of a split project repo on GitLab](/build/images/blog/subtree-split-drupal-module.png) +![Screenshot of a split project repo on GitLab](/dist/images/blog/subtree-split-drupal-module.png) Also, as this is standard Git functionality, you can follow the same process to extract PHP libraries, Symfony bundles, WordPress plugins or anything else. {% endblock %} diff --git a/source/_posts/tdd-test-driven-drupal.md b/source/_posts/tdd-test-driven-drupal.md index c8be3442..f65081c1 100644 --- a/source/_posts/tdd-test-driven-drupal.md +++ b/source/_posts/tdd-test-driven-drupal.md @@ -10,13 +10,13 @@ meta: description: "How to write tests and follow TDD for Drupal applications." type: website image: - url: /build/images/talks/test-driven-drupal-development.png + url: /dist/images/talks/test-driven-drupal-development.png width: 2560 height: 1440 type: image/png --- {% block excerpt %} -

![](/build/images/blog/drupalcamp-dublin.jpg)

+

![](/dist/images/blog/drupalcamp-dublin.jpg)

I recently gave a [talk on automated testing in Drupal][0] talk at [DrupalCamp Dublin][1] and as a lunch and learn session for my colleagues at Microserve. As part of the talk, I gave an example of how to build a Drupal 8 module using a test driven approach. I’ve released the [module code on GitHub][2], and this post outlines the steps of the process. {% endblock %} @@ -119,11 +119,11 @@ Now we can make it pass by adding the page. For this, I will use the Views modul To begin with, I will create a view showing all types of content with a default sort order of newest first. We will use further tests to ensure that only the correct content is returned and that it is ordered correctly. -![](/build/images/blog/tdd-drupal-1.png) { .with-border } +![](/dist/images/blog/tdd-drupal-1.png) { .with-border } The only addition I will make to the view is to add a path at `pages`, as per the acceptance criteria. -![](/build/images/blog/tdd-drupal-2.png) { .with-border } +![](/dist/images/blog/tdd-drupal-2.png) { .with-border } ### Exporting the View @@ -458,7 +458,7 @@ Tests: 1, Assertions: 3, Failures: 1. We can fix this by adding another condition to the view, to only show content based on the node type - i.e. only return page nodes. -![](/build/images/blog/tdd-drupal-3.png) { .with-border } +![](/dist/images/blog/tdd-drupal-3.png) { .with-border } Once the view is updated and the configuration is updated within the module, the test should then pass - and it does. @@ -547,7 +547,7 @@ Tests: 1, Assertions: 2, Failures: 1. This can be fixed by removing the default sort criteria and adding a new one based on "Content: Title". -![](/build/images/blog/tdd-drupal-4.png) { .with-border } +![](/dist/images/blog/tdd-drupal-4.png) { .with-border } Again, once the view has been updated and exported, the test should pass - and it does. diff --git a/source/_posts/turning-your-custom-drupal-module-into-a-feature.md b/source/_posts/turning-your-custom-drupal-module-into-a-feature.md index a83fea42..31c2918c 100644 --- a/source/_posts/turning-your-custom-drupal-module-into-a-feature.md +++ b/source/_posts/turning-your-custom-drupal-module-into-a-feature.md @@ -26,7 +26,7 @@ features[features_api][] = api:2 After clearing the cache, the module is now visible in the Features list - and ready to have the appropriate configuration added to it. -!['The features list showing the custom module'](/build/images/blog/custom-module-as-a-feature.png) +!['The features list showing the custom module'](/dist/images/blog/custom-module-as-a-feature.png) {% endblock %} [0]: https://www.drupal.org/project/features diff --git a/source/_posts/typekit-fonts.md b/source/_posts/typekit-fonts.md index f63a2d98..8a6a6135 100644 --- a/source/_posts/typekit-fonts.md +++ b/source/_posts/typekit-fonts.md @@ -16,6 +16,6 @@ Under 'Kit Settings', ensure that your website domain (e.g. mysite.com) is liste Download and install the [@font-your-face](http://drupal.org/project/fontyourface) module onto your Drupal site, and to go admin/settings/fontyourface to configure it. Enter [your TypeKit API key](https://typekit.com/account/tokens), and click 'Import Typekit' to import your kits and fonts. -Go to admin/build/themes/fontyourface, and click 'Browse fonts to enable'. Click on the name of the font that you want to enable, check 'Enabled', and click 'Edit font' to save your changes. +Go to admin/dist/themes/fontyourface, and click 'Browse fonts to enable'. Click on the name of the font that you want to enable, check 'Enabled', and click 'Edit font' to save your changes. With the font enabled, you can now use it in your CSS. diff --git a/source/_posts/updating-forked-github-repos.md b/source/_posts/updating-forked-github-repos.md index a46128c8..2869b862 100644 --- a/source/_posts/updating-forked-github-repos.md +++ b/source/_posts/updating-forked-github-repos.md @@ -55,12 +55,12 @@ $ git push origin master This seems to have worked OK - the commits are still authored by the correct people and at the correct date and time - and I went ahead and created a new feature branch and pull request based on that master branch.
- The commits on my master branch after rebasing + The commits on my master branch after rebasing
The commits on my forked master branch after rebasing and pushing. All good!
- The new feature branch with my additional commit. + The new feature branch with my additional commit.
The new feature branch with the new commit.
@@ -76,7 +76,7 @@ I believe that it will use an existing "upstream" remote if it exists, otherwise Once you’ve completed the rebase, you can then push your updated branch either from the terminal, or using the *Push* command from the same menu. -![Rebasing a forked repository in PhpStorm using the VCS menu.](/build/images/blog/github-fork-rebase-phpstorm.png) +![Rebasing a forked repository in PhpStorm using the VCS menu.](/dist/images/blog/github-fork-rebase-phpstorm.png) It would be great to see something similar added to [hub](https://hub.github.com) too (I’ve created [an issue](https://github.com/github/hub/issues/1047))! diff --git a/source/_posts/updating-override-node-options-tests.md b/source/_posts/updating-override-node-options-tests.md index adac9d10..0741ae31 100644 --- a/source/_posts/updating-override-node-options-tests.md +++ b/source/_posts/updating-override-node-options-tests.md @@ -193,7 +193,7 @@ Override node options 213 passes, 0 fails, 0 exceptions, and 60 debug messages Test run duration: 25 sec ``` - + [Here][3] are my full changes from the previous patch, where I added the new tests as well as some small refactors. {% endblock %} diff --git a/source/_posts/using-tailwind-css-in-your-drupal-theme.md b/source/_posts/using-tailwind-css-in-your-drupal-theme.md index 811617bd..d96892c4 100644 --- a/source/_posts/using-tailwind-css-in-your-drupal-theme.md +++ b/source/_posts/using-tailwind-css-in-your-drupal-theme.md @@ -58,11 +58,11 @@ By adding a prefix like `tw-`, we can ensure that the Tailwind classes don’t c No prefix: -![](/build/images/blog/using-tailwind-drupal/prefix-1.png){.with-border} +![](/dist/images/blog/using-tailwind-drupal/prefix-1.png){.with-border} With prefix: -![](/build/images/blog/using-tailwind-drupal/prefix-2.png){.with-border} +![](/dist/images/blog/using-tailwind-drupal/prefix-2.png){.with-border} ### Important @@ -78,11 +78,11 @@ For example: if I had this core markup then the left margin added by `tw-ml-4` w
``` -![](/build/images/blog/using-tailwind-drupal/important-1.png){.with-border} +![](/dist/images/blog/using-tailwind-drupal/important-1.png){.with-border} With the `!important` rule enabled though, the Tailwind’s class takes precedence and is applied. -![](/build/images/blog/using-tailwind-drupal/important-2.png){.with-border} +![](/dist/images/blog/using-tailwind-drupal/important-2.png){.with-border} ## Example diff --git a/source/experience.html.twig b/source/experience.html.twig index 3f7ab354..ed7d74ff 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -120,7 +120,7 @@ experiences:
{% if company.logo %}
- {{ company.name }} logo + {{ company.name }} logo
{% endif %} diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig index 81deb9dc..4537a9bd 100644 --- a/source/testimonials.html.twig +++ b/source/testimonials.html.twig @@ -73,7 +73,7 @@ testimonials: {% if testimonial.image %}
{{ testimonial.name }} diff --git a/webpack.mix.js b/webpack.mix.js index f3a6af3f..b583928a 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -4,14 +4,14 @@ require('laravel-mix-purgecss'); require('laravel-mix-tailwind'); mix.disableNotifications() - .sass('assets/sass/site.sass', 'source/build/css') + .sass('assets/sass/site.sass', 'source/dist/css') .combine([ 'node_modules/jquery/dist/jquery.js', 'node_modules/highlightjs/highlight.pack.js', 'assets/js/site.js', - ], 'source/build/js/all.js') - .copyDirectory('assets/images', 'source/build/images') - .copyDirectory('node_modules/font-awesome/fonts', 'source/build/fonts') + ], 'source/dist/js/all.js') + .copyDirectory('assets/images', 'source/dist/images') + .copyDirectory('node_modules/font-awesome/fonts', 'source/dist/fonts') .tailwind() .purgeCss({ globs: [