From 37cf494cd0933ade08a6b951f7523a18a9380473 Mon Sep 17 00:00:00 2001
From: Joshua Harris <joshua.harris@engineering.digital.dwp.gov.uk>
Date: Mon, 20 Jan 2025 14:15:48 +0000
Subject: [PATCH] fix: merge conflict issues

---
 app/assets/sass/application.scss              |   1 -
 .../when-we-write-to-you/colour-paper.html    | 131 ------------------
 .../font-colour-spacing-size.html             |  83 -----------
 .../when-we-write-to-you/large-print-1.html   | 111 ---------------
 4 files changed, 326 deletions(-)
 delete mode 100644 app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/colour-paper.html
 delete mode 100644 app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/font-colour-spacing-size.html
 delete mode 100644 app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/large-print-1.html

diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
index 92bb2b1..5eabb4b 100644
--- a/app/assets/sass/application.scss
+++ b/app/assets/sass/application.scss
@@ -4,7 +4,6 @@
 //
 
 // Add extra styles here
-@import "node_modules/@ministryofjustice/frontend/moj/all";
 @import "big-number";
 
 .white-link {
diff --git a/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/colour-paper.html b/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/colour-paper.html
deleted file mode 100644
index 2ec0526..0000000
--- a/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/colour-paper.html
+++ /dev/null
@@ -1,131 +0,0 @@
-{% extends "layouts/main.html" %}
-
-{% block pageTitle %}
-Content page template – {{ serviceName }} – GOV.UK Prototype Kit
-{% endblock %}
-
-
-{% block beforeContent %}
-
-{% include "preferences/breadcrumbs/customer-view/colour-paper.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-<form class="form" id="radioForm">
-  <fieldset class="govuk-fieldset">
-    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-      <h1 class="govuk-fieldset__heading">
-        What colour paper do you need?
-      </h1>
-    </legend>
-    <div id="coloured-paper-options-hint" class="govuk-hint">
-      Our letters are usually in standard white.
-    </div>
-    <div class="govuk-radios" data-module="govuk-radios">
-      <div class="govuk-radios__item" onclick="set('white')">
-        <input class="govuk-radios__input" id="colour-paper" name="colour-paper" type="radio" value="white">
-        <label class="govuk-label govuk-radios__label" for="colour-paper">
-          Standard white
-        </label>
-        <div id="colour-paper-hint" class="govuk-hint govuk-radios__hint">
-          I do not need an alternative paper colour
-        </div>
-      </div>
-      <div class="govuk-radios__item" onclick="set('cream')">
-        <input class="govuk-radios__input" id="colour-paper-2" name="colour-paper" type="radio" value="cream">
-        <label class="govuk-label govuk-radios__label" for="colour-paper-2">
-          Cream
-        </label>
-      </div>
-      <div class="govuk-radios__item" onclick="set('pastel-pink')">
-        <input class="govuk-radios__input" id="colour-paper-3" name="colour-paper" type="radio" value="pastel pink">
-        <label class="govuk-label govuk-radios__label" for="colour-paper-3">
-          Pastel pink
-        </label>
-      </div>
-      <div class="govuk-radios__item" onclick="set('pastel-yellow')">
-        <input class="govuk-radios__input" id="colour-paper-4" name="colour-paper" type="radio" value="pastel yellow">
-        <label class="govuk-label govuk-radios__label" for="colour-paper-4">
-          Pastel yellow
-        </label>
-      </div>
-      <div class="govuk-radios__item" onclick="set('pastel-green')">
-        <input class="govuk-radios__input" id="colour-paper-5" name="colour-paper" type="radio" value="pastel green">
-        <label class="govuk-label govuk-radios__label" for="colour-paper-5">
-          Pastel green
-        </label>
-      </div>
-      <div class="govuk-radios__item" onclick="set('light-blue')">
-        <input class="govuk-radios__input" id="colour-paper-6" name="colour-paper" type="radio" value="light blue">
-        <label class="govuk-label govuk-radios__label" for="colour-paper-6">
-          Light blue
-        </label>
-      </div>
-
-      <div class="govuk-radios__divider">or</div>
-
-      <div class="govuk-radios__item" onclick="set('i-need-a-different-colour')">
-          <input class="govuk-radios__input" id="colour-paper-7" name="colour-paper" type="radio"
-              value="I need a different colour">
-          <label class="govuk-label govuk-radios__label" for="colour-paper-7">
-            I need a different colour
-          </label>
-      </div>
-
-  </fieldset>
-  <div class="govuk-!-padding-bottom-6"></div>
-
-  
-  <button type="submit" class="govuk-button" data-module="govuk-button">
-    Continue
-  </button>
-  </div>
-  </div>
-
-  <script>
-    var howWeWriteArrary=[];
-    function set(inputValue) {
-      var howWeWrite = sessionStorage.getItem('howWeWrite');
-      if (howWeWrite) {
-        howWeWriteArrary = howWeWrite.split("<br>");
-      }
-
-      howWeWriteArrary.shift();
-
-      if (inputValue === "white") {
-        howWeWriteArrary.push('I do not need an alternative paper colour')
-      } else if (inputValue === "cream") {
-        howWeWriteArrary.push('Cream')
-      } else if (inputValue === "pastel-pink") {
-        howWeWriteArrary.push('Pastel pink')
-      } else if (inputValue === "pastel-yellow") {
-        howWeWriteArrary.push('Pastel yellow')
-      } else if (inputValue === "pastel-green") {
-        howWeWriteArrary.push('Pastel green')
-      } else if (inputValue === "light-blue") {
-        howWeWriteArrary.push('Light blue')
-      } else {
-        howWeWriteArrary.push('I need a different colour')
-      }
-    }
-
-    document.getElementById('radioForm').addEventListener('submit', function (event) {
-      event.preventDefault();
-
-      sessionStorage.setItem('howWeWrite', `Letter with changes to paper colour or print size<br>${howWeWriteArrary.join('<br>')}`);
-
-      const redirectUrls = JSON.parse(sessionStorage.getItem('redirectUrls'));
-      if (redirectUrls.length > 0) {
-        sessionStorage.setItem('redirectUrls', JSON.stringify(redirectUrls.slice(1)))
-        window.location.href = redirectUrls[0];
-      } else {
-        window.location.href = "confirm-your-changes-letters";
-      }
-    });
-
-  </script>
-
-
-  {% endblock %}
\ No newline at end of file
diff --git a/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/font-colour-spacing-size.html b/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/font-colour-spacing-size.html
deleted file mode 100644
index 36029f6..0000000
--- a/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/font-colour-spacing-size.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "layouts/main.html" %}
-
-{% block pageTitle %}
-Content page template – {{ serviceName }} – GOV.UK Prototype Kit
-{% endblock %}
-
-
-{% block beforeContent %}
-
-{% include "preferences/breadcrumbs/customer-view/font-colour-spacing-size.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-<form class="form" id="checkboxForm">
-  <div class="govuk-form-group">
-    <fieldset class="govuk-fieldset" aria-describedby="non-standard-letter-options-hint">
-      <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-        <h1 class="govuk-fieldset__heading">
-          What changes do you need?
-        </h1>
-      </legend>
-      <div id="non-standard-letter-options-hint" class="govuk-hint">
-        You can choose more than one option.
-      </div>
-      <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-        <div class="govuk-checkboxes__item" onclick="set('colour-paper')">
-          <input class="govuk-checkboxes__input" id="non-standard-letter-options-2" name="non-standard-letter-options"
-            type="checkbox" value="Coloured paper" onclick='handleClick(this, "colour-paper");'>
-          <label class="govuk-label govuk-checkboxes__label" for="non-standard-letter-options-2">
-            Coloured paper
-          </label>
-        </div>
-        <div class="govuk-checkboxes__item" onclick="set('print-size')">
-          <input class="govuk-checkboxes__input" id="non-standard-letter-options-3" name="non-standard-letter-options"
-            type="checkbox" value="Print size" onclick='handleClick(this, "large-print-1");'>
-          <label class="govuk-label govuk-checkboxes__label" for="non-standard-letter-options-3">
-            Print size
-          </label>
-        </div>
-      </div>
-    </fieldset>
-  </div>
-  
-  <button type="submit" class="govuk-button" data-module="govuk-button">
-    Continue
-  </button>
-</form>
-
-<script>
-  var redirectUrls = [];
-  function handleClick(cb, redirectUrl) {
-    if (cb.checked) {
-      redirectUrls.push(redirectUrl);
-    } else {
-      redirectUrls.pop(redirectUrl);
-    }
-  }
-
-  function set(inputValue) {
-    if (inputValue === "colour-paper") {
-      sessionStorage.setItem('howWeWrite', 'Letter with changes to paper colour or print size');
-    } else if (inputValue === "print-size") {
-      sessionStorage.setItem('howWeWrite', 'Letter with changes to paper colour or print size');
-    }
-  }
-
-  document.getElementById('checkboxForm').addEventListener('submit', function (event) {
-    event.preventDefault();
-
-    if (redirectUrls.length > 0) {
-      sessionStorage.setItem('redirectUrls', JSON.stringify(redirectUrls.slice(1)))
-      window.location.href = redirectUrls[0];
-    } else {
-      window.location.href = "how-should-we-write-to-you";
-    }
-  });
-
-</script>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/large-print-1.html b/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/large-print-1.html
deleted file mode 100644
index 65d004e..0000000
--- a/app/views/preferences/customer-view/alternative-formats/when-we-write-to-you/large-print-1.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "layouts/main.html" %}
-
-{% block pageTitle %}
-Content page template – {{ serviceName }} – GOV.UK Prototype Kit
-{% endblock %}
-
-
-{% block beforeContent %}
-
-{% include "preferences/breadcrumbs/customer-view/large-print-1.html" %}
-
-{% endblock %}
-
-{% block content %}
-
-<form class="form" id="radioForm">
-  <fieldset class="govuk-fieldset">
-    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-      <h1 class="govuk-fieldset__heading">
-        What size print do you need?
-      </h1>
-    </legend>
-    <div id="large-print-hint" class="govuk-hint">
-      Our letters are usually in 12 point Arial font.
-    </div>
-    <div class="govuk-radios" data-module="govuk-radios">
-      <div class="govuk-radios__item" onclick="set('12-point')">
-        <input class="govuk-radios__input" id="large-print" name="large-print" type="radio" value="12 point">
-        <label class="govuk-label govuk-radios__label" for="large-print">
-          Standard (12 point)
-        </label>
-        <div id="colour-paper-hint" class="govuk-hint govuk-radios__hint">
-          I do not need an alternative print size
-        </div>
-      </div>
-      <div class="govuk-radios__item" onclick="set('16-point')">
-        <input class="govuk-radios__input" id="large-print-2" name="large-print" type="radio" value="16 point">
-        <label class="govuk-label govuk-radios__label" for="large-print-2">
-          Large (16 point)
-        </label>
-      </div>
-      <div class="govuk-radios__item" onclick="set('18-point')">
-        <input class="govuk-radios__input" id="large-print-3" name="large-print" type="radio" value="18 point">
-        <label class="govuk-label govuk-radios__label" for="large-print-3">
-          Extra large (18 point)
-        </label>
-      </div>
-      <div class="govuk-radios__item" onclick="set('26-point')">
-        <input class="govuk-radios__input" id="large-print-4" name="large-print" type="radio" value="26 point">
-        <label class="govuk-label govuk-radios__label" for="large-print-4">
-          Giant (26 point)
-        </label>
-      </div>
-      <div class="govuk-radios__divider">or</div>
-
-      <div class="govuk-radios__item" onclick="set('i-need-a-different-print-size')">
-          <input class="govuk-radios__input" id="large-print-5" name="large-print" type="radio" value="I need a different print size">
-          <label class="govuk-label govuk-radios__label" for="large-print-5">
-            I need a different print size
-          </label>
-      </div>
-  </fieldset>
-  <div class="govuk-!-padding-bottom-6"></div>
-  <button type="submit" class="govuk-button" data-module="govuk-button">
-    Continue
-  </button>
-  </div>
-  </div>
-
-  <script>
-    var howWeWriteArrary = [];
-
-    function set(inputValue) {
-      var howWeWrite = sessionStorage.getItem('howWeWrite');
-      if (howWeWrite) {
-        howWeWriteArrary = howWeWrite.split("<br>");
-      }
-
-      howWeWriteArrary.shift();
-
-      if (inputValue === "12-point") {
-        howWeWriteArrary.push('I do not need an alternative print size');
-      } else if (inputValue === "16-point") {
-        howWeWriteArrary.push('Large (16 point)');
-      } else if (inputValue === "18-point") {
-        howWeWriteArrary.push('Extra large (18 point)');
-      } else if (inputValue === "18-point") {
-        howWeWriteArrary.push('Giant (26 point)');
-      } else {
-        howWeWriteArrary.push('I need a different print size');
-      }
-    }
-
-    document.getElementById('radioForm').addEventListener('submit', function (event) {
-      event.preventDefault();
-
-      sessionStorage.setItem('howWeWrite', `Letter with changes to paper colour or print size<br>${howWeWriteArrary.join('<br>')}`);
-
-      const redirectUrls = JSON.parse(sessionStorage.getItem('redirectUrls'));
-      if (redirectUrls.length > 0) {
-        sessionStorage.setItem('redirectUrls', JSON.stringify(redirectUrls.slice(1)))
-        window.location.href = redirectUrls[0];
-      } else {
-        window.location.href = "confirm-your-changes-letters";
-      }
-    });
-
-  </script>
-
-
-  {% endblock %}
\ No newline at end of file