test final build

Chudroy · Aug 19, 2022 · 47bfb30 · 47bfb30
1 parent 72cb1a1
commit 47bfb30
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 38 deletions.
diff --git a/backend/public/index.html b/backend/public/index.html
@@ -11,6 +11,6 @@
   <style>.mat-typography{font:400 14px/20px Roboto,Helvetica Neue,sans-serif;letter-spacing:normal}body{margin:0}</style><link rel="stylesheet" href="styles.640e508720966be9.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.640e508720966be9.css"></noscript></head>
   <body class="mat-typography">
     <app-root class=""></app-root>
-  <script src="runtime.aaedba49815d2ab0.js" type="module"></script><script src="polyfills.1a4a779d95e3f377.js" type="module"></script><script src="main.e329388b304cb7e6.js" type="module"></script>
+  <script src="runtime.aaedba49815d2ab0.js" type="module"></script><script src="polyfills.1a4a779d95e3f377.js" type="module"></script><script src="main.c1cb8ea7e10aaae5.js" type="module"></script>
 
 </body></html>
diff --git a/backend/public/main.c1cb8ea7e10aaae5.js b/backend/public/main.c1cb8ea7e10aaae5.js
diff --git a/backend/public/main.e329388b304cb7e6.js b/backend/public/main.e329388b304cb7e6.js
diff --git a/backend/routes/message.js b/backend/routes/message.js
@@ -16,7 +16,7 @@ router.get("/", cors(corsOptions), function (req, res, next) {
   res.json({ message: "hit the message GET route" });
 });
 
-router.post("/", cors(corsOptions), function (req, res, next) {
+router.post("/", cors(corsOptions), async function (req, res, next) {
   console.log(req.body);
 
   //define transporter
@@ -40,11 +40,16 @@ router.post("/", cors(corsOptions), function (req, res, next) {
   };
 
   transporter.sendMail(mailData, function (err, info) {
-    if (err) console.log("NodeMail", err);
-    else console.log("NodeMail", info);
+    if (err) {
+      console.log(err);
+      return res.status(500).json({ message: err });
+    } else if (info) {
+      console.log(info);
+      return res.status(200).json({ message: info });
+    } else {
+      res.json({ message: "unable to confirm or deny message sent" });
+    }
   });
-
-  res.json({ message: "hit the message POST route" });
 });
 
 module.exports = router;
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -24,6 +24,7 @@
     "angular-in-memory-web-api": "^0.14.0",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
+    "webpack-bundle-analyzer": "^4.5.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
@@ -41,6 +41,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 @NgModule({
   declarations: [
@@ -78,6 +79,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
     ReactiveFormsModule,
     MatMenuModule,
     MatSlideToggleModule,
+    MatSnackBarModule,
   ],
   providers: [],
   bootstrap: [AppComponent],

diff --git a/frontend/src/app/contact/contact.component.html b/frontend/src/app/contact/contact.component.html
@@ -72,13 +72,6 @@ <h2>Get in touch</h2>
     </button>
   </form>
 
-  <div>
-    <h2>Messages</h2>
-    <p>{{ currentMessage.name }}</p>
-    <p>{{ currentMessage.email }}</p>
-    <p>{{ currentMessage.message }}</p>
-  </div>
-
   <div id="curriculum">
     <h2>Check out my curriculum</h2>
     <button mat-raised-button color="accent">Curriculum</button>

diff --git a/frontend/src/app/contact/contact.component.ts b/frontend/src/app/contact/contact.component.ts
@@ -2,20 +2,15 @@ import { Component, OnInit } from '@angular/core';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { SendMessageService } from '../shared/services/send-message.service';
 import { Message } from '../shared/interfaces/message';
-import { tap } from 'rxjs';
+import { MatSnackBar } from '@angular/material/snack-bar';
 
 @Component({
   selector: 'app-contact',
   templateUrl: './contact.component.html',
   styleUrls: ['./contact.component.css'],
 })
 export class ContactComponent implements OnInit {
-  currentMessage: Message = {
-    id: 0,
-    name: 'n/a',
-    email: 'n/a',
-    message: 'n/a',
-  };
+  currentMessage!: Message;
 
   sendMessageForm = new FormGroup({
     name: new FormControl('', [Validators.required]),
@@ -33,18 +28,32 @@ export class ContactComponent implements OnInit {
     return this.sendMessageForm.get('message');
   }
 
-  constructor(private sendMessageService: SendMessageService) {}
+  constructor(
+    private sendMessageService: SendMessageService,
+    private _snackBar: MatSnackBar
+  ) {}
 
   ngOnInit(): void {
     this.getCurrentMessage();
   }
 
+  openSnackBar(msg: string) {
+    this._snackBar.open(msg, 'Close', { duration: 4000 });
+  }
+
   getCurrentMessage() {
     this.sendMessageService.getCurrentMessage().subscribe();
   }
 
   onSubmit() {
-    this.sendMessageService.sendMessage(this.sendMessageForm.value).subscribe();
+    this.sendMessageService.sendMessage(this.sendMessageForm.value).subscribe({
+      next: (res) => {
+        this.openSnackBar("Message sent! I'll get back to you soon!");
+      },
+      error: (err) => {
+        this.openSnackBar(err);
+      },
+    });
 
     this.currentMessage = this.sendMessageForm.value as Message;
     this.getCurrentMessage();

diff --git a/frontend/src/app/shared/services/send-message.service.ts b/frontend/src/app/shared/services/send-message.service.ts
@@ -8,21 +8,23 @@ import {
 import { Observable, throwError } from 'rxjs';
 import { catchError, retry, tap } from 'rxjs/operators';
 import { Message } from '../interfaces/message';
+import { isDevMode } from '@angular/core';
 
 @Injectable({
   providedIn: 'root',
 })
 export class SendMessageService {
-  private messageUrl = 'http://localhost:3000/send-message';
+  private messageUrl = isDevMode()
+    ? 'http://localhost:3000/send-message'
+    : '/send-message';
+
   private res!: Message;
 
   constructor(private http: HttpClient) {}
 
   getCurrentMessage() {
     return this.http.get<any>(this.messageUrl).pipe(
-      tap((msg) => {
-        console.log(msg);
-      }),
+      tap((msg) => {}),
       catchError(this.handleError)
     );
   }
@@ -32,12 +34,12 @@ export class SendMessageService {
       observe: 'response' as const,
     };
 
-    return this.http.post<any>(this.messageUrl, messageObject).pipe(
-      tap((msg) => {
-        console.log(msg);
-      }),
-      catchError(this.handleError)
-    );
+    return this.http
+      .post<any>(this.messageUrl, messageObject, httpOptions)
+      .pipe(
+        tap((msg) => {}),
+        catchError(this.handleError)
+      );
   }
 
   private handleError(error: HttpErrorResponse) {
@@ -54,7 +56,9 @@ export class SendMessageService {
     }
     // Return an observable with a user-facing error message.
     return throwError(
-      () => new Error('Something bad happened; please try again later.')
+      () =>
+        new Error(`Something bad happened; please try again later. Status: ${error.status}
+      `)
     );
   }
 }
diff --git a/frontend/stats.json b/frontend/stats.json