diff --git a/assets/styles/app.scss b/assets/styles/app.scss index 20e37d4..71e178f 100644 --- a/assets/styles/app.scss +++ b/assets/styles/app.scss @@ -1,4 +1,5 @@ @use 'reset'; +@use 'mvp'; // Self-hosted font assets, bundled and versioned by Webpack Encore. @import '@fontsource/noto-sans/latin-400.css'; @@ -9,3 +10,106 @@ body { background-color: #108ac2; font-family: 'Noto Sans', sans-serif; } +:root { + --container-max: 1280px; + --container-gutter: clamp(1rem, 3vw, 2rem); +} + +.container { + width: min(100% - (2 * var(--container-gutter)), var(--container-max)); + margin-inline: auto; +} + +.container-flex { + width: min(100% - (2 * var(--container-gutter)), var(--container-max)); + margin-inline: auto; +} + +.container-flex--narrow { --container-max: 720px; } // readable text/forms +.container-flex--wide { --container-max: 1440px; } // dashboards/grids +.container-flex--full { --container-max: none; } // still preserves gutters + +.task-list-header { + display: flex; + align-items: center; + justify-content: space-between; + gap: 1rem; + margin-block: 2rem 1rem; +} + +.task-list { + display: grid; + gap: .5rem; + padding: 0; + list-style: none; +} + +.task-list__item form { + display: flex; + align-items: center; + gap: .75rem; +} + +.task-list__checkbox, +.visually-hidden { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; +} + +.task-list__toggle { + display: grid; + place-items: center; + width: 2rem; + height: 2rem; + cursor: pointer; + color: #d9f4ff; + border-radius: 50%; + transition: color .15s ease, background-color .15s ease, transform .15s ease; +} + +.task-list__toggle:hover { + background-color: rgb(255 255 255 / .14); + transform: scale(1.08); +} + +.task-list__toggle-icon { + font-size: 1.75rem; +} + +.task-list__toggle-icon--checked { + display: none; + color: #0b5d2c; +} + +.task-list__checkbox:checked + .task-list__toggle { + color: #8df0ae; +} + +.task-list__checkbox:checked + .task-list__toggle .task-list__toggle-icon--unchecked { + display: none; +} + +.task-list__checkbox:checked + .task-list__toggle .task-list__toggle-icon--checked { + display: block; +} + +.task-list__checkbox:focus-visible + .task-list__toggle { + outline: 3px solid #fff; + outline-offset: 3px; +} + +.task-list__title { + color: inherit; +} + +.task-list__item--completed .task-list__title { + opacity: .65; + text-decoration: line-through; +} diff --git a/assets/styles/mvp.css b/assets/styles/mvp.css new file mode 100644 index 0000000..cb5bc34 --- /dev/null +++ b/assets/styles/mvp.css @@ -0,0 +1,609 @@ +/* MVP.css v1.17.3 - https://github.com/andybrewer/mvp */ + +:root { + --active-brightness: 0.85; + --border-radius: 5px; + --box-shadow: 2px 2px 10px; + --color-accent: #118bee15; + --color-bg: #fff; + --color-bg-secondary: #e9e9e9; + --color-link: #118bee; + --color-secondary: #920de9; + --color-secondary-accent: #920de90b; + --color-shadow: #f4f4f4; + --color-table: #118bee; + --color-text: #000; + --color-text-secondary: #999; + --color-scrollbar: #cacae8; + --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; + --hover-brightness: 1.2; + --justify-important: center; + --justify-normal: left; + --line-height: 1.5; + --width-card: 285px; + --width-card-medium: 460px; + --width-card-wide: 800px; + --width-content: 1080px; +} + +@media (prefers-color-scheme: dark) { + :root[color-mode="user"] { + --color-accent: #0097fc4f; + --color-bg: #333; + --color-bg-secondary: #555; + --color-link: #0097fc; + --color-secondary: #e20de9; + --color-secondary-accent: #e20de94f; + --color-shadow: #bbbbbb20; + --color-table: #0097fc; + --color-text: #f7f7f7; + --color-text-secondary: #aaa; + } +} + +html { + scroll-behavior: smooth; +} + +@media (prefers-reduced-motion: reduce) { + html { + scroll-behavior: auto; + } +} + +/* Layout */ +article aside { + background: var(--color-secondary-accent); + border-left: 4px solid var(--color-secondary); + padding: 0.01rem 0.8rem; +} + +body { + background: var(--color-bg); + color: var(--color-text); + font-family: var(--font-family); + line-height: var(--line-height); + margin: 0; + overflow-x: hidden; + padding: 0; +} + +footer, +header, +main { + margin: 0 auto; + max-width: var(--width-content); + padding: 3rem 1rem; +} + +hr { + background-color: var(--color-bg-secondary); + border: none; + height: 1px; + margin: 4rem 0; + width: 100%; +} + +section { + display: flex; + flex-wrap: wrap; + justify-content: var(--justify-important); +} + +section img, +article img { + max-width: 100%; +} + +section pre { + overflow: auto; +} + +section aside { + border: 1px solid var(--color-bg-secondary); + border-radius: var(--border-radius); + box-shadow: var(--box-shadow) var(--color-shadow); + margin: 1rem; + padding: 1.25rem; + width: var(--width-card); +} + +section aside:hover { + box-shadow: var(--box-shadow) var(--color-bg-secondary); +} + +[hidden] { + display: none; +} + +/* Headers */ +article header, +div header, +main header { + padding-top: 0; +} + +header { + text-align: var(--justify-important); +} + +header a b, +header a em, +header a i, +header a strong { + margin-left: 0.5rem; + margin-right: 0.5rem; +} + +header nav img { + margin: 1rem 0; +} + +section header { + padding-top: 0; + width: 100%; +} + +/* Nav */ +nav { + align-items: center; + display: flex; + font-weight: bold; + justify-content: space-between; + margin-bottom: 7rem; +} + +nav ul { + list-style: none; + padding: 0; +} + +nav ul li { + display: inline-block; + margin: 0 0.5rem; + position: relative; + text-align: left; +} + +/* Nav Dropdown */ +nav ul li:hover ul { + display: block; +} + +nav ul li:focus-within ul { + display: block; +} + +nav ul li ul { + background: var(--color-bg); + border: 1px solid var(--color-bg-secondary); + border-radius: var(--border-radius); + box-shadow: var(--box-shadow) var(--color-shadow); + display: none; + height: auto; + left: -2px; + padding: 0.5rem 1rem; + position: absolute; + top: 1.7rem; + white-space: nowrap; + width: auto; + z-index: 1; +} + +nav ul li ul::before { + /* fill gap above to make mousing over them easier */ + content: ""; + position: absolute; + left: 0; + right: 0; + top: -0.5rem; + height: 0.5rem; +} + +nav ul li ul li, +nav ul li ul li a { + display: block; +} + +/* Nav for Mobile */ +@media (max-width: 768px) { + nav { + flex-wrap: wrap; + } + + nav ul li { + width: calc(100% - 1em); + } + + nav ul li ul { + border: none; + box-shadow: none; + display: block; + position: static; + } +} + +/* Typography */ +code, +samp { + background-color: var(--color-accent); + border-radius: var(--border-radius); + color: var(--color-text); + display: inline-block; + margin: 0 0.1rem; + padding: 0 0.5rem; +} + +details { + margin: 1.3rem 0; +} + +details summary { + font-weight: bold; + cursor: pointer; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + line-height: var(--line-height); + text-wrap: balance; +} + +mark { + padding: 0.1rem; +} + +ol li, +ul li { + padding: 0.2rem 0; +} + +p { + margin: 0.75rem 0; + padding: 0; + width: 100%; +} + +pre { + margin: 1rem 0; + max-width: var(--width-card-wide); + padding: 1rem 0; +} + +pre code, +pre samp { + display: block; + max-width: var(--width-card-wide); + padding: 0.5rem 2rem; + white-space: pre-wrap; +} + +small { + color: var(--color-text-secondary); +} + +sup { + background-color: var(--color-secondary); + border-radius: var(--border-radius); + color: var(--color-bg); + font-size: xx-small; + font-weight: bold; + margin: 0.2rem; + padding: 0.2rem 0.3rem; + position: relative; + top: -2px; +} + +/* Links */ +a { + color: var(--color-link); + display: inline-block; + font-weight: bold; + text-decoration: underline; +} + +a:visited, +area:visited { + color: var(--color-secondary); +} + +a:hover { + filter: brightness(var(--hover-brightness)); +} + +a:active { + filter: brightness(var(--active-brightness)); +} + +a b, +a em, +a i, +a strong, +button, +input[type="submit"] { + border-radius: var(--border-radius); + display: inline-block; + font-size: medium; + font-weight: bold; + line-height: var(--line-height); + margin: 0.5rem 0; + padding: 1rem 2rem; +} + +button, +input[type="submit"] { + font-family: var(--font-family); +} + +button:hover, +input[type="submit"]:hover { + cursor: pointer; + filter: brightness(var(--hover-brightness)); +} + +button:active, +input[type="submit"]:active { + filter: brightness(var(--active-brightness)); +} + +a b, +a strong, +button, +input[type="submit"] { + background-color: var(--color-link); + border: 2px solid var(--color-link); + color: var(--color-bg); +} + +a em, +a i { + border: 2px solid var(--color-link); + border-radius: var(--border-radius); + color: var(--color-link); + display: inline-block; + padding: 1rem 2rem; +} + +article aside a { + color: var(--color-secondary); +} + +/* Images */ +figure { + margin: 0; + padding: 0; +} + +figure img { + max-width: 100%; +} + +figure figcaption { + color: var(--color-text-secondary); +} + +/* Forms */ +button:disabled, +input:disabled { + background: var(--color-bg-secondary); + border-color: var(--color-bg-secondary); + color: var(--color-text-secondary); + cursor: not-allowed; +} + +button[disabled]:hover, +input[type="submit"][disabled]:hover { + filter: none; +} + +form { + border: 1px solid var(--color-bg-secondary); + border-radius: var(--border-radius); + box-shadow: var(--box-shadow) var(--color-shadow); + display: block; + max-width: var(--width-card-wide); + min-width: var(--width-card); + padding: 1.5rem; + text-align: var(--justify-normal); +} + +form header { + margin: 1.5rem 0; + padding: 1.5rem 0; +} + +input, +label, +select, +textarea { + display: block; + font-size: inherit; + max-width: var(--width-card-wide); +} + +input[type="checkbox"], +input[type="radio"] { + display: inline-block; +} + +input[type="checkbox"] + label, +input[type="radio"] + label { + display: inline-block; + font-weight: normal; + position: relative; + top: 1px; +} + +input[type="range"] { + padding: 0.4rem 0; +} + +input, +select, +textarea { + border: 1px solid var(--color-bg-secondary); + border-radius: var(--border-radius); + margin-bottom: 1rem; + padding: 0.4rem 0.8rem; +} + +input[type="text"], +input[type="password"], +input[type="email"], +textarea { + width: calc(100% - 1.6rem); +} + +input[readonly], +textarea[readonly] { + background-color: var(--color-bg-secondary); +} + +label { + font-weight: bold; + margin-bottom: 0.2rem; +} + +/* Popups */ +dialog { + max-width: 90%; + max-height: 85dvh; + margin: auto; + padding-block: 0; + padding-inline: 20px; + border: 1px solid var(--color-bg-secondary); + border-radius: 0.5rem; + overscroll-behavior: contain; + scroll-behavior: smooth; + scrollbar-width: none; /* Hide scrollbar for Firefox */ + -ms-overflow-style: none; /* Hide scrollbar for IE and Edge */ + scrollbar-color: transparent transparent; + animation: bottom-to-top 0.25s ease-in-out forwards; +} + +dialog::-webkit-scrollbar { + width: 0; + display: none; +} + +dialog::-webkit-scrollbar-track { + background: transparent; +} + +dialog::-webkit-scrollbar-thumb { + background-color: transparent; +} + +@media (min-width: 650px) { + dialog { + max-width: 39rem; + } +} + +dialog::backdrop { + background-color: rgba(0, 0, 0, 0.5); +} + +@keyframes bottom-to-top { + 0% { + opacity: 0; + transform: translateY(10%); + } + + 100% { + opacity: 1; + transform: translateY(0); + } +} + +dialog hr { + margin-block: 1rem; +} + +/* Tables */ +table { + border: 1px solid var(--color-bg-secondary); + border-radius: var(--border-radius); + border-spacing: 0; + display: inline-block; + max-width: 100%; + overflow-x: auto; + padding: 0; + white-space: nowrap; +} + +table td, +table th, +table tr { + padding: 0.4rem 0.8rem; + text-align: var(--justify-important); +} + +table thead { + background-color: var(--color-table); + border-collapse: collapse; + border-radius: var(--border-radius); + color: var(--color-bg); + margin: 0; + padding: 0; +} + +table thead tr:first-child th:first-child { + border-top-left-radius: var(--border-radius); +} + +table thead tr:first-child th:last-child { + border-top-right-radius: var(--border-radius); +} + +table thead th:first-child, +table tr td:first-child { + text-align: var(--justify-normal); +} + +table tr:nth-child(even) { + background-color: var(--color-accent); +} + +/* Quotes */ +blockquote { + display: block; + font-size: x-large; + line-height: var(--line-height); + margin: 1rem auto; + max-width: var(--width-card-medium); + padding: 1.5rem 1rem; + text-align: var(--justify-important); +} + +blockquote footer { + color: var(--color-text-secondary); + display: block; + font-size: small; + line-height: var(--line-height); + padding: 1.5rem 0; +} + +/* Scrollbars */ +* { + scrollbar-width: thin; + scrollbar-color: var(--color-scrollbar) transparent; +} + +*::-webkit-scrollbar { + width: 5px; + height: 5px; +} + +*::-webkit-scrollbar-track { + background: transparent; +} + +*::-webkit-scrollbar-thumb { + background-color: var(--color-scrollbar); + border-radius: 10px; +} diff --git a/deploy.sh b/deploy.sh index 4276280..a39e1b1 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,11 +7,15 @@ TAR="symfony-k3s-dev.tar" NAMESPACE="symfony" DEPLOYMENT="symfony" + echo "========================================" echo " Building and deploying $IMAGE" echo "========================================" echo +echo "==> Running Webpack Encore first" +npm run build + echo "==> Removing previous Docker image (if any)" docker image rm "$IMAGE" >/dev/null 2>&1 || true diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index 8e57aee..aa38513 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -68,6 +68,24 @@ final class TaskController extends AbstractController ]); } + #[Route('/{id}/completion', name: 'app_task_toggle_completion', methods: ['POST'])] + public function toggleCompletion(Request $request, Task $task, EntityManagerInterface $entityManager): Response + { + if (!$this->isCsrfTokenValid('completion'.$task->getId(), $request->getPayload()->getString('_token'))) { + throw $this->createAccessDeniedException('Invalid CSRF token.'); + } + + // A checked box is submitted as "completed=1"; an unchecked one is omitted. + $task + ->setIsActive(!$request->getPayload()->getBoolean('completed')) + ->setUpdatedAt(new \DateTimeImmutable()); + $entityManager->flush(); + + return $this->render('task/_task_item.html.twig', [ + 'task' => $task, + ]); + } + #[Route('/{id}', name: 'app_task_delete', methods: ['POST'])] public function delete(Request $request, Task $task, EntityManagerInterface $entityManager): Response { diff --git a/templates/task/_task_item.html.twig b/templates/task/_task_item.html.twig new file mode 100644 index 0000000..06ea323 --- /dev/null +++ b/templates/task/_task_item.html.twig @@ -0,0 +1,24 @@ +
  • +
    + + + + {{ task.title }} +
    +
  • diff --git a/templates/task/index.html.twig b/templates/task/index.html.twig index fe02498..a1b3548 100644 --- a/templates/task/index.html.twig +++ b/templates/task/index.html.twig @@ -1,51 +1,23 @@ {% extends 'base.html.twig' %} -{% block title %}Task index{% endblock %} +{% block title %}Tasks{% endblock %} {% block body %} -

    Task index

    +
    +
    +

    Tasks

    + +add + +
    - - - - - - - - - - - - - - - - - - {% for task in tasks %} - - - - - - - - - - - - - - {% else %} - - - - {% endfor %} - -
    IdTitleDescriptionEstimatedDurationMinutesPriorityCategoryIsRecurringIsActiveCreatedAtUpdatedAtactions
    {{ task.id }}{{ task.title }}{{ task.description }}{{ task.estimatedDurationMinutes }}{{ task.priority }}{{ task.category }}{{ task.isRecurring ? 'Yes' : 'No' }}{{ task.isActive ? 'Yes' : 'No' }}{{ task.createdAt ? task.createdAt|date('Y-m-d H:i:s') : '' }}{{ task.updatedAt ? task.updatedAt|date('Y-m-d H:i:s') : '' }} - show - edit -
    no records found
    + - Create new +
    {% endblock %}