diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 476cf8c3..0d5b71f8 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -46,6 +46,11 @@ companies:
logo: horse-and-country.jpg
url: http://www.horseandcountry.tv
+ inviqa:
+ name: Inviqa
+ logo: inviqa.jpg
+ url: https://inviqa.com
+
lab_class:
name: Lab Class
logo: lab-class.png
@@ -242,8 +247,8 @@ wordpress:
user: opdavies
work:
- role: Senior Developer
- company: microserve
+ role: Senior Software Engineer
+ company: inviqa
youtube:
channel:
diff --git a/data/companies.yml b/data/companies.yml
new file mode 100644
index 00000000..ba211ccf
--- /dev/null
+++ b/data/companies.yml
@@ -0,0 +1,66 @@
+companies:
+ appnovation:
+ name: Appnovation
+ logo: appnovation.png
+ url: https://www.appnovation.com
+
+ cti:
+ name: CTI Digital
+ logo: cti-digital.png
+ url: https://www.ctidigital.com
+
+ develop_me:
+ name: Develop Me Training
+ logo: develop_me.svg
+ url: https://developme.training
+
+ drupal_association:
+ name: Drupal Association
+ logo: drupal-association.png
+ url: https://www.drupal.org/association
+
+ freelance:
+ name: Freelance
+
+ horse_country:
+ name: 'Horse & Country TV'
+ logo: horse-and-country.jpg
+ url: http://www.horseandcountry.tv
+
+ inviqa:
+ name: Inviqa
+ logo: inviqa.jpg
+ url: https://inviqa.com
+
+ lab_class:
+ name: Lab Class
+ logo: lab-class.png
+ url: http://labclass.co.uk
+
+ microserve:
+ name: Microserve
+ logo: microserve.png
+ url: https://microserve.io
+ github: https://github.com/microserve-io
+
+ nomensa:
+ name: Nomensa
+ logo: nomensa.png
+ url: http://www.nomensa.com
+
+ precedent:
+ name: Precedent
+ logo: precedent.jpg
+ url: http://precedent.com
+
+ proctors:
+ name: 'Proctor & Stevenson'
+ logo: proctors.jpg
+ url: http://www.proctors.co.uk
+
+ trent:
+ name: Trent Design
+ url: http://www.trentdesign.net
+
+ zooba:
+ name: Zooba Ltd
diff --git a/source/about.md b/source/about.md
index af6ad1fd..eb60237d 100644
--- a/source/about.md
+++ b/source/about.md
@@ -13,7 +13,7 @@ wide: true
Hi, I’m Oliver Davies (aka opdavies) - a Web Developer based in Wales, UK. I specialise in PHP, front-end development and systems administration.
-I’m a Senior Developer at Microserve, part-time freelancer, former Developer at the Drupal Association, open source contributor and advocate, mentor and conference speaker.
+I’m a {{ site.work.role }} at {{ site.companies[site.work.company].name }}, part-time freelancer, former Developer at the Drupal Association, open source contributor and advocate, mentor and conference speaker.
I primarily work with Drupal and am an Acquia certified Drupal Grand Master, but also use Symfony, Laravel and Sculpin, and have some experience working with JavaScript frameworks including Vue.js and Angular.
diff --git a/source/experience.html.twig b/source/experience.html.twig
index edf21a75..9bfc4ba7 100644
--- a/source/experience.html.twig
+++ b/source/experience.html.twig
@@ -87,6 +87,18 @@ experiences:
start: May 2018
end: March 2019
+ - company: microserve
+ location: Bristol, England
+ role: Senior Drupal Developer
+ start: March 2017
+ end: May 2019
+ description: |
+ Drupal 8 site building, custom module development, theming, data migrations.
+
+ Drupal 7 site building, custom module development, theming.
+
+ First Acquia certified Drupal 8 Developer and back-end specialist.
+
- company: freelance
location: Remote
role: 'Web Developer & System Administrator'
@@ -98,17 +110,11 @@ experiences:
Administration of Debian, Ubuntu and CentOS servers, and configuration using Puppet, or more recently, Ansible.
- - company: microserve
- location: Bristol, England
- role: Senior Drupal Developer
- start: March 2017
+ - company: inviqa
+ location: Remote
+ role: Senior Engineer
+ start: May 2019
end: ~
- description: |
- Drupal 8 site building, custom module development, theming, data migrations.
-
- Drupal 7 site building, custom module development, theming.
-
- First Acquia certified Drupal 8 Developer and back-end specialist.
---
{% macro roleText(experience) %}
{{- experience.role }}
diff --git a/source/images/experience/inviqa.jpg b/source/images/experience/inviqa.jpg
new file mode 100644
index 00000000..de93267d
Binary files /dev/null and b/source/images/experience/inviqa.jpg differ
diff --git a/source/speaker-info.md b/source/speaker-info.md
index fdf39b2e..aeeb2554 100644
--- a/source/speaker-info.md
+++ b/source/speaker-info.md
@@ -9,7 +9,8 @@ layout: default
[Oliver Davies][1] ([@opdavies][2]) has been building websites since 2007, and speaking at meetups and conferences since 2012. He is a Full Stack Developer and an Acquia certified Drupal Grand Master, who also has
experience with DevOps and systems administration as well as development with Symfony, Laravel, Sculpin and Vue.js.
-He is a Senior Developer at [Microserve][3], a Drupal core contributor and mentor, and an open source and contribution advocate.
+
+He is a {{ site.work.role }} at [{{ site.companies[site.work.company].name }}][3], a Drupal core contributor and mentor, and an open source and contribution advocate.
He regularly blogs and gives talks about web development and systems administration, maintains and contributes to various open source projects, and co-organises DrupalCamp Bristol as well as the Drupal Bristol, PHP South West and PHP South Wales user groups.