Skip to content

Commit

Permalink
fix: Standardize Font Style Across All Integration Announcement Pages
Browse files Browse the repository at this point in the history
  • Loading branch information
japhethLG committed Apr 19, 2024
1 parent 06fac47 commit 5ccd4e2
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 13 deletions.
6 changes: 3 additions & 3 deletions src/components/marketplace/AppInstallerComp.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ export const AppInstallerComp = ({ data }) => {
loading={loading || (isInstalled && selectInstance)}
>
{!appSID
? 'Please Login to continue'
? 'Get Started'
: !instanceZUID
? 'Select an Instance to continue'
? 'Get Started'
: isInstalled && !selectInstance
? `App Installed in ${instanceName}`
: `Install ${data?.name} in ${instanceName}`}
: `Get Started`}
</LoadingButton>
{isInstalled && (
<LoadingButton
Expand Down
10 changes: 4 additions & 6 deletions src/components/marketplace/ExtensionsIntaller.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ const ExtensionsIntaller = ({ extensionName, githubUrl, data }) => {
const { setworkingInstance } = useZestyStore((state) => state);
const [instances, setinstances] = React.useState([]);
const instanceZUID = getCookie('ZESTY_WORKING_INSTANCE');
const instanceName = instances?.data?.find(
(e) => e.ZUID === instanceZUID,
)?.name;

let ZestyAPI = useZestyStore((state) => state.ZestyAPI);

// TEMPLATE URL can be access in env files
Expand Down Expand Up @@ -171,14 +169,14 @@ const ExtensionsIntaller = ({ extensionName, githubUrl, data }) => {
loading={loading}
>
{!appSID
? 'Please Login To Continue'
? 'Get Started'
: !instanceZUID
? `Select Instance to continue`
? `Get Started`
: loading && !finishInstall
? `Installing ${extensionName}`
: !loading && finishInstall
? `${extensionName} has been Installed`
: `Install ${extensionName} to ${instanceName}`}
: `Get Started`}
</LoadingButton>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/marketplace/ResourceLinkComp.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const ResourceLinkComp = ({ data }) => {
sx={{ mt: 2 }}
fullWidth
>
{data?.name}
Get Started
</Button>
);
};
56 changes: 53 additions & 3 deletions src/views/marketplace/Extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const InstallButton = ({ data, theme }) => {
color="secondary"
fullWidth
>
Install {data.name}
Get Started
</Button>
);
} else if (data.github_url && !data.app_zuid && !data.resource_link) {
Expand Down Expand Up @@ -162,8 +162,11 @@ const Extension = (props) => {
<Typography
variant="h5"
component="p"
color="text.secondary"
mb={1}
sx={{
color: theme.palette.zesty.zestyZambezi,
fontWeight: 'bold',
}}
>
{props.subtitle}
</Typography>
Expand Down Expand Up @@ -192,11 +195,58 @@ const Extension = (props) => {
props: {
sx: {
color: theme.palette.zesty.zestyZambezi,
marginTop: 2,
},
variant: 'h5',
variant: 'h6',
component: 'p',
},
},
h4: {
component: Typography,
props: {
sx: {
color: theme.palette.zesty.zestyZambezi,
marginTop: 4,
fontWeight: 'bold',
},
variant: 'h6',
component: 'p',
},
},
h3: {
component: Typography,
props: {
sx: {
color: theme.palette.zesty.zestyZambezi,
marginTop: 4,
fontWeight: 'bold',
},
variant: 'h6',
component: 'p',
},
},
h2: {
component: Typography,
props: {
sx: {
color: theme.palette.zesty.zestyZambezi,
marginTop: 4,
fontWeight: 'bold',
},
variant: 'h6',
component: 'p',
},
},
li: {
component: Typography,
props: {
sx: {
color: theme.palette.zesty.zestyZambezi,
},
variant: 'h6',
component: 'li',
},
},
img: {
component: Box,
props: {
Expand Down

0 comments on commit 5ccd4e2

Please sign in to comment.