From 569f56167040e65e993e074e5c7734b4e095597f Mon Sep 17 00:00:00 2001 From: xbl Date: Mon, 27 Oct 2025 22:28:02 +0100 Subject: [PATCH] fix/change --- profiles.py | 2 +- static/js/inactive.js | 10 +++++----- static/style.css | 2 +- templates/profiles.html | 6 +++--- templates/result.html | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/profiles.py b/profiles.py index 14bade9..25b6be4 100644 --- a/profiles.py +++ b/profiles.py @@ -9,7 +9,7 @@ profiles = { "info_text4": "relaxing, sleep promoting" }, "Amnesia Haze": { - "values": [35, 65, 40, 35, 30, 35], + "values": [47, 52, 30, 30, 40, 31], "info_text0": "20%", "info_text1": "<1%", "info_text2": "Sativa-dominant Hybrid", diff --git a/static/js/inactive.js b/static/js/inactive.js index 73df91b..4651999 100755 --- a/static/js/inactive.js +++ b/static/js/inactive.js @@ -8,7 +8,7 @@ document.addEventListener("DOMContentLoaded", () => { const youFillColor = 'rgba(255,255,255,0.1)'; const matchLineColor = 'rgb(191,181,49)'; const matchFillColor = 'rgba(191,181,49,0.420)'; - const radialLineColor= 'rgba(255,255,255,0.420)'; + const radialLineColor= 'rgba(255,255,255,0.1337)'; function distance(a,b){ return Math.sqrt(a.reduce((s,v,i)=>s+(v-b[i])**2,0)); } @@ -70,11 +70,11 @@ document.addEventListener("DOMContentLoaded", () => { maintainAspectRatio:false, scales:{ r:{ - min:0, max:80, + min:0, max:100, ticks:{ display:false, stepSize:20 }, pointLabels:{ font:{ size:isBest?getFontSize():getBottomChartFontSize(), weight:'bold' }, color:'#FFF' }, angleLines:{ color:radialLineColor }, - grid:{ drawticks:false, drawOnChartArea:false, circular:false } + grid:{ color: radialLineColor, drawticks:false, drawOnChartArea:true, circular:false } } }, plugins:{ @@ -150,8 +150,8 @@ document.addEventListener("DOMContentLoaded", () => { const dy = cy-y; const dist = Math.sqrt(dx*dx + dy*dy); const rMax = Math.min(rect.width, rect.height)/2 * 0.9; - let value = (dist/rMax)*80; - value = Math.min(Math.max(Math.round(value),0),80); + let value = (dist/rMax)*100; + value = Math.min(Math.max(Math.round(value),0),100); userData[draggingIndex] = value; updateCharts(); }); diff --git a/static/style.css b/static/style.css index 9718569..d08f7e9 100644 --- a/static/style.css +++ b/static/style.css @@ -289,7 +289,7 @@ button.magenta-button { transition: background-color 0.18s ease, transform 0.12s ease; } -button[type="submit"] { background-color: #808080; } +button[type="submit"] { background-color: #BFB531; } button[type="submit"]:hover { background-color: #FFFFFF; transform: translateY(1px); } button[type="submit"]:active { background-color: #000000; transform: translateY(0); } diff --git a/templates/profiles.html b/templates/profiles.html index dfbee59..5d1a558 100755 --- a/templates/profiles.html +++ b/templates/profiles.html @@ -85,11 +85,11 @@ scales: { r: { min: 0, - max: 80, + max: 100, ticks: { stepSize: 20, display: false }, pointLabels: { font: { size: 15, weight: 'bold' }, color: '#FFF' }, - grid: { color: 'rgba(255,255,255,0.420)', circular: false }, - angleLines: { color: 'rgba(255,255,255,0.69)' } + grid: { color: 'rgba(255,255,255,0.1337)', circular: false }, + angleLines: { color: 'rgba(255,255,255,0.1337)' } } }, plugins: { tooltip: { enabled: false}, legend: { display: false } } diff --git a/templates/result.html b/templates/result.html index 059762c..0c7e1a2 100755 --- a/templates/result.html +++ b/templates/result.html @@ -157,7 +157,7 @@ const youFillColor = 'rgba(255,255,255,0.1)'; const matchLineColor = 'rgb(191,181,49)'; const matchFillColor = 'rgba(191,181,49,0.420)'; - const radialLineColor= 'rgba(255,255,255,0.420)'; + const radialLineColor= 'rgba(255,255,255,0.1337)'; function getFontSize(){ return window.innerWidth < 600 ? 10 : 42; } function getBottomChartFontSize(){ return window.innerWidth < 600 ? 8 : 24; } @@ -203,11 +203,11 @@ scales: { r: { min: 0, - max: 80, + max: 100, ticks: { display: false, stepSize: 20 }, pointLabels: { font: { size: getFontSize(), weight: 'bold' }, color: '#FFF' }, angleLines: { color: radialLineColor }, - grid: { drawticks: false, drawOnChartArea: false, circular: false } + grid: { color: radialLineColor, drawticks: false, circular: false } } }, plugins: { tooltip: { enabled: false }, legend: { display: false } } @@ -239,11 +239,11 @@ scales: { r: { min: 0, - max: 80, + max: 100, ticks: { display: false, stepSize: 20 }, pointLabels: { font: { size: getBottomChartFontSize(), weight: 'bold' }, color: '#FFF' }, angleLines: { color: radialLineColor }, - grid: { drawticks: false, drawOnChartArea: false, circular: false } + grid: { color: radialLineColor, drawticks: false, circular: false } } }, plugins: { tooltip: { enabled: false }, legend: { display: false } }