From aac01e687f4e61bbc6fa8ce90891557f8e1dd359 Mon Sep 17 00:00:00 2001
From: teddy <edward.middletonsmith@gmail.com>
Date: Tue, 10 Sep 2024 16:44:14 +0100
Subject: [PATCH] Bug fix for invalid CSS and JavaScript file references for
 pages

---
 static/css/home.css                           | 25 ------
 static/css/store_shared.css                   | 52 -----------
 static/css/stylesheet.css                     | 86 -------------------
 templates/pages/core/_contact.html            |  4 +-
 templates/pages/core/_home.html               |  4 +-
 templates/pages/core/_services.html           |  4 +-
 .../pages/legal/_accessibility_statement.html |  4 +-
 templates/pages/legal/_license.html           |  4 +-
 templates/pages/legal/_privacy_notice.html    |  4 +-
 .../pages/legal/_retention_schedule.html      |  4 +-
 templates/pages/store/_supplier.html          |  2 +-
 11 files changed, 15 insertions(+), 178 deletions(-)
 delete mode 100644 static/css/home.css
 delete mode 100644 static/css/store_shared.css
 delete mode 100644 static/css/stylesheet.css

diff --git a/static/css/home.css b/static/css/home.css
deleted file mode 100644
index 73a09151..00000000
--- a/static/css/home.css
+++ /dev/null
@@ -1,25 +0,0 @@
-
-.page-body > * {
-    height: 100%;
-}
-#pageBody > * :first-child{
-    margin-top: 25vh;
-}
-#pageBody > * :last-child {
-    margin-bottom: 35vh;
-}
-
-.img-demo {
-    max-width: 50%;
-    min-width: 500px;
-}
-
-.img-featured {
-    width: 100%;
-}
-
-/*
-img {
-  background-image: url("/static/images/Tag_Molly1.png");
-}
-*/
\ No newline at end of file
diff --git a/static/css/store_shared.css b/static/css/store_shared.css
deleted file mode 100644
index 11a7d43d..00000000
--- a/static/css/store_shared.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.img-product {
-    max-width: 20vh;
-    max-height: 20vh;
-    border-radius: 3vh;
-    justify-self: left;
-}
-
-.img-thumbnail {
-    max-width: 10vh;
-    max-height: 10vh;
-    border-radius: 3vh;
-    justify-self: left;
-}
-
-.buttonAdd2Basket {
-    background-color: var(--c_blue_pastel);
-    color: var(--c_blue_dark);
-    border-color: var(--c_blue_dark);
-}
-
-#buttonCheckout, .buttonBuyNow {
-    background-color: var(--c_purple_pastel);
-    color: var(--c_purple_dark);
-    border-color: var(--c_purple_dark);
-}
-
-.button-increment, .button-decrement {
-    border: 2px solid darkgrey;
-    background-color: lightgray;
-    margin: 1vh 1vh;
-    width: 2.5vh;
-    height: 2.5vh;
-    border-radius: 1.25vh;
-    font-size: 2vh;
-}
-
-.container-input > input {
-    padding: 0vh 1vh;
-    border-radius: 0.5vh;
-    max-width: 7vh;
-}
-
-#basket {
-    max-width: 100%;
-}
-
-
-
-/* Right column */
-.rightcolumn {
-    min-width: fit-content;
-}
\ No newline at end of file
diff --git a/static/css/stylesheet.css b/static/css/stylesheet.css
deleted file mode 100644
index 5818ec66..00000000
--- a/static/css/stylesheet.css
+++ /dev/null
@@ -1,86 +0,0 @@
-* {
-    box-sizing: border-box;
-}
-
-body {
-    padding: 10px;
-    display: block;
-    background-color: grey;
-}
-
-.banner {
-    background-color: black;
-    color: white;
-    width: 100%;
-    position: fixed;
-    padding-top: 5vh;
-    padding-bottom: 10vh;
-}
-
-.banner.top {
-    background-color: black;
-    color: white;
-}
-
-.banner.bottom {
-    background-color: black;
-    color: white;
-    bottom: 0;
-}
-
-.row:after {
-    content: "";
-    display: table;
-    clear: both;
-}
-
-.column {
-    float: left;
-    padding: 5vw;
-}
-
-.column.side {
-    width: 25%;
-}
-
-.column.middle {
-    width: 50%;
-}
-
-.midbod {
-    background-color: white;
-    color: black;
-}
-
-.panel {
-    float: left;
-}
-
-img {
-    height: 100px;
-    width: 100px;
-}
-
-.panel.labelcontainer {
-    background-color: black;
-    color: white;
-    text-align: center;
-}
-
-.label {
-    font-family: Arial, Helvetica, sans-serif;
-    text-decoration: none;
-}
-
-.label.bodytext {
-    background-color: black;
-    color: white;
-    text-decoration: none;
-    font-style: normal;
-    font-size: 12;
-}
-
-.label.title {
-    font-style: bold;
-    font-size: 18;
-}
\ No newline at end of file
diff --git a/templates/pages/core/_contact.html b/templates/pages/core/_contact.html
index 5ed34cbf..9ca3da87 100644
--- a/templates/pages/core/_contact.html
+++ b/templates/pages/core/_contact.html
@@ -5,7 +5,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/contact.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/contact.css') }}">
 
     <script src="https://www.google.com/recaptcha/enterprise.js?render=6Lf8Q8cpAAAAAFAawGu4-ma60bvbEixNVTVvRzKe"></script> <!-- reCaptcha Integration -->
     
