From 5ed47612a7dd457c0be856d0b41d2e032b75c8a9 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Guhur Date: Sun, 6 Nov 2022 10:57:50 +0100 Subject: [PATCH] fix: netlify fn --- components/Logo.tsx | 7 +++- ...d-invite-email.js => send-invite-email.ts} | 38 ++++++++----------- 2 files changed, 22 insertions(+), 23 deletions(-) rename functions/send-invite-email/{send-invite-email.js => send-invite-email.ts} (83%) diff --git a/components/Logo.tsx b/components/Logo.tsx index 750298c..5d9526e 100644 --- a/components/Logo.tsx +++ b/components/Logo.tsx @@ -3,7 +3,12 @@ import logoWithText from '../public/logos/logo.svg'; import logo from '../public/logos/logo-footer.svg'; import { useTranslation } from 'next-i18next'; -const Logo = ({ title = undefined, ...props }) => { +interface LogoProps { + title?: boolean; + [props: string]: any; +} + +const Logo = ({ title = false, ...props }: LogoProps) => { const { t } = useTranslation(); const src = title ? logoWithText : logo; return {t('logo.alt')}; diff --git a/functions/send-invite-email/send-invite-email.js b/functions/send-invite-email/send-invite-email.ts similarity index 83% rename from functions/send-invite-email/send-invite-email.js rename to functions/send-invite-email/send-invite-email.ts index d7bb3dd..082ba5e 100644 --- a/functions/send-invite-email/send-invite-email.js +++ b/functions/send-invite-email/send-invite-email.ts @@ -1,21 +1,17 @@ -const fs = require('fs'); -const Mailgun = require('mailgun.js'); +import fs from 'fs'; +// const Mailgun = require('mailgun.js'); // const formData = require('form-data'); -const dotenv = require('dotenv'); -const i18next = require('i18next'); -const Backend = require('i18next-chained-backend'); -const FSBackend = require('i18next-fs-backend'); -const HttpApi = require('i18next-http-backend'); +import dotenv from 'dotenv'; // const Handlebars = require("handlebars"); dotenv.config(); -const { - MAILGUN_API_KEY, - MAILGUN_DOMAIN, - MAILGUN_URL, - FROM_EMAIL_ADDRESS, - CONTACT_TO_EMAIL_ADDRESS, -} = process.env; +// const { +// MAILGUN_API_KEY, +// MAILGUN_DOMAIN, +// MAILGUN_URL, +// FROM_EMAIL_ADDRESS, +// CONTACT_TO_EMAIL_ADDRESS, +// } = process.env; // const mailgun = new Mailgun(formData); // const mg = mailgun.client({ @@ -87,20 +83,18 @@ const txtStr = { fr: fs.readFileSync(__dirname + '/invite-fr.txt').toString(), }; const txtTemplate = { - en: Handlebars.compile(txtStr.en), - fr: Handlebars.compile(txtStr.fr), + en: '', // Handlebars.compile(txtStr.en), + fr: '', // Handlebars.compile(txtStr.fr), }; const htmlStr = { en: fs.readFileSync(__dirname + '/invite-en.html').toString(), fr: fs.readFileSync(__dirname + '/invite-fr.html').toString(), }; const htmlTemplate = { - en: Handlebars.compile(htmlStr.en), - fr: Handlebars.compile(htmlStr.fr), + en: '', // Handlebars.compile(htmlStr.en), + fr: '', // Handlebars.compile(htmlStr.fr), }; -const test = Handlebars.compile('test'); - const sendMail = async (event) => { if (event.httpMethod !== 'POST') { return { @@ -127,8 +121,8 @@ const sendMail = async (event) => { // from: `${i18next.t("Mieux Voter")} `, from: '"Mieux Voter" ', to: Object.keys(data.recipientVariables), - text: txtTemplate.fr(templateData), - html: htmlTemplate.fr(templateData), + text: '', // txtTemplate.fr(templateData), + html: '', // htmlTemplate.fr(templateData), subject: data.title, 'h:Reply-To': 'app@mieuxvoter.fr', 'recipient-variables': JSON.stringify(data.recipientVariables),