Skip to content

Commit 2be20a3

Browse files
JohnRambergerJohnRamberger
authored
Merge pull request #15 from JohnRamberger/development
Development
2 parents 8995b82 + 9827d3d commit 2be20a3

26 files changed

+2121
-243
lines changed

‎.eslintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
amplify-codegen-temp\models

‎amplify/backend/api/hacklyticsportal2023/cli-inputs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"conflictResolution": {
1111
"defaultResolutionStrategy": {
12-
"type": "AUTOMERGE"
12+
"type": "OPTIMISTIC_CONCURRENCY"
1313
}
1414
},
1515
"additionalAuthTypes": [

‎amplify/backend/api/hacklyticsportal2023/schema.graphql‎

Lines changed: 56 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ type AdminSettings
22
@model
33
@auth(
44
rules: [
5+
{ allow: public }
56
{
67
allow: groups
78
groups: ["Administrator"]
89
operations: [read, create, update, delete]
910
}
10-
{ allow: private, operations: [read] }
1111
]
1212
) {
1313
id: ID!
1414
hacklyticsOpen: Boolean
15+
participantEmails: [String]
1516
}
1617

1718
type Event
@@ -33,6 +34,7 @@ type Event
3334
start: AWSDateTime
3435
end: AWSDateTime
3536
location: String
37+
points: Int
3638
checkins: [Checkin] @hasMany
3739
}
3840

@@ -57,17 +59,60 @@ type Checkin
5759
}
5860

5961
type Query {
60-
# @model
61-
# @auth(
62-
# rules: [
63-
# {
64-
# allow: groups
65-
# groups: ["AndroidApp"]
66-
# operations: [read, create, update, delete]
67-
# }
68-
# ]
69-
# )
7062
getUserById(user_uuid: String): String
7163
@function(name: "hacklyticsportal20232e32fd51-${env}")
7264
listUsers: String @function(name: "hacklyticsportal2023listusers-${env}")
7365
}
66+
67+
type Points
68+
@model
69+
@auth(
70+
rules: [
71+
{
72+
allow: groups
73+
groups: ["Administrator"]
74+
operations: [read, create, update, delete]
75+
}
76+
{ allow: private, operations: [read, create, update] }
77+
]
78+
) {
79+
userID: String!
80+
userName: String
81+
points: Int!
82+
}
83+
84+
type ScavengerHunt
85+
@model
86+
@auth(
87+
rules: [
88+
{
89+
allow: groups
90+
groups: ["Administrator"]
91+
operations: [read, create, update, delete]
92+
}
93+
{ allow: private, operations: [read] }
94+
]
95+
) {
96+
id: ID!
97+
name: String!
98+
description: String
99+
status: Boolean
100+
points: Int
101+
}
102+
103+
type ScavengerHuntCheckin
104+
@model
105+
@auth(
106+
rules: [
107+
{
108+
allow: groups
109+
groups: ["Administrator"]
110+
operations: [read, create, update, delete]
111+
}
112+
{ allow: private, operations: [read, create] }
113+
]
114+
) {
115+
id: ID!
116+
checkpointID: String!
117+
userID: String!
118+
}

‎amplify/backend/api/hacklyticsportal2023/transform.conf.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"ElasticsearchWarning": true,
44
"ResolverConfig": {
55
"project": {
6-
"ConflictHandler": "AUTOMERGE",
6+
"ConflictHandler": "OPTIMISTIC_CONCURRENCY",
77
"ConflictDetection": "VERSION"
88
}
99
}

‎amplify/backend/backend-config.json‎

