chore: 1.3.0

app/server.py

@@ -6,6 +6,7 @@ import flask_limiter
 import flask_limiter.util
 import gunicorn.app.base
 import tortoise
+from tortoise.functions import Count
 
 from app import PKG_NAME
 from app.lang import get_lang
@@ -56,6 +57,18 @@ class Server(gunicorn.app.base.BaseApplication):
                 lang=lambda key: get_lang(locale, key),
             )
 
+        @self.app.route("/api/meta", methods=["GET"])
+        async def metadata() -> dict:
+            return {
+                "tasks": await Task.all().count(),
+                "lists": (
+                    await Task.all()
+                    .annotate(count=Count("list_name", distinct=True))
+                    .first()
+                    .values("count")
+                )["count"],
+            }
+
         @self.app.route("/api/lists/<list_name>/tasks", methods=["GET"])
         async def get_tasks(list_name: str) -> list:
             return await Task.filter(list_name=list_name[:128]).values()

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tout-doux",
-    "version": "1.1.0",
+    "version": "1.3.0",
     "private": true,
     "type": "module",
     "engines": {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tout-doux"
-version = "1.1.0"
+version = "1.3.0"
 description = ""
 requires-python = ">=3.14"
 dependencies = [

resources/lang/en.json

@@ -84,5 +84,6 @@
     "save_button": "Save task",
     "clone_button": "Clone task",
     "delete_button": "Delete task",
-    "recent": "Recent lists"
+    "recent": "Recent lists",
+    "metadata": "{lists} lists / {tasks} tasks"
 }

resources/lang/fr.json

@@ -84,5 +84,6 @@
     "save_button": "Sauvegarder la tâche",
     "clone_button": "Cloner la tâche",
     "delete_button": "Supprimer la tâche",
-    "recent": "Listes récentes"
+    "recent": "Listes récentes",
+    "metadata": "{lists} listes / {tasks} tâches"
 }

resources/ts/App.vue

