Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Error: <WorldUsersProvider/> not found in a more holistic way #1769

Merged
merged 27 commits into from
Jul 10, 2021
Merged

fix Error: <WorldUsersProvider/> not found in a more holistic way #1769

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
56dcafd
Add WorldUsersProvider as a wrapper in WithNavigationBar
goran-peoski-work Jul 9, 2021
91a25ef
Add WorldUsersProvider in AdminSubrouter and remove from admin relate…
goran-peoski-work Jul 9, 2021
394f5ac
Merge branch 'staging' into fix/admin-flashes
goran-peoski-work Jul 9, 2021
0e34ebb
Merge branch 'staging' into fix/admin-flashes
goran-peoski-work Jul 9, 2021
dd68f14
Minor code style change
goran-peoski-work Jul 9, 2021
3e5195d
Add RelatedVenuesProvider to VenueAdminPage
goran-peoski-work Jul 9, 2021
f7f5b97
Merge branch 'staging' into fix/admin-flashes
goran-peoski-work Jul 9, 2021
7978378
Merge branch 'staging' into fix/admin-flashes
mike-lvov Jul 9, 2021
5efe461
Add Provided component to be used as wrapper in Route components
goran-peoski-work Jul 9, 2021
824e3a9
Pull more provides higher to Provided routes
goran-peoski-work Jul 9, 2021
15bb172
Merge branch 'staging' into fix/admin-flashes
goran-peoski-work Jul 9, 2021
aa35a4d
Make Provided exeption for VenueWizzard
goran-peoski-work Jul 9, 2021
ca2e823
Update src/components/organisms/AppRouter/AdminSubrouter.tsx
goran-peoski-work Jul 10, 2021
d72a705
Update src/components/organisms/AppRouter/Provided.tsx
goran-peoski-work Jul 10, 2021
8b27981
Update src/hooks/users/useWorldUserLocation.tsx
goran-peoski-work Jul 10, 2021
1ba4f76
Revert erroneous props component -> render
goran-peoski-work Jul 10, 2021
c584282
refactor Routes to use 'nested children' pattern rather than componen…
0xdevalias Jul 10, 2021
6d15756
remove withDebugLog from useRelatedVenues to reduce console spam
0xdevalias Jul 10, 2021
00bb082
export WorldUsersProviderProps from hooks/users
0xdevalias Jul 10, 2021
a037b8c
refactor Provided component to simplify logic / composability
0xdevalias Jul 10, 2021
f3ed798
remove redundant VenueLandingPageProps
0xdevalias Jul 10, 2021
cc0930e
fix DetailsForm to call page navigation function from useEffect inste…
0xdevalias Jul 10, 2021
4fd3481
refactor /admin/venue/creation route in AdminSubrouter now that Detai…
0xdevalias Jul 10, 2021
dfe4f24
add @debt comments + spacing
0xdevalias Jul 10, 2021
89a0ad4
cleanup VenueLandingPage/index.ts to explicitly name exports
0xdevalias Jul 10, 2021
4cef593
Update src/components/organisms/AppRouter/AppRouter.tsx
0xdevalias Jul 10, 2021
14c83db
add spacing to AdminSubrouter
0xdevalias Jul 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/components/organisms/WithNavigationBar/WithNavigationBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { tracePromise } from "utils/performance";

import { useVenueId } from "hooks/useVenueId";
import { RelatedVenuesProvider } from "hooks/useRelatedVenues";
import { WorldUsersProvider } from "hooks/users";

import { Footer } from "components/molecules/Footer";
import { Loading } from "components/molecules/Loading";
Expand Down Expand Up @@ -37,11 +38,13 @@ export const WithNavigationBar: React.FC<WithNavigationBarProps> = ({
* all to have a standard 'admin wrapper frame' in a similar way to how src/pages/VenuePage/TemplateWrapper.tsx
* works on the user side of things.
*/}
<RelatedVenuesProvider venueId={venueId}>
<Suspense fallback={<Loading />}>
<NavBar hasBackButton={hasBackButton} />
</Suspense>
</RelatedVenuesProvider>
<WorldUsersProvider venueId={venueId}>
<RelatedVenuesProvider venueId={venueId}>
<Suspense fallback={<Loading />}>
<NavBar hasBackButton={hasBackButton} />
</Suspense>
</RelatedVenuesProvider>
</WorldUsersProvider>

<div className="navbar-margin">{children}</div>

Expand Down