diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5050e0d..0888f71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,11 @@ variables: JEKYLL_ENV: production LC_ALL: C.UTF-8 +cache: + key: gems + paths: + - /usr/local/bundle/ + before_script: - 'which rsync || ( apt-get update -qq && apt-get install rsync -yqq )' - eval $(ssh-agent -s) @@ -24,16 +29,31 @@ test: except: - master -pages: +deploy:production: stage: deploy script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ - - cd public ; git checkout dev ; cd - + artifacts: + paths: + - public + environment: + name: production + url: https://static.coops.tech + only: + - master + + +deploy:dev: + stage: deploy + script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ artifacts: paths: - public + environment: + name: dev + url: https://dev.static.coops.tech only: - - master + - dev \ No newline at end of file diff --git a/Gemfile b/Gemfile index e8a7006..caeca37 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source 'https://rubygems.org' gem 'jekyll' + +# Fixes deprecation warning - see https://github.com/jekyll/jekyll-sass-converter/pull/75 +gem 'jekyll-sass-converter', git: 'https://github.com/jekyll/jekyll-sass-converter.git', branch: 'sassc' diff --git a/Gemfile.lock b/Gemfile.lock index ec25974..cce78c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/jekyll/jekyll-sass-converter.git + revision: c4d4e3e5b1a2222bb94895f9a6ab7e0216236ab8 + branch: sassc + specs: + jekyll-sass-converter (1.5.2) + sassc (~> 2.0) + GEM remote: https://rubygems.org/ specs: @@ -27,8 +35,6 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) jekyll-watch (2.1.2) listen (~> 3.0) kramdown (1.17.0) @@ -41,23 +47,23 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (2.0.5) + rake (12.3.1) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (2.2.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.6.0) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.0.0) + ffi (~> 1.9.6) + rake PLATFORMS ruby DEPENDENCIES jekyll + jekyll-sass-converter! BUNDLED WITH 1.17.1 diff --git a/_coops/agile-collective.md b/_coops/agile-collective.md index bf49df4..59e501d 100644 --- a/_coops/agile-collective.md +++ b/_coops/agile-collective.md @@ -4,7 +4,7 @@ name: Agile Collective website: http://agile.coop/ email: info@agile.coop twitter: AgileCollective -github: +github: agilecollective telephone: 01865 403 120 address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE latitude: 51.7483161 @@ -56,5 +56,8 @@ technologies: Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team – including our client. As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the ‘Code Club’ on a Wednesday afternoon which is aimed at inspiring young people to get into coding. +<<<<<<< HEAD +======= +>>>>>>> dev There is also a company-wide obsession with cycling of various kinds. diff --git a/_coops/alpha-communication.md b/_coops/alpha-communication.md index 672f7a7..2231cc0 100644 --- a/_coops/alpha-communication.md +++ b/_coops/alpha-communication.md @@ -7,8 +7,8 @@ twitter: alpha.coop github: AlphaCo_op telephone: +441912111938 address: 6 Charlotte Square,Newcastle upon Tyne,United Kingdom,NE1 4XF -latitude: -longitude: +latitude: 54.97101 +longitude: -1.61974 clients: services: - animation @@ -41,5 +41,5 @@ Branding, media, print and video all working together. We deliver on time and within budget. KNOWING -After 30 years, we know what we’re doing +After 30 years, we know what we’re doing. We help you engage with the people you need to reach. diff --git a/_coops/animorph.md b/_coops/animorph.md index b9fb09b..503fe4b 100644 --- a/_coops/animorph.md +++ b/_coops/animorph.md @@ -3,7 +3,7 @@ title: Animorph name: Animorph website: https://animorph.coop email: we@animorph.coop -twitter: +twitter: animorphcoop github: telephone: address: Space4, 149 Fonthill Road,London,N4 3HF diff --git a/_coops/aptivate.md b/_coops/aptivate.md index 439ff61..5344f57 100644 --- a/_coops/aptivate.md +++ b/_coops/aptivate.md @@ -4,7 +4,7 @@ name: Aptivate website: http://aptivate.org/ email: outreach@aptivate.org twitter: aptivateuk -github: +github: aptivate telephone: +44 (0)1223 967838 address: 25 Signet Court, Swann's Road, Cambridge,United Kingdom,CB5 8LA latitude: 52.21427610000001 diff --git a/_coops/autonomic.md b/_coops/autonomic.md index c3762f8..184a2d5 100644 --- a/_coops/autonomic.md +++ b/_coops/autonomic.md @@ -3,7 +3,7 @@ title: Autonomic name: Autonomic website: https://autonomic.zone/ email: autonomic-coop@posteo.net -twitter: autonomic-coop%40posteo.html +twitter: autonomiccoop github: telephone: address: 1539 Pershore Road,Stirchley,Birmingham,United Kingdom,B30 2JH diff --git a/_coops/cetis-llp.md b/_coops/cetis-llp.md index cbd3179..abea4b4 100644 --- a/_coops/cetis-llp.md +++ b/_coops/cetis-llp.md @@ -3,7 +3,7 @@ title: Cetis LLP name: Cetis LLP website: http://www.cetis.org.uk/ email: info@cetis.org.uk -twitter: +twitter: cetisllp github: telephone: 07366025747 address: Halton Mill,Mill Lane,Halton,Lancaster,England,LA2 6ND diff --git a/_coops/chapel-street-studio.md b/_coops/chapel-street-studio.md index 9c61ef3..eba8fdb 100644 --- a/_coops/chapel-street-studio.md +++ b/_coops/chapel-street-studio.md @@ -3,7 +3,7 @@ title: Chapel Street Studio name: Chapel Street Studio website: http://chapelstreetstudio.coop/ email: info@chapelstreetstudio.coop -twitter: +twitter: chapelststudio github: telephone: 07743 426 846 (Martyn Johnston | Secretary) address: Chapel Street Studio,Assembly Bradford, Market Pavilion, Rawson Place,Bradford,West Yorkshire,BD1 3QQ diff --git a/_coops/creative-coop.md b/_coops/creative-coop.md index 7d0518e..16c4b22 100644 --- a/_coops/creative-coop.md +++ b/_coops/creative-coop.md @@ -2,10 +2,10 @@ title: Creative Coop name: Creative Coop website: https://creative.coop -email: +email: hello@creative.coop twitter: github: -telephone: 01274574147 +telephone: 01206 574147 address: 2 Balkerne House, Balkerne Passage,Colchester,United Kingdom,CO1 1PA latitude: 51.89010188809361 longitude: 0.8957915683888586 diff --git a/_coops/outlandish.md b/_coops/outlandish.md index bc6bd0f..fdcc822 100644 --- a/_coops/outlandish.md +++ b/_coops/outlandish.md @@ -3,8 +3,8 @@ title: Outlandish name: Outlandish website: http://www.outlandish.com email: hello@outlandish.com -twitter: outlandishideas -github: hello%40outlandish.html +twitter: outlandish +github: outlandishideas telephone: +44 (0) 207 561 9968 address: 3rd Floor,149 Fonthill Road,Finsbury Park,London,United Kingdom,N4 3HF latitude: 51.56372160000001 @@ -19,6 +19,7 @@ clients: - european-union - gender-action-for-peace-and-security - goethe-institut +- greenpeace - hachette-uk - hotwire-pr - indie-training-fund diff --git a/_includes/footer.html b/_includes/footer.html index 0ba262a..855f2d1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,9 +5,9 @@
@@ -18,7 +18,7 @@
- +

