Merge branch 'master' into migrate-api-to-websocket

.github/dependabot.yml

@@ -0,0 +1,30 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/packages/api"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/packages/api-routes"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/packages/axios-helper"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/packages/prisma-clients"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/packages/types"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/apps/web"
+    schedule:
+      interval: "daily"

.github/workflows/certificate-renewer.yml

@@ -0,0 +1,24 @@
+name: certificate-renewer
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+jobs:
+  renew-certificates:
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Renew certificates
+        uses: appleboy/[email protected]
+        env:
+          DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN_DM }}
+        with:
+          host: ${{ secrets.PRODUCTION_SSH_HOST }}
+          username: ${{ secrets.PRODUCTION_SSH_USER }}
+          key: ${{ secrets.PRODUCTION_SSH_KEY }}
+          command_timeout: 2m
+          envs: DOCKER_REGISTRY_TOKEN_DM
+          script: |
+            cd workspace
+            docker compose run --rm certbot && docker compose up -d --force-recreate web_global

.github/workflows/notification-sender.yml

@@ -0,0 +1,22 @@
+name: notification-sender
+
+on:
+  workflow_dispatch:
+jobs:
+  send-notifications:
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Send emails
+        uses: appleboy/[email protected]
+        env:
+          DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN_DM }}
+        with:
+          host: ${{ secrets.PRODUCTION_SSH_HOST }}
+          username: ${{ secrets.PRODUCTION_SSH_USER }}
+          key: ${{ secrets.PRODUCTION_SSH_KEY }}
+          command_timeout: 2m
+          envs: DOCKER_REGISTRY_TOKEN_DM
+          script: |
+            cd workspace/DucksManager2
+            docker compose exec -w /app/packages api node ./api/scripts/send-notifications.js

.github/workflows/pending-emails-sender.yml

@@ -0,0 +1,22 @@
+name: pending-emails-sender
+
+on:
+  workflow_dispatch:
+jobs:
+  send-emails:
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Send emails
+        uses: appleboy/[email protected]
+        env:
+          DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN_DM }}
+        with:
+          host: ${{ secrets.PRODUCTION_SSH_HOST }}
+          username: ${{ secrets.PRODUCTION_SSH_USER }}
+          key: ${{ secrets.PRODUCTION_SSH_KEY }}
+          command_timeout: 2m
+          envs: DOCKER_REGISTRY_TOKEN_DM
+          script: |
+            cd workspace/DucksManager2
+            docker compose exec -w /app/packages api node ./api/scripts/send-pending-emails.js

apps/web/Dockerfile

@@ -38,6 +38,7 @@ COPY --from=build /app/packages/api/dist/api ./packages/api
 COPY packages/api/package.json ./packages/api
 COPY packages/api/translations ./packages/api/translations
 COPY packages/api/emails ./packages/api/emails
+COPY packages/api/scripts ./packages/api/scripts
 
 RUN --mount=type=cache,id=pnpm-store,target=/app/.pnpm-store \
     pnpm i --production

apps/web/src/components/LastPurchases.vue

@@ -52,7 +52,12 @@ const hasPublicationNames = $computed(() => Object.keys(publicationNames)),
     () =>
       purchasesById.value &&
       allIssues.value
