final starting code update

quanticedu · Aug 21, 2022 · 848ae91 · 848ae91
1 parent da78eec
commit 848ae91
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 20 deletions.
diff --git a/back-end/delete_meme.py b/back-end/delete_meme.py
diff --git a/back-end/post_meme.py b/back-end/post_meme.py
@@ -44,6 +44,7 @@ def lambda_handler(event, context):
     bucket = ### get the sub-resource
 
     # save it in an in-memory file-like object
+    # if you're unfamiliar with the "with" statement, read this: https://www.geeksforgeeks.org/with-statement-in-python/
     with io.BytesIO() as in_mem_file:
         image.save(in_mem_file, format=image.format)
         in_mem_file.seek(0)

diff --git a/client/src/App.js b/client/src/App.js
@@ -58,7 +58,13 @@ const App = () => {
         if (typeof error.json === "function") {
           error.json()
             .then((jsonError) => {
-              alert(`The server is alive, but reports this error: ${jsonError}`);
+              if (typeof jsonError === "string") {
+                alert(`The server is alive, but reports this error: ${jsonError}`);
+              } else if (jsonError.hasOwnProperty("message")) {
+                alert(`The server is alive, but reports this error: ${jsonError.message}`);
+              } else {
+                alert("The server is alive but reports an error.")
+              }
             })
             .catch(() => {
               alert(`The server is not alive. I received this error: ${error.statusText ?? error}`);
@@ -108,7 +114,13 @@ const App = () => {
         if (typeof error.json === "function") {
           error.json()
             .then((jsonError) => {
-              alert(`The server is alive, but reports this error: ${jsonError}`);
+              if (typeof jsonError === "string") {
+                alert(`The server is alive, but reports this error: ${jsonError}`);
+              } else if (jsonError.hasOwnProperty("message")) {
+                alert(`The server is alive, but reports this error: ${jsonError.message}`);
+              } else {
+                alert("The server is alive but reports an error.")
+              }
             })
             .catch(() => {
               alert(`The server is not alive. I received this error: ${error.statusText ?? error}`);
@@ -202,7 +214,13 @@ const App = () => {
         if (typeof error.json === "function") {
           error.json()
             .then((jsonError) => {
-              alert(`The server couldn't post the meme due to this error: ${jsonError}`);
+              if (typeof jsonError === "string") {
+                alert(`The server is alive, but reports this error: ${jsonError}`);
+              } else if (jsonError.hasOwnProperty("message")) {
+                alert(`The server is alive, but reports this error: ${jsonError.message}`);
+              } else {
+                alert("The server is alive but reports an error.")
+              }
             })
             .catch(() => {
               alert(`The server is not alive. I received this error: ${error.statusText ?? error}`);
@@ -234,7 +252,13 @@ const App = () => {
         if (typeof error.json === "function") {
           error.json()
             .then((jsonError) => {
-              alert(`The server couldn't retrieve the meme due to this error: ${jsonError}`);
+              if (typeof jsonError === "string") {
+                alert(`The server is alive, but reports this error: ${jsonError}`);
+              } else if (jsonError.hasOwnProperty("message")) {
+                alert(`The server is alive, but reports this error: ${jsonError.message}`);
+              } else {
+                alert("The server is alive but reports an error.")
+              }
             })
             .catch((nonsonError) => {
               alert(`The server is not alive. I received this error: ${error.statusText ?? error}`);
@@ -266,8 +290,14 @@ const App = () => {
           if (typeof error.json === "function") {
             error.json()
               .then((jsonError) => {
-                alert(`The server couldn't retrieve the meme due to this error: ${jsonError}`);
-              })
+                if (typeof jsonError === "string") {
+                  alert(`The server is alive, but reports this error: ${jsonError}`);
+                } else if (jsonError.hasOwnProperty("message")) {
+                  alert(`The server is alive, but reports this error: ${jsonError.message}`);
+                } else {
+                  alert("The server is alive but reports an error.")
+                }
+                })
               .catch(() => {
                 alert(`The server is not alive. I received this error: ${error.statusText ?? error}`);
               });