Merge pull request #1 from ExcitingTheory:updates

Npm audit fix and amplify pull
ExcitingTheory · Jul 8, 2023 · 4241f7e · 4241f7e
2 parents 3284cb3 + 6cd0119
commit 4241f7e
Show file tree

Hide file tree

Showing 16 changed files with 16,138 additions and 11,930 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,6 +22,7 @@ amplify/\#current-cloud-backend
 amplify/.config/local-*
 amplify/logs
 amplify/mock-data
+amplify/mock-api-resources
 amplify/backend/amplify-meta.json
 amplify/backend/.temp
 build/

diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json
@@ -1,17 +1,17 @@
 {
+  "providers": [
+    "awscloudformation"
+  ],
   "projectName": "spiders1",
   "version": "3.1",
   "frontend": "javascript",
   "javascript": {
     "framework": "react",
     "config": {
       "SourceDir": "src",
-      "DistributionDir": "public",
+      "DistributionDir": ".next",
       "BuildCommand": "npm run-script build",
       "StartCommand": "npm run-script start"
     }
-  },
-  "providers": [
-    "awscloudformation"
-  ]
+  }
 }
diff --git a/amplify/README.md b/amplify/README.md
diff --git a/amplify/backend/backend-config.json b/amplify/backend/backend-config.json
@@ -1,131 +1,197 @@
 {
+  "api": {
+    "spiders1": {
+      "dependsOn": [
+        {
+          "attributes": [
+            "UserPoolId"
+          ],
+          "category": "auth",
+          "resourceName": "spiders17563e8247563e824"
+        }
+      ],
+      "output": {
+        "authConfig": {
+          "additionalAuthenticationProviders": [
+            {
+              "authenticationType": "AWS_IAM"
+            }
+          ],
+          "defaultAuthentication": {
+            "authenticationType": "AMAZON_COGNITO_USER_POOLS",
+            "userPoolConfig": {
+              "userPoolId": "authspiders17563e8247563e824"
+            }
+          }
+        }
+      },
+      "providerPlugin": "awscloudformation",
+      "service": "AppSync"
+    }
+  },
   "auth": {
     "spiders17563e8247563e824": {
-      "service": "Cognito",
-      "providerPlugin": "awscloudformation",
-      "dependsOn": [],
       "customAuth": false,
+      "dependsOn": [],
       "frontendAuthConfig": {
-        "socialProviders": [],
-        "usernameAttributes": [
-          "EMAIL"
+        "mfaConfiguration": "OFF",
+        "mfaTypes": [
+          "SMS"
         ],
+        "passwordProtectionSettings": {
+          "passwordPolicyCharacters": [],
+          "passwordPolicyMinLength": 8
+        },
         "signupAttributes": [
           "EMAIL"
         ],
-        "passwordProtectionSettings": {
-          "passwordPolicyMinLength": 8,
-          "passwordPolicyCharacters": []
-        },
-        "mfaConfiguration": "OFF",
-        "mfaTypes": [
-          "SMS"
+        "socialProviders": [],
+        "usernameAttributes": [
+          "EMAIL"
         ],
         "verificationMechanisms": [
           "EMAIL"
         ]
-      }
+      },
+      "providerPlugin": "awscloudformation",
+      "service": "Cognito"
     }
   },
-  "function": {
-    "spiderEngines": {
-      "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda",
+  "custom": {
+    "spiderLanguage": {
       "dependsOn": [
         {
-          "category": "api",
-          "resourceName": "spiders1",
           "attributes": [
             "GraphQLAPIIdOutput",
             "GraphQLAPIEndpointOutput"
-          ]
+          ],
+          "category": "api",
+          "resourceName": "spiders1"
+        },
+        {
+          "attributes": [
+            "Name",
+            "Arn",
+            "Region",
+            "LambdaExecutionRole"
+          ],
+          "category": "function",
+          "resourceName": "spiderEngines"
         }
-      ]
-    },
-    "spiderWebs": {
-      "build": true,
+      ],
       "providerPlugin": "awscloudformation",
-      "service": "Lambda",
+      "service": "customCDK"
+    }
+  },
+  "function": {
+    "spiderEngines": {
+      "build": true,
       "dependsOn": [
         {
-          "category": "api",
-          "resourceName": "spiders1",
           "attributes": [
             "GraphQLAPIIdOutput",
             "GraphQLAPIEndpointOutput"
-          ]
+          ],
+          "category": "api",
+          "resourceName": "spiders1"
         }
-      ]
+      ],
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
     },
     "spiderKeywords": {
       "build": true,
-      "providerPlugin": "awscloudformation",
-      "service": "Lambda",
       "dependsOn": [
         {
-          "category": "api",
-          "resourceName": "spiders1",
           "attributes": [
             "GraphQLAPIIdOutput",
             "GraphQLAPIEndpointOutput"
-          ]
+          ],
+          "category": "api",
+          "resourceName": "spiders1"
         }
-      ]
-    }
-  },
-  "api": {
-    "spiders1": {
-      "service": "AppSync",
+      ],
       "providerPlugin": "awscloudformation",
+      "service": "Lambda"
+    },
+    "spiderWebs": {
+      "build": true,
       "dependsOn": [
         {
-          "category": "auth",
-          "resourceName": "spiders17563e8247563e824",
           "attributes": [
-            "UserPoolId"
-          ]
+            "GraphQLAPIIdOutput",
+            "GraphQLAPIEndpointOutput"
+          ],
+          "category": "api",
+          "resourceName": "spiders1"
         }
       ],
