Merge branch 'dev' of github.com:hack4impact-calpoly/equestrian-therapy

hack4impact-calpoly · Sep 30, 2023 · 4886602 · 4886602
2 parents 48791df + 33aadd2
commit 4886602
Show file tree

Hide file tree

Showing 45 changed files with 2,222 additions and 712 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -4,3 +4,9 @@ src/models
 amplify-codegen-temp/models
 
 src\models
+
+amplify-codegen-temp\models
+
+amplify/backend
+
+.eslintcache
diff --git a/.prettierignore b/.prettierignore
@@ -4,4 +4,7 @@ docs
 .eslintignore
 .gitignore
 *.jpg
-*.png
+*.png
+*amplify.state
+*yarn.lock
+.eslintcache
diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json
@@ -1,7 +1,5 @@
 {
-  "providers": [
-    "awscloudformation"
-  ],
+  "providers": ["awscloudformation"],
   "projectName": "equestriantherapy",
   "version": "3.1",
   "frontend": "javascript",
@@ -10,8 +8,8 @@
     "config": {
       "SourceDir": "src",
       "DistributionDir": "build",
-      "BuildCommand": "npm run-script build",
-      "StartCommand": "npm run-script start"
+      "BuildCommand": "npm.cmd run-script build",
+      "StartCommand": "npm.cmd run-script start"
     }
   }
-}
+}
diff --git a/amplify/backend/api/h4ipet/cli-inputs.json b/amplify/backend/api/h4ipet/cli-inputs.json
@@ -5,9 +5,8 @@
     "serviceName": "AppSync",
     "defaultAuthType": {
       "mode": "API_KEY",
-      "expirationTime": 365,
-      "apiKeyExpirationDate": "2024-05-27T17:52:10.846Z",
-      "keyDescription": "api key description"
+      "keyDescription": "api key description",
+      "expirationTime": 30
     },
     "additionalAuthTypes": [
       {
@@ -20,4 +19,4 @@
       }
     }
   }
-}
+}
diff --git a/amplify/backend/api/h4ipet/parameters.json b/amplify/backend/api/h4ipet/parameters.json
@@ -2,6 +2,6 @@
   "AppSyncApiName": "h4ipet",
   "DynamoDBBillingMode": "PAY_PER_REQUEST",
   "DynamoDBEnableServerSideEncryption": false,
-  "AuthModeLastUpdated": "2023-05-28T17:39:02.071Z",
+  "AuthModeLastUpdated": "2023-08-31T23:30:38.551Z",
   "CreateAPIKey": 1
 }
diff --git a/amplify/backend/api/h4ipet/schema.graphql b/amplify/backend/api/h4ipet/schema.graphql
@@ -1,27 +1,28 @@
-type Timeslot @model @auth(rules: [{allow: public}]) {
+type Timeslot @model @auth(rules: [{ allow: public }]) {
   id: ID!
   startTime: AWSTime
   endTime: AWSTime
   unavailableDates: [AWSDate]
-  volunteerBookings: [Booking] @hasMany(indexName: "byTimeslot", fields: ["id"])
-  riderBookings: [Booking] @hasMany(indexName: "byTimeslot", fields: ["id"])
+  bookings: [Booking] @hasMany(indexName: "byTimeslot", fields: ["id"])
+  availableSundays: [AWSDate]
+  riderUnavailableDates: [AWSDate]
 }
 
-type Booking @model @auth(rules: [{allow: public}]) {
+type Booking @model @auth(rules: [{ allow: public }]) {
   id: ID!
   title: String
   date: AWSDate
   description: String
   timeslotID: ID! @index(name: "byTimeslot")
   userID: ID! @index(name: "byUser")
+  userType: String
 }
 
-type User @model @auth(rules: [{allow: public}]) {
+type User @model @auth(rules: [{ allow: public }]) {
   id: ID!
-  userName: String
+  userName: AWSEmail
   firstName: String
   lastName: String
   userType: String
   bookings: [Booking] @hasMany(indexName: "byUser", fields: ["id"])
 }
-
diff --git a/amplify/backend/backend-config.json b/amplify/backend/backend-config.json
@@ -11,8 +11,7 @@
           ],
           "defaultAuthentication": {
             "apiKeyConfig": {
-              "apiKeyExpirationDate": "2024-05-27T17:52:10.846Z",
-              "apiKeyExpirationDays": 365,
+              "apiKeyExpirationDays": 30,
               "description": "api key description"
             },
             "authenticationType": "API_KEY"
@@ -52,5 +51,45 @@
       "providerPlugin": "awscloudformation",
       "service": "Cognito"
     }
+  },
+  "function": {
+    "emailUser": {
+      "build": true,
+      "dependsOn": [
+        {
+          "attributes": ["GraphQLAPIIdOutput", "GraphQLAPIEndpointOutput"],
+          "category": "api",
+          "resourceName": "h4ipet"
+        }
+      ],
+      "providerPlugin": "awscloudformation",
+      "service": "Lambda"
+    }
+  },
+  "parameters": {
+    "AMPLIFY_function_emailUser_deploymentBucketName": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "emailUser"
+        }
+      ]
+    },
+    "AMPLIFY_function_emailUser_s3Key": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "emailUser"
+        }
+      ]
+    },
+    "AMPLIFY_function_emailUser_sesEmail": {
+      "usedBy": [
+        {
+          "category": "function",
+          "resourceName": "emailUser"
+        }
+      ]
+    }
   }
 }
diff --git a/amplify/backend/function/emailUser/amplify.state b/amplify/backend/function/emailUser/amplify.state
@@ -0,0 +1,6 @@
+{
+  "pluginId": "amplify-nodejs-function-runtime-provider",
+  "functionRuntime": "nodejs",
+  "useLegacyBuild": true,
+  "defaultEditorFile": "src/index.js"
+}
diff --git a/amplify/backend/function/emailUser/custom-policies.json b/amplify/backend/function/emailUser/custom-policies.json
@@ -0,0 +1,6 @@
+[
+  {
+    "Action": [],
+    "Resource": []
+  }
+]