Merge branch 'master' into add-dublin-talks

.travis.yml

@@ -1,27 +0,0 @@
-language: php
-php: 7
-sudo: true
-
-branches:
-  only:
-    - source
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-    - $HOME/.yarn-cache
-
-before_install:
-  - openssl aes-256-cbc -K $encrypted_01701315b81b_key -iv $encrypted_01701315b81b_iv -in deploy_key.enc -out deploy_key -d
-  - chmod 600 deploy_key
-  - eval `ssh-agent -s`
-  - ssh-add deploy_key
-  - yarn --pure-lockfile
-  - composer install --prefer-dist --no-dev
-
-script: ./publish.sh
-
-env:
-  global:
-    - ENCRYPTION_LABEL: 01701315b81b
-    - COMMIT_AUTHOR_EMAIL: "oliver@oliverdavies.uk"

behat.yml

@@ -1,5 +0,0 @@
-default:
-    extensions:
-        Behat\MinkExtension:
-            base_url: http://127.0.0.1:8000
-            goutte: ~

composer.json

@@ -7,16 +7,16 @@
     },
     "require": {
         "php": "^5.5|^7.0",
-        "behat/mink-extension": "@stable",
-        "behat/mink-goutte-driver": "@stable",
         "dflydev/embedded-composer": "^1.0@dev",
         "mavimo/sculpin-redirect-bundle": "@dev",
-        "opdavies/sculpin-content-generator-bundle": "@stable",
         "opdavies/sculpin-gist-embed-bundle": "^0.1",
         "opdavies/sculpin-twig-markdown-bundle": "^0.1",
         "sculpin/sculpin": "^2.1@dev",
         "tsphethean/sculpin-related-posts-bundle": "~0.1.0"
     },
+    "require-dev": {
+        "opdavies/sculpin-content-generator-bundle": "@stable"
+    },
     "config": {
         "sort-packages": true
     }

features/blog.feature

@@ -1,18 +0,0 @@
-Feature: Blog
-
-    Scenario:
-        Given I am on "/blog"
-        Then the response status code should be 200
-        And the page title should be "Blog"
-        And the active menu link should be "Blog"
-
-    Scenario:
-        Given I am on "/blog/2016/05/03/simplifying-drupal-migrations-with-xautoload"
-        Then the response status code should be 200
-        And the page title should be "Simplifying Drupal Migrations with xautoload"
-        And the active menu link should be "Blog"
-
-    Scenario:
-        Given I am on "/"
-        Then I should see "Latest blog posts"
-        And I should see 3 ".latest-posts .post" elements

features/bootstrap/FeatureContext.php

@@ -1,49 +0,0 @@
-<?php
-
-use Behat\Behat\Tester\Exception\PendingException;
-use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
-use Behat\MinkExtension\Context\MinkContext;
-
-/**
- * Defines application features from the specific context.
- */
-class FeatureContext extends MinkContext implements Context, SnippetAcceptingContext
-{
-    /**
-     * Initializes context.
-     *
-     * Every scenario gets its own context instance.
-     * You can also pass arbitrary arguments to the
-     * context constructor through behat.yml.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * @Then the active menu link should be :text
-     */
-    public function theActiveMenuLinkShouldBe($text)
-    {
-        return $this->assertElementContains('.navbar .active a', $text);
-    }
-
-    /**
-     * @Then the page title should be :text
-     */
-    public function thePageTitleShouldBe($text)
-    {
-        return $this->assertElementContainsText('title', $text);
-    }
-
-    /**
-     * @Then the page title should not be :text
-     */
-    public function thePageTitleShouldNotBe($text)
-    {
-        return $this->assertElementNotContainsText('title', $text);
-    }
-}

features/experience.feature

@@ -1,7 +0,0 @@
-Feature: Experience page
-
-    Scenario:
-        Given I am on "/experience"
-        Then the response status code should be 200
-        And the page title should be "Experience"
-        And the active menu link should be "Experience"

features/home.feature

@@ -1,12 +0,0 @@
-Feature: Home
-    In order to check that the website still works
-    As a website user
-    I need to be able to see that the homepage is correct
-
-    Scenario:
-        Given I am on the homepage
-        Then the response status code should be 200
-        And I should see "a Web Developer and System Administrator based in Wales, UK."
-        And the active menu link should be "About"
-        And the page title should be "Web Developer, System Administrator - PHP, Drupal, Symfony, Linux | Oliver Davies"
-        And the page title should not be "About | Oliver Davies"

features/talks.feature

@@ -1,11 +0,0 @@
-Feature: Talks page
-
-    Scenario:
-        Given I am on "/talks"
-        Then the response status code should be 200
-        And the ".nav li.active a" element should contain "Talks"
-
-    Scenario:
-        Given I am on "/talks/drupal-8-rejoining-the-herd"
-        Then the response status code should be 200
-        And the ".nav li.active a" element should contain "Talks"

features/testimonials.feature

@@ -1,7 +0,0 @@
-Feature: Testimonials page
-
-    Scenario:
-        Given I am on "/testimonials"
-        Then the response status code should be 200
-        And the page title should be "Testimonials"
-        And the active menu link should be "Testimonials"

publish.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-SITE_ENV="prod"
-REPO=`git config remote.origin.url`
-SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
-SHA=`git rev-parse --verify HEAD`
-BUILD_DIR="_deploy"
-
-# Prepare the build directory.
-git clone $REPO $BUILD_DIR
-pushd $BUILD_DIR
-git checkout master || git checkout --orphan master
-popd
-rm -rf ${BUILD_DIR}/**/* || exit 0
-
-# Re-generate the site.
-node_modules/.bin/gulp --production
-vendor/bin/sculpin generate --no-interaction --clean --env=prod
-touch output_prod/.nojekyll
-
-# Add, commit and push the changes.
-pushd $BUILD_DIR
-mv ../output_prod/* .
-git config --local user.email oliver@oliverdavies.uk
-git add -A .
-git commit -m "Re-generate site: $SHA"
-git push $SSH_REPO master
-popd

source/CNAME

@@ -1 +0,0 @@
-www.oliverdavies.uk

source/_includes/talks-table.html.twig

@@ -22,7 +22,7 @@
                         {{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }}
 
                         {% if row.date.time is defined %}
-                            <small class="db black-50">
+                            <small class="db black-70">
                                 {{ row.date.time }}
                             </small>
                         {% endif %}
@@ -40,14 +40,14 @@
                                 {{ row.date.talk_title }}
                             {% endif %}
 
-                            <small class="db black-50">
+                            <small class="db black-70">
                                 {{ row.date.type|default('Talk') }}
                             </small>
                         </td>
                     {% endif %}
 
                     <td class="pa2">
-                        {% if row.event.website is defined %}
+                        {% if row.event.website is not empty %}
                             <a href="{{ row.event.website }}">
                                 {{ row.event.name }}
                             </a>
@@ -56,7 +56,7 @@
                         {% endif %}
 
                         {% if row.event.location is defined %}
-                            <small class="db black-50">
+                            <small class="db black-70">
                                 {{ row.event.location }}
                             </small>
                         {% endif %}