Compare commits
25
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4300e901ab | ||
|
|
6a0e162596 | ||
|
|
603bd9f108 | ||
|
|
41e94c8bcb | ||
|
|
765f3e1f8a | ||
|
|
fb48f64ed8 | ||
|
|
5ae0684d39 | ||
|
|
ea9a50a2f7 | ||
|
|
5e60b5ad20 | ||
|
|
f811facff8 | ||
|
|
db9ecb4773 | ||
|
|
51801f67f9 | ||
|
|
fe41547ced | ||
|
|
e87068e379 | ||
|
|
cc856c3402 | ||
|
|
b24f3bb656 | ||
|
|
cf2f48c84c | ||
|
|
0f5f3b2fc5 | ||
|
|
3a40b06354 | ||
|
|
117d3a2029 | ||
|
|
478091b0ba | ||
|
|
08b3b06089 | ||
|
|
1c7d38fc15 | ||
|
|
350da88802 | ||
|
|
29cdf7bb7e |
@@ -25,7 +25,6 @@ RUN uv pip install . --system
|
||||
|
||||
ENV APP_ENV=production
|
||||
ENV PORT=5000
|
||||
EXPOSE ${PORT}
|
||||
ENV BIND=0.0.0.0
|
||||
|
||||
COPY --from=front-end /app/dist ./dist
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
> A shareable task list with auto resetting items.
|
||||
|
||||

