Skip to content

Commit

Permalink
Feature/facelift (#1075)
Browse files Browse the repository at this point in the history 
* Facelift Project (#1050)

* Created JCWidget

* Created EventCard component

* Created EventsScreen
Events fetch and display
Event join/leave

* Created group card

* Added icons for navbar and buttons

* Created GenericButton component with styles

* New header and header style

* Created GenericContainer

* Added types to JCWidget(resource, group, event)

* Added event type prop to EventsScreen JCWidget

* Fixed "People" navigation
Added bottom border to nav bar
Adjusted ProfileImage size

* Improvements to Event Card
Fixed text breaking design
Fixed event name now displays name instead of description
Adjusted button height

* Added styling for ProfileImage for People card
Adjustments to TertiaryButton style

* Created GenericDirectoryScreen, removed GenericContainer
Improved EventsScreen code structure

* Improvements to Group Card UI

* Created GroupsScreen

* Created PeopleListWidget
Improvements to reusability of JCWidget

* Created Profile Card

* Created ProfileScreen
Updated constants

* Moved GenereicDirectoryScreen to components

* Added mobile header
Added header and bottom tab nav assets

* Updated constants, hide bell

* Improvements to JCWidget

* Created Bottom tab navigator,
Implemented mobile header

* Added mobile styling for events screen

* Created subheader for mobile view

* Added mobile design for people directory
Removed double header

* Added header controls and subheader to header

* Added header controls and subheader to events screen

* Added missing icons for header controls

* Added missing icon for people directory mobile cards

* Added list controls to group screen

* Implemented group screen mobile design

* Fixed scrolling issue

* New Environment

* npm install updates

* Env changes

* Env fixes

* Dashboard, Profile, Widgets, and much more. (#1061)

* Dashboard, Profile, Widgets, and much more.

* Added navigation to create event/group screen

* Added <MessageBoard/> to group, event screens

* DMS + Discussion board + bug fixes (#1068)

* Fixed border radius on event card date

* Fixed last item margin in profile list,
Removed inactive togglebar links in profilesscreen
Quick fix for logo resize issue in header component

* Added delay to touchables to help prevent triggering when scrolling

* Added JC logo to homescreen on mobile

* Fix for profile events not pulling

* Removed upcoming events widget item limit

* fix: event, group screens persons list width bug

* Fixed incorrect date format

* Adding some bottom padding to screens

* fix: updateEvents type

* Added hover state to GenericButton
Fixed navigator background color
Fixed margins in people directory

* Directory screen widgets are now sticky
Added new large ProfileImage style

* Added new styling for discussion board,
Refactored MessageBoard, MessageList components

* Fixed routing issue with group page
Fixed group type

* Added join/leave group function to group page

* Added missing above load more

* Added show reply count state to thread
Moved renderMessage to <MessageItem/>
Added missing 'join/leave' group function to mobile ui

* Fixed warning in MainAuthRouter

* Adjusted ProfileIMage small2 size

* Added mobile UI for discussion board

* Improvements to layout shifting for dashboard carousels

* Fixed an issue causing infinite loading in MessageList

* Fixed bug with create screens for event, group

* Improvements to discussion boards
Started new DMs UI for desktop

* Added mobile design to DMs
Fixed title margin in header
Hid settings bottom tab

* Added "Edit profile stop gap"

* Added spinners to DMs screen

* Fixed alignment bug in MessageDirectList

* Added subscription to handle receiving messages in other conversations
Fixed a bug with sorting dmUsers

* Removed debug msg from conversation preview

* Removed timestamp from conversation item

* Hid start conversation button

* Implemented logic for quick message formatting

* Fixed profile picture margin in DMItem for mobile

* Added loading state to shouldCreateRoom
Fixed a bug to prevent erronously setting room in shouldCreateRoom flow

* pull changes

* push changes

* Fix up menu

* Hide extra menu on admin screen

* DMs Bug fixes  (#1076)

* Fix: bugs in dms

* Undo query changes

* Added listDirectMessageForDms custom query

* fix

* Fix for dms margin (#1078)

* margin fix

* A fix for home screen carousels scrolling on load

* add more test users

* push changes

* Resource Directory + Orgs + Tweaks to resource page (#1089)

* Resources Directory + Orgs + Tweaks to resource page

* Fixed card border, carousel card width, removed video card border

* Fix for admin view

* Crisp icons

* Directory cleanup, some file name changes

* Added white edit icon

* Adjusted icon margin

* Added edit group/event

* Fixed 'groups you are in widget' directing to the wrong screen

* Fixed join/leave groups for group and event screens

* Fixed sorting in multiple screens, hid non working buttons

* Minor fixes

* publish changes

* amplify upgrade

* Startup Admin

* [Courses] Bug Fixes (#1096)

* Fix: removed double menu

* chore: updated message icon

* feat: hid navigation bar

Co-authored-by: Igor Belem <igortbelem@gmail.com>
  • Loading branch information
@GeorgeBellTMH @itbel
GeorgeBellTMH and itbel committed Feb 19, 2022
1 parent 7146773 commit 11a70d0
Show file tree
Hide file tree
Showing 228 changed files with 22,845 additions and 4,345 deletions.
1 change: 1 addition & 0 deletions App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ if (window.location === undefined) env = "mobile"
else if (window.location.hostname === "localhost") env = "localhost"
else if (window.location.hostname.includes("beta")) env = "beta"
else if (window.location.hostname.includes("dev")) env = "dev"
else if (window.location.hostname.includes("d13j9gfr4f50wr")) env = "jcfacelift"
else env = "prod"
Sentry.init({
dsn: "https://8c8703a620444c97ba6e8bb4a60c17d0@o390245.ingest.sentry.io/5231908",
Expand Down
10 changes: 10 additions & 0 deletions amplify/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# 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/
2 changes: 1 addition & 1 deletion amplify/backend/analytics/jcmobile/pinpoint-cloudformation-template.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "Pinpoint resource stack creation using Amplify CLI",
"Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"7.3.3\",\"stackType\":\"analytics-Pinpoint\",\"metadata\":{}}",
"Parameters": {
"appName": {
"Type": "String"
Expand Down
286 changes: 143 additions & 143 deletions amplify/backend/api/jcmobile/stacks/CustomResources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,150 +67,150 @@
]
}
}
},
"EventBriteDataSource": {
"Type": "AWS::AppSync::DataSource",
"Properties": {
"ApiId": {
"Ref": "AppSyncApiId"
},
"Name": "EventBriteHTTP",
"Type": "HTTP",
"HttpConfig": {
"Endpoint": "https://www.eventbriteapi.com/"
}
}
},
"EventBriteListEventsResolver": {
"Type": "AWS::AppSync::Resolver",
"Properties": {
"ApiId": {
"Ref": "AppSyncApiId"
},
"DataSourceName": {
"Fn::GetAtt": [
"EventBriteDataSource",
"Name"
]
},
"FieldName": "eventBriteListEvents",
"TypeName": "Query",
"RequestMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListEvents",
"req",
"vtl"
]
]
}
}
]
},
"ResponseMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListEvents",
"res",
"vtl"
]
]
}
}
]
}
}
},
"EventBriteListTicketClassesResolver": {
"Type": "AWS::AppSync::Resolver",
"Properties": {
"ApiId": {
"Ref": "AppSyncApiId"
},
"DataSourceName": {
"Fn::GetAtt": [
"EventBriteDataSource",
"Name"
]
},
"FieldName": "eventBriteListTicketClasses",
"TypeName": "Query",
"RequestMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListTicketClasses",
"req",
"vtl"
]
]
}
}
]
},
"ResponseMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListTicketClasses",
"res",
"vtl"
]
]
}
}
]
}
}
}
},
"EventBriteDataSource": {
"Type": "AWS::AppSync::DataSource",
"Properties": {
"ApiId": {
"Ref": "AppSyncApiId"
},
"Name": "EventBriteHTTP",
"Type": "HTTP",
"HttpConfig": {
"Endpoint": "https://www.eventbriteapi.com/"
}
}
},
"EventBriteListEventsResolver": {
"Type": "AWS::AppSync::Resolver",
"Properties": {
"ApiId": {
"Ref": "AppSyncApiId"
},
"DataSourceName": {
"Fn::GetAtt": [
"EventBriteDataSource",
"Name"
]
},
"FieldName": "eventBriteListEvents",
"TypeName": "Query",
"RequestMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListEvents",
"req",
"vtl"
]
]
}
}
]
},
"ResponseMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListEvents",
"res",
"vtl"
]
]
}
}
]
}
}
},
"EventBriteListTicketClassesResolver": {
"Type": "AWS::AppSync::Resolver",
"Properties": {
"ApiId": {
"Ref": "AppSyncApiId"
},
"DataSourceName": {
"Fn::GetAtt": [
"EventBriteDataSource",
"Name"
]
},
"FieldName": "eventBriteListTicketClasses",
"TypeName": "Query",
"RequestMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListTicketClasses",
"req",
"vtl"
]
]
}
}
]
},
"ResponseMappingTemplateS3Location": {
"Fn::Sub": [
"s3://${S3DeploymentBucket}/${S3DeploymentRootKey}/resolvers/${ResolverFileName}",
{
"S3DeploymentBucket": {
"Ref": "S3DeploymentBucket"
},
"S3DeploymentRootKey": {
"Ref": "S3DeploymentRootKey"
},
"ResolverFileName": {
"Fn::Join": [
".",
[
"Query",
"eventBriteListTicketClasses",
"res",
"vtl"
]
]
}
}
]
}
}
}

},
},
"Conditions": {
"HasEnvironmentParameter": {
"Fn::Not": [
Expand Down
6 changes: 4 additions & 2 deletions amplify/backend/auth/jcmobile/cli-inputs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"email"
],
"adminQueries": true,
"adminQueryGroup": "admin",
"adminQueryGroup": "userpool",
"hostedUI": false,
"thirdPartyAuth": true,
"authProviders": [
Expand Down Expand Up @@ -158,6 +158,8 @@
],
"parentStack": {
"Ref": "AWS::StackId"
}
},
"facebookAppId": "abc",
"googleClientId": "def"
}
}
7 changes: 0 additions & 7 deletions amplify/backend/backend-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,6 @@
]
}
},
"video": {
"jesuscollectiveCourses": {
"service": "video",
"serviceType": "video-on-demand",
"providerPlugin": "awscloudformation"
}
},
"geo": {
"jcMap": {
"isDefault": true,
Expand Down
16 changes: 13 additions & 3 deletions amplify/backend/function/S3Trigger14f1cefa/S3Trigger14f1cefa-cloudformation-template.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Description": "Lambda resource stack creation using Amplify CLI",
"Description": "{\"createdOn\":\"Mac\",\"createdBy\":\"Amplify\",\"createdWith\":\"7.3.3\",\"stackType\":\"function-Lambda\",\"metadata\":{}}",
"Parameters": {
"env": {
"Type": "String"
},
"deploymentBucketName": {
"Type": "String"
},
"s3Key": {
"Type": "String"
}
},
"Conditions": {
Expand Down Expand Up @@ -62,8 +68,12 @@
"Runtime": "nodejs12.x",
"Timeout": "25",
"Code": {
"S3Bucket": "amplify-jc-mobile-beta-155138-deployment",
"S3Key": "amplify-builds/S3Trigger14f1cefa-6673762f305865664441-build.zip"
"S3Bucket": {
"Ref": "deploymentBucketName"
},
"S3Key": {
"Ref": "s3Key"
}
},
"Layers": []
}
Expand Down

0 comments on commit 11a70d0

Please sign in to comment.