Skip to content

Commit

Permalink
Donations/Login Main PR (#782)
Browse files Browse the repository at this point in the history 
* Initial Login Code - rough

* Lazy load signup

* Add main account page, hide passwords

* Added ConfirmSignup and ForgotPW pages

* Schema changes - initial user creation

* Save user to DB

* Add some more login components

* publish lambda's

* added payment env

* Started basic layout
Created component files

* Initial functions for linking and receipts

* state file

* Get householdID and userID from f1

* Permit link function for logged in only

* Link function updates

* Implemented mobile view for DashboardHome
Improved grid layout for DashboardHome
Disabled button scaling due to breaking deisgn

* Get transactions function

* Give page UI mostly done, started transactions page

* Fied give page dropdown width for mobile

* Added paginate button styling on transactions page

* F1 Transaction data

* Created profile page ui

* Load user data

* Created payment methods page UI

* Added basic sign in page ui

* Applied styling to create account page

* Fixed container height for auth pages, background color

* Added basic styling to forgot password, and confirm sign up
Fixed font weight and font size for labels in give page

* Added Spinner messages

* Added admin to menu if in group

* Move all admin pages to new login

* f1 sync permissions initial

* Transaction screen mobile UI implemented

* Add stripe inputs

* Initial shared function layer

* Added link to homepage, logo

* Added styling to stripe inputs

* Moved class to CARD_ELEMENT_OPTIONS,
Added disabled style to add new card button

* Improvements to transactions page

* Changed class name for improved clarity

* Added close button for auth pages

* Added recurring giving card layout

* Added button styling

* AddCustomer and PaymentMethod improvements

* Move payment data to usercontext

* UserContext State

* Fix transaction dates

* Fixed footer styling

* Give page UI improvements
Added a default option to the fund options select to indicate why Give now button is disabled

* Enabled footer,
Removed auth check useEffect hook,
now using userState.authState

* Now using destructuring assignment for UserContext in Profile Page

* Added state management for give pages (WIP)
Minor UI improvements

* Moved give completion page outside of givepage
Added $ to input field

* Function outlines

* My Total Giving buttons now properly navigate to correct screens

* Styling for Total giving buttons

* Button styling for active recurring givings

* Amount input width adjustment

* Add payment method card is now a resuable component

* Removed add payment card, now using reusable component,
GivePageCard now shows add card component when no cards are added.

* Renamed file to match component,
fix import in Authenticator.tsx

* Fixed variable name

* Added spinner to my recurring giving page

* Latest transactions card improvements:
Now sorts and only shows first 4,
Added overflow to prevent card design from breaking

* Added min-height

* Fixed GiveManageRecurringCard, cards breaking design on mobile

* Created give experience context, started UI work

* Added payment page

* Added Elements provider for stripe

* created fund selection dropdown component

* Give once page wip

* Form data now passes PaymentAddMethod

* fix package warnings

* warning fxees

* Rough in cypress

* Load give page

* Login test up to verify pin

* package updates

* Package lock changes

* Rename give to give2

* Add presignup function and admin functions

* Testing improvements

* Test Profile page

* Profile form is now separate
Added active button logic for give page
Adjusted dashboard content negative margin

* Sync F1 permissions

* Move to tmhprod

Co-authored-by: Igor Belem <igortbelem@gmail.com>
  • Loading branch information
@GeorgeBellTMH @itbel
GeorgeBellTMH and itbel committed Aug 26, 2021
1 parent 12fa31b commit e67ded3
Show file tree
Hide file tree
Showing 270 changed files with 65,870 additions and 19,274 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
web-build
amplify
native-base-theme
native-base-theme/components
native-base-theme/components
cypress
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,5 @@ src/version.js

.eslintcache
debug.log

.nyc_output
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"node_modules": true
"node_modules": true,
"**/node_modules": true
},
"cSpell.enableFiletypes": [
"json"
Expand Down
8 changes: 7 additions & 1 deletion Untitled.code-workspace
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@
"konami",
"mdbreact",
"onclickoutside",
"qandeh",
"themeetinghouse",
"themeetinghousea",
"themeetinghousetmh",
"LIBVIPS",
"hostingbucket",
"tmhprod",
"todt",
"triggerd",
"youtube"
],
"cSpell.ignorePaths": [
Expand All @@ -66,7 +71,8 @@
"Untitled.code-workspace",
".vscode",
".vscode-insiders",
".code-workspace"
".code-workspace",
"package.json"
]
}
}
313 changes: 313 additions & 0 deletions amplify/backend/api/AdminQueries/admin-queries-cloudformation-template.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,313 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "API Gateway resource stack creation using Amplify CLI",

