Jkw merge

.graphqlconfig.yml

@@ -0,0 +1,15 @@
+projects:
+  thrifty:
+    schemaPath: app/src/main/graphql/schema.json
+    includes:
+      - app/src/main/graphql/**/*.graphql
+    excludes:
+      - ./amplify/**
+    extensions:
+      amplify:
+        codeGenTarget: ''
+        generatedFileName: ''
+        docsFilePath: app/src/main/graphql/com/amazonaws/amplify/generated/graphql
+extensions:
+  amplify:
+    version: 3

amplify/.config/project-config.json

@@ -1,13 +1,13 @@
 {
-  "providers": [
-    "awscloudformation"
-  ],
-  "projectName": "Thrifty",
+  "projectName": "thrifty",
   "version": "3.1",
   "frontend": "android",
   "android": {
     "config": {
       "ResDir": "app/src/main/res"
     }
-  }
+  },
+  "providers": [
+    "awscloudformation"
+  ]
 }

amplify/README.md

@@ -0,0 +1,8 @@
+# Getting Started with Amplify CLI
+This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli).
+
+Helpful resources:
+- Amplify documentation: https://docs.amplify.aws
+- Amplify CLI documentation: https://docs.amplify.aws/cli
+- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files
+- Join Amplify's community: https://amplify.aws/community/

amplify/backend/analytics/thrifty/parameters.json

@@ -0,0 +1,21 @@
+{
+    "appName": "thrifty",
+    "roleName": "pinpointLambdaRole66d02b86",
+    "cloudformationPolicyName": "cloudformationPolicy66d02b86",
+    "cloudWatchPolicyName": "cloudWatchPolicy66d02b86",
+    "pinpointPolicyName": "pinpointPolicy66d02b86",
+    "authPolicyName": "pinpoint_amplify_66d02b86",
+    "unauthPolicyName": "pinpoint_amplify_66d02b86",
+    "authRoleName": {
+        "Ref": "AuthRoleName"
+    },
+    "unauthRoleName": {
+        "Ref": "UnauthRoleName"
+    },
+    "authRoleArn": {
+        "Fn::GetAtt": [
+            "AuthRole",
+            "Arn"
+        ]
+    }
+}

amplify/backend/analytics/ThriftyOWUjV/pinpoint-cloudformation-template.json → amplify/backend/analytics/thrifty/pinpoint-cloudformation-template.json

@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Pinpoint resource stack creation using Amplify CLI",
+  "Description": "{\"createdOn\":\"Linux\",\"createdBy\":\"Amplify\",\"createdWith\":\"7.5.4\",\"stackType\":\"analytics-Pinpoint\",\"metadata\":{}}",
   "Parameters": {
     "appName": {
       "Type": "String"

amplify/backend/api/thrifty/cli-inputs.json

@@ -1,26 +1,26 @@
 {
   "version": 1,
   "serviceConfiguration": {
+    "apiName": "thrifty",
     "serviceName": "AppSync",
+    "gqlSchemaPath": "/tmp/amplify-5f4ff87e-eb3f-47d2-a2dc-8391321807a4/amplify/backend/api/thrifty/schema.graphql",
     "defaultAuthType": {
-      "mode": "AMAZON_COGNITO_USER_POOLS",
-      "cognitoUserPoolId": "auththrifty21f6c364"
+      "mode": "API_KEY",
+      "keyDescription": "api key description",
+      "expirationTime": 30
     },
     "conflictResolution": {
       "defaultResolutionStrategy": {
         "type": "AUTOMERGE"
       }
     },
-    "apiName": "thrifty",
-    "gqlSchemaPath": "/tmp/amplify-b38aed8f-cc0e-48c1-ab26-b93ee968bf10/amplify/backend/api/thrifty/schema.graphql",
     "additionalAuthTypes": [
       {
-        "mode": "API_KEY",
-        "keyDescription": "api key description",
-        "expirationTime": 30
+        "mode": "AWS_IAM"
       },
       {
-        "mode": "AWS_IAM"
+        "mode": "AMAZON_COGNITO_USER_POOLS",
+        "cognitoUserPoolId": "auththrifty84b44427"
       }
     ]
   }

amplify/backend/api/thrifty/parameters.json

@@ -4,9 +4,9 @@
   "DynamoDBEnableServerSideEncryption": false,
   "AuthCognitoUserPoolId": {
     "Fn::GetAtt": [
-      "auththrifty21f6c364",
+      "auththrifty84b44427",
       "Outputs.UserPoolId"
     ]
   },
-  "AuthModeLastUpdated": "2021-11-28T17:20:48.071Z"
+  "AuthModeLastUpdated": "2021-12-01T01:19:54.436Z"
 }

amplify/backend/api/thrifty/schema.graphql

@@ -1,33 +1,27 @@
-type Favorite @model @auth(rules: [{allow: private}]) @key(name: "byUser", fields: ["userID"]) {
+type User @model @auth(rules: [{allow: public}]){
   id: ID!
-  titleFav: String!
-  imageFav: String!
-  priceFav: String!
-  sizeFav: String!
-  categoryFav: String!
-  userID: ID
+  email: String!
+  favProducts: [Favorite] @hasMany
 }
 
-type User @model @auth(rules: [{allow: private}]) {
+type Favorite @model @auth(rules: [{allow: public}]){
   id: ID!
-  email: String!
-  Favorite: [Favorite] @connection(keyName: "byUser", fields: ["id"])
+  product: Product @hasOne
 }
-
-type Category @model @auth(rules: [{allow: private}]) {
+type Category @model @auth(rules: [{allow: public}]) {
   id: ID!
-  name: String!
-  Products: [Product] @connection(keyName: "byCategory", fields: ["id"])
+  name: String
+  Products: [Product] @hasMany(indexName: "byCategory", fields: ["id"])
 }
 
-type Product @model @auth(rules: [{allow: private}]) @key(name: "byCategory", fields: ["categoryID"]) {
+type Product @model {
   id: ID!
   title: String!
   description: String!
   price: String!
   size: String!
   color: String!
-  categoryID: ID
-  image: String!
+  image: String
+  categoryID: ID @index(name: "byCategory")
 }