From d04aa0409031552e6abce4981938804333e6e626 Mon Sep 17 00:00:00 2001
From: Candace Lebby <clebby@zaizi.com>
Date: Fri, 6 Oct 2023 09:24:54 +0100
Subject: [PATCH 1/5] initial commit of search feauture

---
 .flaskenv                      |  2 +-
 app/templates/main/search.html | 44 ++++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/.flaskenv b/.flaskenv
index efee604a..ff35ad09 100644
--- a/.flaskenv
+++ b/.flaskenv
@@ -6,7 +6,7 @@ FLASK_APP=govuk-frontend-flask.py
 FLASK_DEBUG=True
 FLASK_RUN_PORT=5000
 REDIS_URL=memory://
-SECRET_KEY=
+SECRET_KEY= njndfnk342
 SERVICE_NAME="AYR - Access Your Records"
 SERVICE_PHASE="BETA"
 SERVICE_URL="https://ayr.nationalarchives.gov.uk/"
diff --git a/app/templates/main/search.html b/app/templates/main/search.html
index e0b403f8..69b91d76 100644
--- a/app/templates/main/search.html
+++ b/app/templates/main/search.html
@@ -7,35 +7,55 @@
 
 {% block content %}
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
+    <div class="govuk-grid-column-full">
         {{ super() }}
-        <h1 class="govuk-heading-xl">Search</h1>
+        <h2 class="govuk-heading-l">Search for records</h2>
+        <p class="govuk-body-l">Search for digital-born records transfered to The National Archives</p>
 
 
-        <div class="govuk-form-group govuk-!-display-inline">
+        <div class="govuk-form-group">
+          <label class="govuk-label" for="two-thirds">  
+          </label>
+          <input class="govuk-input govuk-!-width-two-thirds" id="two-thirds" name="twoThirds" type="text">
+         <button class="govuk-button" data-module="govuk-button">Search</button>
+
+         
+         
+        <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
               <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                <h1 class="govuk-fieldset__heading">
-                  Filter
-                </h1>
               </legend>
-              <div class="govuk-radios govuk-radios--small" data-module="govuk-radios">
+              
+
+              <div class="govuk-radios govuk-radios--small govuk-radios--inline" data-module="govuk-radios">
+                <p class="govuk-body govuk-link govuk-!-display-inline">
+                  <a href="#" class="govuk-link">Advanced search</a>
+                  </p>
                 <div class="govuk-radios__item">
-                  <input class="govuk-radios__input" id="changedName" name="changedName" type="radio" value="month">
+                  <input class="govuk-radios__input" id="changedName" name="changedName" type="radio" value="yes">
                   <label class="govuk-label govuk-radios__label" for="changedName">
-                    My Records
+                    My records
                   </label>
                 </div>
+                
                 <div class="govuk-radios__item">
-                  <input class="govuk-radios__input" id="changedName-2" name="changedName" type="radio" value="year">
+                  <input class="govuk-radios__input" id="changedName-2" name="changedName" type="radio" value="no">
                   <label class="govuk-label govuk-radios__label" for="changedName-2">
-                    All Departments
+                    All department records
                   </label>
+                  </div>
                 </div>
+                
               </div>
             </fieldset>
           </div>
+        </div>
 
-    </div>
+
+            
 </div>
+
+</div>
+
+
 {% endblock %}
\ No newline at end of file