Site developed by Glowbox Design & Outlandish.

Source code available on git.coop.

Hosted by Webarchitects for CoTech ©2018

diff --git a/_includes/head.html b/_includes/head.html index 96b75ff..76f39ed 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,5 +1,6 @@ + {{ page.title }} « Cooperative Technologists @@ -12,12 +13,12 @@ - - - - - - + + + + + + - - + + diff --git a/_includes/header.html b/_includes/header.html index 198e60d..6b96688 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,11 +3,11 @@
- - ← Go Back + ← Go Back
diff --git a/_includes/javascripts.html b/_includes/javascripts.html index 340fac3..743de34 100644 --- a/_includes/javascripts.html +++ b/_includes/javascripts.html @@ -1 +1 @@ - + diff --git a/_layouts/coop.html b/_layouts/coop.html index c910750..c24a7fe 100644 --- a/_layouts/coop.html +++ b/_layouts/coop.html @@ -16,7 +16,7 @@
- +

{{ page.name }}

{{ page.website }} @@ -87,7 +87,7 @@ {% assign s = site.services | where: "slug", service | first %}
-
+
{{ s.name }}
@@ -107,7 +107,7 @@ {% assign t = site.technologies | where: "slug", technology | first %}
-
+
{{ t.name }}
@@ -126,7 +126,7 @@ {% for client in page.clients %} {% assign c = site.clients | where: "slug", client | first %}
-
+
{{ c.title }}
{% endfor %} diff --git a/_layouts/home.html b/_layouts/home.html index 739f709..f4a4b21 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -11,8 +11,8 @@
- diff --git a/_layouts/service.html b/_layouts/service.html index aa122ee..dc4206e 100644 --- a/_layouts/service.html +++ b/_layouts/service.html @@ -15,7 +15,7 @@
- +