"Parameters": {
"authRoleName": {
"Type": "String"
},
"unauthRoleName": {
"Type": "String"
},
"env": {
"Type": "String"
},


"authcognitodevtmhUserPoolId": {
"Type": "String",
"Default": "authcognitodevtmhUserPoolId"
},




"functionAdminQueriesa1b7e2e8Arn": {
"Type": "String",
"Default": "functionAdminQueriesa1b7e2e8Arn"
},


"functionAdminQueriesa1b7e2e8Name": {
"Type": "String",
"Default": "functionAdminQueriesa1b7e2e8Name"
}




},
"Conditions": {
"ShouldNotCreateEnvResources": {
"Fn::Equals": [
{
"Ref": "env"
},
"NONE"
]
}
},
"Resources": {
"AdminQueries": {
"Type": "AWS::ApiGateway::RestApi",
"Properties": {
"Description": "",
"Name": "AdminQueries",
"Body": {
"swagger": "2.0",
"info": {
"version": "2018-05-24T17:52:00Z",
"title": "AdminQueries"
},
"host": {
"Fn::Join": [
"",
[
"apigateway.",
{
"Ref": "AWS::Region"
},
".amazonaws.com"
]
]
},
"basePath": {
"Fn::If": [
"ShouldNotCreateEnvResources",
"/Prod",
{
"Fn::Join": [
"",
[
"/",
{
"Ref": "env"
}
]
]
}
]
},
"schemes": [
"https"
],
"paths": {
"/{proxy+}": {
"options": {
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"responses": {
"200": {
"description": "200 response",
"schema": {
"$ref": "#/definitions/Empty"
},
"headers": {
"Access-Control-Allow-Origin": {
"type": "string"
},
"Access-Control-Allow-Methods": {
"type": "string"
},
"Access-Control-Allow-Headers": {
"type": "string"
}
}
}
},
"x-amazon-apigateway-integration": {
"responses": {
"default": {
"statusCode": "200",
"responseParameters": {
"method.response.header.Access-Control-Allow-Methods": "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'",
"method.response.header.Access-Control-Allow-Headers": "'Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token'",
"method.response.header.Access-Control-Allow-Origin": "'*'"
}
}
},
"passthroughBehavior": "when_no_match",
"requestTemplates": {
"application/json": "{\"statusCode\": 200}"
},
"type": "mock"
}
},
"x-amazon-apigateway-any-method": {
"produces": [
"application/json"
],
"parameters": [
{
"name": "proxy",
"in": "path",
"required": true,
"type": "string"
},
{
"name": "Authorization",
"in": "header",
"required": false,
"type": "string"
}
],
"responses": {},
"security": [
{
"Cognito": [
"aws.cognito.signin.user.admin"
]
}
],
"x-amazon-apigateway-request-validator": "Validate query string parameters and headers",
"x-amazon-apigateway-integration": {
"uri": {
"Fn::Join": [
"",
[
"arn:aws:apigateway:",
{
"Ref": "AWS::Region"
},
":lambda:path/2015-03-31/functions/",
{

"Ref": "functionAdminQueriesa1b7e2e8Arn"
},
"/invocations"
]
]
},
"passthroughBehavior": "when_no_match",
"httpMethod": "POST",
"cacheNamespace": "n40eb9",
"cacheKeyParameters": [
"method.request.path.proxy"
],
"contentHandling": "CONVERT_TO_TEXT",
"type": "aws_proxy"
}
}
}
},
"securityDefinitions": {
"Cognito": {
"type": "apiKey",
"name": "Authorization",
"in": "header",
"x-amazon-apigateway-authtype": "cognito_user_pools",
"x-amazon-apigateway-authorizer": {
"providerARNs": [
{
"Fn::Join": [
"",
[
"arn:aws:cognito-idp:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":userpool/",
{

"Ref": "authcognitodevtmhUserPoolId"
}

]
]
}
],
"type": "cognito_user_pools"
}
}
},
"definitions": {
"Empty": {
"type": "object",
"title": "Empty Schema"
}
},
"x-amazon-apigateway-request-validators": {
"Validate query string parameters and headers": {
"validateRequestParameters": true,
"validateRequestBody": false
}
}

}
}

},
"DeploymentAPIGWAdminQueries": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"Description": "The Development stage deployment of your API.",
"StageName": {
"Fn::If": [
"ShouldNotCreateEnvResources",
"Prod",
{
"Ref": "env"
}
]
},
"RestApiId": {
"Ref": "AdminQueries"
}
}
},
"AdminQueriesAPIGWPolicyForLambda": {
"Type": "AWS::Lambda::Permission",
"Properties": {
"FunctionName":
{
"Ref": "functionAdminQueriesa1b7e2e8Name"
},

"Action": "lambda:InvokeFunction",
"Principal": "apigateway.amazonaws.com",
"SourceArn": {
"Fn::Join": [
"",
[
"arn:aws:execute-api:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":",
{
"Ref": "AdminQueries"
},
"/*/*/*"
]
]
}
}
}
},
"Outputs": {
"RootUrl": {
"Description": "Root URL of the API gateway",
"Value": {"Fn::Join": ["", ["https://", {"Ref": "AdminQueries"}, ".execute-api.", {"Ref": "AWS::Region"}, ".amazonaws.com/", {"Fn::If": ["ShouldNotCreateEnvResources","Prod", {"Ref": "env"} ]}]]}
},
"ApiName": {
"Description": "API Friendly name",
"Value": "AdminQueries"
},
"ApiId": {
"Description": "AdminQueries's API ID",
"Value": {"Ref": "AdminQueries"}
}
}
}
8 changes: 8 additions & 0 deletions amplify/backend/api/AdminQueries/parameters.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"authRoleName": {
"Ref": "AuthRoleName"
},
"unauthRoleName": {
"Ref": "UnauthRoleName"
}
}

0 comments on commit e67ded3

Please sign in to comment.