Merge branch 'dev' into master
This commit is contained in:
		
							
								
								
									
										0
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -1,17 +0,0 @@ | ||||
| { | ||||
|     "projectName": "michalvankodev", | ||||
|     "version": "2.0", | ||||
|     "frontend": "javascript", | ||||
|     "javascript": { | ||||
|         "framework": "none", | ||||
|         "config": { | ||||
|             "SourceDir": "src", | ||||
|             "DistributionDir": "__sapper__/export", | ||||
|             "BuildCommand": "npm run-script export", | ||||
|             "StartCommand": "npm run-script start" | ||||
|         } | ||||
|     }, | ||||
|     "providers": [ | ||||
|         "awscloudformation" | ||||
|     ] | ||||
| } | ||||
| @@ -1,8 +0,0 @@ | ||||
| { | ||||
| 	"hosting": { | ||||
| 		"S3AndCloudFront": { | ||||
| 			"service": "S3AndCloudFront", | ||||
| 			"providerPlugin": "awscloudformation" | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
| @@ -1,3 +0,0 @@ | ||||
| { | ||||
|     "bucketName": "michalvankodev-20190712100852-hostingbucket" | ||||
| } | ||||
| @@ -1,113 +0,0 @@ | ||||
| { | ||||
|     "AWSTemplateFormatVersion": "2010-09-09", | ||||
|     "Description": "Hosting resource stack creation using Amplify CLI", | ||||
|     "Parameters": { | ||||
|         "env": { | ||||
|             "Type": "String" | ||||
|         }, | ||||
|         "bucketName": { | ||||
|             "Type": "String" | ||||
|         } | ||||
|     }, | ||||
|     "Conditions": { | ||||
|         "ShouldNotCreateEnvResources": { | ||||
|             "Fn::Equals": [ | ||||
|                 { | ||||
|                     "Ref": "env" | ||||
|                 }, | ||||
|                 "NONE" | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
|     "Resources": { | ||||
|         "S3Bucket": { | ||||
|             "Type": "AWS::S3::Bucket", | ||||
|             "DeletionPolicy": "Retain", | ||||
|             "Properties": { | ||||
|                 "BucketName": { | ||||
|                     "Fn::If": [ | ||||
|                         "ShouldNotCreateEnvResources", | ||||
|                         { | ||||
|                             "Ref": "bucketName" | ||||
|                         }, | ||||
|                         { | ||||
|                             "Fn::Join": [ | ||||
|                                 "", | ||||
|                                 [ | ||||
|                                     { | ||||
|                                         "Ref": "bucketName" | ||||
|                                     }, | ||||
|                                     "-", | ||||
|                                     { | ||||
|                                         "Ref": "env" | ||||
|                                     } | ||||
|                                 ] | ||||
|                             ] | ||||
|                         } | ||||
|                     ] | ||||
|                 }, | ||||
|                 "AccessControl": "Private", | ||||
|                 "WebsiteConfiguration": { | ||||
|                     "IndexDocument": "index.html", | ||||
|                     "ErrorDocument": "index.html" | ||||
|                 }, | ||||
|                 "CorsConfiguration": { | ||||
|                     "CorsRules": [ | ||||
|                         { | ||||
|                             "AllowedHeaders": [ | ||||
|                                 "Authorization", | ||||
|                                 "Content-Length" | ||||
|                             ], | ||||
|                             "AllowedMethods": [ | ||||
|                                 "GET" | ||||
|                             ], | ||||
|                             "AllowedOrigins": [ | ||||
|                                 "*" | ||||
|                             ], | ||||
|                             "MaxAge": 3000 | ||||
|                         } | ||||
|                     ] | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     }, | ||||
|     "Outputs": { | ||||
|         "Region": { | ||||
|             "Value": { | ||||
|                 "Ref": "AWS::Region" | ||||
|             } | ||||
|         }, | ||||
|         "HostingBucketName": { | ||||
|             "Description": "Hosting bucket name", | ||||
|             "Value": { | ||||
|                 "Ref": "S3Bucket" | ||||
|             } | ||||
|         }, | ||||
|         "WebsiteURL": { | ||||
|             "Value": { | ||||
|                 "Fn::GetAtt": [ | ||||
|                     "S3Bucket", | ||||
|                     "WebsiteURL" | ||||
|                 ] | ||||
|             }, | ||||
|             "Description": "URL for website hosted on S3" | ||||
|         }, | ||||
|         "S3BucketSecureURL": { | ||||
|             "Value": { | ||||
|                 "Fn::Join": [ | ||||
|                     "", | ||||
|                     [ | ||||
|                         "https://", | ||||
|                         { | ||||
|                             "Fn::GetAtt": [ | ||||
|                                 "S3Bucket", | ||||
|                                 "DomainName" | ||||
|                             ] | ||||
|                         } | ||||
|                     ] | ||||
|                 ] | ||||
|             }, | ||||
|             "Description": "Name of S3 bucket to hold website content" | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -1,26 +0,0 @@ | ||||
| { | ||||
|     "dev": { | ||||
|         "awscloudformation": { | ||||
|             "AuthRoleName": "michalvankodev-dev-20190712095737-authRole", | ||||
|             "UnauthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-dev-20190712095737-unauthRole", | ||||
|             "AuthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-dev-20190712095737-authRole", | ||||
|             "Region": "eu-central-1", | ||||
|             "DeploymentBucketName": "michalvankodev-dev-20190712095737-deployment", | ||||
|             "UnauthRoleName": "michalvankodev-dev-20190712095737-unauthRole", | ||||
|             "StackName": "michalvankodev-dev-20190712095737", | ||||
|             "StackId": "arn:aws:cloudformation:eu-central-1:359485202421:stack/michalvankodev-dev-20190712095737/b705b240-a47a-11e9-8ccd-02c3d40e0dd8" | ||||
|         } | ||||
|     }, | ||||
|     "master": { | ||||
|         "awscloudformation": { | ||||
|             "AuthRoleName": "michalvankodev-master-20190712123826-authRole", | ||||
|             "UnauthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-master-20190712123826-unauthRole", | ||||
|             "AuthRoleArn": "arn:aws:iam::359485202421:role/michalvankodev-master-20190712123826-authRole", | ||||
|             "Region": "eu-central-1", | ||||
|             "DeploymentBucketName": "michalvankodev-master-20190712123826-deployment", | ||||
|             "UnauthRoleName": "michalvankodev-master-20190712123826-unauthRole", | ||||
|             "StackName": "michalvankodev-master-20190712123826", | ||||
|             "StackId": "arn:aws:cloudformation:eu-central-1:359485202421:stack/michalvankodev-master-20190712123826/2e2fd290-a491-11e9-add7-0aee446e3232" | ||||
|         } | ||||
|     } | ||||
| } | ||||
		Reference in New Issue
	
	Block a user