Merging Gwf case study (#55)

* Adding GWF Case Study * GWF Merge (#54) * Small text tweaks and nav links * Update TCS Terminology (#32) * Update TCS Terminology Doesn't appear to be any other pages that need updating (as they were missed, back when it was changed to User Devices). * Update category ids --------- Co-authored-by: Matthew Griffin <[email protected]> * Projects - restructuring Renamed "case studies" to "projects" and added a project side nav. * Reverting the "The" * upstream * Update 5-detailed-hardware-emissions.md * Adding GWF Case Study * Small text tweaks and nav links * Projects - restructuring Renamed "case studies" to "projects" and added a project side nav. * Reverting the "The" * upstream * Update 5-detailed-hardware-emissions.md * Apply standard page format and review upstream copy * tweaks to upstream and added to detailed upstream * adding operational content more to come * operational carbon emissions additions * Completing cloud emissions section * Adding cloudflare method and process to operational * Reading width and alignment tweaks * Create data assumptions page, start intro * Rename intro to overview * Copy editing tweaks to data assumptions page * Tidy up layout of operational emissions * making formulas more readable * making formulas more readable in upstream * Add high-level and detailed estimates to assumptions * Finish write-up about laptop high level emissions * Finish high-level estimates for Cat U, employee hardware * Add reducing impact eg what-if section * Adding Downstream Emissions * Adding beermat printer and detailed operational devices * Updates and fixes * Adding treemap image and table The table breaks down the emission categories and values. and each item links to the relevant page and section. * Detailed Cloud CPU estimates Added a method for adding more detailed CPU usage estimates for Hetzner. * Green Metrics Tool notes * Minor corrections to improving CPU estimates. * Minor edits to reducing impact page with GMT info. * Add colours and formatting to results table * Put GMT in own headed section * Overview page intro, results and first pass at insights * Get estimates language consistent, fix broken partners html at end * Address typos and readability in assumptions * High level estimates for employee hardware * Dividing lines in upstream * Refine detailed estimates write-up for upstream hardware * Finished upstream emissions * Add confidence ratings to notes overview table * HIgh level estimates for employee hardware * Operational emissions for hardware and network reviewed * Updating Employee Device Operational Emissions * Finish off network in operational * Review and edits to Cat O, cloud services detailed estimates * Remove footnotes in favour for inline lines, printers section * Complete operational emissions section * Little typo * Downstream emissions review and edits * updates to embodied carbon * Updating/revising the cloud estimates * four not five * Upstream emission - hardware write-up amends with BYOD_attribution_factor * Add in appendix section and move GMT stuff in therez * Explicit state this is about carbon and not digital sustainability * Updated the cloud emissions to use a hydro/wind power mix for hetzner and scaleway * Update 4-operational-emissions.md Adding a spend-based approach to SaaS and correcting typos * Adding the what-ifs to the reducing impact page * Last push on detailed write-up parts * updating numbers, adding graphic * Finalised carbon values, overview and graphic - added SL logo and blurb, few tweaks here and there. - moved the css around * Few small typos and clarifications * Pass at key insights, more to come though * Further work to refine our main insights * Create new insights section * Insights 1 and 2 fleshed out * Insight three written up * Insight 4 written up * Insight 5, and overview updated * Add title to insights page * Introduce an insight that digital is not impact free * Shorten and summarise insights * Little tweaks to insights presentation * remove not * typos and hyphens * fixes * Fixing anchor and duplicate heading * Tweaks to insights * Add in thoughts around compatibility of GHG protocol in cloud services part * Reorder results and insights on overview page * Address borken link on project page * Addition of reporting vs impact, add anchor links to assumptions page * Swap block for object storage * Consistent spelling of data centre * Addition of finland into what if scenarios * typo fix * Catching a few details --------- Co-authored-by: hanopcan <[email protected]> Co-authored-by: Matthew Griffin <[email protected]> Co-authored-by: jcamilleri-scottlogic <[email protected]> Co-authored-by: fershad <[email protected]> * First pass merging, fixing links and navigation + needed to reintroduce the employee devices category item (legacy) + identified and fixed bug in noLink param in categoryItem + identified bug and created ticket in category links to pages (hangover from nav changes?) + identified and fixed broken links to glossary page (nav chnage hangover) * Add css folder to the paths that postcss-import will search * Don't ignore package-lock Minor spelling fix * Updating case studies page + Case studies now iterates over the caseStudies.yml collection to show name, description and links + updated the caseStudies layout page navigation to find first case study by id in collection * Delete gwf.md --------- Co-authored-by: hanopcan <[email protected]> Co-authored-by: Matthew Griffin <[email protected]> Co-authored-by: jcamilleri-scottlogic <[email protected]> Co-authored-by: fershad <[email protected]> Co-authored-by: Matthew Griffin <[email protected]>
ScottLogic · Sep 11, 2024 · 119f9e6 · 119f9e6
1 parent 00ffa68
commit 119f9e6
Show file tree

Hide file tree

Showing 32 changed files with 1,971 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ vendor/
 .DS_Store
 **/.DS_Store
 # Ignore .vscode settings folder
-.vscode/
+.vscode/
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -12,13 +12,13 @@ GEM
     ffi (1.16.3)
     ffi (1.16.3-x64-mingw-ucrt)
     forwardable-extended (2.6.0)
-    google-protobuf (3.25.2)
-    google-protobuf (3.25.2-aarch64-linux)
-    google-protobuf (3.25.2-arm64-darwin)
-    google-protobuf (3.25.2-x64-mingw-ucrt)
-    google-protobuf (3.25.2-x86-linux)
-    google-protobuf (3.25.2-x86_64-darwin)
-    google-protobuf (3.25.2-x86_64-linux)
+    google-protobuf (3.25.3)
+    google-protobuf (3.25.3-aarch64-linux)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x64-mingw-ucrt)
+    google-protobuf (3.25.3-x86-linux)
+    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ A proposed Technology Carbon Standard that aims to provide a unified standard fo
 
 ## Running a Local Environment
 
-Setting up your local environment you will need to install [Ruby](https://www.ruby-lang.org/en/) and [NodeJS](https://nodejs.org/en). Once installed run the followinng commands to install the project dependenices: ```npm install``` and  ```bundle install```.
+Setting up your local environment you will need to install [Ruby](https://www.ruby-lang.org/en/) and [NodeJS](https://nodejs.org/en). Once installed run the following commands to install the project dependencies: ```npm install``` and  ```bundle install```.
 
 To run a local environment use: 
 ```bundle exec jekyll serve```. This will start a local server running the website on http://localhost:4000/.

diff --git a/_data/carbonStandard.yml b/_data/carbonStandard.yml
@@ -90,6 +90,16 @@ CatONetworkDevices:
   link: /impact-categories/operational#networking-devices
   noLink: false
 
+# LEGACY ITEM
+# Maintaining legacy items for (typically) case studies where the TCS has moved on, but the item is still referenced.
+CatOEmployeeDevices:
+  id: CatOEmployeeDevices
+  category: cat-o
+  title: Employee Devices
+  icon: devices
+  selected: false
+  noLink: true
+
 CatOOnsiteEmployeeDevices:
   id: CatOOnsiteEmployeeDevices
   category: cat-o

diff --git a/_data/caseStudies.yml b/_data/caseStudies.yml
@@ -0,0 +1,22 @@
+- gwf:
+  id: gwf
+  name: Green Web Foundation
+  link: /case-studies/green-web-foundation
+  description: This project collaboration between [Green Web Foundation](https://www.thegreenwebfoundation.org/){:target="_blank"} and [Scott Logic](https://www.scottlogic.com/){:target="_blank"} ran in mid 2024. It trialled using an early version of the TCS framework to estimate the carbon emissions arising from Green Web Foundation's digital estate, using publicly available data. This write-up provides full documentation of the decisions, methodology and learning points so others can learn from what we experienced.
+  nav:
+  - name: Overview
+    link: /case-studies/green-web-foundation/overview
+  - name: Insights
+    link: /case-studies/green-web-foundation/insights
+  - name: Assumptions
+    link: /case-studies/green-web-foundation/assumptions
+  - name: Upstream Emissions
+    link: /case-studies/green-web-foundation/upstream
+  - name: Operational Emissions
+    link: /case-studies/green-web-foundation/operational
+  - name: Downstream Emissions
+    link: /case-studies/green-web-foundation/downstream
+  - name: Reducing impact
+    link: /case-studies/green-web-foundation/reducing-impact
+  - name: Appendix
+    link: /case-studies/green-web-foundation/appendix
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -7,8 +7,8 @@
       link: /technology-categories
     # - name: Roles
     #   link: /roles
-# - name: Case Studies
-#   link: /case-studies
+- name: Case Studies
+  link: /case-studies
 - name: Resources
   link: /resources
   sublinks:   

diff --git a/_includes/categoryItem.html b/_includes/categoryItem.html
@@ -28,8 +28,14 @@
   {% assign link = site.data.carbonStandard[item].link %}
 {% endif %}
 
+{% if include.noLink %}
+  {% assign noLink = include.noLink %}
+{% else %}
+  {% assign noLink = site.data.carbonStandard[item].noLink %}
+{% endif %}
+
 <div class="my-2">
-  {% if include.noLink == true %}
+  {% if noLink == true %}
     <div id="{{ id }}" class="flex gap-2 {% if description %}items-start{% else %}items-center{% endif %}{% if include.selected %} bg-white/80{% endif %}">
   {% else %}
     <a id="{{ id }}" href="{{ link }}" aria-label="{{ title }}" class="flex gap-2 no-underline text-inherit hover:bg-white/30 {% if description %}items-start{% else %}items-center{% endif %}{% if include.selected %} bg-white/80{% endif %}">
@@ -43,7 +49,7 @@
       <div class="font-light text-sm">{{ description }}</div>
     </div>
 
-  {% if include.noLink == true %}
+  {% if noLink == true %}
     </div>
   {% else %}
     </a>

diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -1,5 +1,5 @@
 {% assign currentNavigation = site.data.navigation | reverse | find_exp: "item", "page.url contains item.link" %}
-<div class="container max-w-7xl mx-auto w-full flex px-2 pt-4 pb-4 sm:pb-0 items-center space-x-4 justify-start">
+<div class="container max-w-screen-xl mx-auto w-full flex px-2 pt-4 pb-4 sm:pb-0 items-center space-x-4 justify-start">
 
   <button id="menu-button" type="button" class="sm:hidden" aria-expanded="false" aria-label="open menu">
     <svg id="menu-icon" aria-hidden="true" class="size-8 fill-cambridge-50 hover:fill-cambridge-400"><use href="/assets/images/icons.svg#menu"></use></svg>

diff --git a/_layouts/caseStudies.html b/_layouts/caseStudies.html
@@ -0,0 +1,26 @@
+---
+layout: default
+---
+
+{% assign caseStudy = site.data.caseStudies | where:"id", page.caseStudy | first %}
+
+<div class="flex flex-col md:flex-row gap-6">
+  <aside class="md:w-1/5 border-b md:border-r md:border-b-0 border-gunmetal-200 md:pl-4 pr-2 pb-2 pt-0">
+
+    <a href="{{ caseStudy.link }}" class="font-light block md:px-2 hover:bg-gunmetal-100 dark:hover:bg-gunmetal-900  {% if page.url == '/categories' %}text-cambridge-600 dark:text-cambridge-100 font-semibold{% endif %}">
+      {{ caseStudy.name }}
+    </a>
+
+    <div class="flex flex-col">
+      {% for item in caseStudy.nav %}
+        <a href="{{ item.link }}" class="font-light px-4 hover:bg-gunmetal-100 dark:hover:bg-gunmetal-900 {% if page.url == item.link %}text-cambridge-600 dark:text-cambridge-100 font-semibold{% endif %}">
+          {{ item.name }}
+        </a>
+      {% endfor %}
+    </div>
+
+  </aside>
+  <article class="md:w-4/5">
+    {{ content }}
+  </article>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -32,7 +32,7 @@
 
     <!-- MAIN CONTENT -->
 
-    <main class="container min-h-[calc(100vh-214px)] max-w-7xl w-full px-2 py-4 mx-auto font-light prose dark:prose-invert prose-headings:font-light">
+    <main class="container min-h-[calc(100vh-214px)] max-w-screen-xl w-full px-2 py-4 mx-auto font-light prose dark:prose-invert prose-headings:font-light">
       {{ content }}
     </main>
 

diff --git a/_layouts/sideNavigation.html b/_layouts/sideNavigation.html
@@ -3,11 +3,11 @@
 ---
 
 <div class="flex flex-col md:flex-row gap-6">
-    <aside class="md:w-1/5 border-b md:border-r md:border-b-0 border-gunmetal-200 pr-2 pb-2 pt-0">
-        {% assign sideNavItem = site.data.sideNavigation | where_exp: "item", "page.url contains item.baseUrl" %}
-        {% include sideNavigationLevel.html categories=sideNavItem %}      
-    </aside>
-    <article class="md:w-4/5">
-      {{ content }}
-    </article>
-  </div>
+  <aside class="md:w-1/5 border-b md:border-r md:border-b-0 border-gunmetal-200 pr-2 pb-2 pt-0">
+      {% assign sideNavItem = site.data.sideNavigation | where_exp: "item", "page.url contains item.baseUrl" %}
+      {% include sideNavigationLevel.html categories=sideNavItem %}
+  </aside>
+  <article class="md:w-4/5">
+    {{ content }}
+  </article>
+</div>
diff --git a/assets/css/gwf.css b/assets/css/gwf.css
@@ -0,0 +1,39 @@
+@layer components {
+  /* Custom styles for GWF results table */
+  .gwf-results-table + table th,
+  .gwf-results-table + table td {
+    @apply px-3
+  }
+
+  .gwf-results-table + table thead tr {
+    @apply bg-charcoal-200 dark:bg-charcoal
+  }
+  .gwf-results-table + table thead th {
+    @apply font-bold pt-2
+  }
+
+  /* CAT-U Upstream emissions header */
+  .gwf-results-table + table tbody tr:first-of-type {
+    @apply bg-blue dark:bg-blue-700 text-white;
+  }
+
+  /* CAT-O Operational emissions header */
+  .gwf-results-table + table tbody tr:nth-of-type(6) {
+    @apply cat-o
+  }
+
+  /* CAT-C Operational emissions header */
+  .gwf-results-table + table tbody tr:nth-of-type(11) {
+    @apply cat-c
+  }
+
+  /* CAT-D Downstream emissions header */
+  .gwf-results-table + table tbody tr:nth-of-type(15) {
+    @apply cat-d
+  }
+  /* CAT-D Downstream emissions header */
+  .gwf-results-table + table tbody tr:last-of-type {
+    @apply bg-charcoal-800 dark:bg-charcoal text-white font-bold
+  }
+
+}
diff --git a/assets/css/main.css b/assets/css/main.css
@@ -1,11 +1,15 @@
 ---
 ---
 
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss/base";
+@import "tailwindcss/components";
+@import "tailwindcss/utilities";
+
+/* Project Specific CSS */
+@import "gwf.css";
 
 @layer base {
+
   html {
     font-size: 16px;
     scrollbar-gutter: stable;
@@ -68,4 +72,5 @@
   .cat-d-body {
     @apply bg-cambridge-200 dark:bg-cambridge-700 text-charcoal dark:text-white;
   }
+
 }
diff --git a/assets/images/case-studies/GWF/GWF-logo.svg b/assets/images/case-studies/GWF/GWF-logo.svg
diff --git a/assets/images/case-studies/GWF/TWGF logo.png b/assets/images/case-studies/GWF/TWGF logo.png
diff --git a/assets/images/case-studies/GWF/gwf-emissions-treemap.png b/assets/images/case-studies/GWF/gwf-emissions-treemap.png
diff --git a/assets/images/scott-logic-primary-no-tagline-full-color-rgb.svg b/assets/images/scott-logic-primary-no-tagline-full-color-rgb.svg