Airtable refactor, bug fixes, Auth overhaul #48

annieyro · 2020-03-26T03:58:57Z

What's new in this PR

Refactoring our Airtable code in this repo to use airtable-schema-generator (now that it's been updated to 1.3.3 with some nice features!).

REQUIRES `.env.development`/`production` to be changed from `AIRTABLE_API_KEY` to `REACT_APP_AIRTABLE_API_KEY`

...for compatibility for v1.3.3

Has the same Airtable schema updates as calblueprint/dccentralkitchen-clerks#29; Points History screen will not load without transaction columns being changed to Total Sale.

Removed code in common.js since BASE will no longer be used

Map

Bug: initial store showed the incorrect products
Edge case: If no products are linked to a store, the key productIds will not exist on the store object, so special handling is required

Navigation

Cleanup: refactored AppNavigator by extracting DrawerContent as a class, and moving AuthStack to StackNavigators

News

Bug: NewsScreen displayed Created date, not Post Date

Rewards

Deprecated: removed pull-to-refresh implementation to declutter the file. We can add it back from a different trigger if necessary. Removed deprecated props which were not being used in RewardsHome and PointsHistory components.
Cleanup: Made Overline components normally-cased (since the styled component uses text-transform)
Cleanup: Added isLoading to DrawerContent and RewardsScreen. This is probably the most crucial place to add a loading screen (@ace) imo; it's noticeably laggy here.
Cleanup: Add Rewards.js to constants so things aren't hardcoded.

Auth

Integrated @tommypoa 's changes from material-ui branch

SignUp

Fixed SignUp's duplicate customer check to actually work, but no design exists for displaying the error right now (@12aschen)
Replaced the name, nameError etc in this.state to use an object similar to indicators.
Changed behavior of handleErrorState to update error messages from validate.js instead of being hardcoded into AuthField
Added an error message and error state for name
Made onTextChange hooks async so that error handling would happen after values updated in state; and handled permissions

Note that onBlur is still required for the edge case of user tapping in then tapping out

Added margin to the SignUp button

Login

Added error message and no error message but error indicators for that state.
Changed Login to LogIn/Log In where necessary (and Logout in the drawer)
closes Change Login and Logout to Log In and Log Out #69
Hardcoded the size of TextFieldContainer (losing transition animations to error states) to do so.

Relevant Links

Related PRs

Waiting on @tommypoa for some last updates to auth

How to review

Nothing should really change appearance-wise or functionality-wise for anything except the Signup/Login flow! But everything should still work (^:

Next steps

Would be nice to change userId to customerId for consistency between the repos.

Tests Performed, Edge Cases

Signup: https://www.loom.com/share/896a8bb1e5ba442281908122fc35e298

Login: https://www.loom.com/share/947060a3784242bc8e79f91b24c8c386

Screenshots

CC: @wangannie

…h VSCode format on save

@ace

- Deprecated: removed pull-to-refresh implementation to declutter the file. We can add it back from a different trigger if necessary. Removed deprecated props which were not being used in `RewardsHome` and `PointsHistory` components. - Cleanup: Made `Overline` components normally-cased (since the styled component uses `text-transform`) - Cleanup: Added `isLoading` to `DrawerContent` and `RewardsScreen`. This is probably the most crucial place to add a loading screen (@ace) imo; it's noticeably laggy here.

prettier.config.js

…te and stores loading

wangannie

👏 👏 Wow very cool stuff!

I just noted a couple details and bugs. Also, this might have nothing to do with this, but overall I've noticed that it's loading substantially slower, particularly upon logging in and loading the Rewards screen/points history. It definitely feels like a lot more time spent staring at a white screen...is that something we can do anything about, or maybe we just need to prioritize adding loading screens?

.env.example

components/rewards/RewardsHome.js

constants/Rewards.js

components/rewards/RewardsHome.js

lib/mapUtils.js

navigation/StackNavigators.js

screens/auth/SignUpScreen.js

wangannie · 2020-04-02T15:52:12Z

screens/auth/LoginScreen.js

+        // In case of database malformation, may return more than one record
+        // TODO this message is a design edge case
+        error =
+          'Database error: more than one customer found with this login information. Please report an issue so we can fix it for you!';


Well the 'report issue' link only shows in the hamburger menu which requires you to be logged in 😅 @12aschen

…so unable to submit twice

annieyro · 2020-04-02T21:12:43Z

Realized that we shouldn't have been keeping permissions in state at all, and the unnecessary async/await pattern was making things messy/slow, so updated that ;; eliminated some code in SignUp and LogIn (':

annieyro · 2020-04-03T04:35:52Z

https://www.loom.com/share/de3bf3929ace40c1a86b712e1fdf5c62?focus_title=1&muted=1 last updates

kennethlien

This is crazy bruh ur a goat

…chen into annie/update-airtable

…nt/dccentralkitchen into annie/update-airtable

tommypoa and others added 14 commits March 23, 2020 00:36

Add material UI. Changing error states.

7ec5a16

Error working, but working on better UI.

130fb04

Update prettier rules to match clerk repo, and no longer conflict wit…

bd89278

…h VSCode format on save

Update packages - upgrade generator version

9118740

Update Airtable schema

59a5081

Refactor MapScreen and related components

c128f77

Refactor News and related components

d3cf863

Clean up AppNavigator.js

3915fb2

Refactor Resources

1f57b24

Replace getUser

f24205d

Use constants/Rewards.js for reward point value

c79e52d

Error working with both signup and login. Styling not done.

ae7b262

Overhaul Signup

33e0f7a

annieyro commented Mar 26, 2020

View reviewed changes

prettier.config.js Outdated Show resolved Hide resolved

annieyro added 4 commits March 25, 2020 21:11

Undo prettier width change and cleanup

2d63467

Add workspace-specific shared settings (format and run eslint on save)

18b1530

Update prettier config

61ed95b

Update prettier config and run prettier on all ours

70f5fae

annieyro mentioned this pull request Mar 27, 2020

Update prettier config to use trailing commas; add local workspace settings for VS Code #53

Merged

annieyro added 10 commits March 28, 2020 17:25

Update schema with changed fields

5a0f4e6

Add workspace-specific color

dce398c

Merge branch 'master' into annie/update-airtable

eb8d9b3

Merge branch 'tommy/materialui_refactor' into annie/update-airtable

ab42e4b

Small fixes

b34379f

Merge branch 'master' into annie/update-airtable

b6d1f69

Add back filter for Clerk Training, enforce ordering on location upda…

129eb86

…te and stores loading

Update login code

91eb9f2

Bugfix

88a8716

Remove .eslintignore

ec7f020

annieyro marked this pull request as ready for review April 1, 2020 04:50

annieyro requested a review from aivantg April 1, 2020 04:50

Support base change to development Airtable base

3470012

wangannie requested changes Apr 2, 2020

View reviewed changes

Add rewardDollarValue

f3126ee

wangannie requested a review from kennethlien April 2, 2020 17:54

This was referenced Apr 2, 2020

No Cap #58

Closed

Added Proptypes #61

Merged

annieyro added 5 commits April 2, 2020 14:10

Fix typo

8c0acca

Filter out clerk training in dev as well

ab6bd5f

Cleanup .env.example

e341af2

Update login and logout

68da60c

Remove permissions from state and calculate in render. Update SignUp …

55a5608

…so unable to submit twice

annieyro force-pushed the annie/update-airtable branch from 5afadac to 55a5608 Compare April 2, 2020 21:10

annieyro added 3 commits April 2, 2020 14:13

Merge branch 'master' into annie/update-airtable

f6e80ee

Update line widths

f0fa653

Display duplicate customer error

588542b

kennethlien approved these changes Apr 3, 2020

View reviewed changes

wangannie approved these changes Apr 3, 2020

View reviewed changes

wangannie added 2 commits April 2, 2020 22:40

Merge branch 'master' of https://github.com/calblueprint/dccentralkit…

ac5e0eb

…chen into annie/update-airtable

Merge branch 'annie/update-airtable' of https://github.com/calbluepri…

6214dd9

…nt/dccentralkitchen into annie/update-airtable

wangannie merged commit b4dc7be into master Apr 3, 2020

This was referenced Apr 6, 2020

Fix loading drawer bug #75

Merged

Default store, recenter location button #72

Merged

Prevent tokens from being created in SignUp/LogIn, fix Login bug, cleanup #84

Merged

annieyro deleted the annie/update-airtable branch April 10, 2020 09:40

This was referenced May 13, 2020

Display error message for phone number length for Log In #156

Merged

[0] Development lifecycle improvements #23

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Airtable refactor, bug fixes, Auth overhaul #48

Airtable refactor, bug fixes, Auth overhaul #48

annieyro commented Mar 26, 2020 •

edited

Loading

wangannie left a comment

wangannie Apr 2, 2020

annieyro commented Apr 2, 2020

annieyro commented Apr 3, 2020

kennethlien left a comment

Airtable refactor, bug fixes, Auth overhaul #48

Airtable refactor, bug fixes, Auth overhaul #48

Conversation

annieyro commented Mar 26, 2020 • edited Loading

What's new in this PR

REQUIRES .env.development/production to be changed from AIRTABLE_API_KEY to REACT_APP_AIRTABLE_API_KEY

Map

Navigation

News

Rewards

Auth

SignUp

Login

Relevant Links

Related PRs

How to review

Next steps

Tests Performed, Edge Cases

Screenshots

wangannie left a comment

Choose a reason for hiding this comment

wangannie Apr 2, 2020

Choose a reason for hiding this comment

annieyro commented Apr 2, 2020

annieyro commented Apr 3, 2020

kennethlien left a comment

Choose a reason for hiding this comment

annieyro commented Mar 26, 2020 •

edited

Loading

REQUIRES `.env.development`/`production` to be changed from `AIRTABLE_API_KEY` to `REACT_APP_AIRTABLE_API_KEY`