Add mail template, mail HTML generation and a few UI fixes

2024-11-25 17:37:43 +01:00 · 2024-11-25 17:37:43 +01:00 · 4df9297d47
parent d71e8b7910
commit 4df9297d47
12 changed files with 171 additions and 20 deletions
--- a/components/base/Select.vue
+++ b/components/base/Select.vue
@ -1,6 +1,6 @@
 <template>
-    <Label class="py-4 flex flex-row justify-center items-center">
-        <span>{{ label }}</span>
+    <Label class="my-2 flex flex-1 items-center justify-between flex-col md:flex-row">
+        <span class="pb-1 md:p-0">{{ label }}</span>
        <SelectRoot v-model="model">
            <SelectTrigger :disabled="disabled" class="mx-4 inline-flex min-w-[160px] items-center justify-between px-3 text-sm font-semibold leading-none h-8 gap-1
                bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 outline-none data-[placeholder]:font-normal
--- a/db.sqlite
+++ b/db.sqlite
--- a/db.sqlite-shm
+++ b/db.sqlite-shm
--- a/db.sqlite-wal
+++ b/db.sqlite-wal
--- a/error.vue
+++ b/error.vue
@ -8,7 +8,7 @@
            <Icon icon="si:error-line" class="w-12 h-12 text-light-60 dark:text-dark-60"/>
            <div class="text-3xl">Une erreur est survenue.</div>
        </div>
