diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..8257ad3b2200896190adf6a169e72d17ca3f25f3
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+ "cSpell.words": [
+ "jsonify",
+ "pbad",
+ "pnorm",
+ "sessionmaker",
+ "SQLALCHEMY",
+ "ubad",
+ "uniquifier",
+ "unorm"
+ ]
+}
\ No newline at end of file
diff --git a/backend/__pycache__/__init__.cpython-312.pyc b/backend/__pycache__/__init__.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4e8ec48bcb28399e3e80b9b7d6902852a5a1a1bb
Binary files /dev/null and b/backend/__pycache__/__init__.cpython-312.pyc differ
diff --git a/backend/__pycache__/app.cpython-312.pyc b/backend/__pycache__/app.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3bbf8e0d83916a6adf27a9b64f9b14a31cedc340
Binary files /dev/null and b/backend/__pycache__/app.cpython-312.pyc differ
diff --git a/backend/__pycache__/auth.cpython-312.pyc b/backend/__pycache__/auth.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..41bf5abe68439fb431c0dcf165491ca9bae06697
Binary files /dev/null and b/backend/__pycache__/auth.cpython-312.pyc differ
diff --git a/backend/__pycache__/config.cpython-312.pyc b/backend/__pycache__/config.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1ad0a3bfc3a6a67f8476876c109b1fd6cc1ccc7c
Binary files /dev/null and b/backend/__pycache__/config.cpython-312.pyc differ
diff --git a/backend/__pycache__/models.cpython-312.pyc b/backend/__pycache__/models.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..705ca16841c5ccc4fc4fed689c0bfe65e13ec741
Binary files /dev/null and b/backend/__pycache__/models.cpython-312.pyc differ
diff --git a/backend/__pycache__/models_auth.cpython-312.pyc b/backend/__pycache__/models_auth.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6ec1f490194ac8c2a3e39f3d669009c4c3bd6288
Binary files /dev/null and b/backend/__pycache__/models_auth.cpython-312.pyc differ
diff --git a/backend/__pycache__/models_default.cpython-312.pyc b/backend/__pycache__/models_default.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4ab5572050fb9d6c7820c41b9e1b3e6e7f7e7f36
Binary files /dev/null and b/backend/__pycache__/models_default.cpython-312.pyc differ
diff --git a/backend/__pycache__/models_shared.cpython-312.pyc b/backend/__pycache__/models_shared.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3b3a27fcc8e917096b634578258a73b3e885d6fc
Binary files /dev/null and b/backend/__pycache__/models_shared.cpython-312.pyc differ
diff --git a/backend/__pycache__/routes_auth.cpython-312.pyc b/backend/__pycache__/routes_auth.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..998c3a8521bd83ad3129d833d1fc7dddef100df3
Binary files /dev/null and b/backend/__pycache__/routes_auth.cpython-312.pyc differ
diff --git a/backend/__pycache__/routes_default.cpython-312.pyc b/backend/__pycache__/routes_default.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..efaa10d6cffe236a8025625f07b0cd0310f0b888
Binary files /dev/null and b/backend/__pycache__/routes_default.cpython-312.pyc differ
diff --git a/backend/__pycache__/server.cpython-312.pyc b/backend/__pycache__/server.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cc8652b26983302807fb479b9e819320ebf28b12
Binary files /dev/null and b/backend/__pycache__/server.cpython-312.pyc differ
diff --git a/frontend/src/Components/Search/MultiSelectText.jsx b/frontend/src/Components/Search/MultiSelectText.jsx
index 083859a7e346dd32254e14291b7dd11f493cd22f..4b8452672454f1c4c5bf19c135cb639abbda8ba1 100644
--- a/frontend/src/Components/Search/MultiSelectText.jsx
+++ b/frontend/src/Components/Search/MultiSelectText.jsx
@@ -87,7 +87,7 @@ function MultiSelectText({ selection, multiSelect, indexHandler }) {
marginTop: "36px",
fontFamily: "source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;",
fontSize: "36px",
- backgroundColor: "#07192e",
+ backgroundColor: "#061525",
lineHeight: "1.1",
}}
diff --git a/frontend/src/Components/Search/SearchComponent.jsx b/frontend/src/Components/Search/SearchComponent.jsx
index b8c60df74c10b1be4a6b6fded25213092e2ee616..121775f64612ff2fe384b5e659674e84e2159245 100644
--- a/frontend/src/Components/Search/SearchComponent.jsx
+++ b/frontend/src/Components/Search/SearchComponent.jsx
@@ -123,13 +123,13 @@ return (
marginTop: "15px",
'& .MuiInputBase-root': {
backgroundColor: '#3D96B1', // Ensure background color applies to the input itself
- color: "#07192e",
+ color: "#061525",
fontSize: "20px",
marginTop: "20px",
fontFamily: "source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;"
},
'& .MuiButtonBase-root svg' : {
- background: "#07192e",
+ background: "#061525",
},
'& .MuiOutlinedInput-root' : {
diff --git a/frontend/src/Css/Dashboard.css b/frontend/src/Css/Dashboard.css
index 13a655ee67fd955e7e05db8c95d68a8ef7b2f2a1..8726d54e35bf30341cebdd7edc34db55f1ffce90 100644
--- a/frontend/src/Css/Dashboard.css
+++ b/frontend/src/Css/Dashboard.css
@@ -6,11 +6,11 @@
justify-content: center;
margin-top: 40px;
color: white;
- transform: scale(0.9);
+ transform: scale(0.8);
}
body{
- background-color: #07192e;
+ background-color: #061525;
}
@@ -25,7 +25,7 @@ body{
.map_container svg{
margin: 2px;
padding-top: 30px;
- background-color: #07192e;
+ background-color: #061525;
}
.table_container{
@@ -37,7 +37,7 @@ body{
}
.Visualiser{
- background-color: #07192e;
+ background-color: #061525;
margin: 2px;
}
@@ -55,7 +55,7 @@ body{
padding: 5px;
margin: 10px;
position: relative;
- background: #07192e;
+ background: #061525;
}
.plot{
diff --git a/frontend/src/Css/Map.css b/frontend/src/Css/Map.css
index 2b0f6c31746473a09e3e450a5c78c7557b19e5f8..9a02e7216a573d4e7e9b6816989651a7445178ac 100644
--- a/frontend/src/Css/Map.css
+++ b/frontend/src/Css/Map.css
@@ -1,5 +1,5 @@
svg {
- background: #07192e;
+ background: #061525;
}
path {
diff --git a/frontend/src/Css/Navbar.css b/frontend/src/Css/Navbar.css
index dab3c88aace03814ff8417768b15da95a6846ff1..3cfbfb210a5222563281cc5dc9d0f57a2dabb7dd 100644
--- a/frontend/src/Css/Navbar.css
+++ b/frontend/src/Css/Navbar.css
@@ -13,7 +13,7 @@
width: 100%;
padding-bottom: 10px;
/*background: #173254;*/
- background-color: #07192e;
+ background-color: #061525;
}
.nav-button{
diff --git a/frontend/src/Pages/Dashboard/Barchart.jsx b/frontend/src/Pages/Dashboard/Barchart.jsx
index e029e95aa260d4ab68d21d9b19e497d011748fc6..1ce4147bad71c6d67fbada6a60a38b44d5dfb8b0 100644
--- a/frontend/src/Pages/Dashboard/Barchart.jsx
+++ b/frontend/src/Pages/Dashboard/Barchart.jsx
@@ -596,8 +596,9 @@ const BarChart = ({ selectedKey }) => {
{'key': ['25', '2016'], 'values': ['2.6']},
{'key': ['25', '2017'], 'values': ['2.6']},
{'key': ['25', '2018'], 'values': ['2.6']}];
+
const svg = d3.select(svgRef.current);
- console.log(selectedKey)
+ console.log("Selected KEY = " + selectedKey);
// Convert selectedKey to a string and pad with leading zero if necessary
const paddedSelectedKey = selectedKey < 10 ? '0' + selectedKey : selectedKey.toString();
@@ -624,13 +625,21 @@ const BarChart = ({ selectedKey }) => {
// Create x-axis
svg.append('g')
.attr('transform', `translate(${margin.left}, ${height + margin.top})`)
- .call(d3.axisBottom(xScale));
+ .call(d3.axisBottom(xScale))
+ .selectAll('path, line, text') // Select the axis lines and text
+ .attr('stroke', 'white') // Set the color of the lines to white
+ .attr('stroke-width', 0) // Set the width of the text
+ .attr('fill', 'white'); // Set the color of the text to white
// Create y-axis
svg.append('g')
.attr('transform', `translate(${margin.left}, ${margin.top})`)
- .call(d3.axisLeft(yScale));
-
+ .call(d3.axisLeft(yScale))
+ .selectAll('path, line, text') // Select the axis lines and text
+ .attr('stroke', 'white') // Set the color of the lines to white
+ .attr('stroke-width', 0) // Set the width of the text
+ .attr('fill', 'white'); // Set the color of the text to white
+
// Create bars
svg.selectAll('.bar')
.data(filteredData)
@@ -640,7 +649,7 @@ const BarChart = ({ selectedKey }) => {
.attr('y', d => yScale(parseFloat(d.values[0])) + margin.top)
.attr('width', xScale.bandwidth())
.attr('height', d => height - yScale(parseFloat(d.values[0])))
- .attr('fill', 'white');
+ .attr('fill', '#3D96B1');
}, [selectedKey]); // Use filteredData in the dependency array
diff --git a/frontend/src/Pages/Dashboard/Map.jsx b/frontend/src/Pages/Dashboard/Map.jsx
index e574842495e4981e78705ea04c1759c3e4193d57..5bdb4984da5b1cdac596d4fa679c0aa048ed21c1 100644
--- a/frontend/src/Pages/Dashboard/Map.jsx
+++ b/frontend/src/Pages/Dashboard/Map.jsx
@@ -44,7 +44,6 @@ const Map = ({handlerFunction, selectedRegion}) => {
.attr('width', 500)
.attr('height', 943);
-
let rectY = 25;
let clickedPath = null;