@@ -88,7 +88,7 @@
     
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/contact.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/core/contact.js') }}"></script>
 
     <script>
         var idEmail = "#{{ model.ID_EMAIL }}";
diff --git a/templates/pages/core/_home.html b/templates/pages/core/_home.html
index fefb3469..e60dba6b 100644
--- a/templates/pages/core/_home.html
+++ b/templates/pages/core/_home.html
@@ -5,7 +5,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}" />
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/home.css') }}" />
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/home.css') }}" />
 
     <!-- HTML content -->
     <div>
@@ -16,7 +16,7 @@
     
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/home.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/core/home.js') }}"></script>
     
     <!--
     <script>
diff --git a/templates/pages/core/_services.html b/templates/pages/core/_services.html
index 80160a9f..33f8d639 100644
--- a/templates/pages/core/_services.html
+++ b/templates/pages/core/_services.html
@@ -7,7 +7,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/core.css') }}" />
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/services.css') }}" />
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/core/services.css') }}" />
 
     <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }}">
@@ -103,7 +103,7 @@
     
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/core.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/services.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/core/services.js') }}"></script>
     
     <!--
     <script>
diff --git a/templates/pages/legal/_accessibility_statement.html b/templates/pages/legal/_accessibility_statement.html
index 27753dc3..e53d9ba5 100644
--- a/templates/pages/legal/_accessibility_statement.html
+++ b/templates/pages/legal/_accessibility_statement.html
@@ -5,7 +5,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/legal.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/accessibility_statement.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/legal/accessibility_statement.css') }}">
     
     <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }} {{ model.FLAG_COLUMN }}">
@@ -204,5 +204,5 @@
 
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/legal.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/accessibility_statement.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/legal/accessibility_statement.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/pages/legal/_license.html b/templates/pages/legal/_license.html
index b8efc112..4a529ee4 100644
--- a/templates/pages/legal/_license.html
+++ b/templates/pages/legal/_license.html
@@ -5,7 +5,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/legal.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/license.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/legal/license.css') }}">
     
     <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }} {{ model.FLAG_COLUMN }}">
@@ -23,7 +23,7 @@
 
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/legal.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/license.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/legal/license.js') }}"></script>
 
     <!--
     <script>
diff --git a/templates/pages/legal/_privacy_notice.html b/templates/pages/legal/_privacy_notice.html
index 686b5ebe..6cf78399 100644
--- a/templates/pages/legal/_privacy_notice.html
+++ b/templates/pages/legal/_privacy_notice.html
@@ -5,7 +5,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/legal.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/privacy_notice.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/legal/privacy_notice.css') }}">
     
     <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }} {{ model.FLAG_COLUMN }}">
@@ -82,7 +82,7 @@
 
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/legal.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/privacy_notice.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/legal/privacy_notice.js') }}"></script>
 
     <!--
     <script>
diff --git a/templates/pages/legal/_retention_schedule.html b/templates/pages/legal/_retention_schedule.html
index 8ed8c967..3ed04950 100644
--- a/templates/pages/legal/_retention_schedule.html
+++ b/templates/pages/legal/_retention_schedule.html
@@ -5,7 +5,7 @@
 {% block page_body %}
     <!-- Include Stylesheet -->
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/legal.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/services.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/legal/services.css') }}">
     
     <!-- HTML content -->
     <div class="{{ model.FLAG_CARD }} {{ model.FLAG_COLUMN }}">
@@ -1948,7 +1948,7 @@
 
     <!-- Include JavaScript -->
     <script type="module" src="{{ url_for('static', filename='js/sections/legal.js') }}"></script>
-    <script type="module" src="{{ url_for('static', filename='js/pages/retention_schedule.js') }}"></script>
+    <script type="module" src="{{ url_for('static', filename='js/pages/legal/retention_schedule.js') }}"></script>
 
     <!--
     <script>
diff --git a/templates/pages/store/_supplier.html b/templates/pages/store/_supplier.html
index cc6504b6..f2ca2843 100644
--- a/templates/pages/store/_supplier.html
+++ b/templates/pages/store/_supplier.html
@@ -8,7 +8,7 @@
     {% include 'layouts/_shared_store.html' %}
     
     <link rel="stylesheet" href="{{ url_for('static', filename='css/sections/store.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/page_store_supplier.css') }}">
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/pages/store/supplier.css') }}">
     
     <!-- HTML content -->
     <div class="card">