small improvements (#156)

async-labs · May 27, 2021 · 8c37079 · 8c37079
1 parent 880cc17
commit 8c37079
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 60 deletions.
diff --git a/book/10-begin/api/server/models/Invitation.ts b/book/10-begin/api/server/models/Invitation.ts
@@ -73,7 +73,9 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Team does not exist or you have no permission');
     }
 
-    const registeredUser = await User.findOne({ email }).select('defaultTeamSlug').setOptions({ lean: true });
+    const registeredUser = await User.findOne({ email })
+      .select('defaultTeamSlug')
+      .setOptions({ lean: true });
 
     if (registeredUser) {
       if (team.memberIds.includes(registeredUser._id.toString())) {
@@ -90,7 +92,9 @@ class InvitationClass extends mongoose.Model {
     }
 
     let token;
-    const invitation = await this.findOne({ teamId, email }).select('token').setOptions({ lean: true });
+    const invitation = await this.findOne({ teamId, email })
+      .select('token')
+      .setOptions({ lean: true });
 
     if (invitation) {
       token = invitation.token;
@@ -116,20 +120,24 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }
 
   public static async getTeamInvitations({ userId, teamId }) {
-    const team = await Team.findOne({ _id: teamId }).select('teamLeaderId').setOptions({ lean: true });
+    const team = await Team.findOne({ _id: teamId })
+      .select('teamLeaderId')
+      .setOptions({ lean: true });
 
     if (userId !== team.teamLeaderId) {
       throw new Error('You have no permission.');

diff --git a/book/10-end/api/server/models/Invitation.ts b/book/10-end/api/server/models/Invitation.ts
@@ -124,14 +124,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/book/7-end/api/server/models/Invitation.ts b/book/7-end/api/server/models/Invitation.ts
@@ -116,14 +116,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/book/8-begin/api/server/models/Invitation.ts b/book/8-begin/api/server/models/Invitation.ts
@@ -116,14 +116,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/book/8-end/api/server/models/Invitation.ts b/book/8-end/api/server/models/Invitation.ts
@@ -116,14 +116,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/book/9-begin/api/server/models/Invitation.ts b/book/9-begin/api/server/models/Invitation.ts
@@ -116,14 +116,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/book/9-end/api/server/models/Invitation.ts b/book/9-end/api/server/models/Invitation.ts
@@ -116,14 +116,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/saas/api/server/models/Invitation.ts b/saas/api/server/models/Invitation.ts
@@ -124,14 +124,16 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation email template not found');
     }
 
-    await sendEmail({
-      from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
-      to: [email],
-      subject: emailTemplate.subject,
-      body: emailTemplate.message,
-    }).catch((err) => {
+    try {
+      await sendEmail({
+        from: `Kelly from saas-app.async-await.com <${process.env.EMAIL_SUPPORT_FROM_ADDRESS}>`,
+        to: [email],
+        subject: emailTemplate.subject,
+        body: emailTemplate.message,
+      });
+    } catch (err) {
       console.log('Email sending error:', err);
-    });
+    }
 
     return await this.findOne({ teamId, email }).setOptions({ lean: true });
   }

diff --git a/saas/app/pages/_app.tsx b/saas/app/pages/_app.tsx
@@ -153,7 +153,11 @@ class MyApp extends App {
           />
           <link
             rel="stylesheet"
-            href="https://d2c24pn6pcl4ug.cloudfront.net/css/nprogress.min.css"
+            href={
+              isThemeDark
+                ? 'https://storage.googleapis.com/async-await/nprogress-light.min.css?v=1'
+                : 'https://storage.googleapis.com/async-await/nprogress-dark.min.css?v=1'
+            }
           />
         </Head>
         <CssBaseline />