diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml
index 4f9d06610..6b95b9b3a 100644
--- a/.github/workflows/deploy-cloud.yaml
+++ b/.github/workflows/deploy-cloud.yaml
@@ -17,13 +17,7 @@ jobs:
REGION: ${{ github.event.client_payload.region }}
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
- # Disable preview when new Marketplace features are in progress.
- # If marketplace is done till next release this can be easily enabled
- # MARKETPLACE_URL: "https://apps.saleor.io/"
- # SALEOR_APPS_PAGE_PATH=saleor-apps
- # SALEOR_APPS_JSON_PATH=api/saleor-apps
- # APP_TEMPLATE_GALLERY_PATH=template-gallery
- # APPS_MARKETPLACE_API_URI: "https://apps.saleor.io/api/v2/saleor-apps"
+ APPS_MARKETPLACE_API_URI: "https://apps.saleor.io/api/v2/saleor-apps"
IS_CLOUD_INSTANCE: true
steps:
- uses: actions/checkout@v2
diff --git a/.github/workflows/deploy-demo-staging.yaml b/.github/workflows/deploy-demo-staging.yaml
index 6f097d647..c258ad661 100644
--- a/.github/workflows/deploy-demo-staging.yaml
+++ b/.github/workflows/deploy-demo-staging.yaml
@@ -20,13 +20,7 @@ jobs:
SENTRY_URL_PREFIX: "~/dashboard/static"
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
- # Disable preview when new Marketplace features are in progress.
- # If marketplace is done till next release this can be easily enabled
- # MARKETPLACE_URL: "https://apps.saleor.io/"
- # SALEOR_APPS_PAGE_PATH=saleor-apps
- # SALEOR_APPS_JSON_PATH=api/saleor-apps
- # APP_TEMPLATE_GALLERY_PATH=template-gallery
- # APPS_MARKETPLACE_API_URI: "https://apps.saleor.io/api/v2/saleor-apps"
+ APPS_MARKETPLACE_API_URI: "https://marketplace-gray.vercel.app/api/v2/saleor-apps"
ENVIRONMENT: demo-staging
DEMO_MODE: true
steps:
diff --git a/.github/workflows/deploy-demo.yaml b/.github/workflows/deploy-demo.yaml
index b4bf6a59c..dd2369289 100644
--- a/.github/workflows/deploy-demo.yaml
+++ b/.github/workflows/deploy-demo.yaml
@@ -15,13 +15,7 @@ jobs:
SENTRY_URL_PREFIX: "~/dashboard/static"
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
- # Disable preview when new Marketplace features are in progress.
- # If marketplace is done till next release this can be easily enabled
- # MARKETPLACE_URL: "https://apps.saleor.io/"
- # SALEOR_APPS_PAGE_PATH=saleor-apps
- # SALEOR_APPS_JSON_PATH=api/saleor-apps
- # APP_TEMPLATE_GALLERY_PATH=template-gallery
- # APPS_MARKETPLACE_API_URI: "https://apps.saleor.io/api/v2/saleor-apps"
+ APPS_MARKETPLACE_API_URI: "https://apps.saleor.io/api/v2/saleor-apps"
ENVIRONMENT: demo
DEMO_MODE: true
steps:
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
index 673610371..86364a06e 100644
--- a/.github/workflows/deploy-staging.yaml
+++ b/.github/workflows/deploy-staging.yaml
@@ -22,13 +22,7 @@ jobs:
SENTRY_URL_PREFIX: "~/dashboard/static"
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
- # Disable preview when new Marketplace features are in progress.
- # If marketplace is done till next release this can be easily enabled
- # MARKETPLACE_URL: "https://apps.saleor.io/"
- # SALEOR_APPS_PAGE_PATH=saleor-apps
- # SALEOR_APPS_JSON_PATH=api/saleor-apps
- # APP_TEMPLATE_GALLERY_PATH=template-gallery
- # APPS_MARKETPLACE_API_URI: "https://marketplace-gray.vercel.app/api/v2/saleor-apps"
+ APPS_MARKETPLACE_API_URI: "https://marketplace-gray.vercel.app/api/v2/saleor-apps"
VERSION: ${{ github.event.inputs.git_ref || github.ref_name }}
IS_CLOUD_INSTANCE: true
steps:
diff --git a/src/index.tsx b/src/index.tsx
index d6cfc1161..38d87df0f 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -11,10 +11,8 @@ import TagManager from "react-gtm-module";
import { useIntl } from "react-intl";
import { BrowserRouter, Route, Switch } from "react-router-dom";
-import AppsSection from "./apps";
import { ExternalAppProvider } from "./apps/components/ExternalAppContext";
import { useLocationState } from "./apps/hooks/useLocationState";
-import { appsSection } from "./apps/urls";
import AttributeSection from "./attributes";
import { attributeSection } from "./attributes/urls";
import Auth, { useUser } from "./auth";
@@ -56,7 +54,7 @@ import MarketplaceSection from "./marketplace";
import { marketplaceUrl } from "./marketplace/urls";
import NavigationSection from "./navigation";
import { navigationSection } from "./navigation/urls";
-import NewAppsSection from "./new-apps";
+import AppsSection from "./new-apps";
import { AppSections } from "./new-apps/urls";
import { NotFound } from "./NotFound";
import OrdersSection from "./orders";
@@ -259,12 +257,8 @@ const Routes: React.FC = () => {
/>
-
> = ({
+ match,
+}) => {
+ const qs = parseQs(location.search.substr(1));
+ const params: AppDetailsUrlQueryParams = qs;
+
+ return (
+
+ );
+};
+
+const App: React.FC> = ({ match }) => (
+
+);
+
+const AppInstall: React.FC = props => {
+ const qs = parseQs(location.search.substr(1));
+ const params: AppInstallUrlQueryParams = qs;
+
+ return ;
+};
+
const AppList: React.FC = () => {
const qs = parseQs(location.search.substr(1));
const params: AppListUrlQueryParams = qs;
@@ -23,6 +52,13 @@ const Apps = () => {
+
+
+
>
);
diff --git a/src/new-apps/urls.ts b/src/new-apps/urls.ts
index 83e653760..5fbf62ec2 100644
--- a/src/new-apps/urls.ts
+++ b/src/new-apps/urls.ts
@@ -8,7 +8,7 @@ export type AppListUrlDialog = "app-installation-remove";
export type AppListUrlQueryParams = Dialog & SingleAction;
export const AppSections = {
- appsSection: "/new-apps/",
+ appsSection: "/apps/",
};
export const AppPaths = {