-        ?.reduce(
+        ?.reduce<
+          {
+            purchase: { date: Date; description: string };
+            issues: IssueWithPublicationcode[];
+          }[]
+        >(
           (acc, issue) => {
             const existingPurchase =
               issue.purchaseId && purchasesById.value![issue.purchaseId];
@@ -69,17 +74,17 @@ const hasPublicationNames = $computed(() => Object.keys(publicationNames)),
               ({ purchase: currentPurchase }) =>
                 currentPurchase.date === purchase.date,
             );
-            if (purchaseIndex === -1) {
+            if (purchaseIndex === -1 && purchase.date) {
               acc.push({
                 purchase: {
-                  date: purchase.date as Date,
+                  date: purchase.date,
                   description: purchase.description,
                 },
                 issues: [],
               });
               purchaseIndex = acc.length - 1;
             }
-            acc[purchaseIndex].issues.push(issue);
+            acc[purchaseIndex]?.issues?.push(issue);
             return acc;
           },
           [] as {

apps/web/src/components/MedalImage.vue

@@ -72,7 +72,7 @@ const props = defineProps<{
 
 const {
   contribution,
-  nextLevel = false,
+  nextLevel,
   userLevelPoints,
   small = false,
   xSmall = false,
@@ -86,7 +86,7 @@ const { t } = useI18n();
 
 const medalColors = ["bronze", "argent", "or"];
 const level = computed(() =>
-  nextLevel && currentLevel.value !== null
+  nextLevel.value && currentLevel.value !== null
     ? currentLevel.value + 1
     : currentLevel.value,
 );

apps/web/src/components/PublicationSelect.vue

@@ -63,7 +63,7 @@ const countryNamesForPublication = $computed(
 );
 const publicationNamesForCurrentCountry = $computed(() =>
   publicationNamesFullCountries.value.includes(currentCountryCode || "")
-    ? Object.keys(publicationNames)
+    ? Object.keys(publicationNames.value)
         .filter((publicationcode) =>
           new RegExp(`^${currentCountryCode}/`).test(publicationcode),
         )

apps/web/src/pages/inducks/import.vue

@@ -317,8 +317,8 @@ const processRawData = async () => {
   const REGEX_VALID_ROW = /^([^^]+\^[^^]+)\^/;
   const issueCodes = rawData
     .split("\n")
-    .filter((row) => !/^country/.test(row) && REGEX_VALID_ROW.test(row))
-    .map((row) => row.match(REGEX_VALID_ROW)![1].replace("^", "/"));
+    .filter((row: string) => !/^country/.test(row) && REGEX_VALID_ROW.test(row))
+    .map((row: string) => row.match(REGEX_VALID_ROW)![1].replace("^", "/"));
   await fetchIssueCodesDetails(issueCodes);
 
   if (!issueCodeDetails) {

apps/web/src/pages/stats/conditions.vue

@@ -4,6 +4,10 @@
     :conditions="conditionsWithoutMissing"
     :number-per-condition="numberPerCondition"
   />
+  <ConditionsComponent
+    :conditions="conditionsWithoutMissing"
+    :number-per-condition="numberPerCondition"
+  />
 </template>
 
 <script setup lang="ts">

packages/api/.env

@@ -8,6 +8,7 @@ INDUCKS_COVERS_ROOT="https://inducks.org/hr.php?normalsize=1&image=https://outdu
 
 MYSQL_ROOT_PASSWORD=changeme
 
+ASSETS_PICTURES_ROOT=http://localhost:8001/images/
 ASSETS_MEDALS_PICTURES_ROOT=http://localhost:8001/images/medals/
 PASTEC_HOSTS=pastec
 PASTEC_PORT=4212

packages/api/emails/edges-published-with-photographer/template.ejs

@@ -15,6 +15,6 @@
 </p>
 <% } %>
 <br />
-<b><%- __("Votre contribution vous a rapporté {{extraPhotographerPoints}} points \"Photographe\"", {extraPhotographerPoints})</b>, <%- __("bravo à vous et merci pour votre contribution : nous sommes heureux de vous compter parmi la communauté active de DucksManager !") %>
+<b><%- __("Votre contribution vous a rapporté {{extraPhotographerPoints}} points \"Photographe\"", {extraPhotographerPoints}) %></b>, <%- __("bravo à vous et merci pour votre contribution : nous sommes heureux de vous compter parmi la communauté active de DucksManager !") %>
 
 <%- include('../footer'); %>

packages/api/emails/email.ts

@@ -10,9 +10,9 @@ const fr = Object.keys(en).reduce((acc, key) => ({ ...acc, [key]: key }), {});
 export const i18n = new I18n({
   locales: ["fr", "en-US"],
 
-  defaultLocale: "en-US",
+  defaultLocale: "fr",
   staticCatalog: {
-    en: Object.entries(en).reduce(
+    "en-US": Object.entries(en).reduce(
       (acc, [key, value]) => ({
         ...acc,
         [key]: value,
@@ -71,18 +71,13 @@ export abstract class Email {
         console.log(
           `Sending email of type ${this.getTemplateDirName()} to ${options.to}`
         );
-        try {
-          await Email.transporter.sendMail(options);
-        } catch (e) {
-          console.log(
-            `Can't send e-mail '${JSON.stringify(options)}': failed with ${e}`
-          );
-        }
+        await Email.transporter.sendMail(options);
       }
     } catch (e) {
-      console.log(
+      console.error(
         `Can't send e-mail '${JSON.stringify(options)}': failed with ${e}`
       );
+      return Promise.reject(e);
     }
   };
 

packages/api/emails/footer.ejs

@@ -1,10 +1,10 @@
 <br />
 <br />
 <%= __('A bientôt sur le site !') %><br />
-<a href="https://ducksmanager.net"><img width="400" src="<%= process.env.VITE_IMAGES_ROOT %>logo_small.png" /></a>
+<a href="<%= process.env.WEBSITE_ROOT %>"><img width="400" src="<%= process.env.ASSETS_PICTURES_ROOT %>logo_small.png" /></a>
 <br />
 <%= __('Retrouvez-nous sur les réseaux sociaux :') %><br />
-<a href="https://www.facebook.com/DucksManager"><img src="<%= process.env.VITE_IMAGES_ROOT %>icons/facebook.png" /></a>&nbsp;
-<a href="https://www.instagram.com/ducksmanager"><img src="<%= process.env.VITE_IMAGES_ROOT %>icons/instagram.png" /></a>&nbsp;
-<a href="https://discord.gg/z959xaejJm"><img src="<%= process.env.VITE_IMAGES_ROOT %>icons/discord.png" /></a>&nbsp;
-<a href="https://www.youtube.com/user/ducksmanager"><img src="<%= process.env.VITE_IMAGES_ROOT %>icons/youtube.png" /></a>
+<a href="https://www.facebook.com/DucksManager"><img src="<%= process.env.ASSETS_PICTURES_ROOT %>icons/facebook.png" /></a>&nbsp;
+<a href="https://www.instagram.com/ducksmanager"><img src="<%= process.env.ASSETS_PICTURES_ROOT %>icons/instagram.png" /></a>&nbsp;
+<a href="https://discord.gg/z959xaejJm"><img src="<%= process.env.ASSETS_PICTURES_ROOT %>icons/discord.png" /></a>&nbsp;
+<a href="https://www.youtube.com/user/ducksmanager"><img src="<%= process.env.ASSETS_PICTURES_ROOT %>icons/youtube.png" /></a>

packages/api/index.ts

@@ -19,7 +19,6 @@ import events from "./services/events";
 import feedback from "./services/feedback";
 import globalStats from "./services/global-stats";
 import login from "./services/login";
-import notifications from "./services/notifications";
 import presentationText from "./services/presentation-text";
 import publicCollection from "./services/public-collection";
 import stats from "./services/stats";
@@ -30,7 +29,7 @@ class ServerWithUser extends Server<
   Record<string, never>,
   Record<string, never>,
   { user?: SessionUser }
-> { }
+> {}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 (BigInt.prototype as any).toJSON = function () {
@@ -47,45 +46,45 @@ Sentry.init({
 });
 
 const httpServer = createServer(async (req, res) => {
-  let data: { error: string } | object
+  let data: { error: string } | object;
   switch (req.url) {
-    case '/status/db':
-      data = await getDbStatus()
+    case "/status/db":
+      data = await getDbStatus();
       break;
-    case '/status/pastecsearch':
-      data = await getPastecSearchStatus()
+    case "/status/pastecsearch":
+      data = await getPastecSearchStatus();
       break;
-    case '/status/pastec':
-      data = await getPastecStatus()
+    case "/status/pastec":
+      data = await getPastecStatus();
     default:
       res.writeHead(404);
       res.end();
-      return
+      return;
   }
 
-  res.writeHead("error" in data ? 500 : 200, { 'Content-Type': 'text/json' });
+  res.writeHead("error" in data ? 500 : 200, { "Content-Type": "text/json" });
   res.write(JSON.stringify(data));
   res.end();
 });
 const io = new ServerWithUser(httpServer, {
   cors: {
-    origin: '*',
+    origin: "*",
   },
 });
 
 instrument(io, {
-  auth: false
+  auth: false,
 });
 
 httpServer.listen(3000);
-console.log('WebSocket open on port 3000')
+console.log("WebSocket open on port 3000");
 
 io.use(OptionalAuthMiddleware);
 io.use((_socket, next) => {
   next();
 
   // app.all(
-  //   /^\/(edgecreator\/(publish|edgesprites)|notifications)|(edges\/(published))|(\/demo\/reset)|(\/notification\/send)|(bookstores\/(approve|refuse))|(presentation-text\/(approve|refuse))/,
+  //   /^\/(edgecreator\/(publish|edgesprites)|notifications)|(edges\/(published))|(\/demo\/reset)|(bookstores\/(approve|refuse))|(presentation-text\/(approve|refuse))/,
   //   [checkUserIsAdmin]
   // );
 
@@ -115,7 +114,6 @@ events(io);
 feedback(io);
 globalStats(io);
 login(io);
-notifications(io);
 presentationText(io);
 publicCollection(io);
 stats(io);