diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000000..aeb421f422 --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +src/models \ No newline at end of file diff --git a/.gitignore b/.gitignore index e1d20a2c4a..fb517d61ea 100755 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,18 @@ awsconfiguration.json #amplify amplify/\#current-cloud-backend amplify/.config/local-* +amplify/logs +amplify/mock-data amplify/backend/amplify-meta.json +amplify/backend/awscloudformation +amplify/backend/.temp +build/ +dist/ +node_modules/ aws-exports.js -awsconfiguration.json \ No newline at end of file +awsconfiguration.json +amplifyconfiguration.json +amplify-build-config.json +amplify-gradle-config.json +amplifytools.xcconfig +.secret-* \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..c87b85ede7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "files.exclude": { + "amplify/.config": true, + "amplify/**/*-parameters.json": true, + "amplify/**/amplify.state": true, + "amplify/**/transform.conf.json": true, + "amplify/#current-cloud-backend": true, + "amplify/backend/amplify-meta.json": true, + "amplify/backend/awscloudformation": true + } +} \ No newline at end of file diff --git a/amplify/.config/project-config.json b/amplify/.config/project-config.json old mode 100755 new mode 100644 index bafe837409..02a525bb3c --- a/amplify/.config/project-config.json +++ b/amplify/.config/project-config.json @@ -1,17 +1,17 @@ { - "projectName": "authcra", - "version": "1.0", - "frontend": "javascript", - "javascript": { - "framework": "react", - "config": { - "SourceDir": "src", - "DistributionDir": "build", - "BuildCommand": "npm run-script build", - "StartCommand": "npm run-script start" - } - }, - "providers": [ - "awscloudformation" - ] + "providers": [ + "awscloudformation" + ], + "projectName": "nest3c", + "version": "3.0", + "frontend": "javascript", + "javascript": { + "framework": "react", + "config": { + "SourceDir": "src", + "DistributionDir": "build", + "BuildCommand": "npm run-script build", + "StartCommand": "npm run-script start" + } + } } \ No newline at end of file diff --git a/amplify/backend/api/nest3c/parameters.json b/amplify/backend/api/nest3c/parameters.json new file mode 100644 index 0000000000..dead253ade --- /dev/null +++ b/amplify/backend/api/nest3c/parameters.json @@ -0,0 +1,5 @@ +{ + "AppSyncApiName": "nest3c", + "DynamoDBBillingMode": "PAY_PER_REQUEST", + "DynamoDBEnableServerSideEncryption": false +} \ No newline at end of file diff --git a/amplify/backend/api/nest3c/schema.graphql b/amplify/backend/api/nest3c/schema.graphql new file mode 100644 index 0000000000..8e61d7cea5 --- /dev/null +++ b/amplify/backend/api/nest3c/schema.graphql @@ -0,0 +1,16 @@ +type Roast @model @auth(rules: [{allow: public}]) { + id: ID! + Roast: [String!] + Ground: [String!] + Roasttosel: [Selection!] @connection(keyName: "byRoast", fields: ["id"]) +} + +type Selection @model @auth(rules: [{allow: public}]) @key(name: "byRoast", fields: ["roastID"]) { + id: ID! + origin: [String!] + blend: [String!] + bagweight: [Int!] + quantity: Int! + roastID: ID! +} + \ No newline at end of file diff --git a/amplify/backend/api/nest3c/stacks/CustomResources.json b/amplify/backend/api/nest3c/stacks/CustomResources.json new file mode 100644 index 0000000000..f95feea378 --- /dev/null +++ b/amplify/backend/api/nest3c/stacks/CustomResources.json @@ -0,0 +1,58 @@ +{ + "AWSTemplateFormatVersion": "2010-09-09", + "Description": "An auto-generated nested stack.", + "Metadata": {}, + "Parameters": { + "AppSyncApiId": { + "Type": "String", + "Description": "The id of the AppSync API associated with this project." + }, + "AppSyncApiName": { + "Type": "String", + "Description": "The name of the AppSync API", + "Default": "AppSyncSimpleTransform" + }, + "env": { + "Type": "String", + "Description": "The environment name. e.g. Dev, Test, or Production", + "Default": "NONE" + }, + "S3DeploymentBucket": { + "Type": "String", + "Description": "The S3 bucket containing all deployment assets for the project." + }, + "S3DeploymentRootKey": { + "Type": "String", + "Description": "An S3 key relative to the S3DeploymentBucket that points to the root\nof the deployment directory." + } + }, + "Resources": { + "EmptyResource": { + "Type": "Custom::EmptyResource", + "Condition": "AlwaysFalse" + } + }, + "Conditions": { + "HasEnvironmentParameter": { + "Fn::Not": [ + { + "Fn::Equals": [ + { + "Ref": "env" + }, + "NONE" + ] + } + ] + }, + "AlwaysFalse": { + "Fn::Equals": ["true", "false"] + } + }, + "Outputs": { + "EmptyOutput": { + "Description": "An empty output. You may delete this if you have at least one resource above.", + "Value": "" + } + } +} diff --git a/amplify/backend/api/nest3c/transform.conf.json b/amplify/backend/api/nest3c/transform.conf.json new file mode 100644 index 0000000000..1a748d4130 --- /dev/null +++ b/amplify/backend/api/nest3c/transform.conf.json @@ -0,0 +1,10 @@ +{ + "Version": 5, + "ElasticsearchWarning": true, + "ResolverConfig": { + "project": { + "ConflictHandler": "AUTOMERGE", + "ConflictDetection": "VERSION" + } + } +} \ No newline at end of file diff --git a/amplify/backend/auth/cognitocf0c6096/cognitocf0c6096-cloudformation-template.yml b/amplify/backend/auth/cognitocf0c6096/cognitocf0c6096-cloudformation-template.yml index 4cfeebbb61..4ff768d31e 100755 --- a/amplify/backend/auth/cognitocf0c6096/cognitocf0c6096-cloudformation-template.yml +++ b/amplify/backend/auth/cognitocf0c6096/cognitocf0c6096-cloudformation-template.yml @@ -263,7 +263,7 @@ Resources: - ' }' - '};' Handler: index.handler - Runtime: nodejs8.10 + Runtime: nodejs10.x Timeout: '300' Role: !GetAtt - UserPoolClientRole diff --git a/amplify/backend/backend-config.json b/amplify/backend/backend-config.json index 52c28f28b8..9e9d3f7952 100755 --- a/amplify/backend/backend-config.json +++ b/amplify/backend/backend-config.json @@ -1,8 +1,30 @@ { - "auth": { - "cognitocf0c6096": { - "service": "Cognito", - "providerPlugin": "awscloudformation" - } - } + "auth": { + "cognitocf0c6096": { + "service": "Cognito", + "providerPlugin": "awscloudformation" + } + }, + "api": { + "nest3c": { + "service": "AppSync", + "providerPlugin": "awscloudformation", + "output": { + "authConfig": { + "defaultAuthentication": { + "authenticationType": "API_KEY", + "apiKeyConfig": { + "apiKeyExpirationDays": 30, + "description": "api key description" + } + }, + "additionalAuthenticationProviders": [ + { + "authenticationType": "AWS_IAM" + } + ] + } + } + } + } } \ No newline at end of file diff --git a/amplify/team-provider-info.json b/amplify/team-provider-info.json new file mode 100644 index 0000000000..fc7d1ed5d8 --- /dev/null +++ b/amplify/team-provider-info.json @@ -0,0 +1,20 @@ +{ + "dev": { + "awscloudformation": { + "AuthRoleName": "amplify-authcra-dev-114129-authRole", + "UnauthRoleArn": "arn:aws:iam::457225119127:role/amplify-authcra-dev-114129-unauthRole", + "AuthRoleArn": "arn:aws:iam::457225119127:role/amplify-authcra-dev-114129-authRole", + "Region": "us-east-1", + "DeploymentBucketName": "amplify-authcra-dev-114129-deployment", + "UnauthRoleName": "amplify-authcra-dev-114129-unauthRole", + "StackName": "amplify-authcra-dev-114129", + "StackId": "arn:aws:cloudformation:us-east-1:457225119127:stack/amplify-authcra-dev-114129/4b7590b0-476f-11eb-be7d-123f2d95f4cf", + "AmplifyAppId": "dfb6ys7hkhm55" + }, + "categories": { + "auth": { + "cognitocf0c6096": {} + } + } + } +} \ No newline at end of file diff --git a/src/App.css b/src/App.css index 92f956e804..5cc33df28b 100755 --- a/src/App.css +++ b/src/App.css @@ -3,8 +3,8 @@ } .App-logo { - animation: App-logo-spin infinite 20s linear; height: 40vmin; + align-items: center; } .App-header { @@ -19,14 +19,8 @@ } .App-link { - color: #61dafb; + color: #ffffff; } -@keyframes App-logo-spin { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } -} + + diff --git a/src/App.js b/src/App.js index 353a862f79..e234430676 100755 --- a/src/App.js +++ b/src/App.js @@ -13,15 +13,15 @@ class App extends Component {
logo

