Skip to content

Commit

Permalink
Merge pull request #6784 from artsy/feature-enable-routes-in-novo
Browse files Browse the repository at this point in the history
feature: Enabled Remaining Routes in Novo
  • Loading branch information
eessex authored Dec 14, 2020
2 parents dfff757 + 28a5906 commit b98117e
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/v2/Apps/Artists/artistsRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const ArtistsByLetterRoute = loadable(
}
)

export const artistsRoutes: RouteConfig[] = [
export const routes: RouteConfig[] = [
{
path: "/artists2",
getComponent: () => ArtistsApp,
Expand Down
2 changes: 1 addition & 1 deletion src/v2/Apps/Collect/collectRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const CollectionApp = loadable(() => import("./Routes/Collection"), {
resolveComponent: component => component.CollectionRefetchContainer,
})

export const collectRoutes: RouteConfig[] = [
export const routes: RouteConfig[] = [
{
path: "/collect/:medium?",
getComponent: () => CollectApp,
Expand Down
11 changes: 6 additions & 5 deletions src/v2/Apps/Consign/consignRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
import loadable from "@loadable/component"
import { graphql } from "react-relay"

const MarketingLandingApp = loadable(() =>
import("./Routes/MarketingLanding/MarketingLandingApp"), {
resolveComponent: component => component.MarketingLandingApp,
}
const MarketingLandingApp = loadable(
() => import("./Routes/MarketingLanding/MarketingLandingApp"),
{
resolveComponent: component => component.MarketingLandingApp,
}
)
const OfferDetailApp = loadable(() => import("./Routes/Offer/OfferDetailApp"), {
resolveComponent: component => component.OfferDetailAppFragmentContainer,
})

export const consignRoutes = [
export const routes = [
{
path: "/consign",
getComponent: () => MarketingLandingApp,
Expand Down
2 changes: 1 addition & 1 deletion src/v2/Apps/Conversation/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import loadable from "@loadable/component"
import { RouteConfig } from "found"
import { graphql } from "react-relay"

export const conversationRoutes: RouteConfig[] = [
export const routes: RouteConfig[] = [
{
path: "/user/conversations",
displayFullPage: true,
Expand Down
2 changes: 1 addition & 1 deletion src/v2/Apps/Debug/debugRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Title } from "react-head"
* Calibre, assets loaded on page, and other debugging things that might
* impact global performance.
*/
export const debugRoutes = [
export const routes = [
{
path: "/debug",
Component: ({ children }) => children,
Expand Down
65 changes: 46 additions & 19 deletions src/v2/Apps/getAppNovoRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,53 @@
import { buildAppRoutes } from "v2/Artsy/Router/buildAppRoutes"
import { RouteConfig } from "found"
import { routes as artistRoutes } from "v2/Apps/Artist/routes"
import { debugRoutes } from "./Debug/debugRoutes"
import * as artistRoutes from "v2/Apps/Artist/routes"
import * as artistSeriesRoutes from "./ArtistSeries/routes"
import * as artistsRoutes from "v2/Apps/Artists/artistsRoutes"
import * as artworkRoutes from "v2/Apps/Artwork/routes"
import * as collectRoutes from "v2/Apps/Collect/collectRoutes"
import * as consignRoutes from "v2/Apps/Consign/consignRoutes"
import * as conversationRoutes from "v2/Apps/Conversation/routes"
import * as debugRoutes from "./Debug/debugRoutes"
import * as fairRoutes from "v2/Apps/Fair/routes"
import * as featureRoutes from "v2/Apps/Feature/routes"
import * as identityVerificationRoutes from "v2/Apps/IdentityVerification/routes"
import * as orderRoutes from "v2/Apps/Order/routes"
import * as purchasesRoutes from "v2/Apps/Purchase/routes"
import * as searchRoutes from "v2/Apps/Search/routes"
import * as showRoutes from "v2/Apps/Show/routes"
import * as viewingRoomRoutes from "./ViewingRoom/routes"

const NOVO_ENABLED_ROUTES = [
artistRoutes,
artistsRoutes,
artistSeriesRoutes,
artworkRoutes,
collectRoutes,
consignRoutes,
conversationRoutes,
debugRoutes,
fairRoutes,
featureRoutes,
identityVerificationRoutes,
orderRoutes,
purchasesRoutes,
searchRoutes,
showRoutes,
viewingRoomRoutes,
] as Array<{ routes: RouteConfig[] }>

export function getAppNovoRoutes(): RouteConfig[] {
return buildAppRoutes([
{
routes: artistRoutes.map(route => {
return {
...route,
path: `/novo${route.path}`,
}
}),
},
// For debugging baseline app shell stuff
{
routes: debugRoutes.map(route => {
return {
return buildAppRoutes(
NOVO_ENABLED_ROUTES.map(route => {
if (!route.routes) {
return
}
return {
routes: route.routes.map(route => ({
...route,
path: `/novo${route.path}`,
}
}),
},
])
})),
}
})
)
}
12 changes: 6 additions & 6 deletions src/v2/Apps/getAppRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { buildAppRoutes } from "v2/Artsy/Router/buildAppRoutes"
import { RouteConfig } from "found"
import { routes as artistRoutes } from "v2/Apps/Artist/routes"
import { artistsRoutes } from "v2/Apps/Artists/artistsRoutes"
import { routes as artistSeriesRoutes } from "./ArtistSeries/routes"
import { routes as artistsRoutes } from "v2/Apps/Artists/artistsRoutes"
import { routes as artworkRoutes } from "v2/Apps/Artwork/routes"
import { collectRoutes } from "v2/Apps/Collect/collectRoutes"
import { conversationRoutes } from "v2/Apps/Conversation/routes"
import { routes as featureRoutes } from "v2/Apps/Feature/routes"
import { routes as collectRoutes } from "v2/Apps/Collect/collectRoutes"
import { routes as consignRoutes } from "v2/Apps/Consign/consignRoutes"
import { routes as conversationRoutes } from "v2/Apps/Conversation/routes"
import { routes as debugRoutes } from "./Debug/debugRoutes"
import { routes as fairRoutes } from "v2/Apps/Fair/routes"
import { routes as featureRoutes } from "v2/Apps/Feature/routes"
import { routes as identityVerificationRoutes } from "v2/Apps/IdentityVerification/routes"
import { routes as orderRoutes } from "v2/Apps/Order/routes"
import { routes as purchasesRoutes } from "v2/Apps/Purchase/routes"
import { routes as searchRoutes } from "v2/Apps/Search/routes"
import { routes as showRoutes } from "v2/Apps/Show/routes"
import { routes as viewingRoomRoutes } from "./ViewingRoom/routes"
import { consignRoutes } from "v2/Apps/Consign/consignRoutes"
import { debugRoutes } from "./Debug/debugRoutes"

export function getAppRoutes(): RouteConfig[] {
return buildAppRoutes([
Expand Down

0 comments on commit b98117e

Please sign in to comment.