From c23915306c3af2226bb094d8233f1625fb73c28e Mon Sep 17 00:00:00 2001
From: Matthew Griffin <mgriffin@scottlogic.com>
Date: Tue, 18 Jun 2024 15:32:49 +0100
Subject: [PATCH 1/4] Add disclaimer component to main view

---
 src/app/disclaimer/disclaimer.component.html  | 15 +++++++++++++
 .../disclaimer/disclaimer.component.spec.ts   | 22 +++++++++++++++++++
 src/app/disclaimer/disclaimer.component.ts    | 10 +++++++++
 .../tech-carbon-estimator.component.html      |  1 +
 .../tech-carbon-estimator.component.ts        |  2 ++
 5 files changed, 50 insertions(+)
 create mode 100644 src/app/disclaimer/disclaimer.component.html
 create mode 100644 src/app/disclaimer/disclaimer.component.spec.ts
 create mode 100644 src/app/disclaimer/disclaimer.component.ts

diff --git a/src/app/disclaimer/disclaimer.component.html b/src/app/disclaimer/disclaimer.component.html
new file mode 100644
index 00000000..b52c2dd6
--- /dev/null
+++ b/src/app/disclaimer/disclaimer.component.html
@@ -0,0 +1,15 @@
+<expansion-panel class="tce-flex tce-justify-between tce-gap-2 tce-flex-col">
+  <div header>
+    <h2 class="tce-text-2xl">Disclaimer</h2>
+  </div>
+  <div content>
+    <p>
+      This tool is provided free of charge to assist you in identifying and measuring your carbon footprint, for
+      information and guidance only. The scores and information provided should not be used for carbon reporting and are
+      made available on an “as is” basis. Scott Logic Limited accepts no liability or responsibility for any use made by
+      any person or organisation of the information or calculations available on this website. Any reliance placed on
+      this website is taken at your own risk. You should read our full website terms and conditions before using this
+      site.
+    </p>
+  </div>
+</expansion-panel>
diff --git a/src/app/disclaimer/disclaimer.component.spec.ts b/src/app/disclaimer/disclaimer.component.spec.ts
new file mode 100644
index 00000000..2bcf93ff
--- /dev/null
+++ b/src/app/disclaimer/disclaimer.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DisclaimerComponent } from './disclaimer.component';
+
+describe('DisclaimerComponent', () => {
+  let component: DisclaimerComponent;
+  let fixture: ComponentFixture<DisclaimerComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [DisclaimerComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DisclaimerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/disclaimer/disclaimer.component.ts b/src/app/disclaimer/disclaimer.component.ts
new file mode 100644
index 00000000..a41bd658
--- /dev/null
+++ b/src/app/disclaimer/disclaimer.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+import { ExpansionPanelComponent } from '../expansion-panel/expansion-panel.component';
+
+@Component({
+  selector: 'disclaimer',
+  standalone: true,
+  imports: [ExpansionPanelComponent],
+  templateUrl: './disclaimer.component.html',
+})
+export class DisclaimerComponent {}
diff --git a/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html b/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html
index d800762a..81e670b8 100644
--- a/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html
+++ b/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html
@@ -19,6 +19,7 @@ <h1 class="tce-text-3xl tce-mb-6">Technology Carbon Estimator</h1>
         #estimations
         class="tce-w-full md:tce-w-1/2 tce-flex tce-flex-col tce-h-dvh md:tce-h-fit tce-py-4 md:tce-py-0 md:tce-pl-4 md:tce-sticky md:tce-top-0">
         <carbon-estimation [carbonEstimation]="carbonEstimation" [extraHeight]="extraHeight"></carbon-estimation>
+        <disclaimer></disclaimer>
         @if (!showAssumptionsAndLimitationView) {
           <button
             id="showAssumptionsAndLimitationButton"
diff --git a/src/app/tech-carbon-estimator/tech-carbon-estimator.component.ts b/src/app/tech-carbon-estimator/tech-carbon-estimator.component.ts
index 69e67a94..1bab42ad 100644
--- a/src/app/tech-carbon-estimator/tech-carbon-estimator.component.ts
+++ b/src/app/tech-carbon-estimator/tech-carbon-estimator.component.ts
@@ -6,6 +6,7 @@ import { CarbonEstimationService } from '../services/carbon-estimation.service';
 import { FormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
 import { AssumptionsAndLimitationComponent } from '../assumptions-and-limitation/assumptions-and-limitation.component';
+import { DisclaimerComponent } from '../disclaimer/disclaimer.component';
 
 @Component({
   selector: 'tech-carbon-estimator',
@@ -16,6 +17,7 @@ import { AssumptionsAndLimitationComponent } from '../assumptions-and-limitation
     FormsModule,
     CommonModule,
     AssumptionsAndLimitationComponent,
+    DisclaimerComponent,
   ],
   templateUrl: './tech-carbon-estimator.component.html',
 })

From 0aeeee7f350babefd164b98782b48fd3853b7d59 Mon Sep 17 00:00:00 2001
From: Matthew Griffin <mgriffin@scottlogic.com>
Date: Wed, 19 Jun 2024 16:44:00 +0100
Subject: [PATCH 2/4] Move disclaimer above form/assumptions and use smaller
 font

---
 src/app/disclaimer/disclaimer.component.html  |  6 ++--
 .../tech-carbon-estimator.component.html      | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/app/disclaimer/disclaimer.component.html b/src/app/disclaimer/disclaimer.component.html
index b52c2dd6..b2553785 100644
--- a/src/app/disclaimer/disclaimer.component.html
+++ b/src/app/disclaimer/disclaimer.component.html
@@ -1,9 +1,9 @@
-<expansion-panel class="tce-flex tce-justify-between tce-gap-2 tce-flex-col">
+<expansion-panel class="tce-flex tce-justify-between tce-gap-2 tce-flex-col tce-pb-4">
   <div header>
-    <h2 class="tce-text-2xl">Disclaimer</h2>
+    <h2 class="tce-text-xl">Disclaimer</h2>
   </div>
   <div content>
-    <p>
+    <p class="tce-text-sm">
       This tool is provided free of charge to assist you in identifying and measuring your carbon footprint, for
       information and guidance only. The scores and information provided should not be used for carbon reporting and are
       made available on an “as is” basis. Scott Logic Limited accepts no liability or responsibility for any use made by
diff --git a/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html b/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html
index 81e670b8..6da03542 100644
--- a/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html
+++ b/src/app/tech-carbon-estimator/tech-carbon-estimator.component.html
@@ -1,25 +1,25 @@
 <div id="techCarbonEstimator" class="tce-flex tce-flex-col tce-px-4 tce-pt-4 md:tce-pb-4 tce-h-full">
   <h1 class="tce-text-3xl tce-mb-6">Technology Carbon Estimator</h1>
   <div class="tce-flex tce-w-full tce-grow tce-flex-wrap md:tce-flex-nowrap">
-    @if (showAssumptionsAndLimitationView) {
-      <assumptions-and-limitation
-        #assumptionsLimitation
-        aria-live="polite"
-        (closeEvent)="closeAssumptionsAndLimitation($event)"
-        class="tce-w-full md:tce-w-1/2 tce-pb-4 md:tce-pb-0 md:tce-pr-4"></assumptions-and-limitation>
-    } @else {
-      <carbon-estimator-form
-        [formValue]="formValue"
-        (formSubmit)="handleFormSubmit($event)"
-        (formReset)="handleFormReset()"
-        class="tce-w-full md:tce-w-1/2 tce-pb-4 md:tce-pb-0 md:tce-pr-4"></carbon-estimator-form>
-    }
+    <div class="tce-w-full md:tce-w-1/2 tce-pb-4 md:tce-pb-0 md:tce-pr-4">
+      <disclaimer></disclaimer>
+      @if (showAssumptionsAndLimitationView) {
+        <assumptions-and-limitation
+          #assumptionsLimitation
+          aria-live="polite"
+          (closeEvent)="closeAssumptionsAndLimitation($event)"></assumptions-and-limitation>
+      } @else {
+        <carbon-estimator-form
+          [formValue]="formValue"
+          (formSubmit)="handleFormSubmit($event)"
+          (formReset)="handleFormReset()"></carbon-estimator-form>
+      }
+    </div>
     @if (showEstimation) {
       <div
         #estimations
         class="tce-w-full md:tce-w-1/2 tce-flex tce-flex-col tce-h-dvh md:tce-h-fit tce-py-4 md:tce-py-0 md:tce-pl-4 md:tce-sticky md:tce-top-0">
         <carbon-estimation [carbonEstimation]="carbonEstimation" [extraHeight]="extraHeight"></carbon-estimation>
-        <disclaimer></disclaimer>
         @if (!showAssumptionsAndLimitationView) {
           <button
             id="showAssumptionsAndLimitationButton"

From 6b108e3ed74950c3d5db6e8ba28fa8461e35e4d3 Mon Sep 17 00:00:00 2001
From: Matthew Griffin <mgriffin@scottlogic.com>
Date: Wed, 19 Jun 2024 16:54:53 +0100
Subject: [PATCH 3/4] Add new component to docs

---
 docs/components.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/components.md b/docs/components.md
index 20cf781b..1b0b9244 100644
--- a/docs/components.md
+++ b/docs/components.md
@@ -15,6 +15,8 @@ flowchart TB
     assumptions-and-limitation`"]
     Note["`NoteComponent
     note`"]
+    Disclaimer["`DisclaimerComponent
+    disclaimer`"]
     ExpansionPanel["`ExpansionPanelComponent
     expansion-panel`"]
   end
@@ -26,11 +28,11 @@ flowchart TB
     FormatCostRangePipe
   end
 
-  CarbonEstimator --> CarbonEstimatorForm & CarbonEstimation & Assumptions
+  CarbonEstimator --> CarbonEstimatorForm & CarbonEstimation & Assumptions & Disclaimer
   CarbonEstimatorForm ---> FormatCostRangePipe
   CarbonEstimatorForm --> Note
   CarbonEstimator & CarbonEstimatorForm ---> CarbonEstimationService
-  CarbonEstimatorForm & CarbonEstimation --> ExpansionPanel
+  CarbonEstimatorForm & CarbonEstimation & Disclaimer --> ExpansionPanel
   CarbonEstimationService & Assumptions --> CarbonIntensityService
 ```
 
@@ -59,6 +61,10 @@ Uses the [CarbonIntensityService](services.md#carbonintensityservice) to get the
 
 Highlights assumptions that will be made when certain options are selected.
 
+## DisclaimerComponent
+
+Displays disclaimer about how the tool should be used.
+
 ## ExpansionPanelComponent
 
 Displays explanatory text that can be hidden if desired.

From a3cd894ffa4d49597384dfa2af6e974aa5819915 Mon Sep 17 00:00:00 2001
From: Matthew Griffin <mgriffin@scottlogic.com>
Date: Fri, 21 Jun 2024 17:00:52 +0100
Subject: [PATCH 4/4] Add link to terms and conditions

---
 src/app/disclaimer/disclaimer.component.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/disclaimer/disclaimer.component.html b/src/app/disclaimer/disclaimer.component.html
index b2553785..638ade9e 100644
--- a/src/app/disclaimer/disclaimer.component.html
+++ b/src/app/disclaimer/disclaimer.component.html
@@ -8,8 +8,11 @@ <h2 class="tce-text-xl">Disclaimer</h2>
       information and guidance only. The scores and information provided should not be used for carbon reporting and are
       made available on an “as is” basis. Scott Logic Limited accepts no liability or responsibility for any use made by
       any person or organisation of the information or calculations available on this website. Any reliance placed on
-      this website is taken at your own risk. You should read our full website terms and conditions before using this
-      site.
+      this website is taken at your own risk. You should read our full website
+      <a href="https://github.com/ScottLogic/sl-tech-carbon-estimator/blob/main/TERMS.md" class="tce-underline"
+        >terms and conditions</a
+      >
+      before using this site.
     </p>
   </div>
 </expansion-panel>