|
||||
|
||||
**[todo.klemek.fr](https://todo.klemek.fr)**
|
||||
|
||||
## Running your own
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
from tortoise import migrations
|
||||
from tortoise.migrations import operations as ops
|
||||
from tortoise import fields
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [('models', '0001_initial')]
|
||||
|
||||
initial = False
|
||||
|
||||
operations = [
|
||||
ops.AlterField(
|
||||
model_name='Task',
|
||||
name='list_name',
|
||||
field=fields.CharField(db_index=True, max_length=128),
|
||||
),
|
||||
ops.AlterField(
|
||||
model_name='Task',
|
||||
name='reset_cron',
|
||||
field=fields.CharField(null=True, max_length=64),
|
||||
),
|
||||
]
|
||||
+1
-1
@@ -10,7 +10,7 @@ CRONTAB_REGEX = r"^(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@eve
|
||||
|
||||
|
||||
class Task(AbstractModel):
|
||||
list_name = tortoise.fields.CharField(max_length=32, db_index=True, null=False)
|
||||
list_name = tortoise.fields.CharField(max_length=128, db_index=True, null=False)
|
||||
name = tortoise.fields.TextField(null=False)
|
||||
reset_cron = tortoise.fields.CharField(
|
||||
max_length=64,
|
||||
|
||||
+15
-2
@@ -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,15 +57,27 @@ 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).values()
|
||||
return await Task.filter(list_name=list_name[:128]).values()
|
||||
|
||||
@self.app.route("/api/lists/<list_name>/tasks", methods=["POST"])
|
||||
async def post_task(list_name: str) -> typing.Any:
|
||||
data = flask.request.get_json()
|
||||
logging.getLogger(self.__class__.__name__).info("%s", data)
|
||||
data["list_name"] = list_name
|
||||
data["list_name"] = list_name[:128]
|
||||
parsed_data = Task.validate_create(data)
|
||||
if parsed_data is None:
|
||||
flask.abort(400)
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
<!-- card related -->
|
||||
<meta property="og:title" content="{{ title }}">
|
||||
<meta property="og:description" content="{{ lang('home') }}">
|
||||
<meta property="og:image" content="{{ app_url }}/assets/favicon-96x96.jpg">
|
||||
<meta property="og:image" content="{{ app_url }}/assets/preview.jpg">
|
||||
<meta property="og:url" content="{{ app_url }}/{{ path }}">
|
||||
|
||||
<script
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tout-doux",
|
||||
"version": "1.0.1",
|
||||
"version": "1.3.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"engines": {
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 78 KiB |
+1
-1
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "tout-doux"
|
||||
version = "1.0.1"
|
||||
version = "1.3.0"
|
||||
description = ""
|
||||
requires-python = ">=3.14"
|
||||
dependencies = [
|
||||
|
||||
@@ -10,3 +10,38 @@ body {
|
||||
font-style: normal;
|
||||
font-variation-settings: "wdth" 100;
|
||||
}
|
||||
|
||||
.bg-hero {
|
||||
--size: 15vh;
|
||||
--angle: 45deg;
|
||||
background: repeating-linear-gradient(
|
||||
var(--angle),
|
||||
var(--color-base-200) 0%,
|
||||
var(--color-base-200) 12.5%,
|
||||
var(--color-secondary) 12.5%,
|
||||
var(--color-secondary) 25%,
|
||||
var(--color-base-200) 25%,
|
||||
var(--color-base-200) 37.5%,
|
||||
var(--color-accent) 37.5%,
|
||||
var(--color-accent) 50%,
|
||||
var(--color-base-200) 50%,
|
||||
var(--color-base-200) 62.5%,
|
||||
var(--color-secondary) 62.5%,
|
||||
var(--color-secondary) 75%,
|
||||
var(--color-base-200) 75%,
|
||||
var(--color-base-200) 87.5%,
|
||||
var(--color-accent) 87.5%,
|
||||
var(--color-accent) 100%,
|
||||
var(--color-base-200) 100%
|
||||
);
|
||||
background-repeat: repeat;
|
||||
background-size: calc(var(--size) / sin(var(--angle)))
|
||||
calc(var(--size) / sin(var(--angle)));
|
||||
animation: BackgroundAnimate 10s linear infinite reverse;
|
||||
}
|
||||
|
||||
@keyframes BackgroundAnimate {
|
||||
0% {
|
||||
background-position: calc(var(--size) / sin(var(--angle))) 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,5 +78,12 @@
|
||||
"call_to_action": "Create your list below:",
|
||||
"home_button": "Let's go !",
|
||||
"share_button": "Share my list",
|
||||
"share_text": "Check my list on Tout Doux!"
|
||||
"share_text": "Check my list on Tout Doux!",
|
||||
"add_button": "Add task",
|
||||
"cancel_button": "Cancel editing",
|
||||
"save_button": "Save task",
|
||||
"clone_button": "Clone task",
|
||||
"delete_button": "Delete task",
|
||||
"recent": "Recent lists",
|
||||
"metadata": "{lists} lists / {tasks} tasks"
|
||||
}
|
||||
|
||||
@@ -78,5 +78,12 @@
|
||||
"call_to_action": "Créez ta liste ci-dessous :",
|
||||
"home_button": "C'est parti !",
|
||||
"share_button": "Partager ma liste",
|
||||
"share_text": "Regarde ma liste sur Tout Doux!"
|
||||
"share_text": "Regarde ma liste sur Tout Doux!",
|
||||
"add_button": "Ajouter la tâche",
|
||||
"cancel_button": "Annuler la modification",
|
||||
"save_button": "Sauvegarder la tâche",
|
||||
"clone_button": "Cloner la tâche",
|
||||
"delete_button": "Supprimer la tâche",
|
||||
"recent": "Listes récentes",
|
||||
"metadata": "{lists} listes / {tasks} tâches"
|
||||
}
|
||||
|
||||
+12
-6
@@ -22,16 +22,22 @@ onMounted(() => {
|
||||
:style="{ display: visible ? 'flex' : 'none' }"
|
||||
class="min-h-screen flex-col w-screen"
|
||||
>
|
||||
<div class="hero bg-base-200 grow">
|
||||
<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>
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
@@ -2,7 +2,8 @@
|
||||
import { ref, onBeforeMount, watch } from "vue";
|
||||
import { getCron, parseCron, validCron } from "@/lib/cron";
|
||||
import { CronType } from "@/enums";
|
||||
import { DEFAULT_CRON } from "@/constants";
|
||||
|
||||
const DEFAULT_CRON = "0 0 * * *";
|
||||
|
||||
const cron = defineModel<string | null>({ required: true });
|
||||
const rawCron = ref<string>(DEFAULT_CRON);
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
<script setup lang="ts">
|
||||
import { ArrowBigRightDashIcon } from "@lucide/vue";
|
||||
|
||||
defineProps<{ list: string }>();
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<router-link
|
||||
:to="`/${list}`"
|
||||
class="w-full flex gap-2 mb-2 hover:underline"
|
||||
>
|
||||
<arrow-big-right-dash-icon :size="16" class="inline" /> {{ list }}
|
||||
</router-link>
|
||||
</template>
|
||||
@@ -1,17 +1,25 @@
|
||||
<script setup lang="ts">
|
||||
import { onBeforeMount, ref, watch, computed, defineAsyncComponent } from "vue";
|
||||
import {
|
||||
onBeforeMount,
|
||||
ref,
|
||||
watch,
|
||||
computed,
|
||||
defineAsyncComponent,
|
||||
nextTick,
|
||||
} from "vue";
|
||||
import type { Task } from "@/types";
|
||||
import { CopyIcon, TrashIcon, SaveIcon, XIcon } from "@lucide/vue";
|
||||
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";
|
||||
|
||||
const emit = defineEmits<(e: "clone" | "delete" | "updated", task: Task) => void>();
|
||||
const emit =
|
||||
defineEmits<(e: "clone" | "delete" | "updated", task: Task) => void>();
|
||||
|
||||
const task = defineModel<Task>({ required: true });
|
||||
defineProps<{ showLastChecked: boolean; showNextReset: boolean }>();
|
||||
@@ -20,6 +28,7 @@ const editMode = ref<boolean>(false);
|
||||
const editName = ref<string>("");
|
||||
const editCron = ref<string | null>(null);
|
||||
const refreshKey = ref<number>(0);
|
||||
const editNameInput = ref<HTMLInputElement | null>(null);
|
||||
|
||||
const checked = computed<boolean>(() => taskCompleted(task.value));
|
||||
const nextReset = computed<Date | null>(() => taskNextReset(task.value));
|
||||
@@ -28,15 +37,30 @@ 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;
|
||||
editCron.value = task.value.reset_cron;
|
||||
editMode.value = false;
|
||||
}
|
||||
|
||||
function onSave() {
|
||||
updateTask(task.value.id, {
|
||||
name: editName.value,
|
||||
if (editName.value.trim()) {
|
||||
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);
|
||||
@@ -45,45 +69,55 @@ 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(() => {
|
||||
@@ -93,6 +127,7 @@ onBeforeMount(() => {
|
||||
refreshKey.value++;
|
||||
}, 60000);
|
||||
});
|
||||
|
||||
watch(task, () => {
|
||||
if (!editMode.value && task.value.name !== editName.value) {
|
||||
editName.value = task.value.name;
|
||||
@@ -112,12 +147,12 @@ watch(task, () => {
|
||||
type="checkbox"
|
||||
class="checkbox"
|
||||
:checked="checked"
|
||||
@click.prevent="onCheck"
|
||||
@click="onCheck"
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="cursor-pointer text-lg select-none"
|
||||
@click.prevent="editMode = true"
|
||||
@click.prevent="onOpen"
|
||||
>
|
||||
<div>{{ task.name }}</div>
|
||||
<div
|
||||
@@ -131,27 +166,53 @@ watch(task, () => {
|
||||
v-if="showNextReset && checked && nextReset"
|
||||
class="font-light text-xs italic"
|
||||
>
|
||||
{{ $t("resets") }} {{ relativeTime(nextReset, $i18n.locale) }}
|
||||
{{ $t("resets") }}
|
||||
{{ relativeTime(nextReset, $i18n.locale) }}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
<div class="list-col-grow flex flex-col gap-2">
|
||||
<div class="flex justify-evenly">
|
||||
<button class="btn btn-square me-1" @click="onClose">
|
||||
<button
|
||||
class="btn btn-square me-1"
|
||||
:title="$t('cancel_button')"
|
||||
@click="onClose"
|
||||
>
|
||||
<x-icon />
|
||||
</button>
|
||||
<button class="btn btn-square me-1" @click="onSave">
|
||||
<button
|
||||
class="btn btn-square me-1"
|
||||
:class="
|
||||
editName.trim().length === 0 ? 'btn-disabled' : ''
|
||||
"
|
||||
:title="$t('save_button')"
|
||||
@click="onSave"
|
||||
>
|
||||
<save-icon />
|
||||
</button>
|
||||
<button class="btn btn-square me-1" @click="onClone">
|
||||
<button
|
||||
class="btn btn-square me-1"
|
||||
:title="$t('clone_button')"
|
||||
@click="onClone"
|
||||
>
|
||||
<copy-icon />
|
||||
</button>
|
||||
<button class="btn btn-square" @click="onDelete">
|
||||
<button
|
||||
class="btn btn-square"
|
||||
:title="$t('delete_button')"
|
||||
@click="onDelete"
|
||||
>
|
||||
<trash-icon />
|
||||
</button>
|
||||
</div>
|
||||
<input v-model="editName" type="text" class="input w-full" />
|
||||
<input
|
||||
ref="editNameInput"
|
||||
v-model="editName"
|
||||
type="text"
|
||||
class="input w-full"
|
||||
@keyup.enter="onSave"
|
||||
/>
|
||||
<cron-input v-model="editCron" :edit-mode="editMode" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
export const DEFAULT_CRON = "0 0 * * *";
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getCookie, setCookie } from "./cookies";
|
||||
import { getCookie, setCookie } from "@/lib/cookies";
|
||||
|
||||
export function getLang() {
|
||||
const params = new URLSearchParams(document.location.search);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 };
|
||||
});
|
||||
@@ -46,3 +46,8 @@ export interface Alert {
|
||||
created: Date;
|
||||
seconds: number;
|
||||
}
|
||||
|
||||
export interface Metadata {
|
||||
tasks: number;
|
||||
lists: number;
|
||||
}
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
<script setup lang="ts">
|
||||
import { ArrowBigRightDashIcon, DicesIcon } from "@lucide/vue";
|
||||
import { useListStore } from "@/stores/lists";
|
||||
import { ArrowBigRightDashIcon, DicesIcon, HistoryIcon } from "@lucide/vue";
|
||||
import { generateSlug } from "random-word-slugs";
|
||||
import { onBeforeMount, ref } from "vue";
|
||||
import { defineAsyncComponent, onBeforeMount, ref } from "vue";
|
||||
import { onBeforeRouteUpdate } from "vue-router";
|
||||
const RecentItem = defineAsyncComponent(
|
||||
() => import("@/components/RecentItem.vue"),
|
||||
);
|
||||
|
||||
const listNameInput = ref<string>(generateSlug(4));
|
||||
|
||||
const { lists: recentLists } = useListStore();
|
||||
|
||||
function onRandom() {
|
||||
listNameInput.value = generateSlug(4);
|
||||
}
|
||||
@@ -19,19 +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">
|
||||
<div
|
||||
class="mb-4 italic text-xl font-extralight"
|
||||
>{{ $t('home') }}<br/>{{ $t('call_to_action') }}</div>
|
||||
<div class="flex gap-2 mb-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"
|
||||
@@ -43,9 +48,9 @@ onBeforeRouteUpdate(updateTitle);
|
||||
<dices-icon />
|
||||
</button>
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<div class="mt-4">
|
||||
<router-link
|
||||
class="btn btn-lg px-4"
|
||||
class="btn btn-lg"
|
||||
:class="listNameInput.trim().length === 0 ? 'btn-disabled' : ''"
|
||||
:to="`/${listNameInput.trim()}`"
|
||||
>
|
||||
@@ -53,5 +58,21 @@ onBeforeRouteUpdate(updateTitle);
|
||||
{{ $t("home_button") }}
|
||||
</router-link>
|
||||
</div>
|
||||
<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"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
+113
-79
@@ -9,24 +9,27 @@ import {
|
||||
CircleCheckBigIcon,
|
||||
CheckCheckIcon,
|
||||
SearchIcon,
|
||||
Share2Icon
|
||||
Share2Icon,
|
||||
} from "@lucide/vue";
|
||||
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 { useListStore } from "@/stores/lists";
|
||||
|
||||
const route = useRoute();
|
||||
|
||||
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);
|
||||
@@ -47,14 +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();
|
||||
setTimeout(fetchTasks, 10000);
|
||||
reSortTasks(true);
|
||||
loading.value = false;
|
||||
refreshTimeout.value = setTimeout(() => {
|
||||
fetchTasks(list.value ?? "");
|
||||
}, 10000);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
if (tasks.value.length !== 0) {
|
||||
@@ -66,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) {
|
||||
createTask(list.value, {
|
||||
if (taskInput.value.trim() && list.value && !loading.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(() => {
|
||||
@@ -91,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(() => {
|
||||
@@ -108,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"));
|
||||
@@ -115,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() {
|
||||
@@ -128,10 +155,11 @@ function onChangeSortReverse() {
|
||||
}
|
||||
|
||||
function onShare() {
|
||||
if (!empty.value) {
|
||||
shareLink(
|
||||
`Tout Doux - ${list.value ?? ''}`,
|
||||
i18n.t('share_text'),
|
||||
`${document.location.href.split('?')[0] ?? ''}?lang=${i18n.locale.value}`
|
||||
`Tout Doux - ${list.value ?? ""}`,
|
||||
i18n.t("share_text"),
|
||||
`${document.location.href.split("?")[0] ?? ""}?lang=${i18n.locale.value}`,
|
||||
)
|
||||
.then((viaShare) => {
|
||||
if (!viaShare) {
|
||||
@@ -139,94 +167,85 @@ function onShare() {
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
alertError(i18n.t("alerts.share_error"))
|
||||
alertError(i18n.t("alerts.share_error"));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function updateTitle() {
|
||||
if (list.value !== null) {
|
||||
document.title = `Tout Doux - ${list.value} (${completedCount.value.toFixed(0)}/${taskCount.value.toFixed(0)})`
|
||||
document.title = `Tout Doux - ${list.value} (${completedCount.value.toFixed(0)}/${taskCount.value.toFixed(0)})`;
|
||||
}
|
||||
}
|
||||
|
||||
onBeforeMount(() => {
|
||||
list.value = route.params.list as string;
|
||||
fetchTasks();
|
||||
list.value = (route.params.list as string).slice(0, 128);
|
||||
fetchTasks(list.value);
|
||||
});
|
||||
|
||||
onBeforeRouteUpdate((to) => {
|
||||
list.value = to.params.list as string;
|
||||
fetchTasks();
|
||||
list.value = (to.params.list as string).slice(0, 128);
|
||||
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 }}) <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="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="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>
|
||||
<li class="list-row">
|
||||
<div class="list-col-grow">
|
||||
<input
|
||||
v-model="taskInput"
|
||||
type="text"
|
||||
:placeholder="$t('new_task_hint')"
|
||||
class="input w-full"
|
||||
@keyup.enter="onNewTask"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<button
|
||||
class="btn btn-square"
|
||||
:disabled="taskInput.trim().length === 0"
|
||||
@click="onNewTask"
|
||||
>
|
||||
<circle-plus-icon />
|
||||
</button>
|
||||
</div>
|
||||
</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"
|
||||
@@ -245,14 +264,29 @@ onBeforeRouteUpdate((to) => {
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button class="btn btn-sm px-4" @click="onShare">
|
||||
<share-2-icon class="inline" :size="16" /> {{ $t('share_button') }}
|
||||
<div class="flex gap-2">
|
||||
<input
|
||||
v-model="taskInput"
|
||||
type="text"
|
||||
:placeholder="$t('new_task_hint')"
|
||||
class="input grow"
|
||||
@keyup.enter="onNewTask"
|
||||
/>
|
||||
<button
|
||||
class="btn btn-square"
|
||||
:disabled="loading || taskInput.trim().length === 0"
|
||||
:title="$t('add_button')"
|
||||
@click="onNewTask"
|
||||
>
|
||||
<circle-plus-icon />
|
||||
</button>
|
||||
</div>
|
||||
<div 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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user