From 495d645d623c3a7339a64e5a5afc1b1e4f09c847 Mon Sep 17 00:00:00 2001
From: Candace Lebby <clebby@zaizi.com>
Date: Fri, 6 Oct 2023 11:11:45 +0100
Subject: [PATCH 2/5] .flaskenv file added to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index d0692722..4e94e4c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ instance/*
 !instance/.gitignore
 .webassets-cache
 .env
+.flaskenv
 
 ### Flask.Python Stack ###
 # Byte-compiled / optimized / DLL files

From cfa067e5266093278fc9ff49d91df12cfaafc64c Mon Sep 17 00:00:00 2001
From: Colin B <colinbowen2@gmail.com>
Date: Fri, 6 Oct 2023 11:17:28 +0100
Subject: [PATCH 3/5] Remove flask env file

---
 .flaskenv | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 .flaskenv

diff --git a/.flaskenv b/.flaskenv
deleted file mode 100644
index ff35ad09..00000000
--- a/.flaskenv
+++ /dev/null
@@ -1,12 +0,0 @@
-CONTACT_EMAIL=[contact email]
-CONTACT_PHONE=[contact phone]
-DEPARTMENT_NAME="The National Archives"
-DEPARTMENT_URL="https://www.nationalarchives.gov.uk/"
-FLASK_APP=govuk-frontend-flask.py
-FLASK_DEBUG=True
-FLASK_RUN_PORT=5000
-REDIS_URL=memory://
-SECRET_KEY= njndfnk342
-SERVICE_NAME="AYR - Access Your Records"
-SERVICE_PHASE="BETA"
-SERVICE_URL="https://ayr.nationalarchives.gov.uk/"

From 3746a4e2f30cc3be27f9749cb5e48ca46cf9c81a Mon Sep 17 00:00:00 2001
From: Candace Lebby <clebby@zaizi.com>
Date: Fri, 6 Oct 2023 16:21:44 +0100
Subject: [PATCH 4/5] Removed advanced search link

---
 app/templates/main/search.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/templates/main/search.html b/app/templates/main/search.html
index 69b91d76..4722dbff 100644
--- a/app/templates/main/search.html
+++ b/app/templates/main/search.html
@@ -28,9 +28,7 @@ <h2 class="govuk-heading-l">Search for records</h2>
               
 
               <div class="govuk-radios govuk-radios--small govuk-radios--inline" data-module="govuk-radios">
-                <p class="govuk-body govuk-link govuk-!-display-inline">
-                  <a href="#" class="govuk-link">Advanced search</a>
-                  </p>
+                
                 <div class="govuk-radios__item">
                   <input class="govuk-radios__input" id="changedName" name="changedName" type="radio" value="yes">
                   <label class="govuk-label govuk-radios__label" for="changedName">

From cb0557a1f715d60f5ee0888771499782f3883cee Mon Sep 17 00:00:00 2001
From: Colin B <colinbowen2@gmail.com>
Date: Mon, 9 Oct 2023 12:57:52 +0100
Subject: [PATCH 5/5] Pre-commit check

---
 app/templates/main/search.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/templates/main/search.html b/app/templates/main/search.html
index 4722dbff..dd913a44 100644
--- a/app/templates/main/search.html
+++ b/app/templates/main/search.html
@@ -14,28 +14,28 @@ <h2 class="govuk-heading-l">Search for records</h2>
 
 
         <div class="govuk-form-group">
-          <label class="govuk-label" for="two-thirds">  
+          <label class="govuk-label" for="two-thirds">
           </label>
           <input class="govuk-input govuk-!-width-two-thirds" id="two-thirds" name="twoThirds" type="text">
          <button class="govuk-button" data-module="govuk-button">Search</button>
 
-         
-         
+
+
         <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
               <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
               </legend>
-              
+
 
               <div class="govuk-radios govuk-radios--small govuk-radios--inline" data-module="govuk-radios">
-                
+
                 <div class="govuk-radios__item">
                   <input class="govuk-radios__input" id="changedName" name="changedName" type="radio" value="yes">
                   <label class="govuk-label govuk-radios__label" for="changedName">
                     My records
                   </label>
                 </div>
-                
+
                 <div class="govuk-radios__item">
                   <input class="govuk-radios__input" id="changedName-2" name="changedName" type="radio" value="no">
                   <label class="govuk-label govuk-radios__label" for="changedName-2">
@@ -43,17 +43,17 @@ <h2 class="govuk-heading-l">Search for records</h2>
                   </label>
                   </div>
                 </div>
-                
+
               </div>
             </fieldset>
           </div>
         </div>
 
 
-            
+
 </div>
 
 </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}