diff --git a/assets/styles/app.scss b/assets/styles/app.scss index 2f5d00b..9485958 100644 --- a/assets/styles/app.scss +++ b/assets/styles/app.scss @@ -15,20 +15,24 @@ body { --container-max: 1280px; --container-gutter: clamp(1rem, 3vw, 2rem); } + header { display: flex; align-items: center; } + .logo { height: 60px; width: auto; } + .mascots { height: 150px; width: auto; margin-left: auto; } + .container { width: min(100% - (2 * var(--container-gutter)), var(--container-max)); margin-inline: auto; @@ -48,7 +52,10 @@ header { --container-max: 1440px; } - +.weather-location { + display: flex; + gap: 10px; +} .day-picker { display: flex; align-items: center; @@ -63,9 +70,11 @@ header { color: inherit; } -.day-picker > a { - display: grid; - place-items: center; +.day-picker>a { + display: flex; + justify-content: center; + align-items: center; + line-height: 0; width: 2.5rem; height: 2.5rem; font-size: 2rem; @@ -78,6 +87,7 @@ header { .day-picker div a { display: block; } + // dashboards/grids .container-flex--full { --container-max: none; @@ -171,35 +181,49 @@ header { flex-direction: column; } } + .weather-forecast { font-size: 2em; margin-bottom: 50px; color: #fff; + display: flex; + gap: 10px; + > span { + line-height: 2; + font-size: 25px; + } } + .task-composer { background-color: #fff; border-radius: 10px; margin-bottom: 50px; flex-direction: column; - + &__submit { + display: flex; + } form.task-composer__form { width: 100%; max-width: unset; box-shadow: unset; + label, input, - textarea{ + textarea { max-width: unset; } } + &__main { width: 100%; } + &__details { display: flex; gap: 25px; + input[type=checkbox] { - height: 30px; + height: 30px; } } } @@ -227,7 +251,7 @@ header { border-radius: .5rem; } -.task-composer__repeat-input:checked ~ .task-composer__repeat-fields { +.task-composer__repeat-input:checked~.task-composer__repeat-fields { display: grid; } @@ -242,6 +266,7 @@ header { align-items: center; gap: .5rem; background-color: #fff; + form { background-color: #fff; outline: unset; @@ -353,11 +378,27 @@ header { opacity: .65; text-decoration: line-through; } -.task-result { - background-color: #fff; - color: #000; - padding: 25px; + +.task-result-container { + + .task-result { + color: #000; + padding: 25px; + margin: 25px; + + h2 { + color: #fff; + font-size: 25px; + } + + h3 { + color: #000; + font-size: 20px; + } + } } + + .htmx-indicator { display: none; } @@ -386,4 +427,89 @@ header { .request-failed:not([hidden]) { display: inline-flex; +} + +.suggested-tasks { + display: flex; + flex-direction: column; + gap: 25px; + padding: 25px; + background-color: #fff; + + >li { + outline: 1px solid black; + width: 100%; + position: relative; + + button { + padding: 0; + margin: 0; + font-size: 15px; + border-radius: 0; + position: absolute; + top: 0; + right: 0; + } + + >article { + display: flex; + flex-direction: column; + width: 100%; + padding: 25px; + + .summary {} + + .info { + ul { + display: flex; + gap: 20px; + + li { + display: flex; + gap: 20px; + + span:first-of-type { + font-weight: 700; + } + } + } + } + } + } +} + +.braindump-form { + width: 100%; + box-shadow: unset; + max-width: unset; + position: relative; + background-color: #fff; + + textarea { + max-width: unset; + } +} + +.thinking { + // display: block; + background-color: rgba(0, 0, 0, 0.5); + transition: 0.3s all ease-in-out; + position: absolute; + inset: 0; + display: flex; + align-items: center; + justify-content: center; + gap: 15px; + font-size: 2em; + color: #fff; + inset: 0; + z-index: -1; + opacity: 0; + + &.htmx-request { + // display: block; + z-index: 10; + opacity: 1; + + } } \ No newline at end of file diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index 8a987af..e2311d3 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -34,7 +34,7 @@ final class TaskController extends AbstractController 'battery_budget' => $taskRecommendationService->budgetFor($batteryLevel), 'selected_date' => $selectedDate, 'form' => $this->createForm(TaskType::class, $newTask, ['include_active' => false]), - 'weather_forecast' => $selectedDate->format('Y-m-d') === (new \DateTimeImmutable('today'))->format('Y-m-d') ? $weatherService->cachedForecastFor($settings, $selectedDate) : null, + 'weather_forecast' => $selectedDate->format('Y-m-d') === $selectedDate->format('Y-m-d') ? $weatherService->cachedForecastFor($settings, $selectedDate) : null, 'has_saved_location' => $settings?->hasLocation() ?? false, ]); } diff --git a/templates/braindump/_task_result.html.twig b/templates/braindump/_task_result.html.twig index 7f09005..fb0ab82 100644 --- a/templates/braindump/_task_result.html.twig +++ b/templates/braindump/_task_result.html.twig @@ -2,29 +2,37 @@

No tasks were suggested.

{% else %}

Suggested tasks

- + {% endif %} \ No newline at end of file diff --git a/templates/braindump/index.html.twig b/templates/braindump/index.html.twig index 3930469..25a8eeb 100644 --- a/templates/braindump/index.html.twig +++ b/templates/braindump/index.html.twig @@ -7,6 +7,7 @@

Brain Dump

- - + + + progress_activity + Thinking… + +
- - progress_activity - Thinking… - -
- {# HTMX will put the proposed tasks here #} + +
+
+ {# HTMX will put the proposed tasks here #} +
{% endblock %} \ No newline at end of file diff --git a/templates/task/index.html.twig b/templates/task/index.html.twig index f4aaa13..a986ab8 100644 --- a/templates/task/index.html.twig +++ b/templates/task/index.html.twig @@ -8,14 +8,18 @@

Tasks