-      "output": {
-        "authConfig": {
-          "defaultAuthentication": {
-            "authenticationType": "AMAZON_COGNITO_USER_POOLS",
-            "userPoolConfig": {
-              "userPoolId": "authspiders17563e8247563e824"
-            }
-          },
-          "additionalAuthenticationProviders": [
-            {
-              "authenticationType": "AWS_IAM"
-            }
-          ]
-        }
-      }
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
     }
   },
-  "custom": {
-    "spiderLanguage": {
-      "service": "customCDK",
-      "providerPlugin": "awscloudformation",
-      "dependsOn": [
+  "parameters": {
+    "AMPLIFY_function_spiderEngines_deploymentBucketName": {
+      "usedBy": [
         {
-          "category": "api",
-          "resourceName": "spiders1",
-          "attributes": [
-            "GraphQLAPIIdOutput",
-            "GraphQLAPIEndpointOutput"
-          ]
-        },
+          "category": "function",
+          "resourceName": "spiderEngines"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderEngines_s3Key": {
+      "usedBy": [
         {
           "category": "function",
-          "resourceName": "spiderEngines",
-          "attributes": [
-            "Name",
-            "Arn",
-            "Region",
-            "LambdaExecutionRole"
-          ]
+          "resourceName": "spiderEngines"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderEngines_secretsPathAmplifyAppId": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "spiderEngines"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderKeywords_deploymentBucketName": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "spiderKeywords"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderKeywords_s3Key": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "spiderKeywords"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderKeywords_secretsPathAmplifyAppId": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "spiderKeywords"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderWebs_deploymentBucketName": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "spiderWebs"
+        }
+      ]
+    },
+    "AMPLIFY_function_spiderWebs_s3Key": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "spiderWebs"
         }
       ]
     }

diff --git a/amplify/backend/types/amplify-dependent-resources-ref.d.ts b/amplify/backend/types/amplify-dependent-resources-ref.d.ts
@@ -1,41 +1,41 @@
 export type AmplifyDependentResourcesAttributes = {
-    "auth": {
-        "spiders17563e8247563e824": {
-            "IdentityPoolId": "string",
-            "IdentityPoolName": "string",
-            "HostedUIDomain": "string",
-            "OAuthMetadata": "string",
-            "UserPoolId": "string",
-            "UserPoolArn": "string",
-            "UserPoolName": "string",
-            "AppClientIDWeb": "string",
-            "AppClientID": "string"
-        }
+  "api": {
+    "spiders1": {
+      "GraphQLAPIEndpointOutput": "string",
+      "GraphQLAPIIdOutput": "string"
+    }
+  },
+  "auth": {
+    "spiders17563e8247563e824": {
+      "AppClientID": "string",
+      "AppClientIDWeb": "string",
+      "HostedUIDomain": "string",
+      "IdentityPoolId": "string",
+      "IdentityPoolName": "string",
+      "OAuthMetadata": "string",
+      "UserPoolArn": "string",
+      "UserPoolId": "string",
+      "UserPoolName": "string"
+    }
+  },
+  "function": {
+    "spiderEngines": {
+      "Arn": "string",
+      "LambdaExecutionRole": "string",
+      "Name": "string",
+      "Region": "string"
     },
-    "function": {
-        "spiderEngines": {
-            "Name": "string",
-            "Arn": "string",
-            "Region": "string",
-            "LambdaExecutionRole": "string"
-        },
-        "spiderWebs": {
-            "Name": "string",
-            "Arn": "string",
-            "Region": "string",
-            "LambdaExecutionRole": "string"
-        },
-        "spiderKeywords": {
-            "Name": "string",
-            "Arn": "string",
-            "Region": "string",
-            "LambdaExecutionRole": "string"
-        }
+    "spiderKeywords": {
+      "Arn": "string",
+      "LambdaExecutionRole": "string",
+      "Name": "string",
+      "Region": "string"
     },
-    "api": {
-        "spiders1": {
-            "GraphQLAPIIdOutput": "string",
-            "GraphQLAPIEndpointOutput": "string"
-        }
+    "spiderWebs": {
+      "Arn": "string",
+      "LambdaExecutionRole": "string",
+      "Name": "string",
+      "Region": "string"
     }
+  }
 }