From d8d9e3bbab0a4e9bf3a6a0371cd98f228e8ae468 Mon Sep 17 00:00:00 2001 From: Anthony Correa Date: Mon, 16 Dec 2024 16:45:24 -0600 Subject: [PATCH] 2024-12-16 --- server/app/templates/base.html | 14 +++++++ server/app/templates/dashboard.html | 51 +++++--------------------- server/app/templates/includes/day.html | 15 ++++++++ server/app/templates/style.css | 24 +++++++++--- 4 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 server/app/templates/base.html create mode 100644 server/app/templates/includes/day.html diff --git a/server/app/templates/base.html b/server/app/templates/base.html new file mode 100644 index 0000000..90133e8 --- /dev/null +++ b/server/app/templates/base.html @@ -0,0 +1,14 @@ + + + + {% block head %} + {% block title %}{% endblock %} + + + + {% endblock %} + + + {% block content %}{% endblock %} + + \ No newline at end of file diff --git a/server/app/templates/dashboard.html b/server/app/templates/dashboard.html index f172429..cd4bf51 100644 --- a/server/app/templates/dashboard.html +++ b/server/app/templates/dashboard.html @@ -1,12 +1,6 @@ - - - - Dashboard ({{today.strftime('%-m/%-d, %-H:%M')}}) - - - - - +{% extends "base.html" %} +{% block title %}Dashboard ({{today.strftime('%-m/%-d, %-H:%M')}}){% endblock %} +{% block content %}
@@ -22,41 +16,16 @@
- {% for day, events in days [:4] %} -
-
- {{ day.strftime('%a %-d') }} -
- {% for event in events %} -
- {{ event.summary }}
- {% if not event.is_all_day %} - {{ event.range_str }} - {% endif %} -
- {% endfor %} -
- {% endfor %} + {% for day, events in days [:4] %} + {% include "includes/day.html" %} + {% endfor %}
{% for day, events in days [4:] %} -
-
- {{ day.strftime('%a %-d') }} -
- {% for event in events %} -
- {{ event.summary }}
- {% if not event.is_all_day %} - {{ event.range_str }} - {% endif %} -
- {% endfor %} -
+ {% include "includes/day.html" %} {% endfor %} -
+
-
{{extra_debug}} {{ today.strftime('%c') }}
+
{{extra_debug}} {{ today.strftime('%c') }}
- - +{%endblock%} diff --git a/server/app/templates/includes/day.html b/server/app/templates/includes/day.html new file mode 100644 index 0000000..0c85e41 --- /dev/null +++ b/server/app/templates/includes/day.html @@ -0,0 +1,15 @@ +
+
+ {{ day.strftime('%a %-d') }} +
+
+ {% for event in events %} +
+ {{ event.summary }}
+ {% if not event.is_all_day %} + {{ event.range_str }} + {% endif %} +
+ {% endfor %} +
+
\ No newline at end of file diff --git a/server/app/templates/style.css b/server/app/templates/style.css index 28bec82..afea9f0 100644 --- a/server/app/templates/style.css +++ b/server/app/templates/style.css @@ -3,13 +3,19 @@ box-sizing: border-box; /* Include padding and borders in size calculations */ } html, body { - width: 600px; - height: 800px; margin: 0; /* Prevent any default margins */ padding: 0; } +body { + width: 600px; + height: 800px; + border: 2px solid red; /* Visual aid */ +} + .dashboard { + border: 2px solid green; /* Visual aid */ + display: -webkit-box; display: -webkit-flex; display: flex; @@ -49,7 +55,7 @@ html, body { font-size: 60px; font-weight: bold; vertical-align: top; - text-align: right !important; + text-align: right; } .splitpanel .weather-icon { @@ -71,6 +77,7 @@ html, body { } .panel.bottom.week .row { + border: 2px solid yellow; /* Visual aid */ display: -webkit-box; display: -webkit-flex; display: flex; @@ -78,6 +85,8 @@ html, body { -webkit-flex: 1; flex: 1; height: 50%; + align-items: stretch; /* Stretch children to fill the width (optional) */ + } .panel.bottom.week .row .day { @@ -85,13 +94,11 @@ html, body { display: -webkit-flex; display: flex; -webkit-box-orient: vertical; /* Old WebKit property for column layout */ - -webkit-box-direction: normal; /* Old WebKit property for forward direction */ + -webkit-box-direction: column; /* Old WebKit property for forward direction */ -webkit-flex-direction: column; /* Flexbox column direction for modern WebKit */ flex-direction: column; /* Standard Flexbox column layout */ border-style: solid; - width: 135px; /* Fixed width for each day */ margin: 1px; - align-items: stretch; /* Stretch children to fill the width (optional) */ justify-content: flex-start; /* Align children at the top */ text-align: left; flex: 1; @@ -119,6 +126,11 @@ html, body { padding: 2px; } +.footer { + text-align: center; + height: 1em; +} + code { font-size: .8em; } \ No newline at end of file