fix: backend improvements + success message

Author: Daniele-rolli

backend/docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - DATABASE_URL=${DATABASE_URL}
     networks:
       - internal
+      # add external if you are not planning on using the nginx in this docker file
 
   db:
     image: postgres:15
@@ -43,9 +44,7 @@ services:
 
 networks:
   internal:
-    internal: true
   external:
-    external: true
 
 volumes:
   pgdata:

backend/package.json

@@ -6,6 +6,7 @@
   "repository": "https://github.com/beaver-notes/beaver-website",
   "author": "Daniele Rolli",
   "license": "MIT",
+  "type": "module",
   "dependencies": {
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",

backend/scripts/export_cvs.js

@@ -1,15 +1,17 @@
-import dotenv from "dotenv";
 import crypto from "crypto";
-import fs from "fs";
 import pkg from "pg";
+import fs from "fs";
 
-dotenv.config();
 const { Pool } = pkg;
 const pool = new Pool({ connectionString: process.env.DATABASE_URL });
 
 const algorithm = "aes-256-gcm";
 
-function decrypt({ iv, encrypted, authTag }) {
+function decrypt(iv, encrypted, authTag) {
+  if (!iv || !encrypted || !authTag) {
+    return null;
+  }
+
   const decipher = crypto.createDecipheriv(
     algorithm,
     Buffer.from(process.env.ENCRYPTION_KEY, "hex"),
@@ -21,15 +23,17 @@ function decrypt({ iv, encrypted, authTag }) {
   return decrypted;
 }
 
-(async () => {
-  const result = await pool.query(
+async function exportEmails() {
+  const { rows } = await pool.query(
     "SELECT iv, encrypted, auth_tag FROM beta_emails"
   );
-  const emails = result.rows.map((row) => decrypt(row));
 
-  const csv = "email\n" + emails.join("\n");
-  fs.writeFileSync("beta_testers.csv", csv);
+  const emails = rows
+    .map((row) => decrypt(row.iv, row.encrypted, row.auth_tag))
+    .filter(Boolean);
+
+  fs.writeFileSync("emails.csv", emails.join("\n"), "utf8");
+  console.log(`Exported ${emails.length} emails`);
+}
 
-  console.log(`Exported ${emails.length} emails to beta_testers.csv`);
-  process.exit(0);
-})();
+exportEmails().catch(console.error);

src/Download.vue

@@ -29,6 +29,7 @@ export default {
       intervalId: null,
       showEmailPrompt: false,
       email: "",
+      statusMessage: "",
     };
   },
   mounted() {
@@ -94,6 +95,7 @@ export default {
         if (response.data.success) {
           this.statusMessage = "Email sent successfully!";
           this.email = "";
+          this.showEmailPrompt = false;
         } else {
           this.statusMessage = "Failed to send email. Try again later.";
         }
@@ -287,8 +289,22 @@ export default {
         v-if="isAndroid"
         class="flex flex-col sm:flex-row gap-4 justify-center items-center w-full max-w-sm"
       >
+        <div v-if="statusMessage" class="mt-6 w-full max-w-sm mx-auto">
+          <p
+            class="text-sm text-center"
+            :class="
+              statusMessage.includes('successfully')
+                ? 'text-green-600 dark:text-green-400'
+                : 'text-red-600 dark:text-red-400'
+            "
+          >
+            {{ statusMessage }}
+          </p>
+        </div>
+
+        <!-- Only show form if no message OR not a success -->
         <div
-          v-if="isAndroid && showEmailPrompt"
+          v-else-if="isAndroid && showEmailPrompt"
           class="mt-6 w-full max-w-sm mx-auto"
         >
           <p