From 979d82df2d51780fd5d6801ed687b8779720d6d0 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 6 Nov 2024 11:36:41 +0000 Subject: [PATCH 01/37] layout build for search results page --- app/templates/main/index.html | 2 +- app/templates/search/catalogue/index.html | 56 ++++++++++++++++++++++- package-lock.json | 9 +++- package.json | 3 +- src/styles/main.scss | 1 + 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/app/templates/main/index.html b/app/templates/main/index.html index be2e67e..cced3ca 100644 --- a/app/templates/main/index.html +++ b/app/templates/main/index.html @@ -7,7 +7,7 @@

DS Search

-

Get started building a National Archives Django application.

+

xGet started building a National Archives Django application.

Useful links

  • diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index 6d8171b..1936c71 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -3,10 +3,62 @@ {%- set pageTitle = 'Catalogue' -%} {% block content %} + +
    -
    -

    {{ pageTitle }}

    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Catalogue search results

    +
    +
    +
    +
    +
    +
    + + +
    + + Start new search + + +
    + + +
    + + + +
    +
    + +
    +
    +
    + +
    +
    + + +
    diff --git a/package-lock.json b/package-lock.json index d0a3642..90f3806 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,8 @@ "packages": { "": { "dependencies": { - "@nationalarchives/frontend": "0.2.14" + "@nationalarchives/frontend": "0.2.14", + "psycopg2-binary": "^0.0.1" }, "devDependencies": { "@babel/core": "^7.22.11", @@ -5048,6 +5049,12 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/psycopg2-binary": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/psycopg2-binary/-/psycopg2-binary-0.0.1.tgz", + "integrity": "sha512-KBMkbVNy9TmSX3TZ5B8stHAuvbCJ855b7KIHV6gDDGsfk4UhsXJvbUyvCO8Q8Zh660QT2yVnd3l3tXOdDVFCrQ==", + "license": "ISC" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/package.json b/package.json index 221ddcb..75f9d9b 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "test:lint": "prettier --check . && stylelint 'src/styles/**/*.scss' && eslint 'src/scripts/**/*.js'" }, "dependencies": { - "@nationalarchives/frontend": "0.2.14" + "@nationalarchives/frontend": "0.2.14", + "psycopg2-binary": "^0.0.1" }, "devDependencies": { "@babel/core": "^7.22.11", diff --git a/src/styles/main.scss b/src/styles/main.scss index f1a6f47..463bfa5 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1 +1,2 @@ @use "@nationalarchives/frontend/nationalarchives/all"; + From edf3f3cc25570a0fda377f39d11293b3d6033aa2 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 6 Nov 2024 12:18:02 +0000 Subject: [PATCH 02/37] accordion layout --- app/templates/search/catalogue/index.html | 75 +++++++++++++++++++++-- src/styles/main.scss | 34 ++++++++++ 2 files changed, 103 insertions(+), 6 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index 1936c71..71e951c 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -36,14 +36,15 @@

    Catalogue search results

    Start new search -
    -
    + @@ -51,12 +52,74 @@

    Catalogue search results

+ + +
+ +
+
+
+
+

+ Search within results +

+
+

Content

+
+
+
+

+ Dates +

+
+

Content

+
+
+
+

+ Collections +

+
+

Content

+
+
+
+

+ Levels +

+
+

Content

+
+
+
+

+ Closure status +

+
+

Content

+
+
+
+

+ Record opening dates +

+
+

Content

+
+
+
+
+ +
+

Results panel

+
+
diff --git a/src/styles/main.scss b/src/styles/main.scss index 463bfa5..91aa1a3 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,2 +1,36 @@ @use "@nationalarchives/frontend/nationalarchives/all"; +// custom styles + +// sub navigation +.sub-nav { + + font-size:0.9em; + + ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333333; + + } + + li { + float: left; + list-style-type: none; + } + + li a { + display: block; + color: white; + text-align: left; + padding-right: 1em; + text-decoration: none; + } + + li a:hover { + background-color: #111111; + } + +} \ No newline at end of file From b1d110060179206b7b539718a768ea51a7b6c35e Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 6 Nov 2024 13:57:19 +0000 Subject: [PATCH 03/37] accordion panel content outline --- app/templates/search/catalogue/index.html | 277 +++++++++++++++++++++- src/styles/main.scss | 2 + 2 files changed, 273 insertions(+), 6 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index 71e951c..a74ddd5 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -70,7 +70,12 @@

Search within results

-

Content

+
+ + + + +
@@ -78,7 +83,76 @@

Dates

-

Content

+
+ +

Dates

+ + For example, 27 3 2007 or 2007 +
+
+
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
@@ -86,7 +160,59 @@

Collections

-

Content

+
+

Collections

 +
+
+
    +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+
+ + See more + + +
+
@@ -94,7 +220,45 @@

Levels

-

Content

+
+

Level

 +
+
+
    +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+
+ + +
+
@@ -102,7 +266,29 @@

Closure status

-

Content

+
+

Closure Status

 +
+
+
    +
  • + +
    • + +
  • + +
    • + +
  • + +
    • +
+
+
+ + +
+
@@ -110,8 +296,87 @@

Record opening dates

-

Content

+
+ +

Record opening date

+ +
+

+ Record opening date +

+
+
+
+ For example, 27 3 2007 or 2007 +
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
diff --git a/src/styles/main.scss b/src/styles/main.scss index 91aa1a3..7109658 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -6,6 +6,8 @@ .sub-nav { font-size:0.9em; + background:grey; + padding:1em; ul { list-style-type: none; From c9002bfd675d9af9e68048da55ece0027d8a86c5 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 6 Nov 2024 16:14:05 +0000 Subject: [PATCH 04/37] accordion sections --- app/templates/search/catalogue/index.html | 506 +++++++++++----------- src/styles/main.scss | 13 + 2 files changed, 260 insertions(+), 259 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index a74ddd5..8869db7 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -61,6 +61,7 @@

Catalogue search results

+
@@ -71,11 +72,9 @@

- - - -
+ +
@@ -83,181 +82,189 @@

Dates

-
- -

Dates

- - For example, 27 3 2007 or 2007 -
-
-
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
-
- - -
-
-
+
+
+ + For example, 27 3 2007 or 2007
+ From: + +
+
+ +
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
-
- - -
-
-
+
+ +
-
- -
+
+ + +
+
+ + To: + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+

Collections

-
-

Collections

 -
-
-
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
+
+
+ +
+
+ +
-
- - See more - - -
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+

Levels

-
-

Level

 -
-
-
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
+
+
+
+
+ +
-
- - -
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
@@ -266,117 +273,98 @@

Closure status

-
-

Closure Status

 -
-
-
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
+
+
+
+
+ +
-
- - -
+
+ + +
+
+ + +
+
+
+
+

Record opening dates

-
- -

Record opening date

- -
-

- Record opening date -

-
-
-
- For example, 27 3 2007 or 2007 -
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
+
+
+ + For example, 27 3 2007 or 2007
+ From: + +
+
+ +
-
-
+
+ + +
+
+ + +
+
+ + To: + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
- + +
+
+ +
+
diff --git a/src/styles/main.scss b/src/styles/main.scss index 7109658..7af26c7 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -8,6 +8,7 @@ font-size:0.9em; background:grey; padding:1em; + ul { list-style-type: none; @@ -35,4 +36,16 @@ background-color: #111111; } +} + +// accordion element + +// search within +.search-filters__search { + margin-bottom: 0.5rem; + border: 1px solid #8c9694; + border-radius: 0.5rem; + width: 100%; + height: 1rem; + padding: 1rem; } \ No newline at end of file From edd5c1df31482a4437da93d98d11a88b1b93befa Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 7 Nov 2024 10:43:08 +0000 Subject: [PATCH 05/37] examples of record entries. --- app/templates/search/catalogue/index.html | 89 ++++++++++++++++++++++- src/styles/main.scss | 2 +- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index 8869db7..a21043f 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -63,7 +63,7 @@

Catalogue search results

-
+
@@ -368,9 +368,94 @@

+
-

Results panel

+ +
diff --git a/src/styles/main.scss b/src/styles/main.scss index 7af26c7..1c0939b 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -40,7 +40,7 @@ // accordion element -// search within +// search within results .search-filters__search { margin-bottom: 0.5rem; border: 1px solid #8c9694; From c105830fae8bc658b1b21a1474a375f52086fea0 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 7 Nov 2024 10:59:11 +0000 Subject: [PATCH 06/37] Results panels --- src/styles/main.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/styles/main.scss b/src/styles/main.scss index 1c0939b..a57b2f1 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -48,4 +48,19 @@ width: 100%; height: 1rem; padding: 1rem; +} + +// results panels (right hand side) + +.search-results__list{ + + li { + list-style-type: none; + border-bottom: 1px solid black; + padding-top:1em; + padding-bottom:1em; + + } + + } \ No newline at end of file From 31889415e87ab0e0bb35aefa6ee1b28100974389 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 7 Nov 2024 14:13:15 +0000 Subject: [PATCH 07/37] Results panel intro / dropdown --- app/templates/search/catalogue/index.html | 26 +++++++++++++++++------ src/styles/main.scss | 12 +++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index a21043f..e42dcd2 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -65,8 +65,8 @@

Catalogue search results

-
-
+
+

Search within results

@@ -77,7 +77,7 @@

-
+

Dates

@@ -136,7 +136,7 @@

-
+

Collections

@@ -212,7 +212,7 @@

-
+

Levels

@@ -268,7 +268,7 @@

-
+

Closure status

@@ -301,7 +301,7 @@

-
+

Record opening dates

@@ -371,6 +371,18 @@

+ +
+
+

Showing 1 - 20 (of 10,000) results

+ +
+
+
  • diff --git a/src/styles/main.scss b/src/styles/main.scss index a57b2f1..de16a94 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -2,6 +2,8 @@ // custom styles +// Results page + // sub navigation .sub-nav { @@ -52,6 +54,16 @@ // results panels (right hand side) +.tna-form__intro { + p { + text-align:left; + padding-right:40%; + + } +} + + + .search-results__list{ li { From 76b8a3f37351c74516a41ce3f0f916e4e48a0a8e Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 7 Nov 2024 14:52:16 +0000 Subject: [PATCH 08/37] sort by icons --- app/templates/search/catalogue/index.html | 16 ++++++++++------ src/styles/main.scss | 12 +++++++++++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index e42dcd2..40dbbd0 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -374,12 +374,16 @@

    -

    Showing 1 - 20 (of 10,000) results

    - +

    Showing 1 - 20 (of 10,000) results

    + +
      +
      • +
      • +
    diff --git a/src/styles/main.scss b/src/styles/main.scss index de16a94..3377719 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -57,11 +57,21 @@ .tna-form__intro { p { text-align:left; - padding-right:40%; + padding-right:30%; } } +// sort results icons +.sort-icons { + + li { + float: left; + list-style-type: none; + margin-left:0.4em; + } +} + .search-results__list{ From 14925a4e9813b4a8a057ff832f099c479d620612 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 7 Nov 2024 14:58:31 +0000 Subject: [PATCH 09/37] pagination element --- app/templates/search/catalogue/index.html | 50 ++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index 40dbbd0..a041759 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -474,7 +474,55 @@

- + + +

From 0552346da24b4e934a5b685e50f61eb0b7cb3836 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 7 Nov 2024 15:22:40 +0000 Subject: [PATCH 10/37] styling adjustments --- src/styles/main.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/main.scss b/src/styles/main.scss index 3377719..3ebd7cb 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -10,6 +10,7 @@ font-size:0.9em; background:grey; padding:1em; + margin-top:1em; ul { @@ -44,7 +45,7 @@ // search within results .search-filters__search { - margin-bottom: 0.5rem; + margin-bottom: 1rem; border: 1px solid #8c9694; border-radius: 0.5rem; width: 100%; From cfc5923f1f0912ef20afcface1be288ff8b1f72d Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 18 Nov 2024 15:07:52 +0000 Subject: [PATCH 11/37] responsive behaviour (grid) --- app/templates/search/catalogue/index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index a041759..d4406b7 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -7,7 +7,7 @@
-
+
@@ -37,7 +37,6 @@

Catalogue search results

- - +
From 9a8699f093a0cfa33606137f381cd340a1dd0756 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 18 Nov 2024 15:22:01 +0000 Subject: [PATCH 12/37] sub navigation styles --- src/styles/main.scss | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/styles/main.scss b/src/styles/main.scss index 3ebd7cb..e1c9cc8 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -8,9 +8,11 @@ .sub-nav { font-size:0.9em; - background:grey; - padding:1em; + // background:grey; + padding-top:0.5em; margin-top:1em; + position: relative; + top: 3em; ul { @@ -25,18 +27,23 @@ li { float: left; list-style-type: none; + padding-right: 1em; } li a { display: block; color: white; text-align: left; - padding-right: 1em; text-decoration: none; + padding-right: 1em; + margin-left: 0px; } li a:hover { background-color: #111111; + border-bottom:10px solid white; + padding-bottom: 0; + margin-bottom: 0; } } From 02ea4f85020ba0bbddaaf8dac0a1a8d04161bea4 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 18 Nov 2024 15:40:36 +0000 Subject: [PATCH 13/37] formatting / prettier --- src/styles/main.scss | 141 ++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/src/styles/main.scss b/src/styles/main.scss index e1c9cc8..df52721 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,96 +1,97 @@ @use "@nationalarchives/frontend/nationalarchives/all"; -// custom styles +// custom styles // Results page // sub navigation .sub-nav { - - font-size:0.9em; - // background:grey; - padding-top:0.5em; - margin-top:1em; - position: relative; - top: 3em; - - - ul { - list-style-type: none; - margin: 0; - padding: 0; - overflow: hidden; - background-color: #333333; - - } - - li { - float: left; - list-style-type: none; - padding-right: 1em; - } - - li a { - display: block; - color: white; - text-align: left; - text-decoration: none; - padding-right: 1em; - margin-left: 0px; - } - - li a:hover { - background-color: #111111; - border-bottom:10px solid white; - padding-bottom: 0; - margin-bottom: 0; - } + margin-top: 1em; + // background:grey; + padding-top: 0.5em; + position: relative; + top: 3em; + + font-size: 0.9em; + + ul { + list-style-type: none; + + margin: 0; + padding: 0; + + overflow: hidden; + + background-color: #333; + } + + li { + padding-right: 1em; + + float: left; + list-style-type: none; + } + + li a { + margin-left: 0; + padding-right: 1em; + + display: block; + + color: white; + text-align: left; + text-decoration: none; + } + + li a:hover { + margin-bottom: 0; + padding-bottom: 0; + + background-color: #111; + border-bottom: 10px solid white; + } } // accordion element // search within results .search-filters__search { - margin-bottom: 1rem; - border: 1px solid #8c9694; - border-radius: 0.5rem; - width: 100%; - height: 1rem; - padding: 1rem; + width: 100%; + height: 1rem; + margin-bottom: 1rem; + padding: 1rem; + + border: 1px solid #8c9694; + border-radius: 0.5rem; } // results panels (right hand side) .tna-form__intro { - p { - text-align:left; - padding-right:30%; - - } + p { + padding-right: 30%; + + text-align: left; + } } // sort results icons .sort-icons { - - li { - float: left; - list-style-type: none; - margin-left:0.4em; - } -} - + li { + margin-left: 0.4em; + float: left; + list-style-type: none; + } +} -.search-results__list{ - - li { - list-style-type: none; - border-bottom: 1px solid black; - padding-top:1em; - padding-bottom:1em; - - } - +.search-results__list { + li { + list-style-type: none; + border-bottom: 1px solid black; -} \ No newline at end of file + padding-top: 1em; + padding-bottom: 1em; + } +} From 11d71d2b103d7f33008db27a4f68042913ce82b3 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Tue, 19 Nov 2024 11:52:58 +0000 Subject: [PATCH 14/37] search box and sub nav adjustments --- app/templates/search/catalogue/index.html | 11 +++---- src/styles/main.scss | 37 +++++++++++++++++++---- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index d4406b7..ed44e7f 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -5,18 +5,18 @@ {% block content %} -
+
-
-
+
+
-
+

Catalogue search results

@@ -29,11 +29,10 @@

Catalogue search results

- Start new search + Start new search diff --git a/src/styles/main.scss b/src/styles/main.scss index df52721..9b7e850 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -4,14 +4,37 @@ // Results page +.search-box { + margin-top:-2.7em; + +} + +.search-panel { + background:#1e1e1e; + h1 { + color:white !important; + } + .tna-search-field__input { + margin-right:1em; + } + .tna-search-field__button:hover, + .tna-search-field__button:hover { + background: white; + + } + .new-search { + color:white; + } +} + // sub navigation .sub-nav { - margin-top: 1em; + // margin-top: 1em; // background:grey; - padding-top: 0.5em; + // padding-top: 0.5em; position: relative; - top: 3em; + top: 2.5em; font-size: 0.9em; @@ -47,9 +70,9 @@ li a:hover { margin-bottom: 0; padding-bottom: 0; - - background-color: #111; - border-bottom: 10px solid white; + border-bottom: 5px solid #f4f4f4; + padding-bottom:0px; + } } @@ -95,3 +118,5 @@ padding-bottom: 1em; } } + + From d5ff0a20facc495f59780a3157b9766f37df9247 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Tue, 19 Nov 2024 16:15:10 +0000 Subject: [PATCH 15/37] icon adjustments --- app/templates/search/catalogue/index.html | 12 +++++------ src/styles/main.scss | 26 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index ed44e7f..c1a75e6 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -210,7 +210,7 @@

-
+

Levels

@@ -266,7 +266,7 @@

-
+

Closure status

@@ -299,7 +299,7 @@

-
+

Record opening dates

@@ -360,7 +360,7 @@

- +

@@ -379,8 +379,8 @@

    -
    • -
    • +
    • +

diff --git a/src/styles/main.scss b/src/styles/main.scss index 9b7e850..9134ac5 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -78,9 +78,17 @@ // accordion element +.tna-accordion { + border: 1px solid #d9d9d6; +} + +.tna-accordion__summary { + background-color: rgb(217, 217, 214); +} + // search within results .search-filters__search { - width: 100%; + width: 90%; height: 1rem; margin-bottom: 1rem; padding: 1rem; @@ -89,8 +97,24 @@ border-radius: 0.5rem; } +.update-filters { + margin-top:1em; + margin-bottom:1em; + +} + + + // results panels (right hand side) +.icon-adjust { + background:black; + color:white; + font-size:1.8em !important; + margin-left:0.1em; + padding:4px; +} + .tna-form__intro { p { padding-right: 30%; From 2b022f6151faf6cbab64e4d3e07d89f5de0ec498 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 11:49:05 +0000 Subject: [PATCH 16/37] separation of sass files --- src/styles/_search_results.scss | 134 ++++++++++++++++++++++++++++++++ src/styles/main.scss | 11 +-- 2 files changed, 137 insertions(+), 8 deletions(-) create mode 100644 src/styles/_search_results.scss diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss new file mode 100644 index 0000000..6b2e06a --- /dev/null +++ b/src/styles/_search_results.scss @@ -0,0 +1,134 @@ + +// Results page + +.search-box { + margin-top:-2.7em; + +} + +.search-panel { + background:#1e1e1e; + h1 { + color:white !important; + } + .tna-search-field__input { + margin-right:1em; + } + .tna-search-field__button:hover, + .tna-search-field__button:hover { + background: white; + + } + .new-search { + color:white; + } +} + +// sub navigation +.sub-nav { + position: relative; + top: 2.5em; + font-size: 0.9em; + + ul { + list-style-type: none; + + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; + } + + li { + padding-right: 1em; + float: left; + list-style-type: none; + } + + li a { + margin-left: 0; + padding-right: 1em; + + display: block; + + color: white; + text-align: left; + text-decoration: none; + } + + li a:hover { + margin-bottom: 0; + padding-bottom: 0; + border-bottom: 5px solid #f4f4f4; + padding-bottom:0px; + + } +} + +// accordion element + +.tna-accordion { + border: 1px solid #d9d9d6; +} + +.tna-accordion__summary { + background-color: rgb(217, 217, 214); +} + +// search within results +.search-filters__search { + width: 90%; + height: 1rem; + margin-bottom: 1rem; + padding: 1rem; + + border: 1px solid #8c9694; + border-radius: 0.5rem; +} + +.update-filters { + margin-top:1em; + margin-bottom:1em; + +} + + + +// results panels (right hand side) + +.icon-adjust { + background:black; + color:white; + font-size:1.8em !important; + margin-left:0.1em; + padding:4px; +} + +.tna-form__intro { + p { + padding-right: 30%; + + text-align: left; + } +} + +// sort results icons +.sort-icons { + margin-left:0.5em; + li { + margin-left: 0.4em; + + float: left; + list-style-type: none; + } +} + +.search-results__list { + li { + list-style-type: none; + border-bottom: 1px solid black; + + padding-top: 1em; + padding-bottom: 1em; + } +} diff --git a/src/styles/main.scss b/src/styles/main.scss index 9134ac5..4f22409 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,6 +1,8 @@ @use "@nationalarchives/frontend/nationalarchives/all"; // custom styles +@use "_search_results.scss"; + // Results page @@ -29,13 +31,8 @@ // sub navigation .sub-nav { - // margin-top: 1em; - // background:grey; - // padding-top: 0.5em; - position: relative; top: 2.5em; - font-size: 0.9em; ul { @@ -43,15 +40,12 @@ margin: 0; padding: 0; - overflow: hidden; - background-color: #333; } li { padding-right: 1em; - float: left; list-style-type: none; } @@ -125,6 +119,7 @@ // sort results icons .sort-icons { + margin-left:0.5em; li { margin-left: 0.4em; From 5a405547c2f966c034d7e72cbefb29b077860a28 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 15:31:47 +0000 Subject: [PATCH 17/37] styles seperation (sass) --- src/styles/main.scss | 139 +------------------------------------------ 1 file changed, 1 insertion(+), 138 deletions(-) diff --git a/src/styles/main.scss b/src/styles/main.scss index 4f22409..f825f99 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,141 +1,4 @@ @use "@nationalarchives/frontend/nationalarchives/all"; // custom styles -@use "_search_results.scss"; - - -// Results page - -.search-box { - margin-top:-2.7em; - -} - -.search-panel { - background:#1e1e1e; - h1 { - color:white !important; - } - .tna-search-field__input { - margin-right:1em; - } - .tna-search-field__button:hover, - .tna-search-field__button:hover { - background: white; - - } - .new-search { - color:white; - } -} - -// sub navigation -.sub-nav { - position: relative; - top: 2.5em; - font-size: 0.9em; - - ul { - list-style-type: none; - - margin: 0; - padding: 0; - overflow: hidden; - background-color: #333; - } - - li { - padding-right: 1em; - float: left; - list-style-type: none; - } - - li a { - margin-left: 0; - padding-right: 1em; - - display: block; - - color: white; - text-align: left; - text-decoration: none; - } - - li a:hover { - margin-bottom: 0; - padding-bottom: 0; - border-bottom: 5px solid #f4f4f4; - padding-bottom:0px; - - } -} - -// accordion element - -.tna-accordion { - border: 1px solid #d9d9d6; -} - -.tna-accordion__summary { - background-color: rgb(217, 217, 214); -} - -// search within results -.search-filters__search { - width: 90%; - height: 1rem; - margin-bottom: 1rem; - padding: 1rem; - - border: 1px solid #8c9694; - border-radius: 0.5rem; -} - -.update-filters { - margin-top:1em; - margin-bottom:1em; - -} - - - -// results panels (right hand side) - -.icon-adjust { - background:black; - color:white; - font-size:1.8em !important; - margin-left:0.1em; - padding:4px; -} - -.tna-form__intro { - p { - padding-right: 30%; - - text-align: left; - } -} - -// sort results icons -.sort-icons { - margin-left:0.5em; - li { - margin-left: 0.4em; - - float: left; - list-style-type: none; - } -} - -.search-results__list { - li { - list-style-type: none; - border-bottom: 1px solid black; - - padding-top: 1em; - padding-bottom: 1em; - } -} - - +@use "_search_results.scss"; \ No newline at end of file From 9f2af4ff70da5dd82268e5b90548bd687c3703d6 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 15:40:22 +0000 Subject: [PATCH 18/37] code formatting --- src/styles/_search_results.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index 6b2e06a..64243af 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -89,7 +89,6 @@ .update-filters { margin-top:1em; margin-bottom:1em; - } From ba3b16c772fca7f053aeb4416cec7f0a9ed65979 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 15:51:05 +0000 Subject: [PATCH 19/37] npm audit fix --- package-lock.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90f3806..b6e9322 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9 +1,10 @@ { - "name": "app", + "name": "ds-search", "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "ds-search", "dependencies": { "@nationalarchives/frontend": "0.2.14", "psycopg2-binary": "^0.0.1" @@ -3078,9 +3079,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { From 3f257a82879be436164a67c2bd9296903311f5f2 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 15:57:28 +0000 Subject: [PATCH 20/37] package.json --- package-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index b6e9322..6ffb08b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,7 +4,6 @@ "requires": true, "packages": { "": { - "name": "ds-search", "dependencies": { "@nationalarchives/frontend": "0.2.14", "psycopg2-binary": "^0.0.1" From 85cd1558acf1c7b5a89868a3c96485df41061086 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 16:17:34 +0000 Subject: [PATCH 21/37] prettier formating --- package-lock.json | 2 +- package.json | 2 +- src/styles/_search_results.scss | 58 +++++++++++++++------------------ src/styles/main.scss | 2 +- 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ffb08b..9c50c6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@babel/preset-env": "^7.22.10", "babel-loader": "^9.1.3", "eslint": "^8.47.0", - "prettier": "^3.0.2", + "prettier": "3.3.3", "sass": "^1.69.4", "stylelint": "^16.1.0", "stylelint-config-standard-scss": "^13.0.0", diff --git a/package.json b/package.json index 75f9d9b..08d839b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@babel/preset-env": "^7.22.10", "babel-loader": "^9.1.3", "eslint": "^8.47.0", - "prettier": "^3.0.2", + "prettier": "3.3.3", "sass": "^1.69.4", "stylelint": "^16.1.0", "stylelint-config-standard-scss": "^13.0.0", diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index 64243af..83ae828 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -1,27 +1,24 @@ - // Results page .search-box { - margin-top:-2.7em; - + margin-top: -2.7em; } .search-panel { - background:#1e1e1e; - h1 { - color:white !important; - } - .tna-search-field__input { - margin-right:1em; - } - .tna-search-field__button:hover, - .tna-search-field__button:hover { - background: white; - - } - .new-search { - color:white; - } + background: #1e1e1e; + h1 { + color: white !important; + } + .tna-search-field__input { + margin-right: 1em; + } + .tna-search-field__button:hover, + .tna-search-field__button:hover { + background: white; + } + .new-search { + color: white; + } } // sub navigation @@ -60,19 +57,18 @@ margin-bottom: 0; padding-bottom: 0; border-bottom: 5px solid #f4f4f4; - padding-bottom:0px; - + padding-bottom: 0px; } } // accordion element .tna-accordion { - border: 1px solid #d9d9d6; + border: 1px solid #d9d9d6; } .tna-accordion__summary { - background-color: rgb(217, 217, 214); + background-color: rgb(217, 217, 214); } // search within results @@ -87,20 +83,18 @@ } .update-filters { - margin-top:1em; - margin-bottom:1em; + margin-top: 1em; + margin-bottom: 1em; } - - // results panels (right hand side) .icon-adjust { - background:black; - color:white; - font-size:1.8em !important; - margin-left:0.1em; - padding:4px; + background: black; + color: white; + font-size: 1.8em !important; + margin-left: 0.1em; + padding: 4px; } .tna-form__intro { @@ -113,7 +107,7 @@ // sort results icons .sort-icons { - margin-left:0.5em; + margin-left: 0.5em; li { margin-left: 0.4em; diff --git a/src/styles/main.scss b/src/styles/main.scss index f825f99..e841f60 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,4 +1,4 @@ @use "@nationalarchives/frontend/nationalarchives/all"; // custom styles -@use "_search_results.scss"; \ No newline at end of file +@use "_search_results.scss"; From 8937dba52403a871071e8bbd433788df65974e93 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Wed, 20 Nov 2024 16:25:11 +0000 Subject: [PATCH 22/37] styles formatting --- src/styles/_search_results.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index 83ae828..c8b9e3e 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -6,12 +6,15 @@ .search-panel { background: #1e1e1e; + h1 { color: white !important; } + .tna-search-field__input { margin-right: 1em; } + .tna-search-field__button:hover, .tna-search-field__button:hover { background: white; From 55364e446f89ce262dd0e5f4c84e61e530c204f1 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 10:39:17 +0000 Subject: [PATCH 23/37] formatting styles --- src/styles/_search_results.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index c8b9e3e..c16c446 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -6,15 +6,15 @@ .search-panel { background: #1e1e1e; - + h1 { color: white !important; } - + .tna-search-field__input { margin-right: 1em; } - + .tna-search-field__button:hover, .tna-search-field__button:hover { background: white; From dfca18271ae35d72fdcf8a00a7b32e341cce0468 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:01:54 +0000 Subject: [PATCH 24/37] formating --- package-lock.json | 2 +- src/styles/_search_results.scss | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c50c6b..9a36976 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ds-search", + "name": "app", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index c16c446..d6b5142 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -15,19 +15,22 @@ margin-right: 1em; } - .tna-search-field__button:hover, + .tna-search-field__button:hover { background: white; } + .new-search { color: white; } } // sub navigation + .sub-nav { position: relative; top: 2.5em; + font-size: 0.9em; ul { From e801ef15aac55f146ec30cee262845842a7e9219 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:06:12 +0000 Subject: [PATCH 25/37] sass formatting --- src/styles/_search_results.scss | 19 ++++++++++++------- src/styles/main.scss | 4 +--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index d6b5142..13759ff 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -15,7 +15,6 @@ margin-right: 1em; } - .tna-search-field__button:hover { background: white; } @@ -38,12 +37,15 @@ margin: 0; padding: 0; + overflow: hidden; + background-color: #333; } li { padding-right: 1em; + float: left; list-style-type: none; } @@ -61,9 +63,9 @@ li a:hover { margin-bottom: 0; - padding-bottom: 0; border-bottom: 5px solid #f4f4f4; - padding-bottom: 0px; + + padding-bottom: 0; } } @@ -74,7 +76,7 @@ } .tna-accordion__summary { - background-color: rgb(217, 217, 214); + background-color: rgb(217 217 214); } // search within results @@ -96,11 +98,13 @@ // results panels (right hand side) .icon-adjust { - background: black; - color: white; - font-size: 1.8em !important; margin-left: 0.1em; padding: 4px; + + color: white; + font-size: 1.8em !important; + + background: black; } .tna-form__intro { @@ -114,6 +118,7 @@ // sort results icons .sort-icons { margin-left: 0.5em; + li { margin-left: 0.4em; diff --git a/src/styles/main.scss b/src/styles/main.scss index e841f60..6d8ed5d 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,4 +1,2 @@ @use "@nationalarchives/frontend/nationalarchives/all"; - -// custom styles -@use "_search_results.scss"; +@use "search_results"; From e8662df5cb6cbb1a1e4af57f1ed708be343c116d Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:25:30 +0000 Subject: [PATCH 26/37] static folder --- src/styles/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/main.scss b/src/styles/main.scss index 6d8ed5d..e5a96b4 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,2 +1,2 @@ @use "@nationalarchives/frontend/nationalarchives/all"; -@use "search_results"; +@use "search_results"; \ No newline at end of file From f59fa5c92b7c3b8b544c40fd2d8336c3d7feefdd Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:29:05 +0000 Subject: [PATCH 27/37] formatting / CI --- src/styles/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/main.scss b/src/styles/main.scss index e5a96b4..6d8ed5d 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,2 +1,2 @@ @use "@nationalarchives/frontend/nationalarchives/all"; -@use "search_results"; \ No newline at end of file +@use "search_results"; From 3171a57ac5702bcf3f4f8a0bdf40af390745dc63 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:53:15 +0000 Subject: [PATCH 28/37] heading style for CI --- app/templates/search/catalogue/index.html | 2 +- src/styles/_search_results.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index c1a75e6..fac53cb 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -8,7 +8,7 @@
- +

{{ pageTitle }}

diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index 13759ff..f87228f 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -1,5 +1,9 @@ // Results page +.hide-heading{ + display:none; +} + .search-box { margin-top: -2.7em; } From 42f8afd214d5383174ea867a024b58e088edb43e Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:55:35 +0000 Subject: [PATCH 29/37] sass formatting --- src/styles/_search_results.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index f87228f..0873e4c 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -1,7 +1,7 @@ // Results page -.hide-heading{ - display:none; +.hide-heading { + display: none; } .search-box { From 8822feeafb2244c8c5a3e7e1904cfc008c291dda Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 11:59:22 +0000 Subject: [PATCH 30/37] heading addition for tests --- app/templates/search/catalogue/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index fac53cb..00ba174 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -8,7 +8,7 @@
-

{{ pageTitle }}

+

{{ pageTitle }}

From dcc8a8698531543573eca9475ffa134eb9cb0fc6 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 14:58:05 +0000 Subject: [PATCH 31/37] hiding heading --- src/styles/_search_results.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index 0873e4c..a1624b4 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -6,6 +6,9 @@ .search-box { margin-top: -2.7em; + h1 { + display: none; + } } .search-panel { From 1c8c8c233a53bd4d09a402eebc9f28dbe63c3f8e Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Thu, 21 Nov 2024 14:59:16 +0000 Subject: [PATCH 32/37] code format --- src/styles/_search_results.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/_search_results.scss b/src/styles/_search_results.scss index a1624b4..d5fdb9b 100644 --- a/src/styles/_search_results.scss +++ b/src/styles/_search_results.scss @@ -6,6 +6,7 @@ .search-box { margin-top: -2.7em; + h1 { display: none; } From fef289b3f194c77525959ac552cb960f86607e33 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 25 Nov 2024 15:32:02 +0000 Subject: [PATCH 33/37] typo correction. --- app/templates/main/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/main/index.html b/app/templates/main/index.html index cced3ca..be2e67e 100644 --- a/app/templates/main/index.html +++ b/app/templates/main/index.html @@ -7,7 +7,7 @@

DS Search

-

xGet started building a National Archives Django application.

+

Get started building a National Archives Django application.

Useful links

  • From 7a9446c163f99cafbd7c52016c3161d88500e68c Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 25 Nov 2024 15:37:48 +0000 Subject: [PATCH 34/37] removal of redundant code --- app/templates/search/catalogue/index.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index 00ba174..d49d4e2 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -9,11 +9,6 @@

    {{ pageTitle }}

    -
    -
    -
    -
    -
    From 559a3b3a187c82a15bbb5eda65bf48c04143d7f5 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 25 Nov 2024 15:39:39 +0000 Subject: [PATCH 35/37] code tidy --- app/templates/search/catalogue/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index d49d4e2..a01a620 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -4,7 +4,6 @@ {% block content %} -
    From 04388b5f04c28dbecdddb2c8e3342c01ce021145 Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 25 Nov 2024 15:43:34 +0000 Subject: [PATCH 36/37] dependancy update --- package-lock.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a36976..1875fbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,7 @@ "packages": { "": { "dependencies": { - "@nationalarchives/frontend": "0.2.14", - "psycopg2-binary": "^0.0.1" + "@nationalarchives/frontend": "0.2.14" }, "devDependencies": { "@babel/core": "^7.22.11", From 703c6998648b006946809195d35590924e0dd0bc Mon Sep 17 00:00:00 2001 From: JohnHeeryTNA Date: Mon, 25 Nov 2024 15:59:20 +0000 Subject: [PATCH 37/37] updated code for column divs --- app/templates/search/catalogue/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/search/catalogue/index.html b/app/templates/search/catalogue/index.html index a01a620..1f22cdc 100644 --- a/app/templates/search/catalogue/index.html +++ b/app/templates/search/catalogue/index.html @@ -6,7 +6,7 @@
    -
    +

    {{ pageTitle }}