Lines changed: 95 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,141 @@
11
{
2-
"auth": {
3-
"hacklyticsportal2023": {
4-
"service": "Cognito",
5-
"providerPlugin": "awscloudformation",
6-
"dependsOn": [],
7-
"customAuth": false,
8-
"frontendAuthConfig": {
9-
"socialProviders": [],
10-
"usernameAttributes": [
11-
"EMAIL"
12-
],
13-
"signupAttributes": [
14-
"BIRTHDATE",
15-
"EMAIL",
16-
"NAME"
17-
],
18-
"passwordProtectionSettings": {
19-
"passwordPolicyMinLength": 8,
20-
"passwordPolicyCharacters": []
21-
},
22-
"mfaConfiguration": "OPTIONAL",
23-
"mfaTypes": [
24-
"TOTP"
25-
],
26-
"verificationMechanisms": [
27-
"EMAIL"
28-
]
29-
}
30-
}
31-
},
322
"api": {
333
"hacklyticsportal2023": {
34-
"service": "AppSync",
35-
"providerPlugin": "awscloudformation",
364
"dependsOn": [
375
{
38-
"category": "auth",
39-
"resourceName": "hacklyticsportal2023",
406
"attributes": [
417
"UserPoolId"
42-
]
8+
],
9+
"category": "auth",
10+
"resourceName": "hacklyticsportal2023"
4311
}
4412
],
4513
"output": {
4614
"authConfig": {
47-
"defaultAuthentication": {
48-
"authenticationType": "AMAZON_COGNITO_USER_POOLS",
49-
"userPoolConfig": {
50-
"userPoolId": "authhacklyticsportal2023"
51-
}
52-
},
5315
"additionalAuthenticationProviders": [
5416
{
55-
"authenticationType": "API_KEY",
5617
"apiKeyConfig": {
57-
"apiKeyExpirationDays": 7,
5818
"apiKeyExpirationDate": "2022-12-11T03:26:24.343Z",
19+
"apiKeyExpirationDays": 7,
5920
"description": ""
60-
}
21+
},
22+
"authenticationType": "API_KEY"
6123
},
6224
{
6325
"authenticationType": "AWS_IAM"
6426
}
65-
]
27+
],
28+
"defaultAuthentication": {
29+
"authenticationType": "AMAZON_COGNITO_USER_POOLS",
30+
"userPoolConfig": {
31+
"userPoolId": "authhacklyticsportal2023"
32+
}
33+
}
6634
}
67-
}
35+
},
36+
"providerPlugin": "awscloudformation",
37+
"service": "AppSync"
6838
}
6939
},
70-
"storage": {
71-
"imagestorage": {
72-
"service": "S3",
40+
"auth": {
41+
"hacklyticsportal2023": {
42+
"customAuth": false,
43+
"dependsOn": [],
44+
"frontendAuthConfig": {
45+
"mfaConfiguration": "OPTIONAL",
46+
"mfaTypes": [
47+
"TOTP"
48+
],
49+
"passwordProtectionSettings": {
50+
"passwordPolicyCharacters": [],
51+
"passwordPolicyMinLength": 8
52+
},
53+
"signupAttributes": [
54+
"BIRTHDATE",
55+
"EMAIL",
56+
"NAME"
57+
],
58+
"socialProviders": [],
59+
"usernameAttributes": [
60+
"EMAIL"
61+
],
62+
"verificationMechanisms": [
63+
"EMAIL"
64+
]
65+
},
7366
"providerPlugin": "awscloudformation",
74-
"dependsOn": []
67+
"service": "Cognito"
7568
}
7669
},
7770
"function": {
7871
"hacklyticsportal20232e32fd51": {
7972
"build": true,
80-
"providerPlugin": "awscloudformation",
81-
"service": "Lambda",
8273
"dependsOn": [
8374
{
84-
"category": "auth",
85-
"resourceName": "hacklyticsportal2023",
8675
"attributes": [
8776
"UserPoolId"
88-
]
77+
],
78+
"category": "auth",
79+
"resourceName": "hacklyticsportal2023"
8980
}
90-
]
81+
],
82+
"providerPlugin": "awscloudformation",
83+
"service": "Lambda"
9184
},
9285
"hacklyticsportal2023listusers": {
9386
"build": true,
94-
"providerPlugin": "awscloudformation",
95-
"service": "Lambda",
9687
"dependsOn": [
9788
{
98-
"category": "auth",
99-
"resourceName": "hacklyticsportal2023",
10089
"attributes": [
10190
"UserPoolId"
102-
]
91+
],
92+
"category": "auth",
93+
"resourceName": "hacklyticsportal2023"
94+
}
95+
],
96+
"providerPlugin": "awscloudformation",
97+
"service": "Lambda"
98+
}
99+
},
100+
"parameters": {
101+
"AMPLIFY_function_hacklyticsportal20232e32fd51_deploymentBucketName": {
102+
"usedBy": [
103+
{
104+
"category": "function",
105+
"resourceName": "hacklyticsportal20232e32fd51"
103106
}
104107
]
108+
},
109+
"AMPLIFY_function_hacklyticsportal20232e32fd51_s3Key": {
110+
"usedBy": [
111+
{
112+
"category": "function",
113+
"resourceName": "hacklyticsportal20232e32fd51"
114+
}
115+
]
116+
},
117+
"AMPLIFY_function_hacklyticsportal2023listusers_deploymentBucketName": {
118+
"usedBy": [
119+
{
120+
"category": "function",
121+
"resourceName": "hacklyticsportal2023listusers"
122+
}
123+
]
124+
},
125+
"AMPLIFY_function_hacklyticsportal2023listusers_s3Key": {
126+
"usedBy": [
127+
{
128+
"category": "function",
129+
"resourceName": "hacklyticsportal2023listusers"
130+
}
131+
]
132+
}
133+
},
134+
"storage": {
135+
"imagestorage": {
136+
"dependsOn": [],
137+
"providerPlugin": "awscloudformation",
138+
"service": "S3"
105139
}
106140
}
107141
}

‎amplify/backend/function/hacklyticsportal20232e32fd51/hacklyticsportal20232e32fd51-cloudformation-template.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,14 @@
255255
"Value": {
256256
"Ref": "LambdaExecutionRole"
257257
}
258+
},
259+
"LambdaExecutionRoleArn": {
260+
"Value": {
261+
"Fn::GetAtt": [
262+
"LambdaExecutionRole",
263+
"Arn"
264+
]
265+
}
258266
}
259267
}
260268
}

0 commit comments

Comments
 (0)