feat: #2174 Coming soon section spacing fix (#2207)

reapit · Jul 29, 2020 · 5fa16fc · 5fa16fc
1 parent 0ac2416
commit 5fa16fc
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 358 deletions.
diff --git a/packages/marketplace/src/components/pages/apps/__tests__/__snapshots__/apps.test.tsx.snap b/packages/marketplace/src/components/pages/apps/__tests__/__snapshots__/apps.test.tsx.snap
diff --git a/...s/marketplace/src/components/pages/apps/__tests__/__snapshots__/coming-soon.test.tsx.snap b/...s/marketplace/src/components/pages/apps/__tests__/__snapshots__/coming-soon.test.tsx.snap
@@ -2,7 +2,6 @@
 
 exports[`ComingSoonApps should match a snapshot 1`] = `
 <Component
-  className="bt pt-4 mt-4"
   isMultiLine={true}
 >
   <Component

diff --git a/packages/marketplace/src/components/pages/apps/apps.tsx b/packages/marketplace/src/components/pages/apps/apps.tsx
@@ -75,37 +75,39 @@ export const Apps: React.FunctionComponent = () => {
         hasMargin={false}
         hasBackground={false}
       >
-        <InfiniteScroll
-          useWindow={false}
-          pageStart={1}
-          loadMore={handleLoadMore({ dispatch, preview, loading })}
-          hasMore={hasMore}
-          loader={<Loader key="infiniteScrollLoader" />}
-          initialLoad={false}
-        >
-          <TransitionGroup>
-            <>
-              {/* <AppSidebar /> */}
-              <H3 isHeadingSection>Browse Apps</H3>
-              {!hasParams && featuredApps.length > 0 && (
-                <div className="pb-4 bb mb-4">
-                  <Grid isMultiLine>
-                    {featuredApps.map(app => (
-                      <FeaturedApp key={app.id} app={app} />
-                    ))}
-                  </Grid>
-                </div>
-              )}
-              <AppList
-                list={apps}
-                loading={loading}
-                onCardClick={handleOnCardClick(history)}
-                infoType={pageNumber > 1 || hasParams ? '' : 'CLIENT_APPS_EMPTY'}
-                animated
-              />
-            </>
-          </TransitionGroup>
-        </InfiniteScroll>
+        <div className="bb mb-4">
+          <InfiniteScroll
+            useWindow={false}
+            pageStart={1}
+            loadMore={handleLoadMore({ dispatch, preview, loading })}
+            hasMore={hasMore}
+            loader={<Loader key="infiniteScrollLoader" />}
+            initialLoad={false}
+          >
+            <TransitionGroup>
+              <>
+                {/* <AppSidebar /> */}
+                <H3 isHeadingSection>Browse Apps</H3>
+                {!hasParams && featuredApps.length > 0 && (
+                  <div className="pb-4 bb mb-4">
+                    <Grid isMultiLine>
+                      {featuredApps.map(app => (
+                        <FeaturedApp key={app.id} app={app} />
+                      ))}
+                    </Grid>
+                  </div>
+                )}
+                <AppList
+                  list={apps}
+                  loading={loading}
+                  onCardClick={handleOnCardClick(history)}
+                  infoType={pageNumber > 1 || hasParams ? '' : 'CLIENT_APPS_EMPTY'}
+                  animated
+                />
+              </>
+            </TransitionGroup>
+          </InfiniteScroll>
+        </div>
         <ComingSoonApps />
       </Section>
     </ErrorBoundary>

diff --git a/packages/marketplace/src/components/pages/apps/coming-soon.tsx b/packages/marketplace/src/components/pages/apps/coming-soon.tsx
@@ -28,7 +28,7 @@ const comingSoonImagesList = [
 
 const ComingSoonApps: React.FC = () => {
   return (
-    <Grid className="bt pt-4 mt-4" isMultiLine>
+    <Grid isMultiLine>
       {comingSoonImagesList.map(imgSrc => (
         <GridThreeColItem key={imgSrc}>
           <div className="card">

diff --git a/packages/marketplace/src/tests/badges/badge-branches.svg b/packages/marketplace/src/tests/badges/badge-branches.svg
diff --git a/packages/marketplace/src/tests/badges/badge-functions.svg b/packages/marketplace/src/tests/badges/badge-functions.svg
diff --git a/packages/marketplace/src/tests/badges/badge-lines.svg b/packages/marketplace/src/tests/badges/badge-lines.svg
diff --git a/packages/marketplace/src/tests/badges/badge-statements.svg b/packages/marketplace/src/tests/badges/badge-statements.svg