@@ -25,13 +25,19 @@ onMounted(() => {
         <div class="hero bg-hero grow">
             <div class="hero-content text-center p-0">
                 <div
-                    class="max-w-md min-w-96 bg-base-100 rounded-box shadow-md"
+                    class="max-w-md min-w-96 bg-base-100 rounded-box shadow-md p-4"
                 >
-                    <h1
-                        class="p-4 pb-2 text-4xl font-bold opacity-60 tracking-wide select-none"
+                    <router-link
+                        to="/"
+                        class="text-4xl font-bold opacity-60 tracking-wide select-none"
                     >
-                        <list-todo-icon :stroke-width="3" :size="32" class="inline" /> Tout Doux
-                    </h1>
+                        <list-todo-icon
+                            :stroke-width="3"
+                            :size="32"
+                            class="inline"
+                        />
+                        Tout Doux
+                    </router-link>
                     <router-view />
                 </div>
             </div>

resources/ts/api/meta.ts

@@ -0,0 +1,6 @@
+import type { Metadata } from "@/types";
+
+export async function getMetadata(): Promise<Metadata> {
+    const response = await fetch(`/api/meta`);
+    return await response.json();
+}

resources/ts/components/PageFooter.vue

@@ -1,9 +1,23 @@
 <script setup lang="ts">
-import { defineAsyncComponent } from "vue";
+import { getMetadata } from "@/api/meta";
+import type { Metadata } from "@/types";
+import { defineAsyncComponent, onBeforeMount, ref } from "vue";
+
+const metadata = ref<Metadata|null>(null);
 
 const LangInput = defineAsyncComponent(
     () => import("@/components/LangInput.vue"),
 );
+
+function fetchMetadata() {
+    void getMetadata()
+        .then((data) => {
+            metadata.value = data;
+            setTimeout(fetchMetadata, 600000);
+        });
+}
+
+onBeforeMount(fetchMetadata);
 </script>
 
 <template>
@@ -19,6 +33,7 @@ const LangInput = defineAsyncComponent(
                 >
                     klemek
                 </a>
+                <span v-if="metadata">- {{ $t("metadata", metadata) }}</span>
             </p>
         </aside>
     </footer>

resources/ts/components/RecentItem.vue

@@ -7,9 +7,8 @@ defineProps<{list: string}>();
 <template>
     <router-link
         :to="`/${list}`"
-        class="w-full flex gap-2 mb-2"
+        class="w-full flex gap-2 mb-2 hover:underline"
     >
-        <arrow-big-right-dash-icon :size="16" class="inline" />
-        <span class="underline">{{ list }}</span>
+        <arrow-big-right-dash-icon :size="16" class="inline" /> {{ list }}
     </router-link>
 </template>

resources/ts/components/TaskItem.vue

@@ -13,7 +13,7 @@ import { updateTask } from "@/api/tasks";
 const CronInput = defineAsyncComponent(
     () => import("@/components/CronInput.vue"),
 );
-import { taskCompleted, taskNextReset } from "@/lib/tasks";
+import { isTemporary, taskCompleted, taskNextReset } from "@/lib/tasks";
 import { relativeTime } from "@/lib/dates";
 import { useAlertStore } from "@/stores/alerts";
 import { useI18n } from "vue-i18n";
@@ -38,10 +38,12 @@ const i18n = useI18n();
 const { alertSuccess, alertError } = useAlertStore();
 
 async function onOpen() {
+    if (!isTemporary(task.value)) {
         editMode.value = true;
         await nextTick();
         editNameInput.value?.focus();
     }
+}
 
 function onClose() {
     editName.value = task.value.name;
@@ -51,10 +53,14 @@ function onClose() {
 
 function onSave() {
     if (editName.value.trim()) {
-        updateTask(task.value.id, {
+        const data = {
             name: editName.value.trim(),
             reset_cron: editCron.value,
-        })
+        };
+        task.value.name = editName.value.trim();
+        task.value.reset_cron = editCron.value;
+        editMode.value = false;
+        updateTask(task.value.id, data)
             .then((newTask) => {
                 task.value = newTask;
                 emit("updated", newTask);
@@ -63,47 +69,56 @@ function onSave() {
             .catch(() => {
                 alertError(i18n.t("alerts.task_update_error"));
             });
-        task.value.name = editName.value;
-        task.value.reset_cron = editCron.value;
-        editMode.value = false;
     }
 }
 
 function onCheck() {
+    if (!isTemporary(task.value)) {
         if (!checked.value) {
-        updateTask(task.value.id, {
+            const data = {
                 check_date: new Date().toISOString(),
                 previous_check_date: task.value.check_date?.toISOString(),
-        })
-            .then((newTask) => {
-                task.value = newTask;
-                emit("updated", newTask);
+            };
+            task.value.previous_check_date = task.value.check_date;
+            task.value.check_date = new Date();
+            updateTask(task.value.id, data)
+                .then((data) => {
+                    task.value = data;
+                    emit("updated", data);
                 })
                 .catch(() => {
                     alertError(i18n.t("alerts.task_update_error"));
                 });
         } else {
-        updateTask(task.value.id, {
+            const data = {
                 check_date: null,
                 previous_check_date: task.value.check_date?.toISOString(),
-        })
-            .then((newTask) => {
-                task.value = newTask;
-                emit("updated", newTask);
+            };
+            task.value.previous_check_date = task.value.check_date;
+            task.value.check_date = null;
+            updateTask(task.value.id, data)
+                .then((data) => {
+                    task.value = data;
+                    emit("updated", data);
                 })
                 .catch(() => {
                     alertError(i18n.t("alerts.task_update_error"));
                 });
         }
     }
+}
 
 function onClone() {
+    if (!isTemporary(task.value)) {
         emit("clone", task.value);
     }
+}
 
 function onDelete() {
+    if (!isTemporary(task.value)) {
         emit("delete", task.value);
     }
+}
 
 onBeforeMount(() => {
     editName.value = task.value.name;
@@ -112,6 +127,7 @@ onBeforeMount(() => {
         refreshKey.value++;
     }, 60000);
 });
+
 watch(task, () => {
     if (!editMode.value && task.value.name !== editName.value) {
         editName.value = task.value.name;
@@ -131,7 +147,7 @@ watch(task, () => {
                     type="checkbox"
                     class="checkbox"
                     :checked="checked"
-                    @click.prevent="onCheck"
+                    @click="onCheck"
                 />
             </div>
             <div

resources/ts/lib/lists.ts

@@ -1,20 +0,0 @@
-import { getCookie, setCookie } from "@/lib/cookies";
-
-const COOKIE_NAME = "recent-lists";
-const MAX_RECENT_LISTS = 32;
-
-export function getRecentLists(): string[] {
-    const rawData = getCookie(COOKIE_NAME, "");
-    if (!rawData) {
-        return [];
-    }
-    return rawData.split(",");
-}
-
-export function saveRecentList(list: string): void {
-    const recentLists = [list]
-        .concat(getRecentLists())
-        .filter((v, i, a) => a.indexOf(v) === i)
-        .slice(0, MAX_RECENT_LISTS);
-    setCookie(COOKIE_NAME, recentLists.join(","));
-}

resources/ts/lib/tasks.ts

@@ -1,7 +1,9 @@
 import { SortType } from "@/enums";
-import type { RawTask, Task } from "@/types";
+import type { RawTask, Task, TaskCreateData } from "@/types";
 import { CronExpressionParser } from "cron-parser";
 
+const TEMPORARY_ID = "tmp";
+
 export function parseTask(task: RawTask): Task {
     return {
         id: task.id,
@@ -16,6 +18,22 @@ export function parseTask(task: RawTask): Task {
     };
 }
 
+export function newTemporaryTask(data: TaskCreateData): Task {
+    return {
+        id: TEMPORARY_ID,
+        name: data.name,
+        reset_cron: data.reset_cron,
+        created_at: new Date(),
+        updated_at: new Date(),
+        check_date: null,
+        previous_check_date: null,
+    }
+}
+
+export function isTemporary(task: Task): boolean {
+    return task.id === TEMPORARY_ID;
+}
+
 export function taskNextReset(task: Task): Date | null {
     if (task.check_date === null || task.reset_cron === null) {
         return null;

resources/ts/stores/lists.ts

@@ -0,0 +1,25 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+import { getCookie, setCookie } from "@/lib/cookies";
+
+const COOKIE_NAME = "recent-lists";
+const MAX_RECENT_LISTS = 32;
+
+export const useListStore = defineStore("lists", () => {
+    const lists = ref<string[]>([]);
+
+    const rawData = getCookie(COOKIE_NAME, "");
+    if (rawData) {
+        lists.value = rawData.split(",");
+    }
+
+    function addList(list: string) {
+        lists.value = [list]
+            .concat(lists.value)
+            .filter((v, i, a) => a.indexOf(v) === i)
+            .slice(0, MAX_RECENT_LISTS);
+        setCookie(COOKIE_NAME, lists.value.join(","));
+    }
+
+    return { lists, addList };
+});

resources/ts/types.ts

@@ -46,3 +46,8 @@ export interface Alert {
     created: Date;
     seconds: number;
 }
+
+export interface Metadata {
+    tasks: number;
+    lists: number;
+}

resources/ts/views/HomeView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { getRecentLists } from "@/lib/lists";
+import { useListStore } from "@/stores/lists";
 import { ArrowBigRightDashIcon, DicesIcon, HistoryIcon } from "@lucide/vue";
 import { generateSlug } from "random-word-slugs";
 import { defineAsyncComponent, onBeforeMount, ref } from "vue";
@@ -9,7 +9,8 @@ const RecentItem = defineAsyncComponent(
 );
 
 const listNameInput = ref<string>(generateSlug(4));
-const recentLists = ref<string[]>(getRecentLists());
+
+const { lists: recentLists } = useListStore();
 
 function onRandom() {
     listNameInput.value = generateSlug(4);
@@ -24,18 +25,18 @@ function onInput() {
 }
 
 function updateTitle() {
-    document.title = 'Tout Doux';
+    document.title = "Tout Doux";
 }
 
-onBeforeMount(updateTitle)
+onBeforeMount(updateTitle);
 onBeforeRouteUpdate(updateTitle);
 </script>
 
 <template>
-    <div
-        class="p-4 italic text-xl font-extralight"
-    >{{ $t('home') }}<br/>{{ $t('call_to_action') }}</div>
-    <div class="flex gap-2 p-4">
+    <div class="italic mt-4 text-xl font-extralight">
+        {{ $t("home") }}<br />{{ $t("call_to_action") }}
+    </div>
+    <div class="flex gap-2 mt-4">
         <input
             v-model="listNameInput"
             type="text"
@@ -47,7 +48,7 @@ onBeforeRouteUpdate(updateTitle);
             <dices-icon />
         </button>
     </div>
-    <div class="w-full">
+    <div class="mt-4">
         <router-link
             class="btn btn-lg"
             :class="listNameInput.trim().length === 0 ? 'btn-disabled' : ''"
@@ -57,14 +58,21 @@ onBeforeRouteUpdate(updateTitle);
             {{ $t("home_button") }}
         </router-link>
     </div>
-    <div v-if="recentLists.length" class="collapse collapse-arrow font-light text-sm">
-        <input id="recent-dropdown" type="checkbox" />
-        <div class="collapse-title">
+    <div
+        v-if="recentLists.length"
+        class="mt-4 -mb-4 lh collapse collapse-arrow font-light text-sm"
+    >
+        <input id="recent-dropdown p-0" type="checkbox" />
+        <div class="collapse-title p-0 content-center">
             <history-icon class="inline" :size="16" />
             {{ $t("recent") }}
         </div>
         <div class="collapse-content">
-            <recent-item v-for="(list, i) in recentLists" :key="`recent-${i}`" :list="list" />
+            <recent-item
+                v-for="(list, i) in recentLists"
+                :key="`recent-${i}`"
+                :list="list"
+            />
         </div>
     </div>
 </template>

resources/ts/views/ListView.vue

@@ -14,14 +14,14 @@ import {
 const TaskItem = defineAsyncComponent(
     () => import("@/components/TaskItem.vue"),
 );
-import { taskCompleted, sortTasks } from "@/lib/tasks";
+import { taskCompleted, sortTasks, newTemporaryTask } from "@/lib/tasks";
 import { SortType } from "@/enums";
 import { booleanCookieRef, enumCookieRef } from "@/lib/cookies";
 import { useAlertStore } from "@/stores/alerts";
 import { useI18n } from "vue-i18n";
-import { onBeforeRouteUpdate, useRoute } from "vue-router";
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute } from "vue-router";
 import { shareLink } from "@/lib/share";
-import { saveRecentList } from "@/lib/lists";
+import { useListStore } from "@/stores/lists";
 
 const route = useRoute();
 
@@ -29,6 +29,7 @@ const list = ref<string | null>(null);
 const loading = ref<boolean>(true);
 const taskInput = ref<string>("");
 const tasks = ref<Task[]>([]);
+const refreshTimeout = ref<number>(0);
 
 const sortType = enumCookieRef<SortType>("sSortType", SortType.CREATED_AT);
 const sortReverse = booleanCookieRef("sortReverse", false);
@@ -49,18 +50,21 @@ const allCompleted = computed<boolean>(
 const i18n = useI18n();
 
 const { alertSuccess, alertError, alertWarning } = useAlertStore();
+const { addList } = useListStore();
 
-function fetchTasks() {
-    if (list.value) {
+function fetchTasks(requestedList: string) {
+    const initialList = list.value;
+    if (list.value === requestedList) {
         getTasks(list.value)
             .then((data: Task[]) => {
+                if (list.value === initialList) {
                     tasks.value = data;
-                reSortTasks();
+                    reSortTasks(true);
                     loading.value = false;
-                if (data.length && list.value) {
-                    saveRecentList(list.value);
+                    refreshTimeout.value = setTimeout(() => {
+                        fetchTasks(list.value ?? "");
+                    }, 10000);
                 }
-                setTimeout(fetchTasks, 10000);
             })
             .catch(() => {
                 if (tasks.value.length !== 0) {
@@ -72,20 +76,28 @@ function fetchTasks() {
     }
 }
 
-function reSortTasks() {
+function reSortTasks(update = false) {
     tasks.value = sortTasks(tasks.value, sortType.value, sortReverse.value);
+    if (update) {
         updateTitle();
+        if (tasks.value.length && list.value) {
+            addList(list.value);
+        }
+    }
 }
 
 function onNewTask() {
     if (taskInput.value.trim() && list.value && !loading.value) {
-        createTask(list.value, {
+        const data = {
             name: taskInput.value.trim(),
             reset_cron: null,
-        })
+        };
+        const task = newTemporaryTask(data);
+        tasks.value.push(task);
+        reSortTasks(true);
+        createTask(list.value, data)
             .then((data: Task) => {
-                tasks.value.push(data);
-                reSortTasks();
+                task.id = data.id;
                 alertSuccess(i18n.t("alerts.task_created"));
             })
             .catch(() => {
@@ -97,14 +109,23 @@ function onNewTask() {
     }
 }
 
+function onUpdateTask() {
+    reSortTasks(true);
+}
+
 function onCloneTask(task: Task) {
     if (list.value) {
-        createTask(list.value, {
+        const data = {
             name: task.name,
             reset_cron: task.reset_cron,
-        })
+        };
+        const newTask = newTemporaryTask(data);
+        tasks.value.push(newTask);
+        reSortTasks(true);
+        createTask(list.value, data)
             .then((data: Task) => {
-                tasks.value.push(data);
+                task.id = data.id;
+                reSortTasks(true);
                 alertSuccess(i18n.t("alerts.task_cloned"));
             })
             .catch(() => {
@@ -114,6 +135,8 @@ function onCloneTask(task: Task) {
 }
 
 function onDeleteTask(task: Task) {
+    tasks.value.splice(tasks.value.indexOf(task), 1);
+    reSortTasks(true);
     deleteTask(task.id)
         .then(() => {
             alertSuccess(i18n.t("alerts.task_deleted"));
@@ -121,8 +144,6 @@ function onDeleteTask(task: Task) {
         .catch(() => {
             alertError(i18n.t("alerts.task_delete_error"));
         });
-
-    tasks.value.splice(tasks.value.indexOf(task), 1);
 }
 
 function onChangeSortType() {
@@ -134,6 +155,7 @@ function onChangeSortReverse() {
 }
 
 function onShare() {
+    if (!empty.value) {
         shareLink(
             `Tout Doux - ${list.value ?? ""}`,
             i18n.t("share_text"),
@@ -148,6 +170,7 @@ function onShare() {
                 alertError(i18n.t("alerts.share_error"));
             });
     }
+}
 
 function updateTitle() {
     if (list.value !== null) {
@@ -157,62 +180,72 @@ function updateTitle() {
 
 onBeforeMount(() => {
     list.value = (route.params.list as string).slice(0, 128);
-    fetchTasks();
+    fetchTasks(list.value);
 });
 
 onBeforeRouteUpdate((to) => {
     list.value = (to.params.list as string).slice(0, 128);
-    fetchTasks();
+    fetchTasks(list.value);
+});
+
+onBeforeRouteLeave(() => {
+    clearTimeout(refreshTimeout.value);
 });
 </script>
 
 <template>
-    <div class="list-row italic text-sm font-extralight self-center">
+    <div
+        class="list-row italic text-sm font-extralight self-center"
+        :class="!empty ? 'cursor-pointer hover:underline' : ''"
+        :title="!empty ? $t('share_button') : ''"
+        @click="onShare"
+    >
         {{ list }}
-        <span v-if="taskCount">({{ completedCount }} / {{ taskCount }})</span>
+        <span v-if="!empty"
+            >({{ completedCount }} / {{ taskCount }})&nbsp;<share-2-icon
+                class="inline"
+                :size="16"
+                :stroke-width="1"
+        /></span>
     </div>
-    <ul class="list">
+    <div
+        v-if="!loading && empty"
+        class="mt-4 mb-4 italic text-xl font-extralight"
+    >
+        <search-icon class="inline" />
+        <span v-html="$t('empty_hint')"></span>
+    </div>
+    <div
+        v-else-if="!loading && allCompleted && separateCompleted"
+        class="mt-4 mb-4 italic text-xl font-extralight"
+    >
+        <check-check-icon class="inline" />
+        <span v-html="$t('all_completed_hint')"></span>
+    </div>
+    <ul v-else class="list">
         <template v-for="(task, i) in tasks" :key="task.id">
             <li v-if="tasks[i] && (!separateCompleted || !taskCompleted(task))">
                 <task-item
                     v-model="tasks[i]"
                     :show-last-checked="showLastChecked"
                     :show-next-reset="showNextReset"
-                    @updated="updateTitle"
+                    @updated="onUpdateTask"
                     @clone="onCloneTask"
                     @delete="onDeleteTask"
                 />
             </li>
         </template>
-        <li
-            v-if="!loading && empty"
-            class="list-row italic text-xl font-extralight self-center"
-        >
-            <span
-                ><search-icon class="inline" />
-                <span v-html="$t('empty_hint')"></span
-            ></span>
-        </li>
-        <li
-            v-else-if="!loading && allCompleted && separateCompleted"
-            class="list-row italic text-xl font-extralight self-center"
-        >
-            <span
-                ><check-check-icon class="inline" />
-                <span v-html="$t('all_completed_hint')"></span
-            ></span>
-        </li>
     </ul>
     <div
         v-if="separateCompleted && hasCompleted"
-        class="collapse collapse-arrow"
+        class="collapse collapse-arrow mb-4"
     >
-        <input id="completed-dropdown" type="checkbox" />
-        <div class="collapse-title mb-0">
+        <input id="completed-dropdown p-0" type="checkbox" />
+        <div class="collapse-title p-0 content-center">
             <circle-check-big-icon class="inline" :size="24" />
             {{ $t("completed") }} ({{ completedCount }})
         </div>
-        <div class="collapse-content p-0">
+        <div class="collapse-content p-0 -mb-4">
             <ul class="list">
                 <template
                     v-for="(task, i) in tasks"
@@ -231,7 +264,7 @@ onBeforeRouteUpdate((to) => {
             </ul>
         </div>
     </div>
-    <div class="flex gap-2 p-4">
+    <div class="flex gap-2">
         <input
             v-model="taskInput"
             type="text"
@@ -248,14 +281,12 @@ onBeforeRouteUpdate((to) => {
             <circle-plus-icon />
         </button>
     </div>
-    <div v-if="!empty">
-        <button class="btn btn-sm px-4" @click="onShare">
-            <share-2-icon class="inline" :size="16" /> {{ $t("share_button") }}
-        </button>
-    </div>
-    <div v-if="!empty" class="collapse collapse-arrow font-light text-sm">
-        <input id="options-dropdown" type="checkbox" />
-        <div class="collapse-title">
+    <div
+        v-if="!empty"
+        class="mt-4 -mb-4 collapse collapse-arrow font-light text-sm"
+    >
+        <input id="options-dropdown p-0" type="checkbox" />
+        <div class="collapse-title p-0 content-center">
             <settings-2-icon class="inline" :size="16" />
             {{ $t("options.title") }}
         </div>

resources/ts/views/NotFoundView.vue

@@ -4,18 +4,20 @@ import { onBeforeMount } from "vue";
 import { onBeforeRouteUpdate } from "vue-router";
 
 function updateTitle() {
-    document.title = 'Tout Doux - Not Found';
+    document.title = "Tout Doux - Not Found";
 }
 
-onBeforeMount(updateTitle)
+onBeforeMount(updateTitle);
 onBeforeRouteUpdate(updateTitle);
 </script>
 
 <template>
-    <div class="italic text-xl font-extralight mb-4">
-        <circle-question-mark-icon class="inline" /> {{ $t('not_found') }}
+    <div class="italic text-xl font-extralight mt-4">
+        <circle-question-mark-icon class="inline" /> {{ $t("not_found") }}
     </div>
-    <div class="w-full">
-        <router-link to="/" class="btn mb-4 px-4">{{ $t('not_found_button') }}</router-link>
+    <div class="w-full mt-4">
+        <router-link to="/" class="btn">{{
+            $t("not_found_button")
+        }}</router-link>
     </div>
 </template>

uv.lock

@@ -323,7 +323,7 @@ asyncpg = [
 
 [[package]]
 name = "tout-doux"
-version = "1.1.0"
+version = "1.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "flask", extra = ["async"] },