Skip to content

Commit 18285aa

Browse files
stefanthossstefanthoss
authored
Fix date for first calendar entry (#7)
* First day is not always today * Nicer font for last updated time
1 parent 44860cb commit 18285aa

File tree

3 files changed

+33
-28
lines changed

3 files changed

+33
-28
lines changed

‎src/render/css/styles.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,17 @@ h1, h2, p, span, .h1, .h2, .p, .span {
3434
max-width: 95%;
3535
font-family: "Lexend-Regular", sans-serif;
3636
font-size: 2.5rem;
37-
display: list-item; /* This has to be "list-item" */
38-
list-style-type: disc; /* See https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type */
37+
display: list-item; /* This has to be "list-item" */
38+
list-style-type: disc; /* See https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type */
3939
list-style-position: inside;
4040
white-space: nowrap;
4141
overflow: hidden;
4242
text-overflow: ellipsis;
4343
}
4444

45-
.did-you-know {
45+
.info-bar {
4646
font-family: "Lexend-Light", sans-serif;
47-
font-size: 2.5rem;
48-
max-width: 95%;
47+
font-size: 1.5rem;
4948
}
5049

5150
.date-padding {

‎src/render/dashboard_template.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h3>{dayaftertomorrow}<br />{dayafter_weather_pop}% | {dayafter_weather_min}-{da
9191
<!-- Calendar -->
9292
<div class="col-md-6">
9393
<div class="row align-items-start ">
94-
<div class="col-md-12 text-right" style="height: 25px">
94+
<div class="col-md-12 text-right info-bar" style="height: 25px">
9595
Last Updated: {update_time}
9696
</div>
9797
</div>
@@ -100,9 +100,9 @@ <h3>{dayaftertomorrow}<br />{dayafter_weather_pop}% | {dayafter_weather_min}-{da
100100
</div>
101101
<div class="row align-items-start ">
102102
<div class="col-md-12">
103-
<h2>Today</h2>
103+
<h2>{cal_day_1}</h2>
104104
<ol class="list-unstyled">
105-
{events_today}
105+
{cal_day_1_events}
106106
</ol>
107107
</div>
108108
</div>
@@ -111,9 +111,9 @@ <h2>Today</h2>
111111
</div>
112112
<div class="row align-items-start ">
113113
<div class="col-md-12">
114-
<h2>{dayafter}</h2>
114+
<h2>{cal_day_2}</h2>
115115
<ol class="list-unstyled">
116-
{events_dayafter}
116+
{cal_day_2_events}
117117
</ol>
118118
</div>
119119
</div>
@@ -122,9 +122,9 @@ <h2>{dayafter}</h2>
122122
</div>
123123
<div class="row align-items-start ">
124124
<div class="col-md-12">
125-
<h2>{dayafter2}</h2>
125+
<h2>{cal_day_3}</h2>
126126
<ol class="list-unstyled">
127-
{events_dayafter2}
127+
{cal_day_3_events}
128128
</ol>
129129
</div>
130130
</div>
@@ -133,9 +133,9 @@ <h2>{dayafter2}</h2>
133133
</div>
134134
<div class="row align-items-start ">
135135
<div class="col-md-12">
136-
<h2>{dayafter3}</h2>
136+
<h2>{cal_day_4}</h2>
137137
<ol class="list-unstyled">
138-
{events_dayafter3}
138+
{cal_day_4_events}
139139
</ol>
140140
</div>
141141
</div>
@@ -144,9 +144,9 @@ <h2>{dayafter3}</h2>
144144
</div>
145145
<div class="row align-items-start ">
146146
<div class="col-md-12">
147-
<h2>{dayafter4}</h2>
147+
<h2>{cal_day_5}</h2>
148148
<ol class="list-unstyled">
149-
{events_dayafter4}
149+
{cal_day_5_events}
150150
</ol>
151151
</div>
152152
</div>

‎src/render/render.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
calendar and refreshing of the eInk display.
88
"""
99

10+
import datetime as dt
1011
import pathlib
1112
import string
12-
from datetime import timedelta
1313
from time import sleep
1414

1515
import structlog
@@ -108,7 +108,12 @@ def process_inputs(
108108
+ event["summary"]
109109
)
110110
cal_events_text += "</div>\n"
111-
cal_events_days.append(d.strftime("%A (%x)"))
111+
if d == current_date:
112+
cal_events_days.append("Today")
113+
elif d == current_date + dt.timedelta(days=1):
114+
cal_events_days.append("Tomorrow")
115+
else:
116+
cal_events_days.append(d.strftime("%A (%x)"))
112117
cal_events_list.append(cal_events_text)
113118

114119
if len(cal_events_days) == 0:
@@ -126,16 +131,17 @@ def process_inputs(
126131
day=current_date.strftime("%-d"),
127132
month=current_date.strftime("%B"),
128133
weekday=current_date.strftime("%A"),
129-
dayaftertomorrow=(current_date + timedelta(days=2)).strftime("%A"),
130-
dayafter=cal_events_days[1],
131-
dayafter2=cal_events_days[2],
132-
dayafter3=cal_events_days[3],
133-
dayafter4=cal_events_days[4],
134-
events_today=cal_events_list[0],
135-
events_dayafter=cal_events_list[1],
136-
events_dayafter2=cal_events_list[2],
137-
events_dayafter3=cal_events_list[3],
138-
events_dayafter4=cal_events_list[4],
134+
dayaftertomorrow=(current_date + dt.timedelta(days=2)).strftime("%A"),
135+
cal_day_1=cal_events_days[0],
136+
cal_day_2=cal_events_days[1],
137+
cal_day_3=cal_events_days[2],
138+
cal_day_4=cal_events_days[3],
139+
cal_day_5=cal_events_days[4],
140+
cal_day_1_events=cal_events_list[0],
141+
cal_day_2_events=cal_events_list[1],
142+
cal_day_3_events=cal_events_list[2],
143+
cal_day_4_events=cal_events_list[3],
144+
cal_day_5_events=cal_events_list[4],
139145
# I'm choosing to show the forecast for the next hour instead of the current weather
140146
current_weather_text=string.capwords(current_weather["weather"][0]["description"]),
141147
current_weather_id=current_weather["weather"][0]["id"],

0 commit comments

Comments
 (0)