-        <pre class="">Erreur {{ error?.statusCode }}: {{ error?.message }}</pre>
+        <pre class="text-center text-wrap">Erreur {{ error?.statusCode }}: {{ error?.message }}</pre>
        <Button @click="handleError">Revenir en lieu sûr</Button>
 	</div>
 </template>
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@ -1,4 +1,6 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
+import PluginVue from '@vitejs/plugin-vue';
+
 export default defineNuxtConfig({
  compatibilityDate: '2024-04-03',
  modules: [
@ -114,11 +116,20 @@ export default defineNuxtConfig({
      path: '~/components',
      pathPrefix: false,
    },
+    {
+      path: '~/server/components',
+      pathPrefix: true,
+      global: true,
+    },
  ],
  nitro: {
+    preset: 'bun',
    experimental: {
      tasks: true,
    },
+    rollupConfig: {
+      plugins: [ PluginVue() ],
+    },
  },
  runtimeConfig: {
    session: {
--- a/pages/admin/index.vue
+++ b/pages/admin/index.vue
@ -1,8 +1,8 @@
 <script lang="ts">
 const mailSchema = z.object({
    to: z.string().email(),
-    message: z.string(),
-    subject: z.string(),
+    template: z.string(),
+    data: z.string(),
 });

 const schemaList: Record<string, z.ZodObject<any> | null> = {
@ -21,7 +21,10 @@ definePageMeta({
 const job = ref<string>('');

 const toaster = useToast();
-const payload = reactive<Record<string, any>>({});
+const payload = reactive<Record<string, any>>({
+    data: JSON.stringify({ username: "Peaceultime", id: 1, timestamp: Date.now() }),
+    to: 'clem31470@gmail.com',
+});
 const data = ref(), status = ref<'idle' | 'pending' | 'success' | 'error'>('idle'), success = ref(false), error = ref<Error | null>();
 async function fetch()
 {
@ -36,6 +39,7 @@ async function fetch()

        if(schema)
        {
+            console.log(payload);
            const parsedPayload = schema.parse(payload);
        }

@ -66,15 +70,20 @@ async function fetch()
    </Head>
    <div class="flex flex-col justify-start items-center">
        <ProseH2>Administration</ProseH2>
-        <Select label="Job" v-model="job" @update:model-value="payload = {}">
-            <SelectItem label="Récupérer les données d'Obsidian" value="pull" />
-            <SelectItem label="Envoyer les données dans Obsidian" value="push" disabled />
-            <SelectItem label="Envoyer un mail de test" value="mail" />
-        </Select>
+        <div class="flex flex-row w-full gap-8">
+            <Select label="Job" v-model="job">
+                <SelectItem label="Récupérer les données d'Obsidian" value="pull" />
+                <SelectItem label="Envoyer les données dans Obsidian" value="push" disabled />
+                <SelectItem label="Envoyer un mail de test" value="mail" />
+            </Select>
+            <Select v-if="job === 'mail'" v-model="payload.template" label="Modèle" class="w-full" ><SelectItem label="Inscription" value="registration" /></Select>
+        </div>
        <div v-if="job === 'mail'" class="flex justify-center items-center flex-col">
            <TextInput label="Destinataire" class="w-full" v-model="payload.to" />
-            <TextInput label="Objet" class="w-full" v-model="payload.subject" />
-            <TextInput label="Message" class="w-full" v-model="payload.message" />
+            <textarea v-model="payload.data" class="w-[640px] bg-light-20 dark:bg-dark-20 border border-light-35 dark:border-dark-35 outline-none m-2 px-2"></textarea>
+            <div class="bg-[#fff] text-[#000]"><MailBase>
+                <MailRegistration v-bind="JSON.parse(payload.data)" />
+            </MailBase></div>
        </div>
        <Button class="self-center" @click="() => !!job && fetch()" :loading="status === 'pending'">
            <span>Executer</span>
--- a/server/api/admin/jobs/[id].post.ts
+++ b/server/api/admin/jobs/[id].post.ts
@ -1,5 +1,13 @@
 import { hasPermissions } from "#shared/auth.util";

+declare module 'nitropack'
+{
+    interface TaskPayload
+    {
+        type: string
+    }
+}
+
 export default defineEventHandler(async (e) => {
    const session = await getUserSession(e);

@ -17,6 +25,9 @@ export default defineEventHandler(async (e) => {
        return;
    }

+    payload.type = id;
+    payload.data = JSON.parse(payload.data);
+    
    const result = await runTask(id, {
        payload: payload
    });
--- a/server/components/mail/base.vue
+++ b/server/components/mail/base.vue
@ -0,0 +1,20 @@
+<template>
+    <html>
+        <body style="min-width: 1000px;">
+            <div style="user-select: none; font-size: medium; font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; width: 70%; margin: auto;">
+                <div style="margin: auto;">
+                    <a href="https://obsidian.peaceultime.com" style="display: inline-block; ">
+                        <span style="font-size: 25px; font-weight: bolder;">d[any]</span>
+                        <img src="cid:logo.obsidian.peaceultime.com" style="width: 64px; height: 64px; display: inline;" alt="Logo" width="64" height="64"/>
+                    </a>
+                </div>
+                <div style="width: 70%; padding: 1em 0;">
+                    <slot />
+                </div>
+                <footer style="color: #707070; font-style: italic; display: flex; justify-content: center; align-items: center; padding: 1em 0;">
+                    <p>Copyright Peaceultime - d[any] - 2024</p>
+                </footer>
+            </div>
+        </body>
+    </html>
+</template>
--- a/server/components/mail/registration.vue
+++ b/server/components/mail/registration.vue
@ -0,0 +1,22 @@
+<template>
+    <div>
+        <p style="font-size: 19px; font-variant: small-caps;">Bienvenue sur d[any], <span style="">{{ username }}</span>.</p>
+        <p>Nous vous invitons à valider votre compte afin de profiter de toutes les fonctionnalités de d[any].</p>
+        <div style="display: flex; justify-content: center; align-items: center; padding: 1em 0;">
+            <a :href="`https://obsidian.peaceultime.com/user/mail-validation?u=${id}&t=${timestamp}&h=${0}`" target="_blank" style="border: 1px solid #999; padding: 1px 4px; background-color: #eee; font-weight: lighter; font-size: large">Je valide mon compte</a>
+        </div>
+        <div>
+            <span>Vous pouvez egalement copier le lien suivant pour valider votre compte: </span>
+            <pre style="border-bottom: 1px solid #999; font-size: small; display: inline-block; user-select: all">{{ `https://obsidian.peaceultime.com/user/mail-validation?u=${id}&t=${timestamp}&h=${0}` }}</pre>
+        </div>
+        <span style="font-size: small; padding-left: 8px;">Ce lien est valable 1 heure.</span>
+    </div>
+</template>
+
+<script setup lang="ts">
+const { id, username, timestamp } = defineProps<{
+    id: number
+    username: string
+    timestamp: number
+}>();
+</script>
--- a/server/components/mail/revalidation.vue
+++ b/server/components/mail/revalidation.vue
@ -0,0 +1,20 @@
+<template>
+    <div class="">
+        <img  />
+        <p>Bienvenue sur d[any], <span>{{ username }}</span>.</p>
+    </div>
+    <p class="">Nous vous invitons à valider votre compte en cliquant <a :href="`https://obsidian.peaceultime.com/user/mail-validation?u=${id}&t=${timestamp}&h=${hash(id.toString(), timestamp)}`"><Button>ici</Button></a> afin de profiter de toutes les fonctionnalités de d[any]</p>
+    <p class="">Vous pouvez egalement copier le lien suivant pour valider votre compte: {{ `https://obsidian.peaceultime.com/user/mail-validation?u=${id}&t=${timestamp}&h=${hash(id.toString(), timestamp)}` }}</p>
+    <span>Ce lien est valable 1 heure.</span>
+    <footer></footer>
+</template>
+
+<script setup lang="ts">
+import { hash } from 'bun';
+
+const { id, username, timestamp } = defineProps<{
+    id: number
+    username: string
+    timestamp: number
+}>();
+</script>
--- a/server/tasks/mail.ts
+++ b/server/tasks/mail.ts
@ -1,9 +1,34 @@
 import nodemailer from 'nodemailer';
+import { createSSRApp, h } from 'vue';
+import { renderToString } from 'vue/server-renderer';
+
+import base from '../components/mail/base.vue';
+import registration from '../components/mail/registration.vue';
+import revalidation from '../components/mail/revalidation.vue';

 const config = useRuntimeConfig();
 const [domain, selector, dkim] = config.mail.dkim.split(":");

+export const templates: Record<string, { component: any, subject: string }> = {
+    "registration": { component: registration, subject: 'Bienvenue sur d[any] 😎' },
+    "revalidate-mail": { component: revalidation, subject: 'd[any]: Valider votre email' },
+};
+
+import 'nitropack/types';
+import type Registration from '../components/mail/registration.vue';
+declare module 'nitropack/types'
+{
+    interface TaskPayload
+    {
+        type: 'mail'
+        to: string[]
+        template: string
+        data: Record<string, any>
+    }
+}
+
 const transport = nodemailer.createTransport({
+    //@ts-ignore
    pool: true,
    host: config.mail.host,
    port: config.mail.port,
@ -27,13 +52,35 @@ export default defineTask({
    },
    async run(e) {
        try {
-            const payload: { to: string[], message: string, subject: string } = e.payload;
-            const status = await transport.sendMail({
-                from: 'Message automatique d[any] <no-reply@peaceultime.com>',
+            if(e.payload.type !== 'mail')
+            {
+                throw new Error(`Données inconnues`);
+            }
+
+            const payload = e.payload;
+            const template = templates[payload.template];
+
+            if(!template)
+            {
+                throw new Error(`Modèle de mail ${payload.template} inconnu`);
+            }
+
+            const mail = {
+                from: 'd[any] - Ne pas répondre <no-reply@peaceultime.com>',
                to: payload.to,
-                text: payload.message,
-                subject: payload.subject,
-            });
+                html: await render(template.component, payload.data),
+                subject: template.subject,
+                attachments: [{
+                    filename: 'logo.svg',
+                    path: '../../public/logo.dark.svg',
+                    cid: 'logo.obsidian.peaceultime.com',
+                }]
+            };
+
+            if(mail.html === '')
+                return { result: false, error: new Error("Invalid content") };
+
+            const status = await transport.sendMail(mail);

            if(status.rejected.length > 0)
            {
@ -48,3 +95,14 @@ export default defineTask({
        }
    },
 })
+
+async function render(component: any, data: Record<string, any>): Promise<string>
+{
+    const app = createSSRApp({
+        render(){
+            return h(base, null, { default: () => h(component, data, []) });
+        }
+    });
+
+    return await renderToString(app);
+}