From b0a751e8b1ddbad97309c2296a2258add4b0ed38 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 28 May 2018 15:34:24 +0200 Subject: [PATCH] Combine config files --- app/config/sculpin_site.yml | 205 ++++++++++++++++++++++++++++++++++-- data/companies.yml | 61 ----------- data/events.yml | 94 ----------------- data/meetups.yml | 12 --- data/navigation.yml | 28 ----- 5 files changed, 199 insertions(+), 201 deletions(-) delete mode 100644 data/companies.yml delete mode 100644 data/events.yml delete mode 100644 data/meetups.yml delete mode 100644 data/navigation.yml diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index fc9206f9..5ffede4f 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -18,6 +18,68 @@ availability: avatar: url: /build/images/me-precedent.jpg +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://assoc.drupal.org + + freelance: + name: Freelance + + horse_country: + name: 'Horse & Country TV' + logo: horse-and-country.jpg + url: http://www.horseandcountry.tv + + 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 + drupalorg: name: opdavies uid: 381388 @@ -26,6 +88,101 @@ drupalorg: email: oliver+website@oliverdavies.uk +events: + drupal-bristol: + name: Drupal Bristol + location: Bristol, UK + website: https://www.drupalbristol.org.uk + + drupal-somerset: + name: Drupal Somerset + location: Glastonbury, UK + + drupalcamp-brighton-15: + name: DrupalCamp Brighton 2015 + location: Brighton, UK + + drupalcamp-bristol-16: + name: DrupalCamp Bristol 2016 + location: Bristol, UK + website: https://2016.drupalcampbristol.org.uk + + drupalcamp-dublin-17: + name: DrupalCamp Dublin 2017 + location: Dublin, Ireland + website: http://2017.drupal.ie + + drupalcamp-london-14: + name: DrupalCamp London 2014 + location: London, UK + + drupalcamp-london-15: + name: DrupalCamp London 2015 + location: London, UK + + drupalcamp-london-16: + name: DrupalCamp London 2016 + location: London, UK + + drupalcamp-london-17: + name: DrupalCamp London 2017 + location: London, UK + website: http://drupalcamp.london + + drupalcamp-london-18: + name: DrupalCamp London 2018 + location: London, UK + website: http://drupalcamp.london + + drupalcamp-north-15: + name: DrupalCamp North 2015 + location: Sunderland, UK + website: http://drupalcampnorth.org + + nomad-php: + name: Nomad PHP + location: Online + website: https://nomadphp.com + + nwdug: + name: NWDUG + location: Manchester, UK + website: http://nwdrupal.org.uk + + phpnw17: + name: PHP North West 2017 + location: Manchester, UK + website: http://conference.phpnw.org.uk/phpnw17 + + phpsc16: + name: PHP South Coast 2016 + location: Portsmouth, UK + website: http://2016.phpsouthcoast.co.uk + + phpsw: + name: PHPSW + location: Bristol, UK + website: https://phpsw.uk + + phpuk18: + name: PHP UK Conference 2018 + location: London, UK + website: https://www.phpconference.co.uk + + swdug: + name: SWDUG + location: Cardiff, UK + + umbristol: + name: umBristol + location: Bristol, UK + website: http://umbristol.co.uk + + unifieddiff: + name: 'unified.diff' + location: Cardiff, UK + website: http://unifieddiff.co.uk + favicon: url: /build/images/me-phpnw.png @@ -50,6 +207,48 @@ latest_posts: 5 linkedin: url: http://uk.linkedin.com/in/opdavies +meetups: + - name: Drupal Bristol + logo: drupal-bristol.jpeg + url: 'http://www.drupalbristol.org.uk' + + - name: DrupalCamp Bristol + logo: drupalcamp-bristol.png + url: 'http://www.drupalcampbristol.co.uk' + + - name: PHPSW + logo: phpsw.jpeg + url: 'http://phpsw.uk' + +navigation: + - title: About + href: '/' + pattern: '^/.$' + + - title: Experience + href: '/experience' + pattern: '^/experience/?$' + + - title: Talks + href: '/talks' + pattern: '^/talks/?' + + - title: 'Open Source' + href: '/opensource' + pattern: '^/opensource/?$' + + - title: Blog + href: '/blog' + pattern: '^/blog/?' + + - title: Book + href: '/test-driven-drupal' + pattern: '^/test-driven-drupal/?' + + - title: Contact + href: '/contact' + pattern: '^/contact/?' + packagist: name: opdavies url: https://packagist.org/users/opdavies @@ -71,9 +270,3 @@ youtube: work: role: Senior Developer company: microserve - -imports: - - '../../data/companies.yml' - - '../../data/events.yml' - - '../../data/meetups.yml' - - '../../data/navigation.yml' diff --git a/data/companies.yml b/data/companies.yml deleted file mode 100644 index a56b10f9..00000000 --- a/data/companies.yml +++ /dev/null @@ -1,61 +0,0 @@ -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://assoc.drupal.org - - freelance: - name: Freelance - - horse_country: - name: 'Horse & Country TV' - logo: horse-and-country.jpg - url: http://www.horseandcountry.tv - - 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/data/events.yml b/data/events.yml deleted file mode 100644 index 34b684fa..00000000 --- a/data/events.yml +++ /dev/null @@ -1,94 +0,0 @@ -events: - drupal-bristol: - name: Drupal Bristol - location: Bristol, UK - website: https://www.drupalbristol.org.uk - - drupal-somerset: - name: Drupal Somerset - location: Glastonbury, UK - - drupalcamp-brighton-15: - name: DrupalCamp Brighton 2015 - location: Brighton, UK - - drupalcamp-bristol-16: - name: DrupalCamp Bristol 2016 - location: Bristol, UK - website: https://2016.drupalcampbristol.org.uk - - drupalcamp-dublin-17: - name: DrupalCamp Dublin 2017 - location: Dublin, Ireland - website: http://2017.drupal.ie - - drupalcamp-london-14: - name: DrupalCamp London 2014 - location: London, UK - - drupalcamp-london-15: - name: DrupalCamp London 2015 - location: London, UK - - drupalcamp-london-16: - name: DrupalCamp London 2016 - location: London, UK - - drupalcamp-london-17: - name: DrupalCamp London 2017 - location: London, UK - website: http://drupalcamp.london - - drupalcamp-london-18: - name: DrupalCamp London 2018 - location: London, UK - website: http://drupalcamp.london - - drupalcamp-north-15: - name: DrupalCamp North 2015 - location: Sunderland, UK - website: http://drupalcampnorth.org - - nomad-php: - name: Nomad PHP - location: Online - website: https://nomadphp.com - - nwdug: - name: NWDUG - location: Manchester, UK - website: http://nwdrupal.org.uk - - phpnw17: - name: PHP North West 2017 - location: Manchester, UK - website: http://conference.phpnw.org.uk/phpnw17 - - phpsc16: - name: PHP South Coast 2016 - location: Portsmouth, UK - website: http://2016.phpsouthcoast.co.uk - - phpsw: - name: PHPSW - location: Bristol, UK - website: https://phpsw.uk - - phpuk18: - name: PHP UK Conference 2018 - location: London, UK - website: https://www.phpconference.co.uk - - swdug: - name: SWDUG - location: Cardiff, UK - - umbristol: - name: umBristol - location: Bristol, UK - website: http://umbristol.co.uk - - unifieddiff: - name: 'unified.diff' - location: Cardiff, UK - website: http://unifieddiff.co.uk diff --git a/data/meetups.yml b/data/meetups.yml deleted file mode 100644 index 028d2b33..00000000 --- a/data/meetups.yml +++ /dev/null @@ -1,12 +0,0 @@ -meetups: - - name: Drupal Bristol - logo: drupal-bristol.jpeg - url: 'http://www.drupalbristol.org.uk' - - - name: DrupalCamp Bristol - logo: drupalcamp-bristol.png - url: 'http://www.drupalcampbristol.co.uk' - - - name: PHPSW - logo: phpsw.jpeg - url: 'http://phpsw.uk' diff --git a/data/navigation.yml b/data/navigation.yml deleted file mode 100644 index df242435..00000000 --- a/data/navigation.yml +++ /dev/null @@ -1,28 +0,0 @@ -navigation: - - title: About - href: '/' - pattern: '^/.$' - - - title: Experience - href: '/experience' - pattern: '^/experience/?$' - - - title: Talks - href: '/talks' - pattern: '^/talks/?' - - - title: 'Open Source' - href: '/opensource' - pattern: '^/opensource/?$' - - - title: Blog - href: '/blog' - pattern: '^/blog/?' - - - title: Book - href: '/test-driven-drupal' - pattern: '^/test-driven-drupal/?' - - - title: Contact - href: '/contact' - pattern: '^/contact/?'