Skip to content

Commit 3a63b75

Browse files
Refactor memory card components and update memory usage display
1 parent b28b50e commit 3a63b75

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

src/static/js/refreshCardData.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ async function refreshData() {
179179

180180
updateCard('.bg-disk', 'disk_percent', data, '%', '.disk-bar');
181181
updateCard('.cpu-temp-card', 'current_temp', data, ' °C', '.temp-bar');
182-
updateCard('.bg-memory', 'memory_percent', data, '%', '.memory-usage-bar');
182+
updateCard('.memory-usage-percent-card', 'memory_percent', data, '%', '.memory-usage-bar');
183+
updateCard('.memory-usage-number-card', 'memory_used', data, ' GB');
183184
updateCard('.cpu-frequency-card', 'cpu_frequency', data, ' MHz', '.frequency-bar', 'cpu_max_frequency');
184185
updateCard('.cpu-usage-card', 'cpu_percent', data, '%', '.cpu-usage-bar');
185186
updateCard('.network-received', 'network_received', data, 'MB');

src/templates/card_comp/memory/usage.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% if card_settings.is_memory_usage_card_enabled %}
22
<div class="col-md-6 col-lg-4 mb-4">
3-
<div class="card memory-usage-card bg-memory shadow-sm" data-memory-usage="{{ system_info['memory_percent'] }}"
3+
<div class="card memory-usage-percent-card" data-memory-usage="{{ system_info['memory_percent'] }}"
44
data-memory-total="{{ system_info['memory_available'] }}">
55
<div class="card-body d-flex flex-column align-items-center">
66
<h5 class="card-title mb-3">Memory Usage <i class="fas fa-memory"></i></h5>
Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
<div class="col-md-6 col-lg-4 mb-4">
2-
<div class="card bg-memory shadow-sm border-0 rounded-3">
3-
<div class="card-body">
4-
<h5 class="card-title">Memory Used <i class="fas fa-memory"></i></h5>
5-
<p class="card-text fs-4">{{ system_info['memory_used']}} GB</p>
2+
<div class="card memory-usage-number-card" data-memory-total="{{ system_info['memory_available'] }}">
3+
<div class="card-body d-flex flex-column align-items-center text-center">
4+
<!-- Title with Icon -->
5+
<h5 class="card-title mb-3 d-flex align-items-center">
6+
<span class="me-2">Memory Usage</span>
7+
<i class="fas fa-memory"></i>
8+
</h5>
9+
10+
<!-- Memory Usage Text -->
11+
<p class="card-text fs-4 usage-value" data-bs-toggle="tooltip" title="Current memory usage in percentage">
12+
{{ system_info['memory_used'] }} GB
13+
</p>
14+
15+
<p class="card-text fs-6 text-muted mb-0">
16+
Total Memory: {{ system_info['memory_available'] }} GB
17+
</p>
618
</div>
719
</div>
8-
</div>
20+
</div>

src/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ def _get_system_info():
482482
info = {
483483
'cpu_percent': cpu_usage_percent(),
484484
'memory_percent': round(memory_info.percent, 2),
485+
"memory_used": get_memory_used(),
485486
'memory_available': memory_available,
486487
'disk_percent': round(disk_info.percent, 2),
487488
'disk_total': disk_total,

0 commit comments

Comments
 (0)