Skip to content

Commit

Permalink
feat: #3040 #3033 #3034 #3037 coming soon marketplace updates (#3043)
Browse files Browse the repository at this point in the history
  • Loading branch information
willmcvay authored Nov 25, 2020
1 parent 23394d0 commit 219e53a
Show file tree
Hide file tree
Showing 28 changed files with 118 additions and 90 deletions.
2 changes: 2 additions & 0 deletions packages/developer-portal/src/components/ui/menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { FaCloud, FaReadme, FaCog, FaChartBar, FaBolt, FaDesktop, FaStoreAlt } f
import { MdHelp } from 'react-icons/md'
import { GoDatabase } from 'react-icons/go'
import { menuItemOverflow } from './__styles__/menu'
import { history } from '../../core/router'

export const generateMenuConfig = (location: Location<any>): MenuConfig => {
return {
Expand All @@ -17,6 +18,7 @@ export const generateMenuConfig = (location: Location<any>): MenuConfig => {
key: 'LOGO',
icon: <ReapitLogo className="nav-item-icon" />,
type: 'LOGO',
callback: () => history.push(Routes.APPS),
},
{
title: 'Apps',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/developer-portal/src/tests/badges/badge-lines.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,71 +7,73 @@ exports[`ClientAppContent ClientAppContent - should match snapshot 1`] = `
isFlex={true}
isFlexColumn={true}
>
<Component
summary="vitae elementum curabitur vitae"
/>
<Component
images={
Array [
Object {
"description": "Application Icon",
"type": "icon",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/7d88729f-2366-4561-9d5c-282615f3946b.jpeg",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/c4a36706-aa44-47f9-9fb6-9053eef4e581.png",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/65bd3b97-e78c-41cd-b75f-e06e1d2f00df.png",
},
]
}
numberImages={2}
splitIndex={1}
/>
<Component
description="enim facilisis"
/>
<Component
images={
Array [
Object {
"description": "Application Icon",
"type": "icon",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/7d88729f-2366-4561-9d5c-282615f3946b.jpeg",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/c4a36706-aa44-47f9-9fb6-9053eef4e581.png",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/65bd3b97-e78c-41cd-b75f-e06e1d2f00df.png",
},
]
}
numberImages={2}
splitIndex={3}
/>
<Component
permissions={
Array [
Object {
"description": "Read data about developers",
"name": "Marketplace/developers.read",
},
Object {
"description": "Write data about developers",
"name": "Marketplace/developers.write",
},
]
}
/>
<mock-styled.div>
<Component
summary="vitae elementum curabitur vitae"
/>
<Component
images={
Array [
Object {
"description": "Application Icon",
"type": "icon",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/7d88729f-2366-4561-9d5c-282615f3946b.jpeg",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/c4a36706-aa44-47f9-9fb6-9053eef4e581.png",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/65bd3b97-e78c-41cd-b75f-e06e1d2f00df.png",
},
]
}
numberImages={2}
splitIndex={1}
/>
<Component
description="enim facilisis"
/>
<Component
images={
Array [
Object {
"description": "Application Icon",
"type": "icon",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/7d88729f-2366-4561-9d5c-282615f3946b.jpeg",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/c4a36706-aa44-47f9-9fb6-9053eef4e581.png",
},
Object {
"description": "Application Image",
"type": "image",
"uri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/65bd3b97-e78c-41cd-b75f-e06e1d2f00df.png",
},
]
}
numberImages={2}
splitIndex={3}
/>
<Component
permissions={
Array [
Object {
"description": "Read data about developers",
"name": "Marketplace/developers.read",
},
Object {
"description": "Write data about developers",
"name": "Marketplace/developers.write",
},
]
}
/>
</mock-styled.div>
</Component>
`;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { Section } from '@reapit/elements'
import { FadeIn, Section } from '@reapit/elements'
import {
SummarySection,
AdditionalImagesSection,
Expand All @@ -18,12 +18,14 @@ const AppContent: React.FC<AppContentProps> = ({ appDetailData }) => {

return (
<Section isFlex isFlexColumn hasPadding={false} hasMargin={false}>
<SummarySection summary={summary} />
<AdditionalImagesSection images={media} splitIndex={1} numberImages={2} />
<DescriptionSection description={description} />
<AdditionalImagesSection images={media} splitIndex={3} numberImages={2} />
{developerAbout && <DeveloperAboutSection>{developerAbout}</DeveloperAboutSection>}
<PermissionsSection permissions={scopes} />
<FadeIn>
<SummarySection summary={summary} />
<AdditionalImagesSection images={media} splitIndex={1} numberImages={2} />
<DescriptionSection description={description} />
<AdditionalImagesSection images={media} splitIndex={3} numberImages={2} />
{developerAbout && <DeveloperAboutSection>{developerAbout}</DeveloperAboutSection>}
<PermissionsSection permissions={scopes} />
</FadeIn>
</Section>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,7 @@ const AppDetail: React.FC = () => {
}
/>
</FadeIn>
<FadeIn>
<AppContent appDetailData={appDetailData} />
</FadeIn>
<AppContent appDetailData={appDetailData} />
{!isMobile && (
<FadeIn>
<BackToAppsSection onClick={onBackToAppsButtonClick(history)} />
Expand Down
34 changes: 28 additions & 6 deletions packages/marketplace/src/components/pages/apps/coming-soon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ import { GridThreeColItem, Grid, H3 } from '@reapit/elements'
import placeHolderImage from '@/assets/images/default-feature-image.jpg'
import comingSoonImageZoopla from '@/assets/images/coming-soon/Zoopla.jpg'
import comingSoonImageYourkeys from '@/assets/images/coming-soon/1Yourkeys.jpg'
import comingSoonImageStarberry from '@/assets/images/coming-soon/2Starberry.jpg'
import comingSoonImageVyomm from '@/assets/images/coming-soon/5Vyomm.jpg'
import comingSoonImageSpectre from '@/assets/images/coming-soon/6Spectre.jpg'
import comingSoonImageTwentyCiVMC from '@/assets/images/coming-soon/TwentyCiVMC.jpg'
import comingSoonImageTwentyci from '@/assets/images/coming-soon/TwentyCiProspect.jpg'
import comingSoonImageZero from '@/assets/images/coming-soon/8Zero.jpg'
import comingSoonImageYomdel from '@/assets/images/coming-soon/9Yomdel.jpg'
import comingSoonImageIntegrated from '@/assets/images/coming-soon/12Integrated.jpg'
import comingSoonSmsSpeedway from '@/assets/images/coming-soon/SMS2.jpg'
import comingSoonSmsSpeedWayIdVerification from '@/assets/images/coming-soon/SMSMobile.jpg'
Expand All @@ -24,6 +21,20 @@ import comingSoonPerfectPortal from '@/assets/images/coming-soon/PerfectPortal.j
import comingSoonRightMove from '@/assets/images/coming-soon/RightMove.jpg'
import comingSoonHomeSearch from '@/assets/images/coming-soon/Homesearch.jpg'
import comingSoonDataWarehouse from '@/assets/images/coming-soon/DataWarehouse.jpg'
import comingSoonNotify from '@/assets/images/coming-soon/Notify.jpg'
import comingSoonSignatureSense from '@/assets/images/coming-soon/Signature.jpg'
import comingSoonFCCParagon from '@/assets/images/coming-soon/FCCParagon.jpg'
import comingSoonPropoly from '@/assets/images/coming-soon/Propoly.jpg'
import comingSoonHomeHero from '@/assets/images/coming-soon/Homehero.jpg'
import comingSoonBarbuck from '@/assets/images/coming-soon/Barbuck.jpg'
import comingSoonNicheCom from '@/assets/images/coming-soon/Nichecom.jpg'
import comingSoonCoadjute from '@/assets/images/coming-soon/Coadjute.jpg'
import comingSoonSMSWorks from '@/assets/images/coming-soon/SMSWorks.jpg'
import comingSoonLeadPro from '@/assets/images/coming-soon/Leadpro.jpg'
import comingSoonSpinify from '@/assets/images/coming-soon/Spinify.jpg'
import comingSoonCanopy from '@/assets/images/coming-soon/Canopy.jpg'
import comingSoonData8 from '@/assets/images/coming-soon/Data8.jpg'
import comingSoonFacebook from '@/assets/images/coming-soon/Facebook.jpg'

import { useReapitConnect } from '@reapit/connect-session'
import { reapitConnectBrowserSession } from '@/core/connect-session'
Expand All @@ -42,9 +53,6 @@ export const onImageError = (event: React.SyntheticEvent<HTMLImageElement>) =>
const comingSoonImagesMap = {
comingSoonImageZoopla,
comingSoonImageYourkeys,
comingSoonImageVyomm,
comingSoonImageStarberry,
comingSoonImageYomdel,
comingSoonImageIntegrated,
comingSoonImageTwentyci,
comingSoonImageZero,
Expand All @@ -61,6 +69,20 @@ const comingSoonImagesMap = {
comingSoonRightMove,
comingSoonHomeSearch,
comingSoonDataWarehouse,
comingSoonNotify,
comingSoonSignatureSense,
comingSoonFCCParagon,
comingSoonPropoly,
comingSoonHomeHero,
comingSoonBarbuck,
comingSoonNicheCom,
comingSoonCoadjute,
comingSoonSMSWorks,
comingSoonLeadPro,
comingSoonSpinify,
comingSoonCanopy,
comingSoonData8,
comingSoonFacebook,
}

export const getComingAppLinkHref = (isDesktop: boolean, email?: string) => {
Expand Down
Loading

0 comments on commit 219e53a

Please sign in to comment.