- Edit src/App.js and save to reload. + Artwork

- Learn React + shop
diff --git a/src/IMG_1085.jpg b/src/IMG_1085.jpg new file mode 100644 index 0000000000..4ae6a09bd7 Binary files /dev/null and b/src/IMG_1085.jpg differ diff --git a/src/logo.svg b/src/logo.svg old mode 100755 new mode 100644 index 6b60c1042f..7b56d75cfa --- a/src/logo.svg +++ b/src/logo.svg @@ -1,7 +1,14 @@ - - - - - - + + + + + + + + + + + + + diff --git a/src/models/index.d.ts b/src/models/index.d.ts new file mode 100644 index 0000000000..6d48cc62df --- /dev/null +++ b/src/models/index.d.ts @@ -0,0 +1,25 @@ +import { ModelInit, MutableModel, PersistentModelConstructor } from "@aws-amplify/datastore"; + + + + + +export declare class Roast { + readonly id: string; + readonly Roast?: string[]; + readonly Ground?: string[]; + readonly Roasttosel?: Selection[]; + constructor(init: ModelInit); + static copyOf(source: Roast, mutator: (draft: MutableModel) => MutableModel | void): Roast; +} + +export declare class Selection { + readonly id: string; + readonly origin?: string[]; + readonly blend?: string[]; + readonly bagweight?: number[]; + readonly quantity: number; + readonly roastID: string; + constructor(init: ModelInit); + static copyOf(source: Selection, mutator: (draft: MutableModel) => MutableModel | void): Selection; +} \ No newline at end of file diff --git a/src/models/index.js b/src/models/index.js new file mode 100644 index 0000000000..6f0c38a8a2 --- /dev/null +++ b/src/models/index.js @@ -0,0 +1,12 @@ +// @ts-check +import { initSchema } from '@aws-amplify/datastore'; +import { schema } from './schema'; + + + +const { Roast, Selection } = initSchema(schema); + +export { + Roast, + Selection +}; \ No newline at end of file diff --git a/src/models/schema.d.ts b/src/models/schema.d.ts new file mode 100644 index 0000000000..59cbd06db6 --- /dev/null +++ b/src/models/schema.d.ts @@ -0,0 +1,3 @@ +import { Schema } from '@aws-amplify/datastore'; + +export declare const schema: Schema; \ No newline at end of file diff --git a/src/models/schema.js b/src/models/schema.js new file mode 100644 index 0000000000..928beb9109 --- /dev/null +++ b/src/models/schema.js @@ -0,0 +1,156 @@ +export const schema = { + "models": { + "Roast": { + "name": "Roast", + "fields": { + "id": { + "name": "id", + "isArray": false, + "type": "ID", + "isRequired": true, + "attributes": [] + }, + "Roast": { + "name": "Roast", + "isArray": true, + "type": "String", + "isRequired": true, + "attributes": [], + "isArrayNullable": true + }, + "Ground": { + "name": "Ground", + "isArray": true, + "type": "String", + "isRequired": true, + "attributes": [], + "isArrayNullable": true + }, + "Roasttosel": { + "name": "Roasttosel", + "isArray": true, + "type": { + "model": "Selection" + }, + "isRequired": true, + "attributes": [], + "isArrayNullable": true, + "association": { + "connectionType": "HAS_MANY", + "associatedWith": "roastID" + } + } + }, + "syncable": true, + "pluralName": "Roasts", + "attributes": [ + { + "type": "model", + "properties": {} + }, + { + "type": "auth", + "properties": { + "rules": [ + { + "allow": "public", + "operations": [ + "create", + "update", + "delete", + "read" + ] + } + ] + } + } + ] + }, + "Selection": { + "name": "Selection", + "fields": { + "id": { + "name": "id", + "isArray": false, + "type": "ID", + "isRequired": true, + "attributes": [] + }, + "origin": { + "name": "origin", + "isArray": true, + "type": "String", + "isRequired": true, + "attributes": [], + "isArrayNullable": true + }, + "blend": { + "name": "blend", + "isArray": true, + "type": "String", + "isRequired": true, + "attributes": [], + "isArrayNullable": true + }, + "bagweight": { + "name": "bagweight", + "isArray": true, + "type": "Int", + "isRequired": true, + "attributes": [], + "isArrayNullable": true + }, + "quantity": { + "name": "quantity", + "isArray": false, + "type": "Int", + "isRequired": true, + "attributes": [] + }, + "roastID": { + "name": "roastID", + "isArray": false, + "type": "ID", + "isRequired": true, + "attributes": [] + } + }, + "syncable": true, + "pluralName": "Selections", + "attributes": [ + { + "type": "model", + "properties": {} + }, + { + "type": "key", + "properties": { + "name": "byRoast", + "fields": [ + "roastID" + ] + } + }, + { + "type": "auth", + "properties": { + "rules": [ + { + "allow": "public", + "operations": [ + "create", + "update", + "delete", + "read" + ] + } + ] + } + } + ] + } + }, + "enums": {}, + "nonModels": {}, + "version": "94f85133e1f5fedb7edc8999a0a38dac" +}; \ No newline at end of file