Coops that offer {{ page.name }}

@@ -40,7 +40,7 @@ {% if coop.services contains page.slug %}
- +
{% endif %} diff --git a/_layouts/technology.html b/_layouts/technology.html index 25a176f..680f991 100644 --- a/_layouts/technology.html +++ b/_layouts/technology.html @@ -15,7 +15,7 @@
- +

Coops that use {{ page.name }}

@@ -40,7 +40,7 @@ {% if coop.technologies contains page.slug %}
- +
{% endif %} diff --git a/about.md b/about.md index bdae04c..61895b4 100644 --- a/about.md +++ b/about.md @@ -22,6 +22,6 @@ Read [our manifesto][manifesto], [contact us if you want to work with us][contac [wiki]: https://wiki.coops.tech/ [mailing-list]: https://www.email-lists.org/mailman/listinfo/tech-coops [wortley-hall]: https://www.wortleyhall.org.uk/ -[manifesto]: {{ site.github.url }}/manifesto -[contact]: {{ site.github.url }}/#contact -[join]: {{ site.github.url }}/join +[manifesto]: /manifesto +[contact]: /#contact +[join]: /join diff --git a/images/clients/greenpeace.png b/images/clients/greenpeace.png new file mode 100644 index 0000000..f6ac494 Binary files /dev/null and b/images/clients/greenpeace.png differ diff --git a/index.html b/index.html index 3dc19f7..231b204 100644 --- a/index.html +++ b/index.html @@ -8,22 +8,22 @@ layout: home
- +
Co-ops
{{ site.coops.size }}
- +
Staff
-
159+
+
253+
- +
Revenue
-
£5.7m
+
£10.3m
- +
Clients
{{ site.clients.size }}+
@@ -55,7 +55,7 @@ layout: home {% for coop in site.coops %}
-
+
{% endfor %} @@ -99,9 +99,10 @@ layout: home

Clients

Here are some of the amazing clients we have worked with so far

- {% for client in site.clients %} + {% assign clients = site.clients | sample:6 %} + {% for client in clients %}
-
+
{% endfor %}
@@ -120,7 +121,7 @@ layout: home {% for service in site.services %}
-
+
{{ service.name }}
@@ -140,7 +141,7 @@ layout: home {% for technology in site.technologies %}
-
+
{{ technology.name }}
diff --git a/join.md b/join.md index e81416b..c7736de 100644 --- a/join.md +++ b/join.md @@ -45,5 +45,5 @@ We're still working our exactly what this entails but in essence you will provid If you'd like to find out more and help shape this official supporter role then please get in touch. You can also read more about us and check out our manifesto. You can also read more [about us][about] and check out our [manifesto][]. -[about]: {{ site.github.url }}/about -[manifesto]: {{ site.github.url }}/manifesto +[about]: /about +[manifesto]: /manifesto diff --git a/manifesto.md b/manifesto.md index 2309e13..d3d9595 100644 --- a/manifesto.md +++ b/manifesto.md @@ -16,5 +16,5 @@ We call upon consumers of digital products -- including trades unions, charities We hereby give notice to technology companies that do not treat their employees fairly, do not give their workers control of their businesses and do not seek to create a fairer world that your days are numbered. We are more creative, more committed and more resilient. [Join us][join]. -[Co-operative Technologists]: {{ site.github.url }}/about -[join]: {{ site.github.url }}/join +[Co-operative Technologists]: /about +[join]: /join